Commit 0d29492e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'vexpress-updates-5.1' of... 

Merge tag 'vexpress-updates-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/dt

ARMv7 Vexpress updates for v5.1

Couple of simple changes to add dynamic-power-coefficient information
for CPUs on TC2 and fix tuple used for uart and mmci interrupts with
lists.

* tag 'vexpress-updates-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux

:
  arm: dts: vexpress-v2p-ca15_a7: Add cpu dynamic-power-coefficient information
  ARM: dts: vexpress: use list instead of tuple for mmci interrupts
  ARM: dts: mps2: use list instead of tuple for uart interrupts

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9ba24e9c cc0dbf43

arch/arm/boot/dts/mps2.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ 
			uart0: serial@4000 {

				compatible = "arm,mps2-uart";

				reg = <0x4000 0x1000>;

				interrupts = <0 1 12>;

				interrupts = <0>, <1>, <12>;

				clocks = <&sysclk>;

				status = "disabled";

			};
@@ -179,7 +179,7 @@ 
			uart1: serial@5000 {

				compatible = "arm,mps2-uart";

				reg = <0x5000 0x1000>;

				interrupts = <2 3 12>;

				interrupts = <2>, <3>, <12>;

				clocks = <&sysclk>;

				status = "disabled";

			};
@@ -187,7 +187,7 @@ 
			uart2: serial@6000 {

				compatible = "arm,mps2-uart";

				reg = <0x6000 0x1000>;

				interrupts = <4 5 12>;

				interrupts = <4>, <5>, <12>;

				clocks = <&sysclk>;

				status = "disabled";

			};

arch/arm/boot/dts/vexpress-v2m-rs1.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ 
				mmci@50000 {

					compatible = "arm,pl180", "arm,primecell";

					reg = <0x050000 0x1000>;

					interrupts = <9 10>;

					interrupts = <9>, <10>;

					cd-gpios = <&v2m_mmc_gpios 0 0>;

					wp-gpios = <&v2m_mmc_gpios 1 0>;

					max-frequency = <12000000>;

arch/arm/boot/dts/vexpress-v2m.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ 
				mmci@5000 {

					compatible = "arm,pl180", "arm,primecell";

					reg = <0x05000 0x1000>;

					interrupts = <9 10>;

					interrupts = <9>, <10>;

					cd-gpios = <&v2m_mmc_gpios 0 0>;

					wp-gpios = <&v2m_mmc_gpios 1 0>;

					max-frequency = <12000000>;

arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts

+5 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
			cci-control-port = <&cci_control1>;

			cpu-idle-states = <&CLUSTER_SLEEP_BIG>;

			capacity-dmips-mhz = <1024>;

			dynamic-power-coefficient = <990>;

		};



		cpu1: cpu@1 {
@@ -51,6 +52,7 @@ 
			cci-control-port = <&cci_control1>;

			cpu-idle-states = <&CLUSTER_SLEEP_BIG>;

			capacity-dmips-mhz = <1024>;

			dynamic-power-coefficient = <990>;

		};



		cpu2: cpu@2 {
@@ -60,6 +62,7 @@ 
			cci-control-port = <&cci_control2>;

			cpu-idle-states = <&CLUSTER_SLEEP_LITTLE>;

			capacity-dmips-mhz = <516>;

			dynamic-power-coefficient = <133>;

		};



		cpu3: cpu@3 {
@@ -69,6 +72,7 @@ 
			cci-control-port = <&cci_control2>;

			cpu-idle-states = <&CLUSTER_SLEEP_LITTLE>;

			capacity-dmips-mhz = <516>;

			dynamic-power-coefficient = <133>;

		};



		cpu4: cpu@4 {
@@ -78,6 +82,7 @@ 
			cci-control-port = <&cci_control2>;

			cpu-idle-states = <&CLUSTER_SLEEP_LITTLE>;

			capacity-dmips-mhz = <516>;

			dynamic-power-coefficient = <133>;

		};



		idle-states {

CRA Git | Maintained and supported by SUSTech CRA and CCSE