Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54edc252 authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents fc20c6ff 14c44aa5

arch/arm/boot/dts/am33xx.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -26,8 +26,12 @@ 
	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		cpu@0 {

			compatible = "arm,cortex-a8";

			device_type = "cpu";

			reg = <0>;



			/*

			 * To consider voltage drop between PMIC and SoC,

arch/arm/boot/dts/armada-370-xp.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -23,8 +23,12 @@ 
	compatible = "marvell,armada-370-xp";



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		cpu@0 {

			compatible = "marvell,sheeva-v7";

			device_type = "cpu";

			reg = <0>;

		};

	};

arch/arm/boot/dts/at91rm9200.dtsi

+5 −1
Original line number Diff line number Diff line
@@ -38,8 +38,12 @@ 
		ssc2 = &ssc2;

	};

	cpus {

		cpu@0 {

		#address-cells = <0>;

		#size-cells = <0>;



		cpu {

			compatible = "arm,arm920t";

			device_type = "cpu";

		};

	};

arch/arm/boot/dts/at91sam9260.dtsi

+6 −2
Original line number Diff line number Diff line
@@ -35,8 +35,12 @@ 
		ssc0 = &ssc0;

	};

	cpus {

		cpu@0 {

			compatible = "arm,arm926ejs";

		#address-cells = <0>;

		#size-cells = <0>;



		cpu {

			compatible = "arm,arm926ej-s";

			device_type = "cpu";

		};

	};

arch/arm/boot/dts/at91sam9263.dtsi

+6 −2
Original line number Diff line number Diff line
@@ -32,8 +32,12 @@ 
		ssc1 = &ssc1;

	};

	cpus {

		cpu@0 {

			compatible = "arm,arm926ejs";

		#address-cells = <0>;

		#size-cells = <0>;



		cpu {

			compatible = "arm,arm926ej-s";

			device_type = "cpu";

		};

	};