ARM: dts: omap4: panda: cleanup bluetooth

Bluetooth is available on the other Panda board versions, too, so move
stuff to common and specify the needed clock properly.

Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
Link: https://lore.kernel.org/r/20250427052735.88133-3-andreas@kemnade.info
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

diff --git a/arch/arm/boot/dts/ti/omap/omap4-panda-common.dtsi b/arch/arm/boot/dts/ti/omap/omap4-panda-common.dtsi
index c860b590142aeb2c8995898813872a7153049cb2..05c871d31d7be1265e1fff6f33da244cf0868478 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/ti/omap/omap4-panda-common.dtsi
@@ -367,10 +367,8 @@
         */
        wl12xx_gpio: wl12xx-gpio-pins {
                pinctrl-single,pins = <
-                       OMAP4_IOPAD(0x066, PIN_OUTPUT | MUX_MODE3)              /* gpmc_a19.gpio_43 */
-                       OMAP4_IOPAD(0x06c, PIN_OUTPUT | MUX_MODE3)              /* gpmc_a22.gpio_46 */
+                       OMAP4_IOPAD(0x066, PIN_OUTPUT | MUX_MODE3)              /* gpmc_a19.gpio_43 - WLAN_EN */
                        OMAP4_IOPAD(0x070, PIN_OUTPUT_PULLUP | MUX_MODE3)       /* gpmc_a24.gpio_48 */
-                       OMAP4_IOPAD(0x072, PIN_OUTPUT_PULLUP | MUX_MODE3)       /* gpmc_a25.gpio_49 */
                >;
        };
 
@@ -393,6 +391,22 @@
                        OMAP4_IOPAD(0x114, PIN_INPUT_PULLUP | MUX_MODE3)        /* gpio_121 */
                >;
        };
+
+       bt_pins: 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: 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 */
+               >;
+       };
 };
 
 &omap4_pmx_wkup {
@@ -531,8 +545,19 @@
 };
 
 &uart2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart2_pins>;
        interrupts-extended = <&wakeupgen GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH
                               &omap4_pmx_core OMAP4_UART2_RX>;
+
+       bluetooth {
+               compatible = "ti,wl1271-st";
+               pinctrl-names = "default";
+               pinctrl-0 = <&bt_pins>;
+               enable-gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>;    /* GPIO_46 */
+               clocks = <&twl 0>;
+               clock-names = "ext_clock";
+       };
 };
 
 &uart3 {

diff --git a/arch/arm/boot/dts/ti/omap/omap4-panda-es.dts b/arch/arm/boot/dts/ti/omap/omap4-panda-es.dts
index fe7b156d10ed03a43781f98871517f3c332fcb7c..a933fe560834bedd8dfb704a60efe91a098135f0 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/omap4-panda-es.dts
+++ b/arch/arm/boot/dts/ti/omap/omap4-panda-es.dts
@@ -49,22 +49,6 @@
                        OMAP4_IOPAD(0x0fc, PIN_INPUT_PULLUP | MUX_MODE3) /* gpio_113 */
                >;
        };
-
-       bt_pins: 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: 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 {
@@ -96,19 +80,3 @@
 &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 */
-       };
-};