diff for duplicates of <5882449D.6050502@hisilicon.com> diff --git a/a/1.txt b/N1/1.txt index 8a1035f..ed7276b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -50,7 +50,7 @@ Wei > + range: gpio-range { > + #pinctrl-single,gpio-range-cells = <3>; > + }; -> + pmx0: pinmux at e896c000 { +> + pmx0: pinmux@e896c000 { > + compatible = "pinctrl-single"; > + reg = <0x0 0xe896c000 0x0 0x1f0>; > + #pinctrl-cells = <1>; @@ -179,7 +179,7 @@ Wei > + }; > + > + /* [IOMG_MMC0_000, IOMG_MMC0_005] */ -> + pmx1: pinmux at ff37e000 { +> + pmx1: pinmux@ff37e000 { > + compatible = "pinctrl-single"; > + reg = <0x0 0xff37e000 0x0 0x18>; > + #gpio-range-cells = <0x3>; @@ -202,7 +202,7 @@ Wei > + }; > + > + /* [IOMG_FIX_000, IOMG_FIX_011] */ -> + pmx2: pinmux at ff3b6000 { +> + pmx2: pinmux@ff3b6000 { > + compatible = "pinctrl-single"; > + reg = <0x0 0xff3b6000 0x0 0x30>; > + #pinctrl-cells = <1>; @@ -223,7 +223,7 @@ Wei > + }; > + > + /* [IOMG_MMC1_000, IOMG_MMC1_005] */ -> + pmx3: pinmux at ff3fd000 { +> + pmx3: pinmux@ff3fd000 { > + compatible = "pinctrl-single"; > + reg = <0x0 0xff3fd000 0x0 0x18>; > + #pinctrl-cells = <1>; @@ -246,7 +246,7 @@ Wei > + }; > + > + /* [IOMG_AO_000, IOMG_AO_041] */ -> + pmx4: pinmux at fff11000 { +> + pmx4: pinmux@fff11000 { > + compatible = "pinctrl-single"; > + reg = <0x0 0xfff11000 0x0 0xa8>; > + #pinctrl-cells = <1>; diff --git a/a/content_digest b/N1/content_digest index 27f2b41..b75a462 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,16 @@ "ref\020170118100435.43318-1-hw.wangxiaoyin@hisilicon.com\0" - "From\0xuwei5@hisilicon.com (Wei Xu)\0" - "Subject\0[PATCH] arm64: dts: hisilicon: add dtsi file for Hisilicon Hi3660 SOC\0" + "From\0Wei Xu <xuwei5@hisilicon.com>\0" + "Subject\0Re: [PATCH] arm64: dts: hisilicon: add dtsi file for Hisilicon Hi3660 SOC\0" "Date\0Fri, 20 Jan 2017 17:10:53 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Wang Xiaoyin <hw.wangxiaoyin@hisilicon.com>" + robh+dt@kernel.org + mark.rutland@arm.com + catalin.marinas@arm.com + will.deacon@arm.com + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + " linux-kernel@vger.kernel.org\0" + "Cc\0chenya99@hisilicon.com\0" "\00:1\0" "b\0" "Hi Wang Xiaoyin,\n" @@ -57,7 +65,7 @@ "> +\t\trange: gpio-range {\n" "> +\t\t\t#pinctrl-single,gpio-range-cells = <3>;\n" "> +\t\t};\n" - "> +\t\tpmx0: pinmux at e896c000 {\n" + "> +\t\tpmx0: pinmux@e896c000 {\n" "> +\t\t\tcompatible = \"pinctrl-single\";\n" "> +\t\t\treg = <0x0 0xe896c000 0x0 0x1f0>;\n" "> +\t\t\t#pinctrl-cells = <1>;\n" @@ -186,7 +194,7 @@ "> +\t\t};\n" "> +\n" "> +\t\t/* [IOMG_MMC0_000, IOMG_MMC0_005] */\n" - "> +\t\tpmx1: pinmux at ff37e000 {\n" + "> +\t\tpmx1: pinmux@ff37e000 {\n" "> +\t\t\tcompatible = \"pinctrl-single\";\n" "> +\t\t\treg = <0x0 0xff37e000 0x0 0x18>;\n" "> +\t\t\t#gpio-range-cells = <0x3>;\n" @@ -209,7 +217,7 @@ "> +\t\t};\n" "> +\n" "> +\t\t/* [IOMG_FIX_000, IOMG_FIX_011] */\n" - "> +\t\tpmx2: pinmux at ff3b6000 {\n" + "> +\t\tpmx2: pinmux@ff3b6000 {\n" "> +\t\t\tcompatible = \"pinctrl-single\";\n" "> +\t\t\treg = <0x0 0xff3b6000 0x0 0x30>;\n" "> +\t\t\t#pinctrl-cells = <1>;\n" @@ -230,7 +238,7 @@ "> +\t\t};\n" "> +\n" "> +\t\t/* [IOMG_MMC1_000, IOMG_MMC1_005] */\n" - "> +\t\tpmx3: pinmux at ff3fd000 {\n" + "> +\t\tpmx3: pinmux@ff3fd000 {\n" "> +\t\t\tcompatible = \"pinctrl-single\";\n" "> +\t\t\treg = <0x0 0xff3fd000 0x0 0x18>;\n" "> +\t\t\t#pinctrl-cells = <1>;\n" @@ -253,7 +261,7 @@ "> +\t\t};\n" "> +\n" "> +\t\t/* [IOMG_AO_000, IOMG_AO_041] */\n" - "> +\t\tpmx4: pinmux at fff11000 {\n" + "> +\t\tpmx4: pinmux@fff11000 {\n" "> +\t\t\tcompatible = \"pinctrl-single\";\n" "> +\t\t\treg = <0x0 0xfff11000 0x0 0xa8>;\n" "> +\t\t\t#pinctrl-cells = <1>;\n" @@ -338,4 +346,4 @@ "> +};\n" > -3eb369be454d296b57cb9d73b3fbb642590194e1c31f8d960f24f136e5a7fd08 +16fd21be315f5face43bf95e5d7d39062ffb564eda37837536d3792373dc2161
diff --git a/a/1.txt b/N2/1.txt index 8a1035f..ed7276b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -50,7 +50,7 @@ Wei > + range: gpio-range { > + #pinctrl-single,gpio-range-cells = <3>; > + }; -> + pmx0: pinmux at e896c000 { +> + pmx0: pinmux@e896c000 { > + compatible = "pinctrl-single"; > + reg = <0x0 0xe896c000 0x0 0x1f0>; > + #pinctrl-cells = <1>; @@ -179,7 +179,7 @@ Wei > + }; > + > + /* [IOMG_MMC0_000, IOMG_MMC0_005] */ -> + pmx1: pinmux at ff37e000 { +> + pmx1: pinmux@ff37e000 { > + compatible = "pinctrl-single"; > + reg = <0x0 0xff37e000 0x0 0x18>; > + #gpio-range-cells = <0x3>; @@ -202,7 +202,7 @@ Wei > + }; > + > + /* [IOMG_FIX_000, IOMG_FIX_011] */ -> + pmx2: pinmux at ff3b6000 { +> + pmx2: pinmux@ff3b6000 { > + compatible = "pinctrl-single"; > + reg = <0x0 0xff3b6000 0x0 0x30>; > + #pinctrl-cells = <1>; @@ -223,7 +223,7 @@ Wei > + }; > + > + /* [IOMG_MMC1_000, IOMG_MMC1_005] */ -> + pmx3: pinmux at ff3fd000 { +> + pmx3: pinmux@ff3fd000 { > + compatible = "pinctrl-single"; > + reg = <0x0 0xff3fd000 0x0 0x18>; > + #pinctrl-cells = <1>; @@ -246,7 +246,7 @@ Wei > + }; > + > + /* [IOMG_AO_000, IOMG_AO_041] */ -> + pmx4: pinmux at fff11000 { +> + pmx4: pinmux@fff11000 { > + compatible = "pinctrl-single"; > + reg = <0x0 0xfff11000 0x0 0xa8>; > + #pinctrl-cells = <1>; diff --git a/a/content_digest b/N2/content_digest index 27f2b41..51f3d26 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,16 @@ "ref\020170118100435.43318-1-hw.wangxiaoyin@hisilicon.com\0" - "From\0xuwei5@hisilicon.com (Wei Xu)\0" - "Subject\0[PATCH] arm64: dts: hisilicon: add dtsi file for Hisilicon Hi3660 SOC\0" + "From\0Wei Xu <xuwei5@hisilicon.com>\0" + "Subject\0Re: [PATCH] arm64: dts: hisilicon: add dtsi file for Hisilicon Hi3660 SOC\0" "Date\0Fri, 20 Jan 2017 17:10:53 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Wang Xiaoyin <hw.wangxiaoyin@hisilicon.com>" + <robh+dt@kernel.org> + <mark.rutland@arm.com> + <catalin.marinas@arm.com> + <will.deacon@arm.com> + <linux-arm-kernel@lists.infradead.org> + <devicetree@vger.kernel.org> + " <linux-kernel@vger.kernel.org>\0" + "Cc\0<chenya99@hisilicon.com>\0" "\00:1\0" "b\0" "Hi Wang Xiaoyin,\n" @@ -57,7 +65,7 @@ "> +\t\trange: gpio-range {\n" "> +\t\t\t#pinctrl-single,gpio-range-cells = <3>;\n" "> +\t\t};\n" - "> +\t\tpmx0: pinmux at e896c000 {\n" + "> +\t\tpmx0: pinmux@e896c000 {\n" "> +\t\t\tcompatible = \"pinctrl-single\";\n" "> +\t\t\treg = <0x0 0xe896c000 0x0 0x1f0>;\n" "> +\t\t\t#pinctrl-cells = <1>;\n" @@ -186,7 +194,7 @@ "> +\t\t};\n" "> +\n" "> +\t\t/* [IOMG_MMC0_000, IOMG_MMC0_005] */\n" - "> +\t\tpmx1: pinmux at ff37e000 {\n" + "> +\t\tpmx1: pinmux@ff37e000 {\n" "> +\t\t\tcompatible = \"pinctrl-single\";\n" "> +\t\t\treg = <0x0 0xff37e000 0x0 0x18>;\n" "> +\t\t\t#gpio-range-cells = <0x3>;\n" @@ -209,7 +217,7 @@ "> +\t\t};\n" "> +\n" "> +\t\t/* [IOMG_FIX_000, IOMG_FIX_011] */\n" - "> +\t\tpmx2: pinmux at ff3b6000 {\n" + "> +\t\tpmx2: pinmux@ff3b6000 {\n" "> +\t\t\tcompatible = \"pinctrl-single\";\n" "> +\t\t\treg = <0x0 0xff3b6000 0x0 0x30>;\n" "> +\t\t\t#pinctrl-cells = <1>;\n" @@ -230,7 +238,7 @@ "> +\t\t};\n" "> +\n" "> +\t\t/* [IOMG_MMC1_000, IOMG_MMC1_005] */\n" - "> +\t\tpmx3: pinmux at ff3fd000 {\n" + "> +\t\tpmx3: pinmux@ff3fd000 {\n" "> +\t\t\tcompatible = \"pinctrl-single\";\n" "> +\t\t\treg = <0x0 0xff3fd000 0x0 0x18>;\n" "> +\t\t\t#pinctrl-cells = <1>;\n" @@ -253,7 +261,7 @@ "> +\t\t};\n" "> +\n" "> +\t\t/* [IOMG_AO_000, IOMG_AO_041] */\n" - "> +\t\tpmx4: pinmux at fff11000 {\n" + "> +\t\tpmx4: pinmux@fff11000 {\n" "> +\t\t\tcompatible = \"pinctrl-single\";\n" "> +\t\t\treg = <0x0 0xfff11000 0x0 0xa8>;\n" "> +\t\t\t#pinctrl-cells = <1>;\n" @@ -338,4 +346,4 @@ "> +};\n" > -3eb369be454d296b57cb9d73b3fbb642590194e1c31f8d960f24f136e5a7fd08 +e65a6e5e5fa21270c927afc9917840b1d40ddaa392a4dce797ff78c7496eb05b
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.