>From 45985183f3e96adf1c846c7bbde32647367024dc Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 12 Dec 2014 14:01:43 +0100 Subject: [PATCH v2 3/4] FIXUP: "ARM:dts:sunxi:ps2 dt nodes for A10/A20 PS2 controller." 2 fixups for: "ARM:dts:sunxi:ps2 dt nodes for A10/A20 PS2 controller." 1) Fixup the sun4i ps/2 nodes interrupt property, sun4i interrupts take only 1 specifier 2) dt bindings should use the compat string for the earliest version of the hardware which has the relevant hardware block, unless there are differences, the A10 and A20 ps2 controllers are identical, so for both sun4i-a10-ps2 should be used as compat string, update the sun7i.dtsi ps2 entries to use the sun4i-a10-ps2 compat string. Signed-off-by: Hans de Goede --- arch/arm/boot/dts/sun4i-a10.dtsi | 4 ++-- arch/arm/boot/dts/sun7i-a20.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index c04c117..e8cd6db 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -818,14 +818,14 @@ ps20: ps2@0x01c2a000 { compatible = "allwinner,sun4i-a10-ps2"; reg = <0x01c2a000 0x400>; - interrupts = <0 62 4>; + interrupts = <62>; clocks = <&apb1_gates 6>; status = "disabled"; }; ps21: ps2@0x01c2a400 { compatible = "allwinner,sun4i-a10-ps2"; reg = <0x01c2a400 0x400>; - interrupts = <0 63 4>; + interrupts = <63>; clocks = <&apb1_gates 7>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 4417c8c3..d54d684 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -1114,14 +1114,14 @@ interrupts = <1 9 0xf04>; }; ps20: ps2@0x01c2a000 { - compatible = "allwinner,sun7i-a20-ps2"; + compatible = "allwinner,sun4i-a10-ps2"; reg = <0x01c2a000 0x400>; interrupts = <0 62 4>; clocks = <&apb1_gates 6>; status = "disabled"; }; ps21: ps2@0x01c2a400 { - compatible = "allwinner,sun7i-a20-ps2"; + compatible = "allwinner,sun4i-a10-ps2"; reg = <0x01c2a400 0x400>; interrupts = <0 63 4>; clocks = <&apb1_gates 7>; -- 2.1.0