| Message ID | 1451286546-5920-6-git-send-email-biao.huang@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 28/12/15 08:09, Biao Huang wrote: > Add pinctrl and GPIO node to mt2701.dtsi > > Signed-off-by: Biao Huang <biao.huang@mediatek.com> > Acked-by: Linus Walleij <linus.walleij@linaro.org> > --- > arch/arm/boot/dts/mt2701.dtsi | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> Linus, will you take this patch through your branch? > diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi > index dc02f76..bd88ae9 100644 > --- a/arch/arm/boot/dts/mt2701.dtsi > +++ b/arch/arm/boot/dts/mt2701.dtsi > @@ -17,6 +17,7 @@ > #include <dt-bindings/clock/mt2701-clk.h> > #include <dt-bindings/reset-controller/mt2701-resets.h> > #include "skeleton64.dtsi" > +#include "mt2701-pinfunc.h" > > / { > compatible = "mediatek,mt2701"; > @@ -99,6 +100,24 @@ > #reset-cells = <1>; > }; > > + pio: pinctrl@10005000 { > + compatible = "mediatek,mt2701-pinctrl"; > + reg = <0 0x1000b000 0 0x1000>; > + mediatek,pctl-regmap = <&syscfg_pctl_a>; > + pins-are-numbered; > + gpio-controller; > + #gpio-cells = <2>; > + interrupt-controller; > + #interrupt-cells = <2>; > + interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; > + }; > + > + syscfg_pctl_a: syscfg@10005000 { > + compatible = "mediatek,mt2701-pctl-a-syscfg", "syscon"; > + reg = <0 0x10005000 0 0x1000>; > + }; > + > watchdog: watchdog@10007000 { > compatible = "mediatek,mt2701-wdt", > "mediatek,mt6589-wdt"; >
On Thu, Dec 31, 2015 at 12:23 PM, Matthias Brugger <matthias.bgg@gmail.com> wrote: > On 28/12/15 08:09, Biao Huang wrote: >> >> Add pinctrl and GPIO node to mt2701.dtsi >> >> Signed-off-by: Biao Huang <biao.huang@mediatek.com> >> Acked-by: Linus Walleij <linus.walleij@linaro.org> >> --- >> arch/arm/boot/dts/mt2701.dtsi | 19 +++++++++++++++++++ >> 1 file changed, 19 insertions(+) >> > > Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> > > Linus, will you take this patch through your branch? No I prefer anything in arch/arm/boot/dts/* to go in through the ARM SoC tree. It can usually be merged orthogonally anyways. I take Documenation/devicetree/bindings/* and patches to the driver itself in drivers/pinctrl/* Yours, Linus Walleij
On 07/01/16 11:14, Linus Walleij wrote: > On Thu, Dec 31, 2015 at 12:23 PM, Matthias Brugger > <matthias.bgg@gmail.com> wrote: >> On 28/12/15 08:09, Biao Huang wrote: >>> >>> Add pinctrl and GPIO node to mt2701.dtsi >>> >>> Signed-off-by: Biao Huang <biao.huang@mediatek.com> >>> Acked-by: Linus Walleij <linus.walleij@linaro.org> >>> --- >>> arch/arm/boot/dts/mt2701.dtsi | 19 +++++++++++++++++++ >>> 1 file changed, 19 insertions(+) >>> >> >> Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> >> >> Linus, will you take this patch through your branch? > > No I prefer anything in arch/arm/boot/dts/* to go in through > the ARM SoC tree. > > It can usually be merged orthogonally anyways. > > I take Documenation/devicetree/bindings/* and patches > to the driver itself in drivers/pinctrl/* > > Yours, > Linus Walleij > Applied, thanks.
diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi index dc02f76..bd88ae9 100644 --- a/arch/arm/boot/dts/mt2701.dtsi +++ b/arch/arm/boot/dts/mt2701.dtsi @@ -17,6 +17,7 @@ #include <dt-bindings/clock/mt2701-clk.h> #include <dt-bindings/reset-controller/mt2701-resets.h> #include "skeleton64.dtsi" +#include "mt2701-pinfunc.h" / { compatible = "mediatek,mt2701"; @@ -99,6 +100,24 @@ #reset-cells = <1>; }; + pio: pinctrl@10005000 { + compatible = "mediatek,mt2701-pinctrl"; + reg = <0 0x1000b000 0 0x1000>; + mediatek,pctl-regmap = <&syscfg_pctl_a>; + pins-are-numbered; + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; + interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; + }; + + syscfg_pctl_a: syscfg@10005000 { + compatible = "mediatek,mt2701-pctl-a-syscfg", "syscon"; + reg = <0 0x10005000 0 0x1000>; + }; + watchdog: watchdog@10007000 { compatible = "mediatek,mt2701-wdt", "mediatek,mt6589-wdt";