diff for duplicates of <1478497281-5477-3-git-send-email-ping.bai@nxp.com> diff --git a/a/1.txt b/N1/1.txt index ae12212..43ddc2a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,13 +13,13 @@ index c5c05fd..c6f6613 100644 reg = <0x021b0000 0x4000>; }; -+ ocotp: ocotp-ctrl at 021bc000 { ++ ocotp: ocotp-ctrl@021bc000 { + compatible = "fsl,imx6ul-ocotp", "syscon"; + reg = <0x021bc000 0x4000>; + clocks = <&clks IMX6UL_CLK_OCOTP>; + }; + - lcdif: lcdif at 021c8000 { + lcdif: lcdif@021c8000 { compatible = "fsl,imx6ul-lcdif", "fsl,imx28-lcdif"; reg = <0x021c8000 0x4000>; -- diff --git a/a/content_digest b/N1/content_digest index 5f448ff..2f4afaa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,17 @@ "ref\01478497281-5477-1-git-send-email-ping.bai@nxp.com\0" - "From\0ping.bai@nxp.com (Bai Ping)\0" + "From\0Bai Ping <ping.bai@nxp.com>\0" "Subject\0[PATCH 3/3] ARM: dts: imx: Add ocotp node for imx6ul\0" "Date\0Mon, 7 Nov 2016 13:41:21 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0srinivas.kandagatla@linaro.org" + maxime.ripard@free-electrons.com + robh+dt@kernel.org + mark.rutland@arm.com + shawnguo@kernel.org + " kernel@pengutronix.de\0" + "Cc\0fabio.estevam@nxp.com" + devicetree@vger.kernel.org + ping.bai@nxp.com + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add ocotp node for i.MX6UL SOC.\n" @@ -20,16 +29,16 @@ " \t\t\t\treg = <0x021b0000 0x4000>;\n" " \t\t\t};\n" " \n" - "+\t\t\tocotp: ocotp-ctrl at 021bc000 {\n" + "+\t\t\tocotp: ocotp-ctrl@021bc000 {\n" "+\t\t\t\tcompatible = \"fsl,imx6ul-ocotp\", \"syscon\";\n" "+\t\t\t\treg = <0x021bc000 0x4000>;\n" "+\t\t\t\tclocks = <&clks IMX6UL_CLK_OCOTP>;\n" "+\t\t\t};\n" "+\n" - " \t\t\tlcdif: lcdif at 021c8000 {\n" + " \t\t\tlcdif: lcdif@021c8000 {\n" " \t\t\t\tcompatible = \"fsl,imx6ul-lcdif\", \"fsl,imx28-lcdif\";\n" " \t\t\t\treg = <0x021c8000 0x4000>;\n" "-- \n" 2.8.2 -9336c7d484abe5e3b0dc67dc27ba395b13a88af1c48411d117f2f7f57831f3e3 +7c5d4e46e6dd8f58708128d4997159ddce2208b92f725a7be9ee92f249f422d9
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.