| Message ID | 1418408748-9797-4-git-send-email-vishnupatekar0510@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Vishnu, On Fri, Dec 12, 2014 at 11:55:46PM +0530, VishnuPatekar wrote: > 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. This shouldn't be a changelog, but what this patch actually does. > Signed-off-by: VishnuPatekar <vishnupatekar0510@gmail.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > arch/arm/boot/dts/sun4i-a10.dtsi | 17 +++++++++++++++++ > arch/arm/boot/dts/sun7i-a20.dtsi | 18 ++++++++++++++++++ > 2 files changed, 35 insertions(+) > > diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi > index 7b4099f..ef9a01c 100644 > --- a/arch/arm/boot/dts/sun4i-a10.dtsi > +++ b/arch/arm/boot/dts/sun4i-a10.dtsi > @@ -629,6 +629,7 @@ > allwinner,drive = <0>; > allwinner,pull = <0>; > }; > + This is an uneeded change > }; > > timer@01c20c00 { > @@ -795,5 +796,21 @@ > #address-cells = <1>; > #size-cells = <0>; > }; > + > + ps20: ps2@01c2a000 { > + compatible = "allwinner,sun4i-a10-ps2"; > + reg = <0x01c2a000 0x400>; > + interrupts = <62>; > + clocks = <&apb1_gates 6>; > + status = "disabled"; > + }; > + > + ps21: ps2@01c2a400 { > + compatible = "allwinner,sun4i-a10-ps2"; > + reg = <0x01c2a400 0x400>; > + 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 e21ce59..6ab7714 100644 > --- a/arch/arm/boot/dts/sun7i-a20.dtsi > +++ b/arch/arm/boot/dts/sun7i-a20.dtsi > @@ -866,6 +866,7 @@ > allwinner,drive = <0>; > allwinner,pull = <0>; > }; > + Ditto. Maxime
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 7b4099f..ef9a01c 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -629,6 +629,7 @@ allwinner,drive = <0>; allwinner,pull = <0>; }; + }; timer@01c20c00 { @@ -795,5 +796,21 @@ #address-cells = <1>; #size-cells = <0>; }; + + ps20: ps2@01c2a000 { + compatible = "allwinner,sun4i-a10-ps2"; + reg = <0x01c2a000 0x400>; + interrupts = <62>; + clocks = <&apb1_gates 6>; + status = "disabled"; + }; + + ps21: ps2@01c2a400 { + compatible = "allwinner,sun4i-a10-ps2"; + reg = <0x01c2a400 0x400>; + 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 e21ce59..6ab7714 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -866,6 +866,7 @@ allwinner,drive = <0>; allwinner,pull = <0>; }; + }; timer@01c20c00 { @@ -1093,5 +1094,22 @@ #interrupt-cells = <3>; interrupts = <1 9 0xf04>; }; + + ps20: ps2@01c2a000 { + compatible = "allwinner,sun4i-a10-ps2"; + reg = <0x01c2a000 0x400>; + interrupts = <0 62 4>; + clocks = <&apb1_gates 6>; + status = "disabled"; + }; + + ps21: ps2@01c2a400 { + compatible = "allwinner,sun4i-a10-ps2"; + reg = <0x01c2a400 0x400>; + interrupts = <0 63 4>; + clocks = <&apb1_gates 7>; + status = "disabled"; + }; + }; };