diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-08 03:38:54 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-08 03:39:38 +0400 |
| commit | 54edc2524d0b3c60d7ff6fe2b779acfcc401c45b (patch) | |
| tree | 2403e8f502cbb6ce48f7ccfbd3d4c8ebd00dda1b /arch/arm/boot/dts/at91sam9n12.dtsi | |
| parent | fc20c6ffdd9875c42c9ff0d4233ed8960165633b (diff) | |
| parent | 14c44aa541744d4cf06db89c27a1e6df293c64d5 (diff) | |
| download | linux-54edc2524d0b3c60d7ff6fe2b779acfcc401c45b.tar.xz | |
Merge branch 'dts-cpus-updates' of git://linux-arm.org/linux-2.6-lp into next/dt
From Lorenzo Pieralisi, this is a series of patches that cleans up the CPU
nodes in most of the SoC dtsi files to conform to the standard bindings.
* 'dts-cpus-updates' of git://linux-arm.org/linux-2.6-lp:
ARM: dts: sunxi: cpus/cpu nodes dts updates
ARM: dts: spear: cpus/cpu nodes dts updates
ARM: dts: sh7372: cpus/cpu nodes dts updates
ARM: dts: r8a7740: cpus/cpu nodes dts updates
ARM: dts: pxa2xx: cpus/cpu nodes dts updates
ARM: dts: prima2: cpus/cpu node dts updates
ARM: dts: picoxcell: cpus/cpu nodes dts updates
ARM: dts: omap: cpus/cpu nodes dts updates
ARM: dts: lpc32xx: cpus/cpu nodes dts updates
ARM: dts: imx: cpus/cpu nodes dts updates
ARM: dts: exynos5440: cpus/cpu nodes dts updates
ARM: dts: at91: cpus/cpu node dts updates
ARM: dts: armada-370-xp: cpus/cpu node dts updates
ARM: dts: am33xx: cpus/cpu nodes dts updates
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9n12.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9n12.dtsi | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi index 1d220b26f516..d37761846cd5 100644 --- a/arch/arm/boot/dts/at91sam9n12.dtsi +++ b/arch/arm/boot/dts/at91sam9n12.dtsi @@ -34,8 +34,12 @@ ssc0 = &ssc0; }; cpus { - cpu@0 { - compatible = "arm,arm926ejs"; + #address-cells = <0>; + #size-cells = <0>; + + cpu { + compatible = "arm,arm926ej-s"; + device_type = "cpu"; }; }; |