diff for duplicates of <5480BE43.9050308@redhat.com> diff --git a/a/1.txt b/N1/1.txt index ec9a391..0e8fdbc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,12 +14,12 @@ On 12/04/2014 12:06 AM, vishnupatekar wrote: > pinctrl-0 = <&uart0_pins_a>; > status = "okay"; > }; -> + ps20: ps2 at 0x01c2a000 { +> + ps20: ps2@0x01c2a000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&ps2_0_pins>; > + status = "okay"; > + }; -> + ps21: ps2 at 0x01c2a400 { +> + ps21: ps2@0x01c2a400 { > + pinctrl-names = "default"; > + pinctrl-0 = <&ps2_1_pins>; > + status = "okay"; @@ -38,7 +38,7 @@ Regards, Hans > -> i2c0: i2c at 01c2ac00 { +> i2c0: i2c@01c2ac00 { > pinctrl-names = "default"; > diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi > index 8605f2b..c77635d 100644 @@ -46,7 +46,7 @@ Hans > +++ b/arch/arm/boot/dts/sun7i-a20.dtsi > @@ -357,7 +357,7 @@ > -> usb_clk: clk at 01c200cc { +> usb_clk: clk@01c200cc { > #clock-cells = <1>; > - #reset-cells = <1>; > + #reset-cells = <1>; @@ -57,13 +57,13 @@ Hans > allwinner,drive = <0>; > allwinner,pull = <0>; > }; -> + ps2_0_pins: ps2_0 at 0 { +> + ps2_0_pins: ps2_0@0 { > + allwinner,pins = "PI20","PI21"; > + allwinner,function = "ps2"; > + allwinner,drive = <0>; > + allwinner,pull = <0>; > + }; -> + ps2_1_pins: ps2_1 at 0 { +> + ps2_1_pins: ps2_1@0 { > + allwinner,pins = "PH12","PH13"; > + allwinner,function = "ps2"; > + allwinner,drive = <0>; @@ -72,19 +72,19 @@ Hans > + > }; > -> timer at 01c20c00 { +> timer@01c20c00 { > @@ -1079,5 +1092,20 @@ > #interrupt-cells = <3>; > interrupts = <1 9 0xf04>; > }; -> + ps20: ps2 at 0x01c2a000 { +> + ps20: ps2@0x01c2a000 { > + compatible = "allwinner,sun7i-a20-ps2"; > + reg = <0x01c2a000 0x400>; > + interrupts = <0 62 4>; > + clocks = <&apb1_gates 6>; > + status = "disabled"; > + }; -> + ps21: ps2 at 0x01c2a400 { +> + ps21: ps2@0x01c2a400 { > + compatible = "allwinner,sun7i-a20-ps2"; > + reg = <0x01c2a400 0x400>; > + interrupts = <0 63 4>; diff --git a/a/content_digest b/N1/content_digest index 07980e3..6a902ec 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,20 @@ "ref\01417647963-28077-1-git-send-email-VishnuPatekar0510@gmail.com\0" - "From\0hdegoede@redhat.com (Hans de Goede)\0" - "Subject\0[linux-sunxi] [PATCH 3/3] ARM:dts:sun7i:ps2 added nodes for Sun7i A20 PS2 controller. \tadded ps2 nodes in lime2 board dts.\0" + "ref\01417647963-28077-1-git-send-email-VishnuPatekar0510-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" + "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" + "Subject\0Re: [PATCH 3/3] ARM:dts:sun7i:ps2 added nodes for Sun7i A20 PS2 controller. \tadded ps2 nodes in lime2 board dts.\0" "Date\0Thu, 04 Dec 2014 21:04:19 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org" + " maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org\0" + "Cc\0robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" + pawel.moll-5wv7dgnIgG8@public.gmane.org + mark.rutland-5wv7dgnIgG8@public.gmane.org + ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org + galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org + linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + inux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " vishnupatekar <VishnuPatekar0510-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" "\00:1\0" "b\0" "Hi,\n" @@ -21,12 +33,12 @@ "> \t\t\tpinctrl-0 = <&uart0_pins_a>;\n" "> \t\t\tstatus = \"okay\";\n" "> \t\t};\n" - "> +\t\tps20: ps2 at 0x01c2a000 {\n" + "> +\t\tps20: ps2@0x01c2a000 {\n" "> +\t\t\tpinctrl-names = \"default\";\n" "> +\t\t\tpinctrl-0 = <&ps2_0_pins>;\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" - "> +\t\tps21: ps2 at 0x01c2a400 {\n" + "> +\t\tps21: ps2@0x01c2a400 {\n" "> +\t\t\tpinctrl-names = \"default\";\n" "> +\t\t\tpinctrl-0 = <&ps2_1_pins>;\n" "> +\t\t\tstatus = \"okay\";\n" @@ -45,7 +57,7 @@ "Hans\n" "\n" ">\n" - "> \t\ti2c0: i2c at 01c2ac00 {\n" + "> \t\ti2c0: i2c@01c2ac00 {\n" "> \t\t\tpinctrl-names = \"default\";\n" "> diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi\n" "> index 8605f2b..c77635d 100644\n" @@ -53,7 +65,7 @@ "> +++ b/arch/arm/boot/dts/sun7i-a20.dtsi\n" "> @@ -357,7 +357,7 @@\n" ">\n" - "> \t\tusb_clk: clk at 01c200cc {\n" + "> \t\tusb_clk: clk@01c200cc {\n" "> \t\t\t#clock-cells = <1>;\n" "> -\t\t #reset-cells = <1>;\n" "> +\t\t\t#reset-cells = <1>;\n" @@ -64,13 +76,13 @@ "> \t\t\t\t allwinner,drive = <0>;\n" "> \t\t\t\t allwinner,pull = <0>;\n" "> \t\t\t};\n" - "> +\t\t\tps2_0_pins: ps2_0 at 0 {\n" + "> +\t\t\tps2_0_pins: ps2_0@0 {\n" "> +\t\t\t\t allwinner,pins = \"PI20\",\"PI21\";\n" "> +\t\t\t\t allwinner,function = \"ps2\";\n" "> +\t\t\t\t allwinner,drive = <0>;\n" "> +\t\t\t\t allwinner,pull = <0>;\n" "> +\t\t\t};\n" - "> +\t\t\tps2_1_pins: ps2_1 at 0 {\n" + "> +\t\t\tps2_1_pins: ps2_1@0 {\n" "> +\t\t\t\t allwinner,pins = \"PH12\",\"PH13\";\n" "> +\t\t\t\t allwinner,function = \"ps2\";\n" "> +\t\t\t\t allwinner,drive = <0>;\n" @@ -79,19 +91,19 @@ "> +\n" "> \t\t};\n" ">\n" - "> \t\ttimer at 01c20c00 {\n" + "> \t\ttimer@01c20c00 {\n" "> @@ -1079,5 +1092,20 @@\n" "> \t\t\t#interrupt-cells = <3>;\n" "> \t\t\tinterrupts = <1 9 0xf04>;\n" "> \t\t};\n" - "> +\t\tps20: ps2 at 0x01c2a000 {\n" + "> +\t\tps20: ps2@0x01c2a000 {\n" "> +\t\t\tcompatible = \"allwinner,sun7i-a20-ps2\";\n" "> +\t\t\treg = <0x01c2a000 0x400>;\n" "> +\t\t\tinterrupts = <0 62 4>;\n" "> +\t\t\tclocks = <&apb1_gates 6>;\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" - "> +\t\tps21: ps2 at 0x01c2a400 {\n" + "> +\t\tps21: ps2@0x01c2a400 {\n" "> +\t\t\tcompatible = \"allwinner,sun7i-a20-ps2\";\n" "> +\t\t\treg = <0x01c2a400 0x400>;\n" "> +\t\t\tinterrupts = <0 63 4>;\n" @@ -103,4 +115,4 @@ "> };\n" > -f0f5d780cd4ef1762c3f3f29da1afd1801536b711939847bbe286ca992f7c534 +b79a3c2dbfa8c358244a5380cc5b4de3ffae771209ee709d5134761a82bc493c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.