diff for duplicates of <5685104D.7070008@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 0495f15..4700768 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,7 +30,7 @@ Linus, will you take this patch through your branch? > #reset-cells = <1>; > }; > -> + pio: pinctrl@10005000 { +> + pio: pinctrl at 10005000 { > + compatible = "mediatek,mt2701-pinctrl"; > + reg = <0 0x1000b000 0 0x1000>; > + mediatek,pctl-regmap = <&syscfg_pctl_a>; @@ -43,12 +43,12 @@ Linus, will you take this patch through your branch? > + <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> + syscfg_pctl_a: syscfg@10005000 { +> + syscfg_pctl_a: syscfg at 10005000 { > + compatible = "mediatek,mt2701-pctl-a-syscfg", "syscon"; > + reg = <0 0x10005000 0 0x1000>; > + }; > + -> watchdog: watchdog@10007000 { +> watchdog: watchdog at 10007000 { > compatible = "mediatek,mt2701-wdt", > "mediatek,mt6589-wdt"; > diff --git a/a/content_digest b/N1/content_digest index 5f6ea02..716de5b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,25 +1,9 @@ "ref\01451286546-5920-1-git-send-email-biao.huang@mediatek.com\0" "ref\01451286546-5920-6-git-send-email-biao.huang@mediatek.com\0" - "From\0Matthias Brugger <matthias.bgg@gmail.com>\0" - "Subject\0Re: [PATCH v3 5/5] arm: dts: Add pinctrl/GPIO/EINT node for mt2701\0" + "From\0matthias.bgg@gmail.com (Matthias Brugger)\0" + "Subject\0[PATCH v3 5/5] arm: dts: Add pinctrl/GPIO/EINT node for mt2701\0" "Date\0Thu, 31 Dec 2015 12:23:57 +0100\0" - "To\0Biao Huang <biao.huang@mediatek.com>" - Rob Herring <robh+dt@kernel.org> - Pawel Moll <pawel.moll@arm.com> - Mark Rutland <mark.rutland@arm.com> - Ian Campbell <ijc+devicetree@hellion.org.uk> - Kumar Gala <galak@codeaurora.org> - Russell King <linux@arm.linux.org.uk> - " Linus Walleij <linus.walleij@linaro.org>\0" - "Cc\0devicetree@vger.kernel.org" - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-mediatek@lists.infradead.org - linux-gpio@vger.kernel.org - srv_heupstream@mediatek.com - yingjoe.chen@mediatek.com - hongzhou.yang@mediatek.com - " erin.lo@mediatek.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "\n" @@ -54,7 +38,7 @@ "> \t\t#reset-cells = <1>;\n" "> \t};\n" ">\n" - "> +\tpio: pinctrl@10005000 {\n" + "> +\tpio: pinctrl at 10005000 {\n" "> +\t\tcompatible = \"mediatek,mt2701-pinctrl\";\n" "> +\t\treg = <0 0x1000b000 0 0x1000>;\n" "> +\t\tmediatek,pctl-regmap = <&syscfg_pctl_a>;\n" @@ -67,14 +51,14 @@ "> +\t\t\t <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t};\n" "> +\n" - "> +\tsyscfg_pctl_a: syscfg@10005000 {\n" + "> +\tsyscfg_pctl_a: syscfg at 10005000 {\n" "> +\t\tcompatible = \"mediatek,mt2701-pctl-a-syscfg\", \"syscon\";\n" "> +\t\treg = <0 0x10005000 0 0x1000>;\n" "> +\t};\n" "> +\n" - "> \twatchdog: watchdog@10007000 {\n" + "> \twatchdog: watchdog at 10007000 {\n" "> \t\tcompatible = \"mediatek,mt2701-wdt\",\n" "> \t\t\t \"mediatek,mt6589-wdt\";\n" > -6fb1c50b81f004328768c383f4eb9b3e9c561fb37db1c75953a128aadd375e32 +9a92dae780624187cdeb06c10596db7108656718f882e296138c85979a4119a3
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.