diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf index ae5f12af8..8d0718f2d 100644 --- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf @@ -44,6 +44,9 @@ BT_DEVICE_NAME ?= "cc6qp" # Bluetooth tty BT_TTY ?= "ttymxc1" +# Bluetooth GPIO +BT_GPIO ?= "da9063-gpio 4" + # XBee XBEE_TTY ?= "ttymxc4" diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf index 3102c8970..025a88cdb 100644 --- a/meta-digi-arm/conf/machine/ccimx6sbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf @@ -46,6 +46,9 @@ SERIAL_CONSOLES ?= "115200;ttymxc3" # Bluetooth tty BT_TTY ?= "ttymxc1" +# Bluetooth GPIO +BT_GPIO ?= "da9063-gpio 4" + # XBee XBEE_TTY ?= "ttymxc4" diff --git a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf index 7a6f98339..56012aee5 100644 --- a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf @@ -31,6 +31,9 @@ SERIAL_CONSOLES ?= "115200;ttymxc4" # Bluetooth tty BT_TTY ?= "ttymxc0" +# Bluetooth GPIO +BT_GPIO ?= "gpio5 9" + # XBee XBEE_TTY ?= "ttymxc1" diff --git a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf index c89bcb477..11fe98a8e 100644 --- a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf +++ b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf @@ -30,6 +30,9 @@ SERIAL_CONSOLES ?= "115200;ttymxc4" # Bluetooth tty BT_TTY ?= "ttymxc0" +# Bluetooth GPIO +BT_GPIO ?= "gpio5 9" + # Default image for install scripts DEFAULT_IMAGE_NAME ?= "core-image-base" diff --git a/meta-digi-arm/conf/machine/ccimx91-dvk.conf b/meta-digi-arm/conf/machine/ccimx91-dvk.conf index af86be294..52c2fede5 100644 --- a/meta-digi-arm/conf/machine/ccimx91-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx91-dvk.conf @@ -14,6 +14,9 @@ SERIAL_CONSOLES = "115200;ttyLP5" # Bluetooth tty BT_TTY ?= "ttyLP0" +# Bluetooth GPIO +BT_GPIO ?= "1 7" + # Firmware MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-nxp-wifi-nxpiw612-sdio firmware-murata-nxp', '', d)}" diff --git a/meta-digi-arm/conf/machine/ccimx93-dvk.conf b/meta-digi-arm/conf/machine/ccimx93-dvk.conf index 4aa4469a4..2286991e0 100644 --- a/meta-digi-arm/conf/machine/ccimx93-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx93-dvk.conf @@ -14,6 +14,9 @@ SERIAL_CONSOLES = "115200;ttyLP5" # Bluetooth tty BT_TTY ?= "ttyLP0" +# Bluetooth GPIO +BT_GPIO ?= "1 7" + # Firmware MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-nxp-wifi-nxpiw612-sdio firmware-murata-nxp', '', d)}" MACHINE_FIRMWARE:append = " ethos-u-firmware" diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf index c0e751c98..25afe34a1 100644 --- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf @@ -177,3 +177,6 @@ OVERLAYFS_ETC_FSTYPE ?= "ext4" # Bluetooth BT_TTY ?= "ttySTM1" + +# Bluetooth GPIO +BT_GPIO ?= "gpiochip11 5" diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb index b732f1e72..c598efc15 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb @@ -26,6 +26,9 @@ inherit update-rc.d systemd do_install() { # INITSCRIPT install -d ${D}${sysconfdir}/init.d/ + # Set BT GPIO + sed -i -e "s,##BT_GPIO##,${BT_GPIO},g" \ + ${WORKDIR}/${BT_INIT_FILE} install -m 0755 ${WORKDIR}/${BT_INIT_FILE} ${D}${sysconfdir}/bluetooth-init ln -sf /etc/bluetooth-init ${D}${sysconfdir}/init.d/bluetooth-init # Set BT UART device diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/bluetooth-init_btnxpuart b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/bluetooth-init_btnxpuart index 1834dd70d..b3e93dab7 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/bluetooth-init_btnxpuart +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/bluetooth-init_btnxpuart @@ -27,7 +27,7 @@ is_not_wifi() { } power() { - is_not_wifi && gpioset 1 7="${1}" + is_not_wifi && gpioset ##BT_GPIO##="${1}" } set_btaddr() { diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx6/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx6/bluetooth-init index b991e3751..29a579e4c 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx6/bluetooth-init +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx6/bluetooth-init @@ -14,7 +14,7 @@ #=============================================================================== # Bluetooth power GPIO -BT_EN_QCA_GPIO_NR="da9063-gpio 4" +BT_EN_QCA_GPIO_NR=##BT_GPIO## # set_gpio_value set_gpio_value() { diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx6sbc/bluetooth-init_atheros b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx6sbc/bluetooth-init_atheros index d927484a2..626afc571 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx6sbc/bluetooth-init_atheros +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx6sbc/bluetooth-init_atheros @@ -14,7 +14,7 @@ #=============================================================================== # Bluetooth power GPIO -BT_PWR_GPIO_NR="da9063-gpio 4" +BT_PWR_GPIO_NR=##BT_GPIO## # set_gpio_value set_gpio_value() { diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx6ul/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx6ul/bluetooth-init index 515233092..a5d1826a0 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx6ul/bluetooth-init +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx6ul/bluetooth-init @@ -14,7 +14,7 @@ #=============================================================================== # Bluetooth power GPIO -BT_EN_QCA_GPIO_NR="gpio5 9" +BT_EN_QCA_GPIO_NR=##BT_GPIO## # set_gpio_value set_gpio_value() { diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccmp2/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccmp2/bluetooth-init index ac368a438..f478dbf60 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccmp2/bluetooth-init +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccmp2/bluetooth-init @@ -26,7 +26,7 @@ log() { bt_power() { #CCMP2 BT_REG_EN GPIO PZ5 - gpioset gpiochip11 5="${1}" + gpioset ##BT_GPIO##="${1}" } set_btaddr() { diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/use-mainline-bsp/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/use-mainline-bsp/bluetooth-init index 5c8d850e6..750c54327 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/use-mainline-bsp/bluetooth-init +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/use-mainline-bsp/bluetooth-init @@ -14,7 +14,7 @@ #=============================================================================== # Bluetooth power GPIO -BT_EN_QCA_GPIO_NR="gpio5 9" +BT_EN_QCA_GPIO_NR=##BT_GPIO## # set_gpio_value set_gpio_value() {