diff for duplicates of <1478044305-5666-1-git-send-email-stillcompiling@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 5fbe04e..e10ab48 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,7 +49,7 @@ index 1bbd36f..d7bed1f 100644 @@ -1092,10 +1092,13 @@ }; - weim: weim at 021b8000 { + weim: weim@021b8000 { + #address-cells = <2>; + #size-cells = <1>; compatible = "fsl,imx6q-weim"; @@ -59,7 +59,7 @@ index 1bbd36f..d7bed1f 100644 + fsl,weim-cs-gpr = <&gpr>; }; - ocotp: ocotp at 021bc000 { + ocotp: ocotp@021bc000 { diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index 02378db..c2b28c0 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi @@ -67,7 +67,7 @@ index 02378db..c2b28c0 100644 @@ -893,8 +893,11 @@ }; - weim: weim at 021b8000 { + weim: weim@021b8000 { + #address-cells = <2>; + #size-cells = <1>; reg = <0x021b8000 0x4000>; @@ -75,7 +75,7 @@ index 02378db..c2b28c0 100644 + fsl,weim-cs-gpr = <&gpr>; }; - ocotp: ocotp at 021bc000 { + ocotp: ocotp@021bc000 { diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 9526c38..78eb023 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi @@ -83,7 +83,7 @@ index 9526c38..78eb023 100644 @@ -968,10 +968,13 @@ }; - weim: weim at 021b8000 { + weim: weim@021b8000 { + #address-cells = <2>; + #size-cells = <1>; compatible = "fsl,imx6sx-weim", "fsl,imx6q-weim"; @@ -93,6 +93,6 @@ index 9526c38..78eb023 100644 + fsl,weim-cs-gpr = <&gpr>; }; - ocotp: ocotp at 021bc000 { + ocotp: ocotp@021bc000 { -- 2.7.4 diff --git a/a/content_digest b/N1/content_digest index 77071e5..a921ae2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,16 @@ - "From\0stillcompiling@gmail.com (Joshua Clayton)\0" + "From\0Joshua Clayton <stillcompiling@gmail.com>\0" "Subject\0[PATCH] ARM: dts: imx6: Add imx-weim parameters to dtsi's\0" "Date\0Tue, 1 Nov 2016 16:51:45 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Shawn Guo <shawnguo@kernel.org>" + Sascha Hauer <kernel@pengutronix.de> + Fabio Estevam <fabio.estevam@nxp.com> + Rob Herring <robh+dt@kernel.org> + Mark Rutland <mark.rutland@arm.com> + Russell King <linux@armlinux.org.uk> + moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE <linux-arm-kernel@lists.infradead.org> + open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS <devicetree@vger.kernel.org> + " open list <linux-kernel@vger.kernel.org>\0" + "Cc\0Joshua Clayton <stillcompiling@gmail.com>\0" "\00:1\0" "b\0" "imx-weim should always set address-cells to 2,\n" @@ -55,7 +64,7 @@ "@@ -1092,10 +1092,13 @@\n" " \t\t\t};\n" " \n" - " \t\t\tweim: weim at 021b8000 {\n" + " \t\t\tweim: weim@021b8000 {\n" "+\t\t\t\t#address-cells = <2>;\n" "+\t\t\t\t#size-cells = <1>;\n" " \t\t\t\tcompatible = \"fsl,imx6q-weim\";\n" @@ -65,7 +74,7 @@ "+\t\t\t\tfsl,weim-cs-gpr = <&gpr>;\n" " \t\t\t};\n" " \n" - " \t\t\tocotp: ocotp at 021bc000 {\n" + " \t\t\tocotp: ocotp@021bc000 {\n" "diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi\n" "index 02378db..c2b28c0 100644\n" "--- a/arch/arm/boot/dts/imx6sl.dtsi\n" @@ -73,7 +82,7 @@ "@@ -893,8 +893,11 @@\n" " \t\t\t};\n" " \n" - " \t\t\tweim: weim at 021b8000 {\n" + " \t\t\tweim: weim@021b8000 {\n" "+\t\t\t\t#address-cells = <2>;\n" "+\t\t\t\t#size-cells = <1>;\n" " \t\t\t\treg = <0x021b8000 0x4000>;\n" @@ -81,7 +90,7 @@ "+\t\t\t\tfsl,weim-cs-gpr = <&gpr>;\n" " \t\t\t};\n" " \n" - " \t\t\tocotp: ocotp at 021bc000 {\n" + " \t\t\tocotp: ocotp@021bc000 {\n" "diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi\n" "index 9526c38..78eb023 100644\n" "--- a/arch/arm/boot/dts/imx6sx.dtsi\n" @@ -89,7 +98,7 @@ "@@ -968,10 +968,13 @@\n" " \t\t\t};\n" " \n" - " \t\t\tweim: weim at 021b8000 {\n" + " \t\t\tweim: weim@021b8000 {\n" "+\t\t\t\t#address-cells = <2>;\n" "+\t\t\t\t#size-cells = <1>;\n" " \t\t\t\tcompatible = \"fsl,imx6sx-weim\", \"fsl,imx6q-weim\";\n" @@ -99,8 +108,8 @@ "+\t\t\t\tfsl,weim-cs-gpr = <&gpr>;\n" " \t\t\t};\n" " \n" - " \t\t\tocotp: ocotp at 021bc000 {\n" + " \t\t\tocotp: ocotp@021bc000 {\n" "-- \n" 2.7.4 -ebdfbcac49dd75c151fabac824c81dd2ac0488af42b0127b1ddf08bf1926847d +8a20960eb0f65dc146b6ceb9f0c945aff4761290670edc0e501e35af65d6069c
diff --git a/a/1.txt b/N2/1.txt index 5fbe04e..e10ab48 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -49,7 +49,7 @@ index 1bbd36f..d7bed1f 100644 @@ -1092,10 +1092,13 @@ }; - weim: weim at 021b8000 { + weim: weim@021b8000 { + #address-cells = <2>; + #size-cells = <1>; compatible = "fsl,imx6q-weim"; @@ -59,7 +59,7 @@ index 1bbd36f..d7bed1f 100644 + fsl,weim-cs-gpr = <&gpr>; }; - ocotp: ocotp at 021bc000 { + ocotp: ocotp@021bc000 { diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index 02378db..c2b28c0 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi @@ -67,7 +67,7 @@ index 02378db..c2b28c0 100644 @@ -893,8 +893,11 @@ }; - weim: weim at 021b8000 { + weim: weim@021b8000 { + #address-cells = <2>; + #size-cells = <1>; reg = <0x021b8000 0x4000>; @@ -75,7 +75,7 @@ index 02378db..c2b28c0 100644 + fsl,weim-cs-gpr = <&gpr>; }; - ocotp: ocotp at 021bc000 { + ocotp: ocotp@021bc000 { diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 9526c38..78eb023 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi @@ -83,7 +83,7 @@ index 9526c38..78eb023 100644 @@ -968,10 +968,13 @@ }; - weim: weim at 021b8000 { + weim: weim@021b8000 { + #address-cells = <2>; + #size-cells = <1>; compatible = "fsl,imx6sx-weim", "fsl,imx6q-weim"; @@ -93,6 +93,6 @@ index 9526c38..78eb023 100644 + fsl,weim-cs-gpr = <&gpr>; }; - ocotp: ocotp at 021bc000 { + ocotp: ocotp@021bc000 { -- 2.7.4 diff --git a/a/content_digest b/N2/content_digest index 77071e5..c7ef829 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,16 @@ - "From\0stillcompiling@gmail.com (Joshua Clayton)\0" + "From\0Joshua Clayton <stillcompiling@gmail.com>\0" "Subject\0[PATCH] ARM: dts: imx6: Add imx-weim parameters to dtsi's\0" "Date\0Tue, 1 Nov 2016 16:51:45 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Shawn Guo <shawnguo@kernel.org>" + Sascha Hauer <kernel@pengutronix.de> + Fabio Estevam <fabio.estevam@nxp.com> + Rob Herring <robh+dt@kernel.org> + Mark Rutland <mark.rutland@arm.com> + Russell King <linux@armlinux.org.uk> + linux-arm-kernel@lists.infradead.org (moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE) + devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS) + " linux-kernel@vger.kernel.org (open list)\0" + "Cc\0Joshua Clayton <stillcompiling@gmail.com>\0" "\00:1\0" "b\0" "imx-weim should always set address-cells to 2,\n" @@ -55,7 +64,7 @@ "@@ -1092,10 +1092,13 @@\n" " \t\t\t};\n" " \n" - " \t\t\tweim: weim at 021b8000 {\n" + " \t\t\tweim: weim@021b8000 {\n" "+\t\t\t\t#address-cells = <2>;\n" "+\t\t\t\t#size-cells = <1>;\n" " \t\t\t\tcompatible = \"fsl,imx6q-weim\";\n" @@ -65,7 +74,7 @@ "+\t\t\t\tfsl,weim-cs-gpr = <&gpr>;\n" " \t\t\t};\n" " \n" - " \t\t\tocotp: ocotp at 021bc000 {\n" + " \t\t\tocotp: ocotp@021bc000 {\n" "diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi\n" "index 02378db..c2b28c0 100644\n" "--- a/arch/arm/boot/dts/imx6sl.dtsi\n" @@ -73,7 +82,7 @@ "@@ -893,8 +893,11 @@\n" " \t\t\t};\n" " \n" - " \t\t\tweim: weim at 021b8000 {\n" + " \t\t\tweim: weim@021b8000 {\n" "+\t\t\t\t#address-cells = <2>;\n" "+\t\t\t\t#size-cells = <1>;\n" " \t\t\t\treg = <0x021b8000 0x4000>;\n" @@ -81,7 +90,7 @@ "+\t\t\t\tfsl,weim-cs-gpr = <&gpr>;\n" " \t\t\t};\n" " \n" - " \t\t\tocotp: ocotp at 021bc000 {\n" + " \t\t\tocotp: ocotp@021bc000 {\n" "diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi\n" "index 9526c38..78eb023 100644\n" "--- a/arch/arm/boot/dts/imx6sx.dtsi\n" @@ -89,7 +98,7 @@ "@@ -968,10 +968,13 @@\n" " \t\t\t};\n" " \n" - " \t\t\tweim: weim at 021b8000 {\n" + " \t\t\tweim: weim@021b8000 {\n" "+\t\t\t\t#address-cells = <2>;\n" "+\t\t\t\t#size-cells = <1>;\n" " \t\t\t\tcompatible = \"fsl,imx6sx-weim\", \"fsl,imx6q-weim\";\n" @@ -99,8 +108,8 @@ "+\t\t\t\tfsl,weim-cs-gpr = <&gpr>;\n" " \t\t\t};\n" " \n" - " \t\t\tocotp: ocotp at 021bc000 {\n" + " \t\t\tocotp: ocotp@021bc000 {\n" "-- \n" 2.7.4 -ebdfbcac49dd75c151fabac824c81dd2ac0488af42b0127b1ddf08bf1926847d +982f2a580161137b42d70a817467ffbb7704c6883f136d5d866f4c8b5948c759
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.