diff for duplicates of <20170712090408.12212-1-linux-kernel-dev@beckhoff.com> diff --git a/a/1.txt b/N1/1.txt index c1d71ad..24b7a2a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -From: Patrick Br?nn <p.bruenn@beckhoff.com> +From: Patrick Brünn <p.bruenn@beckhoff.com> The CX9020 differs from i.MX53 Quick Start Board by: - use uart2 instead of uart1 @@ -7,7 +7,7 @@ The CX9020 differs from i.MX53 Quick Start Board by: - CCAT FPGA connected to emi - enable rtc -Signed-off-by: Patrick Br?nn <p.bruenn@beckhoff.com> +Signed-off-by: Patrick Brünn <p.bruenn@beckhoff.com> --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx53-cx9020.dts | 377 +++++++++++++++++++++++++++++++++++++ @@ -69,7 +69,7 @@ index 000000000000..e6d05ffa9022 + compatible = "bhf,emi-ccat"; + }; + -+ display0: display at di0 { ++ display0: display@di0 { + #address-cells =<1>; + #size-cells = <0>; + compatible = "fsl,imx-parallel-display"; @@ -78,14 +78,14 @@ index 000000000000..e6d05ffa9022 + pinctrl-0 = <&pinctrl_ipu_disp0>; + status = "okay"; + -+ port at 0 { ++ port@0 { + reg = <0>; + display0_in: endpoint { + remote-endpoint = <&ipu_di0_disp0>; + }; + }; + -+ port at 1 { ++ port@1 { + reg = <1>; + display0_out: endpoint { + remote-endpoint = <&panel_in>; @@ -93,7 +93,7 @@ index 000000000000..e6d05ffa9022 + }; + }; + -+ dvi_panel: display at 0 { ++ dvi_panel: display@0 { + #address-cells =<1>; + #size-cells = <0>; + compatible = "simple,ddc-only"; @@ -122,7 +122,7 @@ index 000000000000..e6d05ffa9022 + }; + }; + -+ rtc: rtc at 53fa4000 { ++ rtc: rtc@53fa4000 { + compatible = "fsl,imx53-rtc", "fsl,imx25-rtc"; + reg = <0x53fa4000 0x4000>; + interrupts = <24>; @@ -136,7 +136,7 @@ index 000000000000..e6d05ffa9022 + #address-cells = <1>; + #size-cells = <0>; + -+ reg_3p2v: regulator at 0 { ++ reg_3p2v: regulator@0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "3P2V"; @@ -145,7 +145,7 @@ index 000000000000..e6d05ffa9022 + regulator-always-on; + }; + -+ reg_usb_vbus: regulator at 1 { ++ reg_usb_vbus: regulator@1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "usb_vbus"; @@ -253,7 +253,7 @@ index 000000000000..e6d05ffa9022 + >; + }; + -+ led_pin_gpio3_23: led_gpio3_23 at 0 { ++ led_pin_gpio3_23: led_gpio3_23@0 { + fsl,pins = < + MX53_PAD_EIM_D23__GPIO3_23 0x80000000 + >; @@ -411,3 +411,8 @@ index 000000000000..e6d05ffa9022 +}; -- 2.11.0 + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N1/content_digest index eda995c..546385f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,19 @@ - "From\0linux-kernel-dev@beckhoff.com (linux-kernel-dev at beckhoff.com)\0" + "From\0<linux-kernel-dev@beckhoff.com>\0" "Subject\0[PATCH] ARM: dts: imx: add CX9020 Embedded PC device tree\0" "Date\0Wed, 12 Jul 2017 11:04:08 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0robh+dt@kernel.org" + " mark.rutland@arm.com\0" + "Cc\0devicetree@vger.kernel.org" + " Patrick Br\303\274nn <p.bruenn@beckhoff.com>" + linux@armlinux.org.uk + linux-kernel@vger.kernel.org + kernel@pengutronix.de + fabio.estevam@nxp.com + shawnguo@kernel.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "From: Patrick Br?nn <p.bruenn@beckhoff.com>\n" + "From: Patrick Br\303\274nn <p.bruenn@beckhoff.com>\n" "\n" "The CX9020 differs from i.MX53 Quick Start Board by:\n" "- use uart2 instead of uart1\n" @@ -13,7 +22,7 @@ "- CCAT FPGA connected to emi\n" "- enable rtc\n" "\n" - "Signed-off-by: Patrick Br?nn <p.bruenn@beckhoff.com>\n" + "Signed-off-by: Patrick Br\303\274nn <p.bruenn@beckhoff.com>\n" "---\n" " arch/arm/boot/dts/Makefile | 1 +\n" " arch/arm/boot/dts/imx53-cx9020.dts | 377 +++++++++++++++++++++++++++++++++++++\n" @@ -75,7 +84,7 @@ "+\t\tcompatible = \"bhf,emi-ccat\";\n" "+\t};\n" "+\n" - "+\tdisplay0: display at di0 {\n" + "+\tdisplay0: display@di0 {\n" "+\t\t#address-cells =<1>;\n" "+\t\t#size-cells = <0>;\n" "+\t\tcompatible = \"fsl,imx-parallel-display\";\n" @@ -84,14 +93,14 @@ "+\t\tpinctrl-0 = <&pinctrl_ipu_disp0>;\n" "+\t\tstatus = \"okay\";\n" "+\n" - "+\t\tport at 0 {\n" + "+\t\tport@0 {\n" "+\t\t\treg = <0>;\n" "+\t\t\tdisplay0_in: endpoint {\n" "+\t\t\t\tremote-endpoint = <&ipu_di0_disp0>;\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\tport at 1 {\n" + "+\t\tport@1 {\n" "+\t\t\treg = <1>;\n" "+\t\t\tdisplay0_out: endpoint {\n" "+\t\t\t\tremote-endpoint = <&panel_in>;\n" @@ -99,7 +108,7 @@ "+\t\t};\n" "+\t};\n" "+\n" - "+\tdvi_panel: display at 0 {\n" + "+\tdvi_panel: display@0 {\n" "+\t\t#address-cells =<1>;\n" "+\t\t#size-cells = <0>;\n" "+\t\tcompatible = \"simple,ddc-only\";\n" @@ -128,7 +137,7 @@ "+\t\t};\n" "+\t};\n" "+\n" - "+\trtc: rtc at 53fa4000 {\n" + "+\trtc: rtc@53fa4000 {\n" "+\t\tcompatible = \"fsl,imx53-rtc\", \"fsl,imx25-rtc\";\n" "+\t\treg = <0x53fa4000 0x4000>;\n" "+\t\tinterrupts = <24>;\n" @@ -142,7 +151,7 @@ "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" "+\n" - "+\t\treg_3p2v: regulator at 0 {\n" + "+\t\treg_3p2v: regulator@0 {\n" "+\t\t\tcompatible = \"regulator-fixed\";\n" "+\t\t\treg = <0>;\n" "+\t\t\tregulator-name = \"3P2V\";\n" @@ -151,7 +160,7 @@ "+\t\t\tregulator-always-on;\n" "+\t\t};\n" "+\n" - "+\t\treg_usb_vbus: regulator at 1 {\n" + "+\t\treg_usb_vbus: regulator@1 {\n" "+\t\t\tcompatible = \"regulator-fixed\";\n" "+\t\t\treg = <1>;\n" "+\t\t\tregulator-name = \"usb_vbus\";\n" @@ -259,7 +268,7 @@ "+\t\t\t>;\n" "+\t\t};\n" "+\n" - "+\t\tled_pin_gpio3_23: led_gpio3_23 at 0 {\n" + "+\t\tled_pin_gpio3_23: led_gpio3_23@0 {\n" "+\t\t\tfsl,pins = <\n" "+\t\t\t\tMX53_PAD_EIM_D23__GPIO3_23 0x80000000\n" "+\t\t\t>;\n" @@ -416,6 +425,11 @@ "+\tstatus = \"okay\";\n" "+};\n" "-- \n" - 2.11.0 + "2.11.0\n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -0fb6fb32abb50bee76f1d1232f6bb2dc39a7367b497bbfd76ac7d3a917915644 +f521333ddf838be283cfe1b2658868f82b93232f78b29ee616956815f145ff9e
diff --git a/a/1.txt b/N2/1.txt index c1d71ad..eab2d41 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,4 +1,4 @@ -From: Patrick Br?nn <p.bruenn@beckhoff.com> +From: Patrick Brünn <p.bruenn@beckhoff.com> The CX9020 differs from i.MX53 Quick Start Board by: - use uart2 instead of uart1 @@ -7,7 +7,7 @@ The CX9020 differs from i.MX53 Quick Start Board by: - CCAT FPGA connected to emi - enable rtc -Signed-off-by: Patrick Br?nn <p.bruenn@beckhoff.com> +Signed-off-by: Patrick Brünn <p.bruenn@beckhoff.com> --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx53-cx9020.dts | 377 +++++++++++++++++++++++++++++++++++++ @@ -69,7 +69,7 @@ index 000000000000..e6d05ffa9022 + compatible = "bhf,emi-ccat"; + }; + -+ display0: display at di0 { ++ display0: display@di0 { + #address-cells =<1>; + #size-cells = <0>; + compatible = "fsl,imx-parallel-display"; @@ -78,14 +78,14 @@ index 000000000000..e6d05ffa9022 + pinctrl-0 = <&pinctrl_ipu_disp0>; + status = "okay"; + -+ port at 0 { ++ port@0 { + reg = <0>; + display0_in: endpoint { + remote-endpoint = <&ipu_di0_disp0>; + }; + }; + -+ port at 1 { ++ port@1 { + reg = <1>; + display0_out: endpoint { + remote-endpoint = <&panel_in>; @@ -93,7 +93,7 @@ index 000000000000..e6d05ffa9022 + }; + }; + -+ dvi_panel: display at 0 { ++ dvi_panel: display@0 { + #address-cells =<1>; + #size-cells = <0>; + compatible = "simple,ddc-only"; @@ -122,7 +122,7 @@ index 000000000000..e6d05ffa9022 + }; + }; + -+ rtc: rtc at 53fa4000 { ++ rtc: rtc@53fa4000 { + compatible = "fsl,imx53-rtc", "fsl,imx25-rtc"; + reg = <0x53fa4000 0x4000>; + interrupts = <24>; @@ -136,7 +136,7 @@ index 000000000000..e6d05ffa9022 + #address-cells = <1>; + #size-cells = <0>; + -+ reg_3p2v: regulator at 0 { ++ reg_3p2v: regulator@0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "3P2V"; @@ -145,7 +145,7 @@ index 000000000000..e6d05ffa9022 + regulator-always-on; + }; + -+ reg_usb_vbus: regulator at 1 { ++ reg_usb_vbus: regulator@1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "usb_vbus"; @@ -253,7 +253,7 @@ index 000000000000..e6d05ffa9022 + >; + }; + -+ led_pin_gpio3_23: led_gpio3_23 at 0 { ++ led_pin_gpio3_23: led_gpio3_23@0 { + fsl,pins = < + MX53_PAD_EIM_D23__GPIO3_23 0x80000000 + >; diff --git a/a/content_digest b/N2/content_digest index eda995c..3473f73 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,19 @@ - "From\0linux-kernel-dev@beckhoff.com (linux-kernel-dev at beckhoff.com)\0" + "From\0<linux-kernel-dev@beckhoff.com>\0" "Subject\0[PATCH] ARM: dts: imx: add CX9020 Embedded PC device tree\0" "Date\0Wed, 12 Jul 2017 11:04:08 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0<robh+dt@kernel.org>" + " <mark.rutland@arm.com>\0" + "Cc\0shawnguo@kernel.org" + kernel@pengutronix.de + linux@armlinux.org.uk + fabio.estevam@nxp.com + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + " Patrick Br\303\274nn <p.bruenn@beckhoff.com>\0" "\00:1\0" "b\0" - "From: Patrick Br?nn <p.bruenn@beckhoff.com>\n" + "From: Patrick Br\303\274nn <p.bruenn@beckhoff.com>\n" "\n" "The CX9020 differs from i.MX53 Quick Start Board by:\n" "- use uart2 instead of uart1\n" @@ -13,7 +22,7 @@ "- CCAT FPGA connected to emi\n" "- enable rtc\n" "\n" - "Signed-off-by: Patrick Br?nn <p.bruenn@beckhoff.com>\n" + "Signed-off-by: Patrick Br\303\274nn <p.bruenn@beckhoff.com>\n" "---\n" " arch/arm/boot/dts/Makefile | 1 +\n" " arch/arm/boot/dts/imx53-cx9020.dts | 377 +++++++++++++++++++++++++++++++++++++\n" @@ -75,7 +84,7 @@ "+\t\tcompatible = \"bhf,emi-ccat\";\n" "+\t};\n" "+\n" - "+\tdisplay0: display at di0 {\n" + "+\tdisplay0: display@di0 {\n" "+\t\t#address-cells =<1>;\n" "+\t\t#size-cells = <0>;\n" "+\t\tcompatible = \"fsl,imx-parallel-display\";\n" @@ -84,14 +93,14 @@ "+\t\tpinctrl-0 = <&pinctrl_ipu_disp0>;\n" "+\t\tstatus = \"okay\";\n" "+\n" - "+\t\tport at 0 {\n" + "+\t\tport@0 {\n" "+\t\t\treg = <0>;\n" "+\t\t\tdisplay0_in: endpoint {\n" "+\t\t\t\tremote-endpoint = <&ipu_di0_disp0>;\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\tport at 1 {\n" + "+\t\tport@1 {\n" "+\t\t\treg = <1>;\n" "+\t\t\tdisplay0_out: endpoint {\n" "+\t\t\t\tremote-endpoint = <&panel_in>;\n" @@ -99,7 +108,7 @@ "+\t\t};\n" "+\t};\n" "+\n" - "+\tdvi_panel: display at 0 {\n" + "+\tdvi_panel: display@0 {\n" "+\t\t#address-cells =<1>;\n" "+\t\t#size-cells = <0>;\n" "+\t\tcompatible = \"simple,ddc-only\";\n" @@ -128,7 +137,7 @@ "+\t\t};\n" "+\t};\n" "+\n" - "+\trtc: rtc at 53fa4000 {\n" + "+\trtc: rtc@53fa4000 {\n" "+\t\tcompatible = \"fsl,imx53-rtc\", \"fsl,imx25-rtc\";\n" "+\t\treg = <0x53fa4000 0x4000>;\n" "+\t\tinterrupts = <24>;\n" @@ -142,7 +151,7 @@ "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" "+\n" - "+\t\treg_3p2v: regulator at 0 {\n" + "+\t\treg_3p2v: regulator@0 {\n" "+\t\t\tcompatible = \"regulator-fixed\";\n" "+\t\t\treg = <0>;\n" "+\t\t\tregulator-name = \"3P2V\";\n" @@ -151,7 +160,7 @@ "+\t\t\tregulator-always-on;\n" "+\t\t};\n" "+\n" - "+\t\treg_usb_vbus: regulator at 1 {\n" + "+\t\treg_usb_vbus: regulator@1 {\n" "+\t\t\tcompatible = \"regulator-fixed\";\n" "+\t\t\treg = <1>;\n" "+\t\t\tregulator-name = \"usb_vbus\";\n" @@ -259,7 +268,7 @@ "+\t\t\t>;\n" "+\t\t};\n" "+\n" - "+\t\tled_pin_gpio3_23: led_gpio3_23 at 0 {\n" + "+\t\tled_pin_gpio3_23: led_gpio3_23@0 {\n" "+\t\t\tfsl,pins = <\n" "+\t\t\t\tMX53_PAD_EIM_D23__GPIO3_23 0x80000000\n" "+\t\t\t>;\n" @@ -418,4 +427,4 @@ "-- \n" 2.11.0 -0fb6fb32abb50bee76f1d1232f6bb2dc39a7367b497bbfd76ac7d3a917915644 +a1863a3abdab4652cda6eb8cd9215b1e5f8a4c9e846820e94dfc339612225ea2
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.