From: John Jacques <john.jacq...@lsi.com> The latest boot loader updates the frequency of the clocks in the device tree; it expects there to be a place to put them.
Fix the device trees for ACP and AXM platforms such that the "compatible" field uses the form <manufacturer>,<model>. Signed-off-by: John Jacques <john.jacq...@lsi.com> Signed-off-by: David Mercado <david.merc...@windriver.com> Signed-off-by: Paul Butler <paul.but...@windriver.com> --- arch/arm/boot/dts/axm55xx.dts | 4 ++-- arch/arm/boot/dts/axm55xxemu.dts | 21 +++++++++++++++++++-- arch/powerpc/boot/dts/ACP344xV2.dts | 20 ++++++++++---------- arch/powerpc/boot/dts/acp25xx.dts | 16 ++++++++-------- arch/powerpc/boot/dts/acp342x.dts | 14 +++++++------- arch/powerpc/boot/dts/acp344x.dts | 16 ++++++++-------- 6 files changed, 54 insertions(+), 37 deletions(-) diff --git a/arch/arm/boot/dts/axm55xx.dts b/arch/arm/boot/dts/axm55xx.dts index f18550b..f0b325d 100644 --- a/arch/arm/boot/dts/axm55xx.dts +++ b/arch/arm/boot/dts/axm55xx.dts @@ -232,7 +232,7 @@ }; axxia_femac0: femac@0x2010120000 { - compatible = "acp-femac"; + compatible = "lsi,acp-femac"; device_type = "network"; reg = <0x20 0x10120000 0 0x1000>, <0x20 0x10121000 0 0x1000>, @@ -314,7 +314,7 @@ USB0: usb@004a4000 { device_type = "usb"; - compatible = "acp-usb"; + compatible = "lsi,acp-usb"; enabled = <0>; reg = <0x20 0x10140000 0x0 0020000>, <0x20 0x10094000 0x0 0002000>; diff --git a/arch/arm/boot/dts/axm55xxemu.dts b/arch/arm/boot/dts/axm55xxemu.dts index 99d7a70..1b22b33 100644 --- a/arch/arm/boot/dts/axm55xxemu.dts +++ b/arch/arm/boot/dts/axm55xxemu.dts @@ -1,5 +1,5 @@ /* - * arch/arm/boot/dts/axm5500-sim.dts + * arch/arm/boot/dts/axm55xxemu.dts * * Copyright (C) 2012 LSI * @@ -93,6 +93,23 @@ */ }; + clocks { + #address-cells = <1>; + #size-cells = <0>; + + cpu { + frequency = <0>; /* Filled in by the boot loader. */ + }; + + peripheral { + frequency = <0>; /* Filled in by the boot loader. */ + }; + + emmc { + frequency = <0>; /* Filled in by the boot loader. */ + }; + }; + memory@00000000 { device_type = "memory"; reg = <0 0x00000000 0 0x10000000>; @@ -153,7 +170,7 @@ }; axxia_femac0: femac@0x2010120000 { - compatible = "acp-femac"; + compatible = "lsi,acp-femac"; device_type = "network"; reg = <0x20 0x10120000 0 0x1000>, <0x20 0x10121000 0 0x1000>, diff --git a/arch/powerpc/boot/dts/ACP344xV2.dts b/arch/powerpc/boot/dts/ACP344xV2.dts index 1a4040f..72db6b4 100644 --- a/arch/powerpc/boot/dts/ACP344xV2.dts +++ b/arch/powerpc/boot/dts/ACP344xV2.dts @@ -135,7 +135,7 @@ clock-frequency = <0>; // Filled in by zImage UART0: serial@00404000 { device_type = "serial"; - compatible = "acp-uart0"; + compatible = "lsi,acp-uart0"; enabled = <0>; reg = <0x00404000 0x1000>; clock-reg = <0x00408040 0x20>; @@ -146,7 +146,7 @@ }; UART1: serial@00405000 { device_type = "serial"; - compatible = "acp-uart1"; + compatible = "lsi,acp-uart1"; enabled = <0>; reg = <0x00405000 0x1000>; clock-reg = <0x00408060 0x20>; @@ -157,7 +157,7 @@ }; USB0: usb@004a4000 { device_type = "usb"; - compatible = "acp-usb"; + compatible = "lsi,acp-usb"; enabled = <0>; reg = <0x004a0000 0x00020000 0x0040c000 0x00001000>; @@ -167,7 +167,7 @@ I2C: i2c@00403000 { #address-cells = <1>; #size-cells = <0>; - compatible = "acp-i2c"; + compatible = "lsi,acp-i2c"; enabled = <0>; reg = <0x403000 0x1000 0x408020 0x1000>; interrupt-parent = <&MPIC>; @@ -182,7 +182,7 @@ #address-cells = <1>; #size-cells = <0>; cell-index = <0>; - compatible = "acp-ssp"; + compatible = "arm,acp-ssp"; clock-frequency = <25000000>; enabled = <1>; reg = <0x00402000 0x00001000>; @@ -207,7 +207,7 @@ #address-cells = <1>; #size-cells = <1>; device_type = "nand"; - compatible = "acp-nand"; + compatible = "lsi,acp-nand"; enabled = <0>; reg = <0x00440000 0x20000 0x0040c000 0x1000>; @@ -279,7 +279,7 @@ }; FEMAC: femac@00480000 { device_type = "network"; - compatible = "acp-femac"; + compatible = "lsi,acp-femac"; enabled = <0>; reg = <0x00480000 0x1000 0x00481000 0x1000 @@ -299,7 +299,7 @@ #address-cells = <1>; #size-cells = <0>; cell-index = <0>; - compatible = "amba_pl061"; + compatible = "arm,amba_pl061"; reg = <0x400000 0x1000>; pins-map = <0x10>; /* GPIO 4 reserved for HW*/ }; @@ -308,7 +308,7 @@ #address-cells = <1>; #size-cells = <0>; cell-index = <8>; - compatible = "amba_pl061"; + compatible = "arm,amba_pl061"; reg = <0x401000 0x1000>; pins-map = <0x29>; /* GPIO 8,11,13 reserved for HW*/ }; @@ -462,7 +462,7 @@ }; rio0: rapidio@f0020000 { - compatible = "acp,rapidio-delta"; + compatible = "lsi,rapidio-delta"; device_type = "rapidio"; enabled = <0>; #size = <0>; /* 0 = (256, small system) diff --git a/arch/powerpc/boot/dts/acp25xx.dts b/arch/powerpc/boot/dts/acp25xx.dts index 4db67df..1207631 100644 --- a/arch/powerpc/boot/dts/acp25xx.dts +++ b/arch/powerpc/boot/dts/acp25xx.dts @@ -90,7 +90,7 @@ clock-frequency = <0>; // Filled in by zImage UART0: serial@00404000 { device_type = "serial"; - compatible = "acp-uart0"; + compatible = "lsi,acp-uart0"; enabled = <1>; reg = <0x00404000 0x1000>; clock-reg = <0x00408040 0x20>; @@ -101,7 +101,7 @@ }; UART1: serial@00405000 { device_type = "serial"; - compatible = "acp-uart1"; + compatible = "lsi,acp-uart1"; enabled = <0>; reg = <0x00405000 0x1000>; clock-reg = <0x00408060 0x20>; @@ -112,21 +112,21 @@ }; USB0: usb@004a4000 { device_type = "usb"; - compatible = "acp-usb"; + compatible = "lsi,acp-usb"; enabled = <0>; reg = <0x004a4000 0x00020000>; interrupt-parent = <&MPIC>; interrupts = <31>; }; I2C: i2c@00403000 { - compatible = "acp-i2c"; + compatible = "lsi,acp-i2c"; enabled = <0>; reg = <0x00403000 0x00001000>; interrupt-parent = <&MPIC>; interrupts = <21>; }; SSP: ssp@00402000 { - compatible = "acp-ssp"; + compatible = "arm,acp-ssp"; enabled = <0>; reg = <0x00402000 0x00001000>; interrupt-parent = <&MPIC>; @@ -134,14 +134,14 @@ }; NAND: nand@00440000 { device_type = "nand"; - compatible = "acp-nand"; + compatible = "lsi,acp-nand"; enabled = <1>; reg = <0x00440000 0x20000 0x0040c000 0x1000>; }; FEMAC: femac@00480000 { device_type = "network"; - compatible = "acp-femac"; + compatible = "lsi,acp-femac"; enabled = <1>; reg = <0x00480000 0x1000 0x00481000 0x1000 @@ -284,7 +284,7 @@ }; rio0: rapidio@f0020000 { - compatible = "acp,rapidio-delta"; + compatible = "lsi,rapidio-delta"; device_type = "rapidio"; enabled = <0>; #size = <0>; /* 0 = (256, small system) diff --git a/arch/powerpc/boot/dts/acp342x.dts b/arch/powerpc/boot/dts/acp342x.dts index 8e400e3..c9c8a35 100644 --- a/arch/powerpc/boot/dts/acp342x.dts +++ b/arch/powerpc/boot/dts/acp342x.dts @@ -90,7 +90,7 @@ clock-frequency = <0>; // Filled in by zImage UART0: serial@00404000 { device_type = "serial"; - compatible = "acp-uart0"; + compatible = "lsi,acp-uart0"; enabled = <1>; reg = <0x00404000 0x1000>; clock-reg = <0x00408040 0x20>; @@ -101,7 +101,7 @@ }; UART1: serial@00405000 { device_type = "serial"; - compatible = "acp-uart1"; + compatible = "lsi,acp-uart1"; enabled = <0>; reg = <0x00405000 0x1000>; clock-reg = <0x00408060 0x20>; @@ -120,14 +120,14 @@ interrupts = <31>; }; I2C: i2c@00403000 { - compatible = "acp-i2c"; + compatible = "lsi,acp-i2c"; enabled = <0>; reg = <0x00403000 0x00001000>; interrupt-parent = <&MPIC>; interrupts = <21>; }; SSP: ssp@00402000 { - compatible = "acp-ssp"; + compatible = "arm,acp-ssp"; enabled = <0>; reg = <0x00402000 0x00001000>; interrupt-parent = <&MPIC>; @@ -135,14 +135,14 @@ }; NAND: nand@00440000 { device_type = "nand"; - compatible = "acp-nand"; + compatible = "lsi,acp-nand"; enabled = <1>; reg = <0x00440000 0x20000 0x0040c000 0x1000>; }; FEMAC: femac@00480000 { device_type = "network"; - compatible = "acp-femac"; + compatible = "lsi,acp-femac"; enabled = <1>; reg = <0x00480000 0x1000 0x00481000 0x1000 @@ -285,7 +285,7 @@ }; rio0: rapidio@f0020000 { - compatible = "acp,rapidio-delta"; + compatible = "lsi,rapidio-delta"; device_type = "rapidio"; enabled = <0>; #size = <0>; /* 0 = (256, small system) diff --git a/arch/powerpc/boot/dts/acp344x.dts b/arch/powerpc/boot/dts/acp344x.dts index 4db67df..1207631 100644 --- a/arch/powerpc/boot/dts/acp344x.dts +++ b/arch/powerpc/boot/dts/acp344x.dts @@ -90,7 +90,7 @@ clock-frequency = <0>; // Filled in by zImage UART0: serial@00404000 { device_type = "serial"; - compatible = "acp-uart0"; + compatible = "lsi,acp-uart0"; enabled = <1>; reg = <0x00404000 0x1000>; clock-reg = <0x00408040 0x20>; @@ -101,7 +101,7 @@ }; UART1: serial@00405000 { device_type = "serial"; - compatible = "acp-uart1"; + compatible = "lsi,acp-uart1"; enabled = <0>; reg = <0x00405000 0x1000>; clock-reg = <0x00408060 0x20>; @@ -112,21 +112,21 @@ }; USB0: usb@004a4000 { device_type = "usb"; - compatible = "acp-usb"; + compatible = "lsi,acp-usb"; enabled = <0>; reg = <0x004a4000 0x00020000>; interrupt-parent = <&MPIC>; interrupts = <31>; }; I2C: i2c@00403000 { - compatible = "acp-i2c"; + compatible = "lsi,acp-i2c"; enabled = <0>; reg = <0x00403000 0x00001000>; interrupt-parent = <&MPIC>; interrupts = <21>; }; SSP: ssp@00402000 { - compatible = "acp-ssp"; + compatible = "arm,acp-ssp"; enabled = <0>; reg = <0x00402000 0x00001000>; interrupt-parent = <&MPIC>; @@ -134,14 +134,14 @@ }; NAND: nand@00440000 { device_type = "nand"; - compatible = "acp-nand"; + compatible = "lsi,acp-nand"; enabled = <1>; reg = <0x00440000 0x20000 0x0040c000 0x1000>; }; FEMAC: femac@00480000 { device_type = "network"; - compatible = "acp-femac"; + compatible = "lsi,acp-femac"; enabled = <1>; reg = <0x00480000 0x1000 0x00481000 0x1000 @@ -284,7 +284,7 @@ }; rio0: rapidio@f0020000 { - compatible = "acp,rapidio-delta"; + compatible = "lsi,rapidio-delta"; device_type = "rapidio"; enabled = <0>; #size = <0>; /* 0 = (256, small system) -- 1.7.9.5 -- _______________________________________________ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto