tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 0d29492e 9ba24e9c

+10 -5
+3 -3
arch/arm/boot/dts/mps2.dtsi
··· 171 171 uart0: serial@4000 { 172 172 compatible = "arm,mps2-uart"; 173 173 reg = <0x4000 0x1000>; 174 - interrupts = <0 1 12>; 174 + interrupts = <0>, <1>, <12>; 175 175 clocks = <&sysclk>; 176 176 status = "disabled"; 177 177 }; ··· 179 179 uart1: serial@5000 { 180 180 compatible = "arm,mps2-uart"; 181 181 reg = <0x5000 0x1000>; 182 - interrupts = <2 3 12>; 182 + interrupts = <2>, <3>, <12>; 183 183 clocks = <&sysclk>; 184 184 status = "disabled"; 185 185 }; ··· 187 187 uart2: serial@6000 { 188 188 compatible = "arm,mps2-uart"; 189 189 reg = <0x6000 0x1000>; 190 - interrupts = <4 5 12>; 190 + interrupts = <4>, <5>, <12>; 191 191 clocks = <&sysclk>; 192 192 status = "disabled"; 193 193 };
+1 -1
arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
··· 133 133 mmci@50000 { 134 134 compatible = "arm,pl180", "arm,primecell"; 135 135 reg = <0x050000 0x1000>; 136 - interrupts = <9 10>; 136 + interrupts = <9>, <10>; 137 137 cd-gpios = <&v2m_mmc_gpios 0 0>; 138 138 wp-gpios = <&v2m_mmc_gpios 1 0>; 139 139 max-frequency = <12000000>;
+1 -1
arch/arm/boot/dts/vexpress-v2m.dtsi
··· 133 133 mmci@5000 { 134 134 compatible = "arm,pl180", "arm,primecell"; 135 135 reg = <0x05000 0x1000>; 136 - interrupts = <9 10>; 136 + interrupts = <9>, <10>; 137 137 cd-gpios = <&v2m_mmc_gpios 0 0>; 138 138 wp-gpios = <&v2m_mmc_gpios 1 0>; 139 139 max-frequency = <12000000>;
+5
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
··· 42 42 cci-control-port = <&cci_control1>; 43 43 cpu-idle-states = <&CLUSTER_SLEEP_BIG>; 44 44 capacity-dmips-mhz = <1024>; 45 + dynamic-power-coefficient = <990>; 45 46 }; 46 47 47 48 cpu1: cpu@1 { ··· 52 51 cci-control-port = <&cci_control1>; 53 52 cpu-idle-states = <&CLUSTER_SLEEP_BIG>; 54 53 capacity-dmips-mhz = <1024>; 54 + dynamic-power-coefficient = <990>; 55 55 }; 56 56 57 57 cpu2: cpu@2 { ··· 62 60 cci-control-port = <&cci_control2>; 63 61 cpu-idle-states = <&CLUSTER_SLEEP_LITTLE>; 64 62 capacity-dmips-mhz = <516>; 63 + dynamic-power-coefficient = <133>; 65 64 }; 66 65 67 66 cpu3: cpu@3 { ··· 72 69 cci-control-port = <&cci_control2>; 73 70 cpu-idle-states = <&CLUSTER_SLEEP_LITTLE>; 74 71 capacity-dmips-mhz = <516>; 72 + dynamic-power-coefficient = <133>; 75 73 }; 76 74 77 75 cpu4: cpu@4 { ··· 82 78 cci-control-port = <&cci_control2>; 83 79 cpu-idle-states = <&CLUSTER_SLEEP_LITTLE>; 84 80 capacity-dmips-mhz = <516>; 81 + dynamic-power-coefficient = <133>; 85 82 }; 86 83 87 84 idle-states {