| Message ID | 20171120102354.5354-3-yixun.lan@amlogic.com (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
Yixun Lan <yixun.lan@amlogic.com> writes: > From: Xingyu Chen <xingyu.chen@amlogic.com> > > Add new pinctrl DT info for the Amlogic's Meson-AXG SoC. > > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> > Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com> > Signed-off-by: Yixun Lan <yixun.lan@amlogic.com> > --- > arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 44 ++++++++++++++++++++++++++++++ > 1 file changed, 44 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > index 5fc33b76b91c..e0fb860e12c5 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > @@ -9,6 +9,7 @@ > #include <dt-bindings/interrupt-controller/arm-gic.h> > #include <dt-bindings/clock/axg-clkc.h> > #include <dt-bindings/clock/axg-aoclkc.h> This doesn't apply because this aoclkc.h header does not exist in mainline. Kevin > +#include <dt-bindings/gpio/meson-axg-gpio.h> > > / { > compatible = "amlogic,meson-axg"; > @@ -173,6 +174,32 @@ > #mbox-cells = <1>; > }; > > + periphs: periphs@ff634000 { > + compatible = "simple-bus"; > + reg = <0x0 0xff634000 0x0 0x2000>; > + #address-cells = <2>; > + #size-cells = <2>; > + ranges = <0x0 0x0 0x0 0xff634000 0x0 0x2000>; > + > + pinctrl_periphs: pinctrl@480 { > + compatible = "amlogic,meson-axg-periphs-pinctrl"; > + #address-cells = <2>; > + #size-cells = <2>; > + ranges; > + > + gpio: bank@480 { > + reg = <0x0 0x00480 0x0 0x40>, > + <0x0 0x004e8 0x0 0x14>, > + <0x0 0x00520 0x0 0x14>, > + <0x0 0x00430 0x0 0x3c>; > + reg-names = "mux", "pull", "pull-enable", "gpio"; > + gpio-controller; > + #gpio-cells = <2>; > + gpio-ranges = <&pinctrl_periphs 0 0 86>; > + }; > + }; > + }; > + > sram: sram@fffc0000 { > compatible = "amlogic,meson-axg-sram", "mmio-sram"; > reg = <0x0 0xfffc0000 0x0 0x20000>; > @@ -209,6 +236,23 @@ > }; > }; > > + pinctrl_aobus: pinctrl@14 { > + compatible = "amlogic,meson-axg-aobus-pinctrl"; > + #address-cells = <2>; > + #size-cells = <2>; > + ranges; > + > + gpio_ao: bank@14 { > + reg = <0x0 0x00014 0x0 0x8>, > + <0x0 0x0002c 0x0 0x4>, > + <0x0 0x00024 0x0 0x8>; > + reg-names = "mux", "pull", "gpio"; > + gpio-controller; > + #gpio-cells = <2>; > + gpio-ranges = <&pinctrl_aobus 0 0 15>; > + }; > + }; > + > uart_AO: serial@3000 { > compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart"; > reg = <0x0 0x3000 0x0 0x18>;
Hi Kevin On 12/07/17 04:18, Kevin Hilman wrote: > Yixun Lan <yixun.lan@amlogic.com> writes: > >> From: Xingyu Chen <xingyu.chen@amlogic.com> >> >> Add new pinctrl DT info for the Amlogic's Meson-AXG SoC. >> >> Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> >> Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com> >> Signed-off-by: Yixun Lan <yixun.lan@amlogic.com> >> --- >> arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 44 ++++++++++++++++++++++++++++++ >> 1 file changed, 44 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi >> index 5fc33b76b91c..e0fb860e12c5 100644 >> --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi >> +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi >> @@ -9,6 +9,7 @@ >> #include <dt-bindings/interrupt-controller/arm-gic.h> >> #include <dt-bindings/clock/axg-clkc.h> >> #include <dt-bindings/clock/axg-aoclkc.h> > > This doesn't apply because this aoclkc.h header does not exist in > mainline. > > Kevin > this is due to I create the patch in serial sequence (first clk, then pinctrl), I probably will fix my work flow next time - to rebase all the patch separately on the -rc version but here, the pinctrl DT part has no dependency on DT clk patch.. you could drop the above two #include and just apply the reset could you amend & apply this? or do you want me to send another updated version? >> +#include <dt-bindings/gpio/meson-axg-gpio.h> >> >> / { >> compatible = "amlogic,meson-axg"; >> @@ -173,6 +174,32 @@ >> #mbox-cells = <1>; >> }; >> >> + periphs: periphs@ff634000 { >> + compatible = "simple-bus"; >> + reg = <0x0 0xff634000 0x0 0x2000>; >> + #address-cells = <2>; >> + #size-cells = <2>; >> + ranges = <0x0 0x0 0x0 0xff634000 0x0 0x2000>; >> + >> + pinctrl_periphs: pinctrl@480 { >> + compatible = "amlogic,meson-axg-periphs-pinctrl"; >> + #address-cells = <2>; >> + #size-cells = <2>; >> + ranges; >> + >> + gpio: bank@480 { >> + reg = <0x0 0x00480 0x0 0x40>, >> + <0x0 0x004e8 0x0 0x14>, >> + <0x0 0x00520 0x0 0x14>, >> + <0x0 0x00430 0x0 0x3c>; >> + reg-names = "mux", "pull", "pull-enable", "gpio"; >> + gpio-controller; >> + #gpio-cells = <2>; >> + gpio-ranges = <&pinctrl_periphs 0 0 86>; >> + }; >> + }; >> + }; >> + >> sram: sram@fffc0000 { >> compatible = "amlogic,meson-axg-sram", "mmio-sram"; >> reg = <0x0 0xfffc0000 0x0 0x20000>; >> @@ -209,6 +236,23 @@ >> }; >> }; >> >> + pinctrl_aobus: pinctrl@14 { >> + compatible = "amlogic,meson-axg-aobus-pinctrl"; >> + #address-cells = <2>; >> + #size-cells = <2>; >> + ranges; >> + >> + gpio_ao: bank@14 { >> + reg = <0x0 0x00014 0x0 0x8>, >> + <0x0 0x0002c 0x0 0x4>, >> + <0x0 0x00024 0x0 0x8>; >> + reg-names = "mux", "pull", "gpio"; >> + gpio-controller; >> + #gpio-cells = <2>; >> + gpio-ranges = <&pinctrl_aobus 0 0 15>; >> + }; >> + }; >> + >> uart_AO: serial@3000 { >> compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart"; >> reg = <0x0 0x3000 0x0 0x18>; > > . >
On Wed, Dec 6, 2017 at 5:44 PM, Yixun Lan <yixun.lan@amlogic.com> wrote: > Hi Kevin > > > On 12/07/17 04:18, Kevin Hilman wrote: >> Yixun Lan <yixun.lan@amlogic.com> writes: >> >>> From: Xingyu Chen <xingyu.chen@amlogic.com> >>> >>> Add new pinctrl DT info for the Amlogic's Meson-AXG SoC. >>> >>> Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> >>> Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com> >>> Signed-off-by: Yixun Lan <yixun.lan@amlogic.com> >>> --- >>> arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 44 ++++++++++++++++++++++++++++++ >>> 1 file changed, 44 insertions(+) >>> >>> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi >>> index 5fc33b76b91c..e0fb860e12c5 100644 >>> --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi >>> +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi >>> @@ -9,6 +9,7 @@ >>> #include <dt-bindings/interrupt-controller/arm-gic.h> >>> #include <dt-bindings/clock/axg-clkc.h> >>> #include <dt-bindings/clock/axg-aoclkc.h> >> >> This doesn't apply because this aoclkc.h header does not exist in >> mainline. >> >> Kevin >> > > this is due to I create the patch in serial sequence (first clk, then > pinctrl), I probably will fix my work flow next time - to rebase all the > patch separately on the -rc version > > but here, the pinctrl DT part has no dependency on DT clk patch.. > you could drop the above two #include and just apply the reset > > could you amend & apply this? or do you want me to send another updated > version? I prefer that you rebase (either on -rc or my v4.16/dt64 branch[1]) and resend. Thanks, Kevin [1] https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git/log/?h=v4.16/dt64
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index 5fc33b76b91c..e0fb860e12c5 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -9,6 +9,7 @@ #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/clock/axg-clkc.h> #include <dt-bindings/clock/axg-aoclkc.h> +#include <dt-bindings/gpio/meson-axg-gpio.h> / { compatible = "amlogic,meson-axg"; @@ -173,6 +174,32 @@ #mbox-cells = <1>; }; + periphs: periphs@ff634000 { + compatible = "simple-bus"; + reg = <0x0 0xff634000 0x0 0x2000>; + #address-cells = <2>; + #size-cells = <2>; + ranges = <0x0 0x0 0x0 0xff634000 0x0 0x2000>; + + pinctrl_periphs: pinctrl@480 { + compatible = "amlogic,meson-axg-periphs-pinctrl"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + gpio: bank@480 { + reg = <0x0 0x00480 0x0 0x40>, + <0x0 0x004e8 0x0 0x14>, + <0x0 0x00520 0x0 0x14>, + <0x0 0x00430 0x0 0x3c>; + reg-names = "mux", "pull", "pull-enable", "gpio"; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&pinctrl_periphs 0 0 86>; + }; + }; + }; + sram: sram@fffc0000 { compatible = "amlogic,meson-axg-sram", "mmio-sram"; reg = <0x0 0xfffc0000 0x0 0x20000>; @@ -209,6 +236,23 @@ }; }; + pinctrl_aobus: pinctrl@14 { + compatible = "amlogic,meson-axg-aobus-pinctrl"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + gpio_ao: bank@14 { + reg = <0x0 0x00014 0x0 0x8>, + <0x0 0x0002c 0x0 0x4>, + <0x0 0x00024 0x0 0x8>; + reg-names = "mux", "pull", "gpio"; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&pinctrl_aobus 0 0 15>; + }; + }; + uart_AO: serial@3000 { compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart"; reg = <0x0 0x3000 0x0 0x18>;