diff for duplicates of <5475962A.4090508@redhat.com> diff --git a/a/1.txt b/N1/1.txt index f73c492..840d556 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -43,7 +43,7 @@ Regards, Hans > ->> Signed-off-by: Hans de Goede <hdegoede@redhat.com> +>> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> >> --- >> arch/arm/boot/dts/Makefile | 3 +- >> arch/arm/boot/dts/sun6i-a31s-cs908.dts | 109 +++++++++++++++++++++++++++++++++ @@ -71,7 +71,7 @@ Hans >> +++ b/arch/arm/boot/dts/sun6i-a31s-cs908.dts >> @@ -0,0 +1,109 @@ >> +/* ->> + * Copyright 2014 Hans de Goede <hdegoede@redhat.com> +>> + * Copyright 2014 Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@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 @@ -134,25 +134,25 @@ Hans >> + bootargs = "earlyprintk console=ttyS0,115200"; >> + }; >> + ->> + soc at 01c00000 { ->> + usbphy: phy at 01c19400 { +>> + soc@01c00000 { +>> + usbphy: phy@01c19400 { >> + status = "okay"; >> + }; >> + ->> + ehci0: usb at 01c1a000 { +>> + ehci0: usb@01c1a000 { >> + status = "okay"; >> + }; >> + ->> + ehci1: usb at 01c1b000 { +>> + ehci1: usb@01c1b000 { >> + status = "okay"; >> + }; >> + ->> + ohci1: usb at 01c1b400 { +>> + ohci1: usb@01c1b400 { >> + status = "okay"; >> + }; >> + ->> + pio: pinctrl at 01c20800 { ->> + usb1_vbus_pin_csq908: usb1_vbus_pin at 0 { +>> + pio: pinctrl@01c20800 { +>> + usb1_vbus_pin_csq908: usb1_vbus_pin@0 { >> + allwinner,pins = "PC27"; >> + allwinner,function = "gpio_out"; >> + allwinner,drive = <0>; @@ -160,25 +160,25 @@ Hans >> + }; >> + }; >> + ->> + uart0: serial at 01c28000 { +>> + uart0: serial@01c28000 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&uart0_pins_a>; >> + status = "okay"; >> + }; >> + ->> + gmac: ethernet at 01c30000 { +>> + gmac: ethernet@01c30000 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&gmac_pins_mii_a>; >> + phy = <&phy1>; >> + phy-mode = "mii"; >> + status = "okay"; >> + ->> + phy1: ethernet-phy at 1 { +>> + phy1: ethernet-phy@1 { >> + reg = <1>; >> + }; >> + }; >> + ->> + ir at 01f02000 { +>> + ir@01f02000 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&ir_pins_a>; >> + status = "okay"; diff --git a/a/content_digest b/N1/content_digest index b063071..dcaf1c5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,15 @@ "ref\01416747283-13489-1-git-send-email-hdegoede@redhat.com\0" "ref\01416747283-13489-6-git-send-email-hdegoede@redhat.com\0" "ref\020141125182147.GD25249@lukather\0" - "From\0hdegoede@redhat.com (Hans de Goede)\0" - "Subject\0[PATCH 5/5] ARM: dts: sun6i: Add dts file for CSQ CS908 board\0" + "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" + "Subject\0Re: [PATCH 5/5] ARM: dts: sun6i: Add dts file for CSQ CS908 board\0" "Date\0Wed, 26 Nov 2014 09:58:18 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Cc\0Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>" + Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org> + devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org\0" "\00:1\0" "b\0" "Hi,\n" @@ -52,7 +57,7 @@ "Hans\n" "\n" ">\n" - ">> Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n" + ">> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" ">> ---\n" ">> arch/arm/boot/dts/Makefile | 3 +-\n" ">> arch/arm/boot/dts/sun6i-a31s-cs908.dts | 109 +++++++++++++++++++++++++++++++++\n" @@ -80,7 +85,7 @@ ">> +++ b/arch/arm/boot/dts/sun6i-a31s-cs908.dts\n" ">> @@ -0,0 +1,109 @@\n" ">> +/*\n" - ">> + * Copyright 2014 Hans de Goede <hdegoede@redhat.com>\n" + ">> + * Copyright 2014 Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@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" @@ -143,25 +148,25 @@ ">> +\t\tbootargs = \"earlyprintk console=ttyS0,115200\";\n" ">> +\t};\n" ">> +\n" - ">> +\tsoc at 01c00000 {\n" - ">> +\t\tusbphy: phy at 01c19400 {\n" + ">> +\tsoc@01c00000 {\n" + ">> +\t\tusbphy: phy@01c19400 {\n" ">> +\t\t\tstatus = \"okay\";\n" ">> +\t\t};\n" ">> +\n" - ">> +\t\tehci0: usb at 01c1a000 {\n" + ">> +\t\tehci0: usb@01c1a000 {\n" ">> +\t\t\tstatus = \"okay\";\n" ">> +\t\t};\n" ">> +\n" - ">> +\t\tehci1: usb at 01c1b000 {\n" + ">> +\t\tehci1: usb@01c1b000 {\n" ">> +\t\t\tstatus = \"okay\";\n" ">> +\t\t};\n" ">> +\n" - ">> +\t\tohci1: usb at 01c1b400 {\n" + ">> +\t\tohci1: usb@01c1b400 {\n" ">> +\t\t\tstatus = \"okay\";\n" ">> +\t\t};\n" ">> +\n" - ">> +\t\tpio: pinctrl at 01c20800 {\n" - ">> +\t\t\tusb1_vbus_pin_csq908: usb1_vbus_pin at 0 {\n" + ">> +\t\tpio: pinctrl@01c20800 {\n" + ">> +\t\t\tusb1_vbus_pin_csq908: usb1_vbus_pin@0 {\n" ">> +\t\t\t\tallwinner,pins = \"PC27\";\n" ">> +\t\t\t\tallwinner,function = \"gpio_out\";\n" ">> +\t\t\t\tallwinner,drive = <0>;\n" @@ -169,25 +174,25 @@ ">> +\t\t\t};\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\tgmac: ethernet at 01c30000 {\n" + ">> +\t\tgmac: ethernet@01c30000 {\n" ">> +\t\t\tpinctrl-names = \"default\";\n" ">> +\t\t\tpinctrl-0 = <&gmac_pins_mii_a>;\n" ">> +\t\t\tphy = <&phy1>;\n" ">> +\t\t\tphy-mode = \"mii\";\n" ">> +\t\t\tstatus = \"okay\";\n" ">> +\n" - ">> +\t\t\tphy1: ethernet-phy at 1 {\n" + ">> +\t\t\tphy1: ethernet-phy@1 {\n" ">> +\t\t\t\treg = <1>;\n" ">> +\t\t\t};\n" ">> +\t\t};\n" ">> +\n" - ">> +\t\tir at 01f02000 {\n" + ">> +\t\tir@01f02000 {\n" ">> +\t\t\tpinctrl-names = \"default\";\n" ">> +\t\t\tpinctrl-0 = <&ir_pins_a>;\n" ">> +\t\t\tstatus = \"okay\";\n" @@ -199,4 +204,4 @@ ">>\n" > -bce053b432354671b6ad571839fd74193661d64dfbacb8512b71741a5c76d9d1 +bbdeb257a24bbb4f12a62d4a1ebd32812f837aa4d979e1c85d57a804c2b14eac
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.