diff for duplicates of <548AEA8E.6040100@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 651f5c3..60bf5e3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -61,8 +61,24 @@ Hans > create mode 100644 Documentation/devicetree/bindings/input/allwinner,sunxi-ps2.txt > create mode 100644 drivers/input/serio/sunxi-ps2.c > - --- -You received this message because you are subscribed to the Google Groups "linux-sunxi" group. -To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org -For more options, visit https://groups.google.com/d/optout. +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: 0001-FIXUP-sunxi-dts-bindings-input-ps2-bindings-for-A10-.patch +Type: text/x-patch +Size: 3234 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141212/b78f904f/attachment-0003.bin> +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: 0002-FIXUP-sunxi-drivers-input-ps2-Added-sunxi-A10-A20-ps.patch +Type: text/x-patch +Size: 1147 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141212/b78f904f/attachment-0004.bin> +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: 0003-FIXUP-ARM-dts-sunxi-ps2-dt-nodes-for-A10-A20-PS2-con.patch +Type: text/x-patch +Size: 2258 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141212/b78f904f/attachment-0005.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index ea8b34f..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,6 +0,0 @@ -Content-Type: text/x-patch; - name="0001-FIXUP-sunxi-dts-bindings-input-ps2-bindings-for-A10-.patch" -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; - filename*0="0001-FIXUP-sunxi-dts-bindings-input-ps2-bindings-for-A10-.pa"; - filename*1="tch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index bf69a43..0000000 --- a/a/2.txt +++ /dev/null @@ -1,82 +0,0 @@ ->From 85105ec25cfb0dcff102e579e00a0a6c38ac34e9 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> -Date: Fri, 12 Dec 2014 14:05:56 +0100 -Subject: [PATCH v2 1/4] FIXUP: "sunxi:dts-bindings:input:ps2 bindings for - A10/A20 ps2." - -2 fixups for: "sunxi:dts-bindings:input:ps2 bindings for A10/A20 ps2." - -1) 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. - -2) ps2 / serio bindings belong under Documentation/devicetree/bindings/serio - -Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> ---- - .../bindings/input/allwinner,sunxi-ps2.txt | 23 ---------------------- - .../bindings/serio/allwinner,sun4i-a10-ps2.txt | 22 +++++++++++++++++++++ - 2 files changed, 22 insertions(+), 23 deletions(-) - delete mode 100644 Documentation/devicetree/bindings/input/allwinner,sunxi-ps2.txt - create mode 100644 Documentation/devicetree/bindings/serio/allwinner,sun4i-a10-ps2.txt - -diff --git a/Documentation/devicetree/bindings/input/allwinner,sunxi-ps2.txt b/Documentation/devicetree/bindings/input/allwinner,sunxi-ps2.txt -deleted file mode 100644 -index 3a8919a..0000000 ---- a/Documentation/devicetree/bindings/input/allwinner,sunxi-ps2.txt -+++ /dev/null -@@ -1,23 +0,0 @@ --* Device tree bindings for Allwinner A10, A20 PS2 host controller -- --A20 PS2 is dual role controller(PS2 host and PS2 device). These bindings are for PS2 host controller. --IBM compliant IBM PS2 and AT-compatible keyboard and mouse can be connected. -- --Required properties: -- -- - reg : Offset and length of the register set for the device. -- - compatible : Should one of the following: -- - "allwinner,sun7i-a20-ps2" -- - "allwinner,sun4i-a10-ps2" -- - interrupts : The interrupt line connected to the PS2. -- - clocks : The gate clk connected to the PS2. -- -- --Example: -- ps20: ps2@0x01c2a000 { -- compatible = "allwinner,sun7i-a20-ps2"; -- reg = <0x01c2a000 0x400>; -- interrupts = <0 62 4>; -- clocks = <&apb1_gates 6>; -- status = "disabled"; -- }; -diff --git a/Documentation/devicetree/bindings/serio/allwinner,sun4i-a10-ps2.txt b/Documentation/devicetree/bindings/serio/allwinner,sun4i-a10-ps2.txt -new file mode 100644 -index 0000000..c93ca90 ---- /dev/null -+++ b/Documentation/devicetree/bindings/serio/allwinner,sun4i-a10-ps2.txt -@@ -0,0 +1,22 @@ -+* Device tree bindings for Allwinner A10, A20 PS2 host controller -+ -+A10 PS2 is dual role controller (PS2 host and PS2 device). These bindings are -+for the PS2 host controller. -+IBM compliant IBM PS2 and AT-compatible keyboard and mouse can be connected. -+ -+Required properties: -+ -+ - reg : Offset and length of the register set for the device. -+ - compatible : "allwinner,sun4i-a10-ps2" -+ - interrupts : The interrupt line connected to the PS2. -+ - clocks : The gate clk connected to the PS2. -+ -+ -+Example: -+ ps20: ps2@0x01c2a000 { -+ compatible = "allwinner,sun4i-a10-ps2"; -+ reg = <0x01c2a000 0x400>; -+ interrupts = <0 62 4>; -+ clocks = <&apb1_gates 6>; -+ status = "disabled"; -+ }; --- -2.1.0 diff --git a/a/3.hdr b/a/3.hdr deleted file mode 100644 index 6adef68..0000000 --- a/a/3.hdr +++ /dev/null @@ -1,6 +0,0 @@ -Content-Type: text/x-patch; - name="0002-FIXUP-sunxi-drivers-input-ps2-Added-sunxi-A10-A20-ps.patch" -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; - filename*0="0002-FIXUP-sunxi-drivers-input-ps2-Added-sunxi-A10-A20-ps.pa"; - filename*1="tch" diff --git a/a/3.txt b/a/3.txt deleted file mode 100644 index 49cdebd..0000000 --- a/a/3.txt +++ /dev/null @@ -1,30 +0,0 @@ ->From 0eecd5e763278a59c4533e576ac1c9616310c21e Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> -Date: Fri, 12 Dec 2014 14:11:56 +0100 -Subject: [PATCH v2 2/4] FIXUP: "sunxi:drivers:input:ps2 Added sunxi A10/A20 - ps2 driver" - -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, drop the sun7i-a20-ps2 compat string. - -Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> ---- - drivers/input/serio/sunxi-ps2.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/input/serio/sunxi-ps2.c b/drivers/input/serio/sunxi-ps2.c -index 4cd89ae..cb89d80 100644 ---- a/drivers/input/serio/sunxi-ps2.c -+++ b/drivers/input/serio/sunxi-ps2.c -@@ -340,7 +340,6 @@ static int sunxips2_remove(struct platform_device *pdev) - - /* Match table for of_platform binding */ - static const struct of_device_id sunxips2_of_match[] = { -- { .compatible = "allwinner,sun7i-a20-ps2", }, - { .compatible = "allwinner,sun4i-a10-ps2", }, - { }, - }; --- -2.1.0 diff --git a/a/4.hdr b/a/4.hdr deleted file mode 100644 index 2b7d550..0000000 --- a/a/4.hdr +++ /dev/null @@ -1,6 +0,0 @@ -Content-Type: text/x-patch; - name="0003-FIXUP-ARM-dts-sunxi-ps2-dt-nodes-for-A10-A20-PS2-con.patch" -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; - filename*0="0003-FIXUP-ARM-dts-sunxi-ps2-dt-nodes-for-A10-A20-PS2-con.pa"; - filename*1="tch" diff --git a/a/4.txt b/a/4.txt deleted file mode 100644 index a7d881e..0000000 --- a/a/4.txt +++ /dev/null @@ -1,65 +0,0 @@ ->From 45985183f3e96adf1c846c7bbde32647367024dc Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> -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 <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> ---- - 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>; diff --git a/a/content_digest b/N1/content_digest index 3368801..25c0d53 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,24 +1,9 @@ "ref\01417907719-26775-1-git-send-email-VishnuPatekar0510@gmail.com\0" - "ref\01417907719-26775-1-git-send-email-VishnuPatekar0510-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" - "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" - "Subject\0Re: [PATCHv2 0/3] ARM:sunxi:ps2 Added support for A10/A20 ps2 controller.\0" + "From\0hdegoede@redhat.com (Hans de Goede)\0" + "Subject\0[linux-sunxi] [PATCHv2 0/3] ARM:sunxi:ps2 Added support for A10/A20 ps2 controller.\0" "Date\0Fri, 12 Dec 2014 14:15:58 +0100\0" - "To\0linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org" - dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org - maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org - " linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org\0" - "Cc\0leafy.myeh-Q9AEpCAkrSgqDJ6do+/SaQ@public.gmane.org" - robh+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 - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " vishnupatekar <VishnuPatekar0510-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "Hi,\n" "\n" @@ -83,196 +68,26 @@ "> create mode 100644 Documentation/devicetree/bindings/input/allwinner,sunxi-ps2.txt\n" "> create mode 100644 drivers/input/serio/sunxi-ps2.c\n" ">\n" - "\n" - "-- \n" - "You received this message because you are subscribed to the Google Groups \"linux-sunxi\" group.\n" - "To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org\n" - For more options, visit https://groups.google.com/d/optout. - "\01:2\0" - "fn\00001-FIXUP-sunxi-dts-bindings-input-ps2-bindings-for-A10-.patch\0" - "b\0" - ">From 85105ec25cfb0dcff102e579e00a0a6c38ac34e9 Mon Sep 17 00:00:00 2001\n" - "From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" - "Date: Fri, 12 Dec 2014 14:05:56 +0100\n" - "Subject: [PATCH v2 1/4] FIXUP: \"sunxi:dts-bindings:input:ps2 bindings for\n" - " A10/A20 ps2.\"\n" - "\n" - "2 fixups for: \"sunxi:dts-bindings:input:ps2 bindings for A10/A20 ps2.\"\n" - "\n" - "1) dt bindings should use the compat string for the earliest version of the\n" - "hardware which has the relevant hardware block, unless there are differences,\n" - "the A10 and A20 ps2 controllers are identical, so for both sun4i-a10-ps2\n" - "should be used as compat string.\n" - "\n" - "2) ps2 / serio bindings belong under Documentation/devicetree/bindings/serio\n" - "\n" - "Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" - "---\n" - " .../bindings/input/allwinner,sunxi-ps2.txt | 23 ----------------------\n" - " .../bindings/serio/allwinner,sun4i-a10-ps2.txt | 22 +++++++++++++++++++++\n" - " 2 files changed, 22 insertions(+), 23 deletions(-)\n" - " delete mode 100644 Documentation/devicetree/bindings/input/allwinner,sunxi-ps2.txt\n" - " create mode 100644 Documentation/devicetree/bindings/serio/allwinner,sun4i-a10-ps2.txt\n" - "\n" - "diff --git a/Documentation/devicetree/bindings/input/allwinner,sunxi-ps2.txt b/Documentation/devicetree/bindings/input/allwinner,sunxi-ps2.txt\n" - "deleted file mode 100644\n" - "index 3a8919a..0000000\n" - "--- a/Documentation/devicetree/bindings/input/allwinner,sunxi-ps2.txt\n" - "+++ /dev/null\n" - "@@ -1,23 +0,0 @@\n" - "-* Device tree bindings for Allwinner A10, A20 PS2 host controller\n" - "-\n" - "-A20 PS2 is dual role controller(PS2 host and PS2 device). These bindings are for PS2 host controller.\n" - "-IBM compliant IBM PS2 and AT-compatible keyboard and mouse can be connected.\n" - "-\n" - "-Required properties:\n" - "-\n" - "- - reg : Offset and length of the register set for the device.\n" - "- - compatible : Should one of the following:\n" - "- - \"allwinner,sun7i-a20-ps2\"\n" - "- - \"allwinner,sun4i-a10-ps2\"\n" - "- - interrupts : The interrupt line connected to the PS2.\n" - "- - clocks : The gate clk connected to the PS2.\n" - "-\n" - "-\n" - "-Example:\n" - "-\tps20: ps2@0x01c2a000 {\n" - "-\t\tcompatible = \"allwinner,sun7i-a20-ps2\";\n" - "-\t\treg = <0x01c2a000 0x400>;\n" - "-\t\tinterrupts = <0 62 4>;\n" - "-\t\tclocks = <&apb1_gates 6>;\n" - "-\t\tstatus = \"disabled\";\n" - "-\t};\n" - "diff --git a/Documentation/devicetree/bindings/serio/allwinner,sun4i-a10-ps2.txt b/Documentation/devicetree/bindings/serio/allwinner,sun4i-a10-ps2.txt\n" - "new file mode 100644\n" - "index 0000000..c93ca90\n" - "--- /dev/null\n" - "+++ b/Documentation/devicetree/bindings/serio/allwinner,sun4i-a10-ps2.txt\n" - "@@ -0,0 +1,22 @@\n" - "+* Device tree bindings for Allwinner A10, A20 PS2 host controller\n" - "+\n" - "+A10 PS2 is dual role controller (PS2 host and PS2 device). These bindings are\n" - "+for the PS2 host controller.\n" - "+IBM compliant IBM PS2 and AT-compatible keyboard and mouse can be connected.\n" - "+\n" - "+Required properties:\n" - "+\n" - "+ - reg : Offset and length of the register set for the device.\n" - "+ - compatible : \"allwinner,sun4i-a10-ps2\"\n" - "+ - interrupts : The interrupt line connected to the PS2.\n" - "+ - clocks : The gate clk connected to the PS2.\n" - "+\n" - "+\n" - "+Example:\n" - "+\tps20: ps2@0x01c2a000 {\n" - "+\t\tcompatible = \"allwinner,sun4i-a10-ps2\";\n" - "+\t\treg = <0x01c2a000 0x400>;\n" - "+\t\tinterrupts = <0 62 4>;\n" - "+\t\tclocks = <&apb1_gates 6>;\n" - "+\t\tstatus = \"disabled\";\n" - "+\t};\n" - "-- \n" - 2.1.0 - "\01:3\0" - "fn\00002-FIXUP-sunxi-drivers-input-ps2-Added-sunxi-A10-A20-ps.patch\0" - "b\0" - ">From 0eecd5e763278a59c4533e576ac1c9616310c21e Mon Sep 17 00:00:00 2001\n" - "From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" - "Date: Fri, 12 Dec 2014 14:11:56 +0100\n" - "Subject: [PATCH v2 2/4] FIXUP: \"sunxi:drivers:input:ps2 Added sunxi A10/A20\n" - " ps2 driver\"\n" - "\n" - "dt bindings should use the compat string for the earliest version of the\n" - "hardware which has the relevant hardware block, unless there are differences,\n" - "the A10 and A20 ps2 controllers are identical, so for both sun4i-a10-ps2\n" - "should be used as compat string, drop the sun7i-a20-ps2 compat string.\n" - "\n" - "Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" - "---\n" - " drivers/input/serio/sunxi-ps2.c | 1 -\n" - " 1 file changed, 1 deletion(-)\n" - "\n" - "diff --git a/drivers/input/serio/sunxi-ps2.c b/drivers/input/serio/sunxi-ps2.c\n" - "index 4cd89ae..cb89d80 100644\n" - "--- a/drivers/input/serio/sunxi-ps2.c\n" - "+++ b/drivers/input/serio/sunxi-ps2.c\n" - "@@ -340,7 +340,6 @@ static int sunxips2_remove(struct platform_device *pdev)\n" - " \n" - " /* Match table for of_platform binding */\n" - " static const struct of_device_id sunxips2_of_match[] = {\n" - "-\t{ .compatible = \"allwinner,sun7i-a20-ps2\", },\n" - " \t{ .compatible = \"allwinner,sun4i-a10-ps2\", },\n" - " \t{ },\n" - " };\n" - "-- \n" - 2.1.0 - "\01:4\0" - "fn\00003-FIXUP-ARM-dts-sunxi-ps2-dt-nodes-for-A10-A20-PS2-con.patch\0" - "b\0" - ">From 45985183f3e96adf1c846c7bbde32647367024dc Mon Sep 17 00:00:00 2001\n" - "From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" - "Date: Fri, 12 Dec 2014 14:01:43 +0100\n" - "Subject: [PATCH v2 3/4] FIXUP: \"ARM:dts:sunxi:ps2 dt nodes for A10/A20 PS2\n" - " controller.\"\n" - "\n" - "2 fixups for: \"ARM:dts:sunxi:ps2 dt nodes for A10/A20 PS2 controller.\"\n" - "\n" - "1) Fixup the sun4i ps/2 nodes interrupt property, sun4i interrupts take\n" - "only 1 specifier\n" - "\n" - "2) dt bindings should use the compat string for the earliest version of the\n" - "hardware which has the relevant hardware block, unless there are differences,\n" - "the A10 and A20 ps2 controllers are identical, so for both sun4i-a10-ps2\n" - "should be used as compat string, update the sun7i.dtsi ps2 entries to\n" - "use the sun4i-a10-ps2 compat string.\n" - "\n" - "Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" - "---\n" - " arch/arm/boot/dts/sun4i-a10.dtsi | 4 ++--\n" - " arch/arm/boot/dts/sun7i-a20.dtsi | 4 ++--\n" - " 2 files changed, 4 insertions(+), 4 deletions(-)\n" - "\n" - "diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi\n" - "index c04c117..e8cd6db 100644\n" - "--- a/arch/arm/boot/dts/sun4i-a10.dtsi\n" - "+++ b/arch/arm/boot/dts/sun4i-a10.dtsi\n" - "@@ -818,14 +818,14 @@\n" - " \t\tps20: ps2@0x01c2a000 {\n" - " \t\t\tcompatible = \"allwinner,sun4i-a10-ps2\";\n" - " \t\t\treg = <0x01c2a000 0x400>;\n" - "-\t\t\tinterrupts = <0 62 4>;\n" - "+\t\t\tinterrupts = <62>;\n" - " \t\t\tclocks = <&apb1_gates 6>;\n" - " \t\t\tstatus = \"disabled\";\n" - " \t\t};\n" - " \t\tps21: ps2@0x01c2a400 {\n" - " \t\t\tcompatible = \"allwinner,sun4i-a10-ps2\";\n" - " \t\t\treg = <0x01c2a400 0x400>;\n" - "-\t\t\tinterrupts = <0 63 4>;\n" - "+\t\t\tinterrupts = <63>;\n" - " \t\t\tclocks = <&apb1_gates 7>;\n" - " \t\t\tstatus = \"disabled\";\n" - " \t\t};\n" - "diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi\n" - "index 4417c8c3..d54d684 100644\n" - "--- a/arch/arm/boot/dts/sun7i-a20.dtsi\n" - "+++ b/arch/arm/boot/dts/sun7i-a20.dtsi\n" - "@@ -1114,14 +1114,14 @@\n" - " \t\t\tinterrupts = <1 9 0xf04>;\n" - " \t\t};\n" - " \t\tps20: ps2@0x01c2a000 {\n" - "-\t\t\tcompatible = \"allwinner,sun7i-a20-ps2\";\n" - "+\t\t\tcompatible = \"allwinner,sun4i-a10-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@0x01c2a400 {\n" - "-\t\t\tcompatible = \"allwinner,sun7i-a20-ps2\";\n" - "+\t\t\tcompatible = \"allwinner,sun4i-a10-ps2\";\n" - " \t\t\treg = <0x01c2a400 0x400>;\n" - " \t\t\tinterrupts = <0 63 4>;\n" - " \t\t\tclocks = <&apb1_gates 7>;" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: 0001-FIXUP-sunxi-dts-bindings-input-ps2-bindings-for-A10-.patch\n" + "Type: text/x-patch\n" + "Size: 3234 bytes\n" + "Desc: not available\n" + "URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141212/b78f904f/attachment-0003.bin>\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: 0002-FIXUP-sunxi-drivers-input-ps2-Added-sunxi-A10-A20-ps.patch\n" + "Type: text/x-patch\n" + "Size: 1147 bytes\n" + "Desc: not available\n" + "URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141212/b78f904f/attachment-0004.bin>\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: 0003-FIXUP-ARM-dts-sunxi-ps2-dt-nodes-for-A10-A20-PS2-con.patch\n" + "Type: text/x-patch\n" + "Size: 2258 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141212/b78f904f/attachment-0005.bin> -9496f9b93ff7abce6240faf76113e90eb85cedbf97cfd99cf8d9938aa75176ea +33c9a0651d07fcbf4b21e7bce2696e91780e83687dbbd05d61e6cc617941df39
diff --git a/a/1.txt b/N2/1.txt index 651f5c3..9778f0d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -61,8 +61,3 @@ Hans > create mode 100644 Documentation/devicetree/bindings/input/allwinner,sunxi-ps2.txt > create mode 100644 drivers/input/serio/sunxi-ps2.c > - --- -You received this message because you are subscribed to the Google Groups "linux-sunxi" group. -To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org -For more options, visit https://groups.google.com/d/optout. diff --git a/a/2.txt b/N2/2.txt index bf69a43..e541886 100644 --- a/a/2.txt +++ b/N2/2.txt @@ -1,5 +1,5 @@ >From 85105ec25cfb0dcff102e579e00a0a6c38ac34e9 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +From: Hans de Goede <hdegoede@redhat.com> Date: Fri, 12 Dec 2014 14:05:56 +0100 Subject: [PATCH v2 1/4] FIXUP: "sunxi:dts-bindings:input:ps2 bindings for A10/A20 ps2." @@ -13,7 +13,7 @@ should be used as compat string. 2) ps2 / serio bindings belong under Documentation/devicetree/bindings/serio -Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- .../bindings/input/allwinner,sunxi-ps2.txt | 23 ---------------------- .../bindings/serio/allwinner,sun4i-a10-ps2.txt | 22 +++++++++++++++++++++ diff --git a/a/3.txt b/N2/3.txt index 49cdebd..07ba25e 100644 --- a/a/3.txt +++ b/N2/3.txt @@ -1,5 +1,5 @@ >From 0eecd5e763278a59c4533e576ac1c9616310c21e Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +From: Hans de Goede <hdegoede@redhat.com> Date: Fri, 12 Dec 2014 14:11:56 +0100 Subject: [PATCH v2 2/4] FIXUP: "sunxi:drivers:input:ps2 Added sunxi A10/A20 ps2 driver" @@ -9,7 +9,7 @@ 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, drop the sun7i-a20-ps2 compat string. -Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/input/serio/sunxi-ps2.c | 1 - 1 file changed, 1 deletion(-) diff --git a/a/4.txt b/N2/4.txt index a7d881e..317c5bc 100644 --- a/a/4.txt +++ b/N2/4.txt @@ -1,5 +1,5 @@ >From 45985183f3e96adf1c846c7bbde32647367024dc Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +From: Hans de Goede <hdegoede@redhat.com> 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." @@ -15,7 +15,7 @@ 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 <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- arch/arm/boot/dts/sun4i-a10.dtsi | 4 ++-- arch/arm/boot/dts/sun7i-a20.dtsi | 4 ++-- @@ -63,3 +63,5 @@ index 4417c8c3..d54d684 100644 reg = <0x01c2a400 0x400>; interrupts = <0 63 4>; clocks = <&apb1_gates 7>; +-- +2.1.0 diff --git a/a/content_digest b/N2/content_digest index 3368801..567d0c4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,23 +1,22 @@ "ref\01417907719-26775-1-git-send-email-VishnuPatekar0510@gmail.com\0" - "ref\01417907719-26775-1-git-send-email-VishnuPatekar0510-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" - "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" - "Subject\0Re: [PATCHv2 0/3] ARM:sunxi:ps2 Added support for A10/A20 ps2 controller.\0" + "From\0Hans de Goede <hdegoede@redhat.com>\0" + "Subject\0Re: [linux-sunxi] [PATCHv2 0/3] ARM:sunxi:ps2 Added support for A10/A20 ps2 controller.\0" "Date\0Fri, 12 Dec 2014 14:15:58 +0100\0" - "To\0linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org" - dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org - maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org - " linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org\0" - "Cc\0leafy.myeh-Q9AEpCAkrSgqDJ6do+/SaQ@public.gmane.org" - robh+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 - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " vishnupatekar <VishnuPatekar0510-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "To\0linux-sunxi@googlegroups.com" + dmitry.torokhov@gmail.com + maxime.ripard@free-electrons.com + " linux@arm.linux.org.uk\0" + "Cc\0leafy.myeh@newbietech.com" + robh+dt@kernel.org + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + linux-input@vger.kernel.org + " vishnupatekar <VishnuPatekar0510@gmail.com>\0" "\01:1\0" "b\0" "Hi,\n" @@ -82,17 +81,12 @@ "> 7 files changed, 467 insertions(+)\n" "> create mode 100644 Documentation/devicetree/bindings/input/allwinner,sunxi-ps2.txt\n" "> create mode 100644 drivers/input/serio/sunxi-ps2.c\n" - ">\n" - "\n" - "-- \n" - "You received this message because you are subscribed to the Google Groups \"linux-sunxi\" group.\n" - "To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org\n" - For more options, visit https://groups.google.com/d/optout. + > "\01:2\0" "fn\00001-FIXUP-sunxi-dts-bindings-input-ps2-bindings-for-A10-.patch\0" "b\0" ">From 85105ec25cfb0dcff102e579e00a0a6c38ac34e9 Mon Sep 17 00:00:00 2001\n" - "From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" + "From: Hans de Goede <hdegoede@redhat.com>\n" "Date: Fri, 12 Dec 2014 14:05:56 +0100\n" "Subject: [PATCH v2 1/4] FIXUP: \"sunxi:dts-bindings:input:ps2 bindings for\n" " A10/A20 ps2.\"\n" @@ -106,7 +100,7 @@ "\n" "2) ps2 / serio bindings belong under Documentation/devicetree/bindings/serio\n" "\n" - "Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" + "Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n" "---\n" " .../bindings/input/allwinner,sunxi-ps2.txt | 23 ----------------------\n" " .../bindings/serio/allwinner,sun4i-a10-ps2.txt | 22 +++++++++++++++++++++\n" @@ -177,7 +171,7 @@ "fn\00002-FIXUP-sunxi-drivers-input-ps2-Added-sunxi-A10-A20-ps.patch\0" "b\0" ">From 0eecd5e763278a59c4533e576ac1c9616310c21e Mon Sep 17 00:00:00 2001\n" - "From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" + "From: Hans de Goede <hdegoede@redhat.com>\n" "Date: Fri, 12 Dec 2014 14:11:56 +0100\n" "Subject: [PATCH v2 2/4] FIXUP: \"sunxi:drivers:input:ps2 Added sunxi A10/A20\n" " ps2 driver\"\n" @@ -187,7 +181,7 @@ "the A10 and A20 ps2 controllers are identical, so for both sun4i-a10-ps2\n" "should be used as compat string, drop the sun7i-a20-ps2 compat string.\n" "\n" - "Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" + "Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n" "---\n" " drivers/input/serio/sunxi-ps2.c | 1 -\n" " 1 file changed, 1 deletion(-)\n" @@ -210,7 +204,7 @@ "fn\00003-FIXUP-ARM-dts-sunxi-ps2-dt-nodes-for-A10-A20-PS2-con.patch\0" "b\0" ">From 45985183f3e96adf1c846c7bbde32647367024dc Mon Sep 17 00:00:00 2001\n" - "From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" + "From: Hans de Goede <hdegoede@redhat.com>\n" "Date: Fri, 12 Dec 2014 14:01:43 +0100\n" "Subject: [PATCH v2 3/4] FIXUP: \"ARM:dts:sunxi:ps2 dt nodes for A10/A20 PS2\n" " controller.\"\n" @@ -226,7 +220,7 @@ "should be used as compat string, update the sun7i.dtsi ps2 entries to\n" "use the sun4i-a10-ps2 compat string.\n" "\n" - "Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" + "Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n" "---\n" " arch/arm/boot/dts/sun4i-a10.dtsi | 4 ++--\n" " arch/arm/boot/dts/sun7i-a20.dtsi | 4 ++--\n" @@ -273,6 +267,8 @@ "+\t\t\tcompatible = \"allwinner,sun4i-a10-ps2\";\n" " \t\t\treg = <0x01c2a400 0x400>;\n" " \t\t\tinterrupts = <0 63 4>;\n" - " \t\t\tclocks = <&apb1_gates 7>;" + " \t\t\tclocks = <&apb1_gates 7>;\n" + "-- \n" + 2.1.0 -9496f9b93ff7abce6240faf76113e90eb85cedbf97cfd99cf8d9938aa75176ea +191c969fcdbb50c9485419274600ba8b6e519ee8070306dab0683adafc746a59
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.