diff for duplicates of <52ADBD41.4050104@redhat.com> diff --git a/a/1.txt b/N1/1.txt index b98ee1e..3c63ebe 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,7 +4,7 @@ On 12/15/2013 02:58 PM, Maxime Ripard wrote: > Hi Hans, > > On Sat, Dec 14, 2013 at 10:58:12PM +0100, Hans de Goede wrote: ->> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +>> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > Commit-log :) @@ -26,7 +26,7 @@ Note as said before I expect David to take things from here. >> }; >> }; >> ->> + sdc0: sdc@01c0f000 { +>> + sdc0: sdc at 01c0f000 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&sdc0_pins_a>; >> + pinctrl-1 = <&mmc0_cd_pin_cubieboard>; @@ -35,8 +35,8 @@ Note as said before I expect David to take things from here. >> + status = "okay"; >> + }; >> + ->> pinctrl@01c20800 { ->> + mmc0_cd_pin_cubieboard: mmc0_cd_pin@0 { +>> pinctrl at 01c20800 { +>> + mmc0_cd_pin_cubieboard: mmc0_cd_pin at 0 { >> + allwinner,pins = "PH1"; >> + allwinner,function = "gpio_in"; >> + allwinner,drive = <0>; @@ -52,7 +52,7 @@ I just took what David was using. I agree picking one and staying with it would be better. > ->> led_pins_cubieboard: led_pins@0 { +>> led_pins_cubieboard: led_pins at 0 { >> allwinner,pins = "PH20", "PH21"; >> allwinner,function = "gpio_out"; >> diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -63,7 +63,7 @@ it would be better. >> #size-cells = <0>; >> }; >> ->> + sdc0: sdc@01c0f000 { +>> + sdc0: sdc at 01c0f000 { >> + compatible = "allwinner,sun4i-mmc"; >> + reg = <0x01c0f000 0x1000>; >> + clocks = <&ahb_gates 8>, <&mmc0>; @@ -79,7 +79,7 @@ Yes 4 of them. > Could you add all of them in the DT ? > ->> intc: interrupt-controller@01c20400 { +>> intc: interrupt-controller at 01c20400 { >> compatible = "allwinner,sun4i-ic"; >> reg = <0x01c20400 0x400>; >> @@ -376,6 +385,13 @@ @@ -87,7 +87,7 @@ Yes 4 of them. >> allwinner,pull = <0>; >> }; >> + ->> + sdc0_pins_a: sdc0@0 { +>> + sdc0_pins_a: sdc0 at 0 { >> + allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5"; >> + allwinner,function = "mmc0"; >> + allwinner,drive = <3>; diff --git a/a/content_digest b/N1/content_digest index ec460c5..bd378b2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,10 @@ "ref\01387058295-20641-1-git-send-email-hdegoede@redhat.com\0" "ref\01387058295-20641-3-git-send-email-hdegoede@redhat.com\0" "ref\020131215135854.GF3651@lukather\0" - "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" - "Subject\0Re: Re: [PATCH 2/5] ARM: dts: sun4i: Add support for mmc\0" + "From\0hdegoede@redhat.com (Hans de Goede)\0" + "Subject\0[linux-sunxi] Re: [PATCH 2/5] ARM: dts: sun4i: Add support for mmc\0" "Date\0Sun, 15 Dec 2013 15:31:29 +0100\0" - "To\0linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org\0" - "Cc\0Chris Ball <cjb-2X9k7bc8m7Mdnm+yROfE0A@public.gmane.org>" - " David Lanzend\303\266rfer <david.lanzendoerfer-Z7Kmv9EsliU@public.gmane.org>" - linux-mmc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi,\n" @@ -18,7 +13,7 @@ "> Hi Hans,\n" ">\n" "> On Sat, Dec 14, 2013 at 10:58:12PM +0100, Hans de Goede wrote:\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" "> Commit-log :)\n" "\n" @@ -40,7 +35,7 @@ ">> \t\t\t};\n" ">> \t\t};\n" ">>\n" - ">> +\t\tsdc0: sdc@01c0f000 {\n" + ">> +\t\tsdc0: sdc at 01c0f000 {\n" ">> +\t\t\tpinctrl-names = \"default\";\n" ">> +\t\t\tpinctrl-0 = <&sdc0_pins_a>;\n" ">> +\t\t\tpinctrl-1 = <&mmc0_cd_pin_cubieboard>;\n" @@ -49,8 +44,8 @@ ">> +\t\t\tstatus = \"okay\";\n" ">> +\t\t};\n" ">> +\n" - ">> \t\tpinctrl@01c20800 {\n" - ">> +\t\t\tmmc0_cd_pin_cubieboard: mmc0_cd_pin@0 {\n" + ">> \t\tpinctrl at 01c20800 {\n" + ">> +\t\t\tmmc0_cd_pin_cubieboard: mmc0_cd_pin at 0 {\n" ">> +\t\t\t\tallwinner,pins = \"PH1\";\n" ">> +\t\t\t\tallwinner,function = \"gpio_in\";\n" ">> +\t\t\t\tallwinner,drive = <0>;\n" @@ -66,7 +61,7 @@ "it would be better.\n" "\n" ">\n" - ">> \t\t\tled_pins_cubieboard: led_pins@0 {\n" + ">> \t\t\tled_pins_cubieboard: led_pins at 0 {\n" ">> \t\t\t\tallwinner,pins = \"PH20\", \"PH21\";\n" ">> \t\t\t\tallwinner,function = \"gpio_out\";\n" ">> diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi\n" @@ -77,7 +72,7 @@ ">> \t\t\t#size-cells = <0>;\n" ">> \t\t};\n" ">>\n" - ">> +\t\tsdc0: sdc@01c0f000 {\n" + ">> +\t\tsdc0: sdc at 01c0f000 {\n" ">> +\t\t\tcompatible = \"allwinner,sun4i-mmc\";\n" ">> +\t\t\treg = <0x01c0f000 0x1000>;\n" ">> +\t\t\tclocks = <&ahb_gates 8>, <&mmc0>;\n" @@ -93,7 +88,7 @@ "\n" "> Could you add all of them in the DT ?\n" ">\n" - ">> \t\tintc: interrupt-controller@01c20400 {\n" + ">> \t\tintc: interrupt-controller at 01c20400 {\n" ">> \t\t\tcompatible = \"allwinner,sun4i-ic\";\n" ">> \t\t\treg = <0x01c20400 0x400>;\n" ">> @@ -376,6 +385,13 @@\n" @@ -101,7 +96,7 @@ ">> \t\t\t\tallwinner,pull = <0>;\n" ">> \t\t\t};\n" ">> +\n" - ">> +\t\t\tsdc0_pins_a: sdc0@0 {\n" + ">> +\t\t\tsdc0_pins_a: sdc0 at 0 {\n" ">> +\t\t\t\tallwinner,pins = \"PF0\",\"PF1\",\"PF2\",\"PF3\",\"PF4\",\"PF5\";\n" ">> +\t\t\t\tallwinner,function = \"mmc0\";\n" ">> +\t\t\t\tallwinner,drive = <3>;\n" @@ -145,4 +140,4 @@ "\n" Hans -8ebae0918e9130c44c6922d7bb6b286af41c996f98ac10b114a110362d9f39b5 +bb935b557aad1ef07c364fb609e102b42997e8b4d0bd5c04cc623c6c3df0a16f
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.