diff for duplicates of <20160823200349.GR2598@lukather> diff --git a/a/1.txt b/N1/1.txt index 765faed..f650658 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,7 +26,7 @@ The indentation looks off. > + reg = <0x40000000 0>; > + }; > + -> + gic: interrupt-controller at 1c81000 { +> + gic: interrupt-controller@1c81000 { > + compatible = "arm,gic-400"; > + interrupt-controller; > + #interrupt-cells = <3>; @@ -60,7 +60,7 @@ The indentation looks off. > + #size-cells = <1>; > + ranges; > + -> + pio: pinctrl at 1c20800 { +> + pio: pinctrl@1c20800 { > + compatible = "allwinner,sun50i-a64-pinctrl"; > + reg = <0x01c20800 0x400>; > + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>, @@ -72,84 +72,84 @@ The indentation looks off. > + interrupt-controller; > + #interrupt-cells = <2>; > + -> + uart0_pins_a: uart0 at 0 { +> + uart0_pins_a: uart0@0 { > + allwinner,pins = "PB8", "PB9"; > + allwinner,function = "uart0"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart0_pins_b: uart0 at 1 { +> + uart0_pins_b: uart0@1 { > + allwinner,pins = "PF2", "PF3"; > + allwinner,function = "uart0"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart1_2pins: uart1_2 at 0 { +> + uart1_2pins: uart1_2@0 { > + allwinner,pins = "PG6", "PG7"; > + allwinner,function = "uart1"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart1_4pins: uart1_4 at 0 { +> + uart1_4pins: uart1_4@0 { > + allwinner,pins = "PG6", "PG7", "PG8", "PG9"; > + allwinner,function = "uart1"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart2_2pins: uart2_2 at 0 { +> + uart2_2pins: uart2_2@0 { > + allwinner,pins = "PB0", "PB1"; > + allwinner,function = "uart2"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart2_4pins: uart2_4 at 0 { +> + uart2_4pins: uart2_4@0 { > + allwinner,pins = "PB0", "PB1", "PB2", "PB3"; > + allwinner,function = "uart2"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart3_pins_a: uart3 at 0 { +> + uart3_pins_a: uart3@0 { > + allwinner,pins = "PD0", "PD1"; > + allwinner,function = "uart3"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart3_2pins_b: uart3_2 at 1 { +> + uart3_2pins_b: uart3_2@1 { > + allwinner,pins = "PH4", "PH5"; > + allwinner,function = "uart3"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart3_4pins_b: uart3_4 at 1 { +> + uart3_4pins_b: uart3_4@1 { > + allwinner,pins = "PH4", "PH5", "PH6", "PH7"; > + allwinner,function = "uart3"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart4_2pins: uart4_2 at 0 { +> + uart4_2pins: uart4_2@0 { > + allwinner,pins = "PD2", "PD3"; > + allwinner,function = "uart4"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart4_4pins: uart4_4 at 0 { +> + uart4_4pins: uart4_4@0 { > + allwinner,pins = "PD2", "PD3", "PD4", "PD5"; > + allwinner,function = "uart4"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + mmc0_pins: mmc0 at 0 { +> + mmc0_pins: mmc0@0 { > + allwinner,pins = "PF0", "PF1", "PF2", "PF3", > + "PF4", "PF5"; > + allwinner,function = "mmc0"; @@ -157,14 +157,14 @@ The indentation looks off. > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + mmc0_default_cd_pin: mmc0_cd_pin at 0 { +> + mmc0_default_cd_pin: mmc0_cd_pin@0 { > + allwinner,pins = "PF6"; > + allwinner,function = "gpio_in"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; > + }; > + -> + mmc1_pins: mmc1 at 0 { +> + mmc1_pins: mmc1@0 { > + allwinner,pins = "PG0", "PG1", "PG2", "PG3", > + "PG4", "PG5"; > + allwinner,function = "mmc1"; @@ -172,7 +172,7 @@ The indentation looks off. > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + mmc2_pins: mmc2 at 0 { +> + mmc2_pins: mmc2@0 { > + allwinner,pins = "PC1", "PC5", "PC6", "PC8", > + "PC9", "PC10", "PC11", "PC12", > + "PC13", "PC14", "PC15", "PC16"; @@ -213,10 +213,3 @@ Maxime Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com --------------- next part -------------- -A non-text attachment was scrubbed... -Name: signature.asc -Type: application/pgp-signature -Size: 819 bytes -Desc: not available -URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160823/216b15bb/attachment.sig> diff --git a/a/content_digest b/N1/content_digest index 0ea48f4..e0ac262 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,18 @@ "ref\020160808172149.30861-1-andre.przywara@arm.com\0" "ref\020160808172149.30861-6-andre.przywara@arm.com\0" - "From\0maxime.ripard@free-electrons.com (Maxime Ripard)\0" - "Subject\0[PATCH v4 5/7] arm64: dts: add Allwinner A64 SoC .dtsi\0" + "ref\020160808172149.30861-6-andre.przywara-5wv7dgnIgG8@public.gmane.org\0" + "From\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Subject\0Re: [PATCH v4 5/7] arm64: dts: add Allwinner A64 SoC .dtsi\0" "Date\0Tue, 23 Aug 2016 22:03:49 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" - "\00:1\0" + "To\0Andre Przywara <andre.przywara-5wv7dgnIgG8@public.gmane.org>\0" + "Cc\0Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>" + linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "\01:1\0" "b\0" "Hi,\n" "\n" @@ -34,7 +42,7 @@ "> +\t\treg = <0x40000000 0>;\n" "> +\t};\n" "> +\n" - "> +\tgic: interrupt-controller at 1c81000 {\n" + "> +\tgic: interrupt-controller@1c81000 {\n" "> +\t\tcompatible = \"arm,gic-400\";\n" "> +\t\tinterrupt-controller;\n" "> +\t\t#interrupt-cells = <3>;\n" @@ -68,7 +76,7 @@ "> +\t\t#size-cells = <1>;\n" "> +\t\tranges;\n" "> +\n" - "> +\t\tpio: pinctrl at 1c20800 {\n" + "> +\t\tpio: pinctrl@1c20800 {\n" "> +\t\t\tcompatible = \"allwinner,sun50i-a64-pinctrl\";\n" "> +\t\t\treg = <0x01c20800 0x400>;\n" "> +\t\t\tinterrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,\n" @@ -80,84 +88,84 @@ "> +\t\t\tinterrupt-controller;\n" "> +\t\t\t#interrupt-cells = <2>;\n" "> +\n" - "> +\t\t\tuart0_pins_a: uart0 at 0 {\n" + "> +\t\t\tuart0_pins_a: uart0@0 {\n" "> +\t\t\t\tallwinner,pins = \"PB8\", \"PB9\";\n" "> +\t\t\t\tallwinner,function = \"uart0\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart0_pins_b: uart0 at 1 {\n" + "> +\t\t\tuart0_pins_b: uart0@1 {\n" "> +\t\t\t\tallwinner,pins = \"PF2\", \"PF3\";\n" "> +\t\t\t\tallwinner,function = \"uart0\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart1_2pins: uart1_2 at 0 {\n" + "> +\t\t\tuart1_2pins: uart1_2@0 {\n" "> +\t\t\t\tallwinner,pins = \"PG6\", \"PG7\";\n" "> +\t\t\t\tallwinner,function = \"uart1\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart1_4pins: uart1_4 at 0 {\n" + "> +\t\t\tuart1_4pins: uart1_4@0 {\n" "> +\t\t\t\tallwinner,pins = \"PG6\", \"PG7\", \"PG8\", \"PG9\";\n" "> +\t\t\t\tallwinner,function = \"uart1\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart2_2pins: uart2_2 at 0 {\n" + "> +\t\t\tuart2_2pins: uart2_2@0 {\n" "> +\t\t\t\tallwinner,pins = \"PB0\", \"PB1\";\n" "> +\t\t\t\tallwinner,function = \"uart2\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart2_4pins: uart2_4 at 0 {\n" + "> +\t\t\tuart2_4pins: uart2_4@0 {\n" "> +\t\t\t\tallwinner,pins = \"PB0\", \"PB1\", \"PB2\", \"PB3\";\n" "> +\t\t\t\tallwinner,function = \"uart2\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart3_pins_a: uart3 at 0 {\n" + "> +\t\t\tuart3_pins_a: uart3@0 {\n" "> +\t\t\t\tallwinner,pins = \"PD0\", \"PD1\";\n" "> +\t\t\t\tallwinner,function = \"uart3\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart3_2pins_b: uart3_2 at 1 {\n" + "> +\t\t\tuart3_2pins_b: uart3_2@1 {\n" "> +\t\t\t\tallwinner,pins = \"PH4\", \"PH5\";\n" "> +\t\t\t\tallwinner,function = \"uart3\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart3_4pins_b: uart3_4 at 1 {\n" + "> +\t\t\tuart3_4pins_b: uart3_4@1 {\n" "> +\t\t\t\tallwinner,pins = \"PH4\", \"PH5\", \"PH6\", \"PH7\";\n" "> +\t\t\t\tallwinner,function = \"uart3\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart4_2pins: uart4_2 at 0 {\n" + "> +\t\t\tuart4_2pins: uart4_2@0 {\n" "> +\t\t\t\tallwinner,pins = \"PD2\", \"PD3\";\n" "> +\t\t\t\tallwinner,function = \"uart4\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart4_4pins: uart4_4 at 0 {\n" + "> +\t\t\tuart4_4pins: uart4_4@0 {\n" "> +\t\t\t\tallwinner,pins = \"PD2\", \"PD3\", \"PD4\", \"PD5\";\n" "> +\t\t\t\tallwinner,function = \"uart4\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmc0_pins: mmc0 at 0 {\n" + "> +\t\t\tmmc0_pins: mmc0@0 {\n" "> +\t\t\t\tallwinner,pins = \"PF0\", \"PF1\", \"PF2\", \"PF3\",\n" "> +\t\t\t\t\t\t \"PF4\", \"PF5\";\n" "> +\t\t\t\tallwinner,function = \"mmc0\";\n" @@ -165,14 +173,14 @@ "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmc0_default_cd_pin: mmc0_cd_pin at 0 {\n" + "> +\t\t\tmmc0_default_cd_pin: mmc0_cd_pin@0 {\n" "> +\t\t\t\tallwinner,pins = \"PF6\";\n" "> +\t\t\t\tallwinner,function = \"gpio_in\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_PULL_UP>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmc1_pins: mmc1 at 0 {\n" + "> +\t\t\tmmc1_pins: mmc1@0 {\n" "> +\t\t\t\tallwinner,pins = \"PG0\", \"PG1\", \"PG2\", \"PG3\",\n" "> +\t\t\t\t\t\t \"PG4\", \"PG5\";\n" "> +\t\t\t\tallwinner,function = \"mmc1\";\n" @@ -180,7 +188,7 @@ "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmc2_pins: mmc2 at 0 {\n" + "> +\t\t\tmmc2_pins: mmc2@0 {\n" "> +\t\t\t\tallwinner,pins = \"PC1\", \"PC5\", \"PC6\", \"PC8\",\n" "> +\t\t\t\t\t\t \"PC9\", \"PC10\", \"PC11\", \"PC12\",\n" "> +\t\t\t\t\t\t \"PC13\", \"PC14\", \"PC15\", \"PC16\";\n" @@ -220,13 +228,6 @@ "-- \n" "Maxime Ripard, Free Electrons\n" "Embedded Linux and Kernel engineering\n" - "http://free-electrons.com\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: signature.asc\n" - "Type: application/pgp-signature\n" - "Size: 819 bytes\n" - "Desc: not available\n" - URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160823/216b15bb/attachment.sig> + http://free-electrons.com -37fba3ce83de0dbf609b9c860640a09041e95b0637822a743f366ad2eb2c4b87 +fba3aefdcec1626144ece92dfaee4234f24be84e67a1d03b191f7a8400b20a7f
diff --git a/a/1.txt b/N2/1.txt index 765faed..f650658 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -26,7 +26,7 @@ The indentation looks off. > + reg = <0x40000000 0>; > + }; > + -> + gic: interrupt-controller at 1c81000 { +> + gic: interrupt-controller@1c81000 { > + compatible = "arm,gic-400"; > + interrupt-controller; > + #interrupt-cells = <3>; @@ -60,7 +60,7 @@ The indentation looks off. > + #size-cells = <1>; > + ranges; > + -> + pio: pinctrl at 1c20800 { +> + pio: pinctrl@1c20800 { > + compatible = "allwinner,sun50i-a64-pinctrl"; > + reg = <0x01c20800 0x400>; > + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>, @@ -72,84 +72,84 @@ The indentation looks off. > + interrupt-controller; > + #interrupt-cells = <2>; > + -> + uart0_pins_a: uart0 at 0 { +> + uart0_pins_a: uart0@0 { > + allwinner,pins = "PB8", "PB9"; > + allwinner,function = "uart0"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart0_pins_b: uart0 at 1 { +> + uart0_pins_b: uart0@1 { > + allwinner,pins = "PF2", "PF3"; > + allwinner,function = "uart0"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart1_2pins: uart1_2 at 0 { +> + uart1_2pins: uart1_2@0 { > + allwinner,pins = "PG6", "PG7"; > + allwinner,function = "uart1"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart1_4pins: uart1_4 at 0 { +> + uart1_4pins: uart1_4@0 { > + allwinner,pins = "PG6", "PG7", "PG8", "PG9"; > + allwinner,function = "uart1"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart2_2pins: uart2_2 at 0 { +> + uart2_2pins: uart2_2@0 { > + allwinner,pins = "PB0", "PB1"; > + allwinner,function = "uart2"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart2_4pins: uart2_4 at 0 { +> + uart2_4pins: uart2_4@0 { > + allwinner,pins = "PB0", "PB1", "PB2", "PB3"; > + allwinner,function = "uart2"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart3_pins_a: uart3 at 0 { +> + uart3_pins_a: uart3@0 { > + allwinner,pins = "PD0", "PD1"; > + allwinner,function = "uart3"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart3_2pins_b: uart3_2 at 1 { +> + uart3_2pins_b: uart3_2@1 { > + allwinner,pins = "PH4", "PH5"; > + allwinner,function = "uart3"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart3_4pins_b: uart3_4 at 1 { +> + uart3_4pins_b: uart3_4@1 { > + allwinner,pins = "PH4", "PH5", "PH6", "PH7"; > + allwinner,function = "uart3"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart4_2pins: uart4_2 at 0 { +> + uart4_2pins: uart4_2@0 { > + allwinner,pins = "PD2", "PD3"; > + allwinner,function = "uart4"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + uart4_4pins: uart4_4 at 0 { +> + uart4_4pins: uart4_4@0 { > + allwinner,pins = "PD2", "PD3", "PD4", "PD5"; > + allwinner,function = "uart4"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + mmc0_pins: mmc0 at 0 { +> + mmc0_pins: mmc0@0 { > + allwinner,pins = "PF0", "PF1", "PF2", "PF3", > + "PF4", "PF5"; > + allwinner,function = "mmc0"; @@ -157,14 +157,14 @@ The indentation looks off. > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + mmc0_default_cd_pin: mmc0_cd_pin at 0 { +> + mmc0_default_cd_pin: mmc0_cd_pin@0 { > + allwinner,pins = "PF6"; > + allwinner,function = "gpio_in"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; > + }; > + -> + mmc1_pins: mmc1 at 0 { +> + mmc1_pins: mmc1@0 { > + allwinner,pins = "PG0", "PG1", "PG2", "PG3", > + "PG4", "PG5"; > + allwinner,function = "mmc1"; @@ -172,7 +172,7 @@ The indentation looks off. > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> + mmc2_pins: mmc2 at 0 { +> + mmc2_pins: mmc2@0 { > + allwinner,pins = "PC1", "PC5", "PC6", "PC8", > + "PC9", "PC10", "PC11", "PC12", > + "PC13", "PC14", "PC15", "PC16"; @@ -213,10 +213,3 @@ Maxime Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com --------------- next part -------------- -A non-text attachment was scrubbed... -Name: signature.asc -Type: application/pgp-signature -Size: 819 bytes -Desc: not available -URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160823/216b15bb/attachment.sig> diff --git a/N2/2.bin b/N2/2.bin new file mode 100644 index 0000000..a9ac59d --- /dev/null +++ b/N2/2.bin @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAEBAgAGBQJXvKwlAAoJEBx+YmzsjxAgIUUP/Amew1Ea+Vd3U3iETXq9/RNy +JL3XK3HzdXbYNWN9u/tF1oRiG2GeBuKhXK11S4U6x5Xfh0UbznUErWwRMUGiFXUH +exnlPZu3DyXnFx6ffeDE8VeKCNH0ZxYDmbo8krZIj60SSj8vGZl/YJVQVeNdukRI +FlTxA4H5nAmbtsvUKhJuuIDSg9P1XqvTYJFrYL9eJtxJoxaQefq78Cbkm2zvkN0z +ZxT533knR3onHwLkLuIzINqWbq8FLDGGTpWcmYVBXUQkH4B3rOrN6pDp5Ra9xlze ++0voj368FUYAdQW/jsZDMXzDpcpM+uRXSUsMOJu40hkMWg9mAzoY3NWbdzqlLl6n +mDB3dPSddT8fiB7LNDKyoxbtDLnGbsa52epiHCe4ffQZ5TgOXLEU3TuveV8HAG/1 +zKdbVmKryOXzMOqcgUzoO4/B6HjJGjrQIW/IDPsr06NGDEBy/X4cqceaH1nawSCy +oot46ejHb21GvXfLkLyUVCXqU+Fx8q5W8ZgJNnqQMLAbymbLIgxc2sI9FF0/CZB4 +c9PqhPPqmnvcIzSXAnAN8vFwLhf/lsdReUHXXNy7lg7q39uQzI/ZRtav7qMvnjLb +RCzoM8eWQmtSTpBwFgdFuuq5KiCi4DqETeRHezHATf5+53/qWrn8lezld0mAzJDE +nwR/p9HzE7TV6pZH3Bt3 +=BcDe +-----END PGP SIGNATURE----- diff --git a/N2/2.hdr b/N2/2.hdr new file mode 100644 index 0000000..5e5352c --- /dev/null +++ b/N2/2.hdr @@ -0,0 +1 @@ +Content-Type: application/pgp-signature; name="signature.asc" diff --git a/a/content_digest b/N2/content_digest index 0ea48f4..299c699 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,17 @@ "ref\020160808172149.30861-1-andre.przywara@arm.com\0" "ref\020160808172149.30861-6-andre.przywara@arm.com\0" - "From\0maxime.ripard@free-electrons.com (Maxime Ripard)\0" - "Subject\0[PATCH v4 5/7] arm64: dts: add Allwinner A64 SoC .dtsi\0" + "From\0Maxime Ripard <maxime.ripard@free-electrons.com>\0" + "Subject\0Re: [PATCH v4 5/7] arm64: dts: add Allwinner A64 SoC .dtsi\0" "Date\0Tue, 23 Aug 2016 22:03:49 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" - "\00:1\0" + "To\0Andre Przywara <andre.przywara@arm.com>\0" + "Cc\0Chen-Yu Tsai <wens@csie.org>" + linux-sunxi@googlegroups.com + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + Rob Herring <robh+dt@kernel.org> + Mark Rutland <mark.rutland@arm.com> + " devicetree@vger.kernel.org\0" + "\01:1\0" "b\0" "Hi,\n" "\n" @@ -34,7 +41,7 @@ "> +\t\treg = <0x40000000 0>;\n" "> +\t};\n" "> +\n" - "> +\tgic: interrupt-controller at 1c81000 {\n" + "> +\tgic: interrupt-controller@1c81000 {\n" "> +\t\tcompatible = \"arm,gic-400\";\n" "> +\t\tinterrupt-controller;\n" "> +\t\t#interrupt-cells = <3>;\n" @@ -68,7 +75,7 @@ "> +\t\t#size-cells = <1>;\n" "> +\t\tranges;\n" "> +\n" - "> +\t\tpio: pinctrl at 1c20800 {\n" + "> +\t\tpio: pinctrl@1c20800 {\n" "> +\t\t\tcompatible = \"allwinner,sun50i-a64-pinctrl\";\n" "> +\t\t\treg = <0x01c20800 0x400>;\n" "> +\t\t\tinterrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,\n" @@ -80,84 +87,84 @@ "> +\t\t\tinterrupt-controller;\n" "> +\t\t\t#interrupt-cells = <2>;\n" "> +\n" - "> +\t\t\tuart0_pins_a: uart0 at 0 {\n" + "> +\t\t\tuart0_pins_a: uart0@0 {\n" "> +\t\t\t\tallwinner,pins = \"PB8\", \"PB9\";\n" "> +\t\t\t\tallwinner,function = \"uart0\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart0_pins_b: uart0 at 1 {\n" + "> +\t\t\tuart0_pins_b: uart0@1 {\n" "> +\t\t\t\tallwinner,pins = \"PF2\", \"PF3\";\n" "> +\t\t\t\tallwinner,function = \"uart0\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart1_2pins: uart1_2 at 0 {\n" + "> +\t\t\tuart1_2pins: uart1_2@0 {\n" "> +\t\t\t\tallwinner,pins = \"PG6\", \"PG7\";\n" "> +\t\t\t\tallwinner,function = \"uart1\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart1_4pins: uart1_4 at 0 {\n" + "> +\t\t\tuart1_4pins: uart1_4@0 {\n" "> +\t\t\t\tallwinner,pins = \"PG6\", \"PG7\", \"PG8\", \"PG9\";\n" "> +\t\t\t\tallwinner,function = \"uart1\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart2_2pins: uart2_2 at 0 {\n" + "> +\t\t\tuart2_2pins: uart2_2@0 {\n" "> +\t\t\t\tallwinner,pins = \"PB0\", \"PB1\";\n" "> +\t\t\t\tallwinner,function = \"uart2\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart2_4pins: uart2_4 at 0 {\n" + "> +\t\t\tuart2_4pins: uart2_4@0 {\n" "> +\t\t\t\tallwinner,pins = \"PB0\", \"PB1\", \"PB2\", \"PB3\";\n" "> +\t\t\t\tallwinner,function = \"uart2\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart3_pins_a: uart3 at 0 {\n" + "> +\t\t\tuart3_pins_a: uart3@0 {\n" "> +\t\t\t\tallwinner,pins = \"PD0\", \"PD1\";\n" "> +\t\t\t\tallwinner,function = \"uart3\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart3_2pins_b: uart3_2 at 1 {\n" + "> +\t\t\tuart3_2pins_b: uart3_2@1 {\n" "> +\t\t\t\tallwinner,pins = \"PH4\", \"PH5\";\n" "> +\t\t\t\tallwinner,function = \"uart3\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart3_4pins_b: uart3_4 at 1 {\n" + "> +\t\t\tuart3_4pins_b: uart3_4@1 {\n" "> +\t\t\t\tallwinner,pins = \"PH4\", \"PH5\", \"PH6\", \"PH7\";\n" "> +\t\t\t\tallwinner,function = \"uart3\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart4_2pins: uart4_2 at 0 {\n" + "> +\t\t\tuart4_2pins: uart4_2@0 {\n" "> +\t\t\t\tallwinner,pins = \"PD2\", \"PD3\";\n" "> +\t\t\t\tallwinner,function = \"uart4\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart4_4pins: uart4_4 at 0 {\n" + "> +\t\t\tuart4_4pins: uart4_4@0 {\n" "> +\t\t\t\tallwinner,pins = \"PD2\", \"PD3\", \"PD4\", \"PD5\";\n" "> +\t\t\t\tallwinner,function = \"uart4\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmc0_pins: mmc0 at 0 {\n" + "> +\t\t\tmmc0_pins: mmc0@0 {\n" "> +\t\t\t\tallwinner,pins = \"PF0\", \"PF1\", \"PF2\", \"PF3\",\n" "> +\t\t\t\t\t\t \"PF4\", \"PF5\";\n" "> +\t\t\t\tallwinner,function = \"mmc0\";\n" @@ -165,14 +172,14 @@ "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmc0_default_cd_pin: mmc0_cd_pin at 0 {\n" + "> +\t\t\tmmc0_default_cd_pin: mmc0_cd_pin@0 {\n" "> +\t\t\t\tallwinner,pins = \"PF6\";\n" "> +\t\t\t\tallwinner,function = \"gpio_in\";\n" "> +\t\t\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_PULL_UP>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmc1_pins: mmc1 at 0 {\n" + "> +\t\t\tmmc1_pins: mmc1@0 {\n" "> +\t\t\t\tallwinner,pins = \"PG0\", \"PG1\", \"PG2\", \"PG3\",\n" "> +\t\t\t\t\t\t \"PG4\", \"PG5\";\n" "> +\t\t\t\tallwinner,function = \"mmc1\";\n" @@ -180,7 +187,7 @@ "> +\t\t\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmc2_pins: mmc2 at 0 {\n" + "> +\t\t\tmmc2_pins: mmc2@0 {\n" "> +\t\t\t\tallwinner,pins = \"PC1\", \"PC5\", \"PC6\", \"PC8\",\n" "> +\t\t\t\t\t\t \"PC9\", \"PC10\", \"PC11\", \"PC12\",\n" "> +\t\t\t\t\t\t \"PC13\", \"PC14\", \"PC15\", \"PC16\";\n" @@ -220,13 +227,26 @@ "-- \n" "Maxime Ripard, Free Electrons\n" "Embedded Linux and Kernel engineering\n" - "http://free-electrons.com\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: signature.asc\n" - "Type: application/pgp-signature\n" - "Size: 819 bytes\n" - "Desc: not available\n" - URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160823/216b15bb/attachment.sig> + http://free-electrons.com + "\01:2\0" + "fn\0signature.asc\0" + "b\0" + "-----BEGIN PGP SIGNATURE-----\n" + "Version: GnuPG v1\n" + "\n" + "iQIcBAEBAgAGBQJXvKwlAAoJEBx+YmzsjxAgIUUP/Amew1Ea+Vd3U3iETXq9/RNy\n" + "JL3XK3HzdXbYNWN9u/tF1oRiG2GeBuKhXK11S4U6x5Xfh0UbznUErWwRMUGiFXUH\n" + "exnlPZu3DyXnFx6ffeDE8VeKCNH0ZxYDmbo8krZIj60SSj8vGZl/YJVQVeNdukRI\n" + "FlTxA4H5nAmbtsvUKhJuuIDSg9P1XqvTYJFrYL9eJtxJoxaQefq78Cbkm2zvkN0z\n" + "ZxT533knR3onHwLkLuIzINqWbq8FLDGGTpWcmYVBXUQkH4B3rOrN6pDp5Ra9xlze\n" + "+0voj368FUYAdQW/jsZDMXzDpcpM+uRXSUsMOJu40hkMWg9mAzoY3NWbdzqlLl6n\n" + "mDB3dPSddT8fiB7LNDKyoxbtDLnGbsa52epiHCe4ffQZ5TgOXLEU3TuveV8HAG/1\n" + "zKdbVmKryOXzMOqcgUzoO4/B6HjJGjrQIW/IDPsr06NGDEBy/X4cqceaH1nawSCy\n" + "oot46ejHb21GvXfLkLyUVCXqU+Fx8q5W8ZgJNnqQMLAbymbLIgxc2sI9FF0/CZB4\n" + "c9PqhPPqmnvcIzSXAnAN8vFwLhf/lsdReUHXXNy7lg7q39uQzI/ZRtav7qMvnjLb\n" + "RCzoM8eWQmtSTpBwFgdFuuq5KiCi4DqETeRHezHATf5+53/qWrn8lezld0mAzJDE\n" + "nwR/p9HzE7TV6pZH3Bt3\n" + "=BcDe\n" + "-----END PGP SIGNATURE-----\n" -37fba3ce83de0dbf609b9c860640a09041e95b0637822a743f366ad2eb2c4b87 +828ea379ddd66f56028ba981cbdbd831df0d222dd65c9d477cfc1538c251422b
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.