diff for duplicates of <20170116020958.62767-2-bruherrera@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 4440392..79d237b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -70,7 +70,7 @@ index e4dae0e..bc07aa8 100644 }; }; -+ usbotg_fs_pins_a: usbotg_fs at 0 { ++ usbotg_fs_pins_a: usbotg_fs@0 { + pins { + pinmux = <STM32F429_PA10_FUNC_OTG_FS_ID>, + <STM32F429_PA11_FUNC_OTG_FS_DM>, @@ -81,7 +81,7 @@ index e4dae0e..bc07aa8 100644 + }; + }; + -+ usbotg_fs_pins_b: usbotg_fs at 1 { ++ usbotg_fs_pins_b: usbotg_fs@1 { + pins { + pinmux = <STM32F429_PB12_FUNC_OTG_HS_ID>, + <STM32F429_PB14_FUNC_OTG_HS_DM>, @@ -94,14 +94,14 @@ index e4dae0e..bc07aa8 100644 + + + - usbotg_hs_pins_a: usbotg_hs at 0 { + usbotg_hs_pins_a: usbotg_hs@0 { pins { pinmux = <STM32F429_PH4_FUNC_OTG_HS_ULPI_NXT>, @@ -420,6 +444,15 @@ status = "disabled"; }; -+ usbotg_fs: usb at 50000000 { ++ usbotg_fs: usb@50000000 { + compatible = "st,stm32f4xx-fsotg", "snps,dwc2"; + reg = <0x50000000 0x40000>; + interrupts = <67>; @@ -110,7 +110,7 @@ index e4dae0e..bc07aa8 100644 + status = "disabled"; + }; + - rng: rng at 50060800 { + rng: rng@50060800 { compatible = "st,stm32-rng"; reg = <0x50060800 0x400>; diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts diff --git a/a/content_digest b/N1/content_digest index 895e0c9..e6b6268 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,15 @@ "ref\020170116020958.62767-1-bruherrera@gmail.com\0" - "From\0bruherrera@gmail.com (Bruno Herrera)\0" + "From\0Bruno Herrera <bruherrera@gmail.com>\0" "Subject\0[v2 2/3] ARM: dts: STM32 Add USB FS host mode support\0" "Date\0Mon, 16 Jan 2017 00:09:55 -0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Rob Herring <robh+dt@kernel.org>" + Mark Rutland <mark.rutland@arm.com> + Maxime Coquelin <mcoquelin.stm32@gmail.com> + " Alexandre Torgue <alexandre.torgue@st.com>\0" + "Cc\0devicetree@vger.kernel.org" + Russell King <linux@armlinux.org.uk> + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "This patch adds the USB pins and nodes for USB HS/FS cores working at FS speed,\n" @@ -77,7 +84,7 @@ " \t\t\t\t};\n" " \t\t\t};\n" " \n" - "+\t\t\tusbotg_fs_pins_a: usbotg_fs at 0 {\n" + "+\t\t\tusbotg_fs_pins_a: usbotg_fs@0 {\n" "+\t\t\t\tpins {\n" "+\t\t\t\t\tpinmux = <STM32F429_PA10_FUNC_OTG_FS_ID>,\n" "+\t\t\t\t\t\t <STM32F429_PA11_FUNC_OTG_FS_DM>,\n" @@ -88,7 +95,7 @@ "+\t\t\t\t};\n" "+\t\t\t};\n" "+\n" - "+\t\t\tusbotg_fs_pins_b: usbotg_fs at 1 {\n" + "+\t\t\tusbotg_fs_pins_b: usbotg_fs@1 {\n" "+\t\t\t\tpins {\n" "+\t\t\t\t\tpinmux = <STM32F429_PB12_FUNC_OTG_HS_ID>,\n" "+\t\t\t\t\t\t <STM32F429_PB14_FUNC_OTG_HS_DM>,\n" @@ -101,14 +108,14 @@ "+\n" "+\n" "+\n" - " \t\t\tusbotg_hs_pins_a: usbotg_hs at 0 {\n" + " \t\t\tusbotg_hs_pins_a: usbotg_hs@0 {\n" " \t\t\t\tpins {\n" " \t\t\t\t\tpinmux = <STM32F429_PH4_FUNC_OTG_HS_ULPI_NXT>,\n" "@@ -420,6 +444,15 @@\n" " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" " \n" - "+\t\tusbotg_fs: usb at 50000000 {\n" + "+\t\tusbotg_fs: usb@50000000 {\n" "+\t\t\tcompatible = \"st,stm32f4xx-fsotg\", \"snps,dwc2\";\n" "+\t\t\treg = <0x50000000 0x40000>;\n" "+\t\t\tinterrupts = <67>;\n" @@ -117,7 +124,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - " \t\trng: rng at 50060800 {\n" + " \t\trng: rng@50060800 {\n" " \t\t\tcompatible = \"st,stm32-rng\";\n" " \t\t\treg = <0x50060800 0x400>;\n" "diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts\n" @@ -168,4 +175,4 @@ "-- \n" 2.10.1 (Apple Git-78) -1d41d53bc6deda9638debcfe9f927b3a16b577fa01f23c87b927d2b7f71d8c1b +d6d02b19fb16f859907b01259af48ac25a6af5ea2647bf929521d04e872533c6
diff --git a/a/1.txt b/N2/1.txt index 4440392..79d237b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -70,7 +70,7 @@ index e4dae0e..bc07aa8 100644 }; }; -+ usbotg_fs_pins_a: usbotg_fs at 0 { ++ usbotg_fs_pins_a: usbotg_fs@0 { + pins { + pinmux = <STM32F429_PA10_FUNC_OTG_FS_ID>, + <STM32F429_PA11_FUNC_OTG_FS_DM>, @@ -81,7 +81,7 @@ index e4dae0e..bc07aa8 100644 + }; + }; + -+ usbotg_fs_pins_b: usbotg_fs at 1 { ++ usbotg_fs_pins_b: usbotg_fs@1 { + pins { + pinmux = <STM32F429_PB12_FUNC_OTG_HS_ID>, + <STM32F429_PB14_FUNC_OTG_HS_DM>, @@ -94,14 +94,14 @@ index e4dae0e..bc07aa8 100644 + + + - usbotg_hs_pins_a: usbotg_hs at 0 { + usbotg_hs_pins_a: usbotg_hs@0 { pins { pinmux = <STM32F429_PH4_FUNC_OTG_HS_ULPI_NXT>, @@ -420,6 +444,15 @@ status = "disabled"; }; -+ usbotg_fs: usb at 50000000 { ++ usbotg_fs: usb@50000000 { + compatible = "st,stm32f4xx-fsotg", "snps,dwc2"; + reg = <0x50000000 0x40000>; + interrupts = <67>; @@ -110,7 +110,7 @@ index e4dae0e..bc07aa8 100644 + status = "disabled"; + }; + - rng: rng at 50060800 { + rng: rng@50060800 { compatible = "st,stm32-rng"; reg = <0x50060800 0x400>; diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts diff --git a/a/content_digest b/N2/content_digest index 895e0c9..ade1924 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,15 @@ "ref\020170116020958.62767-1-bruherrera@gmail.com\0" - "From\0bruherrera@gmail.com (Bruno Herrera)\0" + "From\0Bruno Herrera <bruherrera@gmail.com>\0" "Subject\0[v2 2/3] ARM: dts: STM32 Add USB FS host mode support\0" "Date\0Mon, 16 Jan 2017 00:09:55 -0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Rob Herring <robh+dt@kernel.org>" + Mark Rutland <mark.rutland@arm.com> + Maxime Coquelin <mcoquelin.stm32@gmail.com> + " Alexandre Torgue <alexandre.torgue@st.com>\0" + "Cc\0Russell King <linux@armlinux.org.uk>" + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "This patch adds the USB pins and nodes for USB HS/FS cores working at FS speed,\n" @@ -77,7 +84,7 @@ " \t\t\t\t};\n" " \t\t\t};\n" " \n" - "+\t\t\tusbotg_fs_pins_a: usbotg_fs at 0 {\n" + "+\t\t\tusbotg_fs_pins_a: usbotg_fs@0 {\n" "+\t\t\t\tpins {\n" "+\t\t\t\t\tpinmux = <STM32F429_PA10_FUNC_OTG_FS_ID>,\n" "+\t\t\t\t\t\t <STM32F429_PA11_FUNC_OTG_FS_DM>,\n" @@ -88,7 +95,7 @@ "+\t\t\t\t};\n" "+\t\t\t};\n" "+\n" - "+\t\t\tusbotg_fs_pins_b: usbotg_fs at 1 {\n" + "+\t\t\tusbotg_fs_pins_b: usbotg_fs@1 {\n" "+\t\t\t\tpins {\n" "+\t\t\t\t\tpinmux = <STM32F429_PB12_FUNC_OTG_HS_ID>,\n" "+\t\t\t\t\t\t <STM32F429_PB14_FUNC_OTG_HS_DM>,\n" @@ -101,14 +108,14 @@ "+\n" "+\n" "+\n" - " \t\t\tusbotg_hs_pins_a: usbotg_hs at 0 {\n" + " \t\t\tusbotg_hs_pins_a: usbotg_hs@0 {\n" " \t\t\t\tpins {\n" " \t\t\t\t\tpinmux = <STM32F429_PH4_FUNC_OTG_HS_ULPI_NXT>,\n" "@@ -420,6 +444,15 @@\n" " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" " \n" - "+\t\tusbotg_fs: usb at 50000000 {\n" + "+\t\tusbotg_fs: usb@50000000 {\n" "+\t\t\tcompatible = \"st,stm32f4xx-fsotg\", \"snps,dwc2\";\n" "+\t\t\treg = <0x50000000 0x40000>;\n" "+\t\t\tinterrupts = <67>;\n" @@ -117,7 +124,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - " \t\trng: rng at 50060800 {\n" + " \t\trng: rng@50060800 {\n" " \t\t\tcompatible = \"st,stm32-rng\";\n" " \t\t\treg = <0x50060800 0x400>;\n" "diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts\n" @@ -168,4 +175,4 @@ "-- \n" 2.10.1 (Apple Git-78) -1d41d53bc6deda9638debcfe9f927b3a16b577fa01f23c87b927d2b7f71d8c1b +c6297de261959b54b12d93e8249e45e47c242be4e5d9102f29263fa82bea154b
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.