* fix wrong pinmux offset preventing the user button from working * add uart connection for bluetooth wl1271 hci
H. Nikolaus Schaller (2): ARM: dts: pandaboard: fix pinmux for gpio user button of Pandaboard ES ARM: dts: pandaboard es: add bluetooth uart for HCI
arch/arm/boot/dts/omap4-panda-es.dts | 34 +++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-)
The pinmux control register offset passed to OMAP4_IOPAD is odd.
Fixes: ab9a13665e7c ("ARM: dts: pandaboard: add gpio user button") Cc: stable@vger.kernel.org Signed-off-by: H. Nikolaus Schaller hns@goldelico.com --- arch/arm/boot/dts/omap4-panda-es.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts index cfa85aa3da085e..6afa8fd7c412de 100644 --- a/arch/arm/boot/dts/omap4-panda-es.dts +++ b/arch/arm/boot/dts/omap4-panda-es.dts @@ -46,7 +46,7 @@ OMAP4_IOPAD(0x0f6, PIN_OUTPUT | MUX_MODE3) /* gpio_110 */
button_pins: pinmux_button_pins { pinctrl-single,pins = < - OMAP4_IOPAD(0x11b, PIN_INPUT_PULLUP | MUX_MODE3) /* gpio_113 */ + OMAP4_IOPAD(0x0fc, PIN_INPUT_PULLUP | MUX_MODE3) /* gpio_113 */ >; }; };
The wl271 bluetooth uart is connected to uart2. Setup a serdev uart child and separate bluetooth and uart2 pinmux from wl12xx pinmux to better group the pins and muxes.
Signed-off-by: H. Nikolaus Schaller hns@goldelico.com --- arch/arm/boot/dts/omap4-panda-es.dts | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts index 6afa8fd7c412de..7c6886cd738f03 100644 --- a/arch/arm/boot/dts/omap4-panda-es.dts +++ b/arch/arm/boot/dts/omap4-panda-es.dts @@ -49,6 +49,22 @@ button_pins: pinmux_button_pins { OMAP4_IOPAD(0x0fc, PIN_INPUT_PULLUP | MUX_MODE3) /* gpio_113 */ >; }; + + bt_pins: pinmux_bt_pins { + pinctrl-single,pins = < + OMAP4_IOPAD(0x06c, PIN_OUTPUT | MUX_MODE3) /* gpmc_a22.gpio_46 - BTEN */ + OMAP4_IOPAD(0x072, PIN_OUTPUT_PULLUP | MUX_MODE3) /* gpmc_a25.gpio_49 - BTWAKEUP */ + >; + }; + + uart2_pins: pinmux_uart2_pins { + pinctrl-single,pins = < + OMAP4_IOPAD(0x118, PIN_INPUT_PULLUP | MUX_MODE0) /* uart2_cts.uart2_cts - HCI */ + OMAP4_IOPAD(0x11a, PIN_OUTPUT | MUX_MODE0) /* uart2_rts.uart2_rts */ + OMAP4_IOPAD(0x11c, PIN_INPUT_PULLUP | MUX_MODE0) /* uart2_rx.uart2_rx */ + OMAP4_IOPAD(0x11e, PIN_OUTPUT | MUX_MODE0) /* uart2_tx.uart2_tx */ + >; + }; };
&led_wkgpio_pins { @@ -80,3 +96,19 @@ buttonS2 { &gpio1_target { ti,no-reset-on-init; }; + +&wl12xx_gpio { + pinctrl-single,pins = < + OMAP4_IOPAD(0x066, PIN_OUTPUT | MUX_MODE3) /* gpmc_a19.gpio_43 */ + OMAP4_IOPAD(0x070, PIN_OUTPUT_PULLUP | MUX_MODE3) /* gpmc_a24.gpio_48 */ + >; +}; + +&uart2 { + pinctrl-names = "default"; + pinctrl-0 = <&uart2_pins &bt_pins>; + bluetooth: tiwi { + compatible = "ti,wl1271-st"; + enable-gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>; /* GPIO_46 */ + }; +};
ping
Am 03.10.2020 um 16:09 schrieb H. Nikolaus Schaller hns@goldelico.com:
- fix wrong pinmux offset preventing the user button from working
- add uart connection for bluetooth wl1271 hci
H. Nikolaus Schaller (2): ARM: dts: pandaboard: fix pinmux for gpio user button of Pandaboard ES ARM: dts: pandaboard es: add bluetooth uart for HCI
arch/arm/boot/dts/omap4-panda-es.dts | 34 +++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-)
-- 2.26.2
* H. Nikolaus Schaller hns@goldelico.com [201030 09:09]:
ping
Am 03.10.2020 um 16:09 schrieb H. Nikolaus Schaller hns@goldelico.com:
- fix wrong pinmux offset preventing the user button from working
- add uart connection for bluetooth wl1271 hci
H. Nikolaus Schaller (2): ARM: dts: pandaboard: fix pinmux for gpio user button of Pandaboard ES ARM: dts: pandaboard es: add bluetooth uart for HCI
Thanks applying both into omap-for-v5.11/dt.
Tony