diff for duplicates of <54BD5203.90000@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 77b1605..a4604c4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -59,8 +59,8 @@ Hans > +++ b/arch/arm/boot/dts/sun7i-a20-inet-k970.dts > @@ -0,0 +1,249 @@ > +/* -> + * Copyright 2014 - Iain Paton <ipaton0@gmail.com> -> + * Copyright 2015 - Lars D?lle <lars.doelle@on-line.de> +> + * Copyright 2014 - Iain Paton <ipaton0-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +> + * Copyright 2015 - Lars Dölle <lars.doelle-RMqqONVpFt+ELgA04lAiVw@public.gmane.org> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual @@ -121,8 +121,8 @@ Hans > + > + compatible = "inet,a20-inet-k970", "allwinner,sun7i-a20"; > + -> + soc at 01c00000 { -> + mmc0: mmc at 01c0f000 { +> + soc@01c00000 { +> + mmc0: mmc@01c0f000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; > + vmmc-supply = <®_vcc3v3>; @@ -132,40 +132,40 @@ Hans > + status = "okay"; > + }; > + -> + usbphy: phy at 01c13400 { +> + usbphy: phy@01c13400 { > + usb1_vbus-supply = <®_usb1_vbus>; > + usb2_vbus-supply = <®_usb2_vbus>; > + status = "okay"; > + }; > + -> + ehci0: usb at 01c14000 { +> + ehci0: usb@01c14000 { > + status = "okay"; > + }; > + -> + ohci0: usb at 01c14400 { +> + ohci0: usb@01c14400 { > + status = "okay"; > + }; > + -> + ehci1: usb at 01c1c000 { +> + ehci1: usb@01c1c000 { > + status = "okay"; > + }; > + -> + ohci1: usb at 01c1c400 { +> + ohci1: usb@01c1c400 { > + status = "okay"; > + }; > + -> + uart0: serial at 01c28000 { +> + uart0: serial@01c28000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart0_pins_a>; > + status = "okay"; > + }; > + -> + i2c0: i2c at 01c2ac00 { +> + i2c0: i2c@01c2ac00 { > + pinctrl-names = "default"; > + pinctrl-0 = <&i2c0_pins_a>; > + status = "okay"; > + -> + axp209: pmic at 34 { +> + axp209: pmic@34 { > + compatible = "x-powers,axp209"; > + reg = <0x34>; > + interrupt-parent = <&nmi_intc>; @@ -220,7 +220,7 @@ Hans > + }; > + }; > + -> + i2c1: i2c at 01c2b000 { +> + i2c1: i2c@01c2b000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&i2c1_pins_a>; > + status = "okay"; @@ -228,15 +228,15 @@ Hans > + // accelerometer mma865x on 0x1d > + }; > + -> + pio: pinctrl at 01c20800 { +> + pio: pinctrl@01c20800 { > + -> + edt_ft5x06_pins_a: ft5 at 0 { // interrupt +> + edt_ft5x06_pins_a: ft5@0 { // interrupt > + allwinner,pins = "PH21"; > + allwinner,function = "irq"; > + allwinner,drive = <SUN4I_PINCTRL_20_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; -> + edt_ft5x06_pins_b: ft5 at 1 { // power +> + edt_ft5x06_pins_b: ft5@1 { // power > + allwinner,pins = "PH22"; > + allwinner,function = "gpio_out"; > + allwinner,drive = <SUN4I_PINCTRL_20_MA>; @@ -245,12 +245,12 @@ Hans > + }; > + }; > + -> + i2c2: i2c at 01c2b400 { +> + i2c2: i2c@01c2b400 { > + pinctrl-names = "default"; > + pinctrl-0 = <&i2c2_pins_a>; > + status = "okay"; > + -> + polytouch: edt-ft5x06 at 38 { +> + polytouch: edt-ft5x06@38 { > + compatible = "edt,edt-ft5x06"; > + reg = <0x38>; > + pinctrl-names = "default"; @@ -261,28 +261,28 @@ Hans > + }; > + }; > + -> + lradc: lradc at 01c22800 { +> + lradc: lradc@01c22800 { > + > + vref-supply = <®_vcc3v0>; > + status = "okay"; > + > + // The driver picks the closest voltage. > + -> + button at 158 { +> + button@158 { > + label = "Volume Up"; > + linux,code = <KEY_VOLUMEUP>; > + channel = <0>; > + voltage = <158730>; > + }; > + -> + button at 952 { +> + button@952 { > + label = "Volume Down"; > + linux,code = <KEY_VOLUMEDOWN>; > + channel = <0>; > + voltage = <952380>; > + }; > + -> + button at 1142 { +> + button@1142 { > + label = "Menu"; // labeled ESC on the back cover > + linux,code = <KEY_MENU>; > + channel = <0>; @@ -308,3 +308,8 @@ Hans > + }; > +}; > + +-- +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/content_digest b/N1/content_digest index 9f387da..5b30579 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,13 @@ "ref\03184462.M90eiSWZKq@x64.localnet\0" - "From\0hdegoede@redhat.com (Hans de Goede)\0" - "Subject\0[linux-sunxi] [PATCH] added sun7i-a20-inet-k970.dts\0" + "ref\03184462.M90eiSWZKq-01DtBWzyqXQXpj0+iOhflA@public.gmane.org\0" + "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" + "Subject\0Re: [PATCH] added sun7i-a20-inet-k970.dts\0" "Date\0Mon, 19 Jan 2015 19:50:43 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org" + " Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Cc\0linux-arm-kernel <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>" + devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + " Aleksei Mamlin <mamlinav-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" "\00:1\0" "b\0" "Hi,\n" @@ -66,8 +71,8 @@ "> +++ b/arch/arm/boot/dts/sun7i-a20-inet-k970.dts\n" "> @@ -0,0 +1,249 @@\n" "> +/*\n" - "> + * Copyright 2014 - Iain Paton <ipaton0@gmail.com>\n" - "> + * Copyright 2015 - Lars D?lle <lars.doelle@on-line.de>\n" + "> + * Copyright 2014 - Iain Paton <ipaton0-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" + "> + * Copyright 2015 - Lars D\303\266lle <lars.doelle-RMqqONVpFt+ELgA04lAiVw@public.gmane.org>\n" "> + *\n" "> + * This file is dual-licensed: you can use it either under the terms\n" "> + * of the GPL or the X11 license, at your option. Note that this dual\n" @@ -128,8 +133,8 @@ "> +\n" "> +\tcompatible = \"inet,a20-inet-k970\", \"allwinner,sun7i-a20\";\n" "> +\n" - "> +\tsoc at 01c00000 {\n" - "> +\t\tmmc0: mmc at 01c0f000 {\n" + "> +\tsoc@01c00000 {\n" + "> +\t\tmmc0: mmc@01c0f000 {\n" "> +\t\t\tpinctrl-names = \"default\";\n" "> +\t\t\tpinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;\n" "> +\t\t\tvmmc-supply = <®_vcc3v3>;\n" @@ -139,40 +144,40 @@ "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tusbphy: phy at 01c13400 {\n" + "> +\t\tusbphy: phy@01c13400 {\n" "> +\t\t\tusb1_vbus-supply = <®_usb1_vbus>;\n" "> +\t\t\tusb2_vbus-supply = <®_usb2_vbus>;\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tehci0: usb at 01c14000 {\n" + "> +\t\tehci0: usb@01c14000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tohci0: usb at 01c14400 {\n" + "> +\t\tohci0: usb@01c14400 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tehci1: usb at 01c1c000 {\n" + "> +\t\tehci1: usb@01c1c000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tohci1: usb at 01c1c400 {\n" + "> +\t\tohci1: usb@01c1c400 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart0: serial at 01c28000 {\n" + "> +\t\tuart0: serial@01c28000 {\n" "> +\t\t\tpinctrl-names = \"default\";\n" "> +\t\t\tpinctrl-0 = <&uart0_pins_a>;\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c0: i2c at 01c2ac00 {\n" + "> +\t\ti2c0: i2c@01c2ac00 {\n" "> +\t\t\tpinctrl-names = \"default\";\n" "> +\t\t\tpinctrl-0 = <&i2c0_pins_a>;\n" "> +\t\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\t\taxp209: pmic at 34 {\n" + "> +\t\t\taxp209: pmic@34 {\n" "> +\t\t\t\tcompatible = \"x-powers,axp209\";\n" "> +\t\t\t\treg = <0x34>;\n" "> +\t\t\t\tinterrupt-parent = <&nmi_intc>;\n" @@ -227,7 +232,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> + i2c1: i2c at 01c2b000 {\n" + "> + i2c1: i2c@01c2b000 {\n" "> + pinctrl-names = \"default\";\n" "> + pinctrl-0 = <&i2c1_pins_a>;\n" "> + status = \"okay\";\n" @@ -235,15 +240,15 @@ "> + // accelerometer mma865x on 0x1d\n" "> + };\n" "> +\n" - "> +\t\tpio: pinctrl at 01c20800 {\n" + "> +\t\tpio: pinctrl@01c20800 {\n" "> +\n" - "> +\t\t\tedt_ft5x06_pins_a: ft5 at 0 { // interrupt\n" + "> +\t\t\tedt_ft5x06_pins_a: ft5@0 { // interrupt\n" "> +\t\t\t\tallwinner,pins = \"PH21\";\n" "> +\t\t\t\tallwinner,function = \"irq\";\n" "> + \t\t\t\tallwinner,drive = <SUN4I_PINCTRL_20_MA>;\n" "> + \t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" - "> +\t\t\tedt_ft5x06_pins_b: ft5 at 1 { // power\n" + "> +\t\t\tedt_ft5x06_pins_b: ft5@1 { // power\n" "> +\t\t\t\tallwinner,pins = \"PH22\";\n" "> + \t\t\t\tallwinner,function = \"gpio_out\";\n" "> + \t\t\t\tallwinner,drive = <SUN4I_PINCTRL_20_MA>;\n" @@ -252,12 +257,12 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> + i2c2: i2c at 01c2b400 {\n" + "> + i2c2: i2c@01c2b400 {\n" "> + pinctrl-names = \"default\";\n" "> + pinctrl-0 = <&i2c2_pins_a>;\n" "> + status = \"okay\";\n" "> +\n" - "> +\t\t\tpolytouch: edt-ft5x06 at 38 {\n" + "> +\t\t\tpolytouch: edt-ft5x06@38 {\n" "> +\t\t\t\tcompatible = \"edt,edt-ft5x06\";\n" "> +\t\t\t\treg = <0x38>;\n" "> +\t\t\t\tpinctrl-names = \"default\";\n" @@ -268,28 +273,28 @@ "> +\t\t\t};\n" "> + };\n" "> +\n" - "> +\t\tlradc: lradc at 01c22800 {\n" + "> +\t\tlradc: lradc@01c22800 {\n" "> +\n" "> +\t\t\tvref-supply = <®_vcc3v0>;\n" "> +\t \tstatus = \"okay\";\n" "> +\n" "> + \t// The driver picks the closest voltage.\n" "> +\n" - "> +\t\t\tbutton at 158 {\n" + "> +\t\t\tbutton@158 {\n" "> +\t\t\t\tlabel = \"Volume Up\";\n" "> +\t\t\t\tlinux,code = <KEY_VOLUMEUP>;\n" "> +\t\t\t\tchannel = <0>;\n" "> +\t\t\t\tvoltage = <158730>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tbutton at 952 {\n" + "> +\t\t\tbutton@952 {\n" "> +\t\t\t\tlabel = \"Volume Down\";\n" "> +\t\t\t\tlinux,code = <KEY_VOLUMEDOWN>;\n" "> +\t\t\t\tchannel = <0>;\n" "> +\t\t\t\tvoltage = <952380>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tbutton at 1142 {\n" + "> +\t\t\tbutton@1142 {\n" "> +\t\t\t\tlabel = \"Menu\"; // labeled ESC on the back cover\n" "> +\t\t\t\tlinux,code = <KEY_MENU>;\n" "> +\t\t\t\tchannel = <0>;\n" @@ -314,6 +319,11 @@ "> +\t\tregulator-always-on;\n" "> +\t};\n" "> +};\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. -5d05d499659c6e854c6aec43e2c63dc0fbe1f0fbeaf3c81dc928dc6e1ac3650c +5ce05b5841da9477c00080b750a74b31bfb771fe69087fe3d528f6766447ea17
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.