| Message ID | 20170117030611.23827-3-afaerber@suse.de |
|---|---|
| State | New |
| Headers | show |
Andreas Färber <afaerber@suse.de> writes: > Add an SDIO reset GPIO and enable the serial used by the AP6255 > Bluetooth module. Based on work by Martin Blumenstingl. > > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts > index 9f04fa4e5aec..6ea225f584bd 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts > @@ -58,6 +58,7 @@ > > aliases { > serial0 = &uart_AO; > + serial1 = &uart_A; > }; > > chosen { > @@ -122,7 +123,8 @@ > > sdio_pwrseq: sdio-pwrseq { > compatible = "mmc-pwrseq-simple"; > - reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; > + reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>, > + <&gpio GPIOX_17 GPIO_ACTIVE_LOW>; > clocks = <&wifi32k>; > clock-names = "ext_clock"; c.f. thread on Martin's series. I don't like this (ab)use of reset-gpios for sdio-pwrseq, and there's some work coming that will make this much cleaner. So, I'll hold off on this until the other solution is ready. Kevin
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts index 9f04fa4e5aec..6ea225f584bd 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts @@ -58,6 +58,7 @@ aliases { serial0 = &uart_AO; + serial1 = &uart_A; }; chosen { @@ -122,7 +123,8 @@ sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; - reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_17 GPIO_ACTIVE_LOW>; clocks = <&wifi32k>; clock-names = "ext_clock"; }; @@ -238,3 +240,10 @@ pinctrl-0 = <&uart_ao_a_pins>; pinctrl-names = "default"; }; + +&uart_A { + status = "okay"; + pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; + pinctrl-names = "default"; + uart-has-rtscts; +};
Add an SDIO reset GPIO and enable the serial used by the AP6255 Bluetooth module. Based on work by Martin Blumenstingl. Signed-off-by: Andreas Färber <afaerber@suse.de> --- arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)