From bc8f3bf499eb8a25bbac53e575fac9967400edd2 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> Date: Thu, 23 Dec 2021 17:16:54 -0600 Subject: [PATCH] am335x-bonegreen-gateway.dts: use fixup for ble Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- src/arm/am335x-bonegreen-gateway.dts | 83 ++++++++++++++++++++++------ 1 file changed, 66 insertions(+), 17 deletions(-) diff --git a/src/arm/am335x-bonegreen-gateway.dts b/src/arm/am335x-bonegreen-gateway.dts index f6b9b66..6588ce7 100644 --- a/src/arm/am335x-bonegreen-gateway.dts +++ b/src/arm/am335x-bonegreen-gateway.dts @@ -2,6 +2,7 @@ /* * Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/ */ + /dts-v1/; #include "am33xx.dtsi" @@ -21,6 +22,7 @@ chosen { base_dtb = "am335x-bonegreen-gateway.dts"; base_dtb_timestamp = __TIMESTAMP__; + wl1835_bt = "S3-texas-300000"; }; wlan_en_reg: fixedregulator@2 { @@ -36,7 +38,39 @@ }; leds { - pinctrl-0 = <&user_leds_s0 &extra_led_pins>; + 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"; + }; led6 { label = "beaglebone:green:usr4"; @@ -44,6 +78,12 @@ linux,default-trigger = "netdev"; default-state = "off"; }; + + wl18xx_bt_en: led7 { + label = "wl18xx_bt_en"; + gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; + default-state = "off"; + }; }; }; @@ -70,9 +110,19 @@ pinctrl-names = "default"; pinctrl-0 = <&usbhost_pins>; + 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 */ + AM33XX_PADCONF(AM335X_PIN_MII1_RXD0, PIN_OUTPUT_PULLUP, MUX_MODE7) /* WL_Active_LED / USR4 */ + >; + }; + bt_pins: pinmux_bt_pins { pinctrl-single,pins = < - AM33XX_PADCONF(AM335X_PIN_MII1_TXD0, PIN_OUTPUT_PULLUP, MUX_MODE7) /* gmii1_txd0.gpio0_28 - BT_EN */ + AM33XX_PADCONF(AM335X_PIN_MII1_TXD0, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* gmii1_txd0.gpio0_28 - BT_EN */ >; }; @@ -103,9 +153,9 @@ >; }; - extra_led_pins: pinmux_extra_led_pins { + usbhost_pins: pinmux_usbhost_pins { pinctrl-single,pins = < - AM33XX_PADCONF(AM335X_PIN_MII1_RXD0, PIN_OUTPUT, MUX_MODE7) /* WL_Active_LED / USR4 */ + AM33XX_PADCONF(AM335X_PIN_MII1_TXD1, PIN_OUTPUT_PULLUP, MUX_MODE7) /* gmii1_txd1.gpio0[21] */ >; }; @@ -116,12 +166,6 @@ AM33XX_PADCONF(AM335X_PIN_MII1_RX_CLK, PIN_OUTPUT_PULLUP, MUX_MODE7) /* gmii1_rxclk.gpio3_10 LS_BUF_EN */ >; }; - - usbhost_pins: pinmux_usbhost_pins { - pinctrl-single,pins = < - AM33XX_IOPAD(0x924, PIN_OUTPUT_PULLUP | MUX_MODE7) /* gmii1_txd1.gpio0[21] */ - >; - }; }; &mac { @@ -160,16 +204,20 @@ &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 = <&gpio0 28 GPIO_ACTIVE_HIGH>; - }; + //bluetooth { + // compatible = "ti,wl1835-st"; + // enable-gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; + //}; }; &i2c0 { + #address-cells = <1>; + #size-cells = <0>; + extrtc: rtc@68 { compatible = "dallas,ds1340"; reg = <0x68>; @@ -178,7 +226,7 @@ // (K16) gmii1_txd1.gpio0[21] &gpio0 { - usb_reset { + usb-reset-hog { gpio-hog; gpios = <21 GPIO_ACTIVE_HIGH>; output-high; @@ -187,7 +235,7 @@ }; &gpio3 { - ls_buf_en { + ls-buf-en-hog { gpio-hog; gpios = <10 GPIO_ACTIVE_HIGH>; output-high; @@ -202,6 +250,7 @@ hub@1 { compatible = "usb424,9512"; reg = <1>; + #address-cells = <1>; #size-cells = <0>; -- GitLab