From 425fabbc3c2517b8a2be18a8eb8e8f45e5672afc Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 20 Jul 2023 13:35:12 -0500
Subject: [PATCH] merge: 5.10.x-ti fixes
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
src/arm/am335x-bonegreen-wireless.dts | 63 ++++++++++++++++++++++--
src/arm/overlays/BB-BBGW-WL1835-00A0.dts | 19 ++++---
2 files changed, 71 insertions(+), 11 deletions(-)
diff --git a/src/arm/am335x-bonegreen-wireless.dts b/src/arm/am335x-bonegreen-wireless.dts
index 42385b1d..a94e7318 100644
--- a/src/arm/am335x-bonegreen-wireless.dts
+++ b/src/arm/am335x-bonegreen-wireless.dts
@@ -16,6 +16,7 @@
chosen {
base_dtb = "am335x-bonegreen-wireless.dts";
base_dtb_timestamp = __TIMESTAMP__;
+ wl1835_bt = "S3-texas-300000";
};
wlan_en_reg: fixedregulator@2 {
@@ -29,9 +30,60 @@
gpio = <&gpio0 26 0>;
enable-active-high;
};
+
+ leds {
+ pinctrl-names = "default";
+ //pinctrl-0 = <&user_leds_s0>;
+ pinctrl-0 = <&user_leds_s0 &bt_pins>;
+
+ compatible = "gpio-leds";
+
+ led2 {
+ label = "beaglebone:green:usr0";
+ gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "heartbeat";
+ default-state = "off";
+ };
+
+ led3 {
+ label = "beaglebone:green:usr1";
+ gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "mmc0";
+ default-state = "off";
+ };
+
+ led4 {
+ label = "beaglebone:green:usr2";
+ gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "cpu0";
+ default-state = "off";
+ };
+
+ led5 {
+ label = "beaglebone:green:usr3";
+ gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "mmc1";
+ default-state = "off";
+ };
+
+ wl18xx_bt_en: led7 {
+ label = "wl18xx_bt_en";
+ gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ };
+ };
};
&am33xx_pinmux {
+ user_leds_s0: user_leds_s0 {
+ pinctrl-single,pins = <
+ AM33XX_PADCONF(AM335X_PIN_GPMC_A5, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* gpmc_a5.gpio1_21 */
+ AM33XX_PADCONF(AM335X_PIN_GPMC_A6, PIN_OUTPUT_PULLUP, MUX_MODE7) /* gpmc_a6.gpio1_22 */
+ AM33XX_PADCONF(AM335X_PIN_GPMC_A7, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* gpmc_a7.gpio1_23 */
+ AM33XX_PADCONF(AM335X_PIN_GPMC_A8, PIN_OUTPUT_PULLUP, MUX_MODE7) /* gpmc_a8.gpio1_24 */
+ >;
+ };
+
bt_pins: pinmux_bt_pins {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_GPMC_BEN1, PIN_OUTPUT_PULLUP, MUX_MODE7) /* gpmc_ad12.gpio1_28 BT_EN */
@@ -96,13 +148,14 @@
&uart3 {
pinctrl-names = "default";
- pinctrl-0 = <&uart3_pins &bt_pins>;
+ pinctrl-0 = <&uart3_pins>;
+ //pinctrl-0 = <&uart3_pins &bt_pins>;
status = "okay";
- bluetooth {
- compatible = "ti,wl1835-st";
- enable-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
- };
+ //bluetooth {
+ // compatible = "ti,wl1835-st";
+ // enable-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
+ //};
};
&gpio1 {
diff --git a/src/arm/overlays/BB-BBGW-WL1835-00A0.dts b/src/arm/overlays/BB-BBGW-WL1835-00A0.dts
index 23e26edf..d1a6702e 100644
--- a/src/arm/overlays/BB-BBGW-WL1835-00A0.dts
+++ b/src/arm/overlays/BB-BBGW-WL1835-00A0.dts
@@ -36,6 +36,12 @@
P9_28_pinmux { status = "disabled"; };
P9_29_pinmux { status = "disabled"; };
P9_31_pinmux { status = "disabled"; };
+
+ /* wl1835 */
+ P8_14_pinmux { status = "disabled"; }; /* wl1835: wl_en */
+ P8_17_pinmux { status = "disabled"; }; /* wl1835: wl_irq */
+ P8_26_pinmux { status = "disabled"; }; /* wl1835: LS_BUF_EN */
+ P9_30_pinmux { status = "disabled"; }; /* wl1835: MCASP0_AHCLKR */
};
&{/} {
@@ -109,7 +115,7 @@
bt_pins: pinmux_bt_pins {
pinctrl-single,pins = <
- AM33XX_PADCONF(AM335X_PIN_GPMC_BEN1, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* gpmc_ad12.gpio1_28 BT_EN */
+ AM33XX_PADCONF(AM335X_PIN_GPMC_BEN1, PIN_OUTPUT_PULLUP, MUX_MODE7) /* gpmc_ad12.gpio1_28 BT_EN */
>;
};
@@ -171,13 +177,14 @@
&uart3 {
pinctrl-names = "default";
- pinctrl-0 = <&uart3_pins &bt_pins>;
+ pinctrl-0 = <&uart3_pins>;
+ //pinctrl-0 = <&uart3_pins &bt_pins>;
status = "okay";
- bluetooth {
- compatible = "ti,wl1835-st";
- enable-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
- };
+ //bluetooth {
+ // compatible = "ti,wl1835-st";
+ // enable-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
+ //};
};
&gpio1 {
--
GitLab