From 68975207ee896b6537bf3419c0dad17ae7f907fa Mon Sep 17 00:00:00 2001 From: Gerrit SelfHelp Service Account Date: Sun, 3 Dec 2023 22:37:27 -0800 Subject: [PATCH 01/57] Initial empty repository From c45e899c16b8118be0499561409c3ee7806bb6d8 Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Thu, 21 Dec 2023 16:16:13 +0530 Subject: [PATCH 02/57] btfm: dts: msm: Add device tree entries for sun target Add initial device tree entries for sun target Change-Id: I5bda39009e553cfacd32b15235b6f58ce803bb9a Signed-off-by: Hemant Gupta --- Kbuild | 13 ++++ Makefile | 9 +++ bindings/bluetooth/btfm_slim.txt | 16 +++++ bindings/bluetooth/btpower.txt | 60 ++++++++++++++++++ bindings/bt-fm/rtc6226_fm.txt | 13 ++++ pineapple-kiwi-bt.dts | 17 +++++ pineapple-kiwi-bt.dtsi | 98 +++++++++++++++++++++++++++++ sun-kiwi-bt.dts | 17 +++++ sun-kiwi-bt.dtsi | 105 +++++++++++++++++++++++++++++++ sun-peach-bt-v8.dts | 18 ++++++ sun-peach-bt-v8.dtsi | 96 ++++++++++++++++++++++++++++ sun-peach-bt.dts | 18 ++++++ sun-peach-bt.dtsi | 101 +++++++++++++++++++++++++++++ 13 files changed, 581 insertions(+) create mode 100644 Kbuild create mode 100644 Makefile create mode 100644 bindings/bluetooth/btfm_slim.txt create mode 100644 bindings/bluetooth/btpower.txt create mode 100644 bindings/bt-fm/rtc6226_fm.txt create mode 100644 pineapple-kiwi-bt.dts create mode 100644 pineapple-kiwi-bt.dtsi create mode 100644 sun-kiwi-bt.dts create mode 100644 sun-kiwi-bt.dtsi create mode 100644 sun-peach-bt-v8.dts create mode 100644 sun-peach-bt-v8.dtsi create mode 100644 sun-peach-bt.dts create mode 100644 sun-peach-bt.dtsi diff --git a/Kbuild b/Kbuild new file mode 100644 index 00000000..3533af96 --- /dev/null +++ b/Kbuild @@ -0,0 +1,13 @@ +ifeq ($(CONFIG_ARCH_PINEAPPLE),y) +dtbo-y += pineapple-kiwi-bt.dtbo +endif + +ifeq ($(CONFIG_ARCH_SUN), y) +dtbo-y += sun-peach-bt.dtbo +dtbo-y += sun-kiwi-bt.dtbo +dtbo-y += sun-peach-bt-v8.dtbo +endif + +always-y := $(dtb-y) $(dtbo-y) +subdir-y := $(dts-dirs) +clean-files := *.dtb *.dtbo diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..ef33f916 --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +KBUILD_OPTIONS += KBUILD_EXTMOD_DTS=. + +all: dtbs + +clean: + $(MAKE) -C $(KERNEL_SRC) M=$(M) clean + +%: + $(MAKE) -C $(KERNEL_SRC) M=$(M) $@ $(KBUILD_OPTIONS) diff --git a/bindings/bluetooth/btfm_slim.txt b/bindings/bluetooth/btfm_slim.txt new file mode 100644 index 00000000..2f116b5a --- /dev/null +++ b/bindings/bluetooth/btfm_slim.txt @@ -0,0 +1,16 @@ +* BTFM Slimbus Slave Driver +BTFM Slimbus Slave driver configure and initialize slimbus slave device. +Bluetooth A2DP, SCO and FM Audio data is transferred over slimbus interface. + +Required properties: + - compatible: Should be set to the following where 217 is manufacture id and 221 is prod id: + ex. HSP elmental address is 0x000120021702 + compatible = "slim217,221" + - reg should be filled as per specs + reg = <1 0>; + +Example: + slimbus: btfmslim-driver { + compatible = "slim217,221"; + reg = <1 0>; + }; diff --git a/bindings/bluetooth/btpower.txt b/bindings/bluetooth/btpower.txt new file mode 100644 index 00000000..c0227c2b --- /dev/null +++ b/bindings/bluetooth/btpower.txt @@ -0,0 +1,60 @@ +* Bluetooth Controller +Bluetooth controller communicates with the Bluetooth Host using HCI Transport +layer. HCI Transport layer can be based on UART or USB serial communication +protocol. + +Required properties: +- compatible: "qcom," + chip: Should be set to one of the following: + qcom,qca6174 + qcom,wcn3990 + qcom,qca6390 + qcom,qca6490 + qcom,kiwi + - qcom,bt-reset-gpio: GPIO pin to bring BT Controller out of reset + +Optional properties: + - qcom,xo-clk-gpio: GPIO for enabling clock at bootstrap + - qcom,bt-vdd-pa-supply: Bluetooth VDD PA regulator handle + - qcom,bt-vdd-io-supply: Bluetooth VDD IO regulator handle + - qcom,bt-vdd-ldo-supply: Bluetooth VDD LDO regulator handle. Kept under + optional parameters as some of the chipsets doesn't require ldo + or it may use from same vddio. + - qcom,bt-vdd-xtal-supply: Bluetooth VDD XTAL regulator handle + - qcom,bt-vdd-core-supply: Bluetooth VDD CORE regulator handle + - qcom,bt-vdd-asd-supply: Bluetooth VDD regulator handle for antenna switch + - reg: Memory regions defined as starting address and size + - reg-names: Names of the memory regions defined in reg entry + diversity. + - qcom,bt-chip-pwd-supply: Chip power down gpio is required when bluetooth + module and other modules like wifi co-exist in a singe chip and + shares a common gpio to bring chip out of reset. + - qcom,-config: Specifies voltage/current levels for supply. Should specified + in pairs (min, max), units uV. There can be optional + load in curr, unit uA. Last entry specifies if the retention + mode is supported for the regulator. + - mboxes: Specifies mbox channel data for AOP messaging + - qcom,vreg_ipa: Specifies Voltage regulator used for QCA6490 Internal Power + Amp config + +Example: + bluetooth: bt_qca6490 { + compatible = "qcom,qca6390", "qcom,qca6490"; + pinctrl-names = "default"; + pinctrl-0 = <&bt_en_sleep>; + qcom,bt-reset-gpio = <&tlmm 81 0>; /* BT_EN */ + qcom,wl-reset-gpio = <&tlmm 80 0>; /* WL_EN */ + qcom,bt-sw-ctrl-gpio = <&tlmm 82 0>; /* SW_CTRL */ + qcom,bt-xo-clk-gpio = <&tlmm 204 0>; /* XO */ + qcom,bt-vdd-aon-supply = <&S11B>; + qcom,bt-vdd-dig-supply = <&S11B>; + qcom,bt-vdd-rfa1-supply = <&S1C>; + qcom,bt-vdd-rfa2-supply = <&S12B>; + qcom,bt-vdd-asd-supply = <&L7E>; + + qcom,bt-vdd-aon-config = <966000 966000 0 1>; + qcom,bt-vdd-dig-config = <966000 966000 0 1>; + qcom,bt-vdd-rfa1-config = <1880000 1880000 0 1>; + qcom,bt-vdd-rfa2-config = <1350000 1350000 0 1>; + qcom,bt-vdd-asd-config = <2800000 2800000 0 1>; + }; diff --git a/bindings/bt-fm/rtc6226_fm.txt b/bindings/bt-fm/rtc6226_fm.txt new file mode 100644 index 00000000..d77417bf --- /dev/null +++ b/bindings/bt-fm/rtc6226_fm.txt @@ -0,0 +1,13 @@ +Richwave FM radio device + +-FM RX playback with RDS +FM signal is demodulated then audio L/R samples are sent to external audio codec. +FM Rx RDS data received sent to host processor on I2C. + +Required Properties: +- compatible: "rtc6226" + +Example: + rtc6226 { + compatible = "rtc6226"; + }; diff --git a/pineapple-kiwi-bt.dts b/pineapple-kiwi-bt.dts new file mode 100644 index 00000000..9243e7b4 --- /dev/null +++ b/pineapple-kiwi-bt.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "pineapple-kiwi-bt.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Pineapple SoCs"; + compatible = "qcom,pineapple", "qcom,pineapplep"; + qcom,msm-id = <557 0x10000>, <577 0x10000>, <557 0x20000>, <577 0x20000>; + qcom,board-id = <0 0>; +}; diff --git a/pineapple-kiwi-bt.dtsi b/pineapple-kiwi-bt.dtsi new file mode 100644 index 00000000..17018223 --- /dev/null +++ b/pineapple-kiwi-bt.dtsi @@ -0,0 +1,98 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&tlmm { + bt_en_sleep: bt_en_sleep { + mux { + pins = "gpio17"; + function = "gpio"; + }; + + config { + pins = "gpio17"; + drive-strength = <2>; + output-low; + bias-pull-down; + }; + }; +}; + +&soc { + bluetooth: bt_kiwi { + compatible = "qcom,kiwi"; + pinctrl-names = "bt_en_sleep"; + pinctrl-0 = <&bt_en_sleep>; + /* List of GPIOs to be setup for interrupt wakeup capable*/ + mpm_wake_set_gpios = <18>; + qcom,bt-reset-gpio = <&tlmm 17 0>; /* BT_EN */ + qcom,wl-reset-gpio = <&tlmm 16 0>; /* WL_EN */ + qcom,bt-sw-ctrl-gpio = <&tlmm 18 0>; /* SW_CTRL */ + mboxes = <&qmp_aop 0>; + + qcom,bt-vdd18-aon-supply = <&L15B>; /* BT VDD1.8 AON */ + qcom,bt-vdd12-io-supply = <&L3C>; /* BT VDD1.2V IO */ + qcom,bt-ant-ldo-supply = <&L6K>; /* BT ANT */ + qcom,bt-vdd-dig-supply = <&S3C>; /* BT LDO*/ + qcom,bt-vdd-aon-supply = <&S3C>; /* BT AON LDO*/ + qcom,bt-vdd-rfaOp8-supply = <&S3C>; /* BT RFAOp8 CMN LDO*/ + qcom,bt-vdd-rfa1-supply = <&S1C>; /* BT RFA1.2 LDO */ + qcom,bt-vdd-rfa2-supply = <&S6C>; /* BT RFA1.8 LDO */ + + qcom,bt-vdd18-aon-config = <1800000 1800000 0 1>; + qcom,bt-vdd12-io-config = <1200000 1200000 0 1>; + qcom,bt-ant-ldo-config = <1800000 1800000 0 1>; + qcom,bt-vdd-aon-config = <916000 916000 0 1>; + qcom,bt-vdd-dig-config = <916000 916000 0 1>; + qcom,bt-vdd-rfaOp8-config = <916000 916000 0 1>; + qcom,bt-vdd-rfa1-config = <1316000 1316000 0 1>; + qcom,bt-vdd-rfa2-config = <1864000 1864000 0 1>; + qcom,pdc_init_table= + "{class: wlan_pdc, ss: rf, res: s3c.v, upval: 916}", + "{class: wlan_pdc, ss: rf, res: s3c.v, dwnval: 612}", + "{class: wlan_pdc, ss: rf, res: s1c.v, upval: 1316}", + "{class: wlan_pdc, ss: rf, res: s1c.v, dwnval: 944}", + "{class: wlan_pdc, ss: rf, res: s6c.v, upval: 1864}", + "{class: wlan_pdc, ss: rf, res: s6c.v, dwnval: 1820}"; + }; + slim_msm: slim@6C40000 { + status = "ok"; + ngd@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <1>; + //slimbus child nodes + slimbus: btfmslim-driver { + compatible = "slim217,221"; + reg = <1 0>; + qcom,btslim-address = <0x0>; /* BT SLIM EP address*/ + qcom,btslimtx-channels = <159 160>; /* slimbus FM_Tx, SCO_Tx channels */ + qcom,btslimrx-channels = <157 158>; /* slimbus SCO_A2DP_Rx A2DP_Rx */ + }; + }; + }; +}; + +// FM changes +&qupv3_se6_i2c { + status = "ok"; + nq@64 { + compatible = "rtc6226"; + reg = <0x64>; + fmint-gpio = <&tlmm 85 0>; + vdd-supply = <&L16B>; + rtc6226,vdd-supply-voltage = <2800000 2800000>; + rtc6226,vdd-load = <15000>; + vio-supply = <&L15B>; + rtc6226,vio-supply-voltage = <1800000 1800000>; + }; +}; + +//uart instance +&qupv3_se14_4uart { + status = "ok"; +}; diff --git a/sun-kiwi-bt.dts b/sun-kiwi-bt.dts new file mode 100644 index 00000000..94f693ff --- /dev/null +++ b/sun-kiwi-bt.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-kiwi-bt.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun SoCs"; + compatible = "qcom,sun", "qcom,sunp", "qcom,sun-mtp", "qcom,sun-cdp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,board-id = <0x20001 0>, <0x20008 0>; +}; diff --git a/sun-kiwi-bt.dtsi b/sun-kiwi-bt.dtsi new file mode 100644 index 00000000..cbb6cb43 --- /dev/null +++ b/sun-kiwi-bt.dtsi @@ -0,0 +1,105 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&pm8550vs_f_gpios { + bt_uwb_en: bt_uwb_en { + pins = "gpio3"; + function = "normal"; + input-disable; + output-enable; + bias-disable; + power-source = <1>; + }; +}; + +&tlmm { + cnss_bt_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio18"; + function = "wcn_sw_ctrl"; + }; + }; +}; + +&soc { + bluetooth: bt_kiwi { + compatible = "qcom,kiwi"; + pinctrl-names = "bt_uwb_en", "sw_ctrl"; + pinctrl-0 = <&bt_uwb_en>; + pinctrl-1 = <&cnss_bt_sw_ctrl>; + /* List of GPIOs to be setup for interrupt wakeup capable*/ + mpm_wake_set_gpios = <18>; + qcom,wl-reset-gpio = <&tlmm 16 0>; /* WL_EN */ + qcom,bt-sw-ctrl-gpio = <&tlmm 18 0>; /* SW_CTRL */ + qcom,bt-reset-gpio = <&pm8550vs_f_gpios 3 0>; /* BT_EN */ + qcom,qmp = <&aoss_qmp>; + + qcom,bt-vdd18-aon-supply = <&L3F>; /* BT VDD1.8 AON */ + qcom,bt-vdd12-io-supply = <&L2F>; /* BT VDD1.2V IO */ + qcom,bt-ant-ldo-supply = <&L6K>; /* BT ANT - AV91C_VDD */ + qcom,bt-vdd-aon-supply = <&S1D>; /* BT AON LDO*/ + qcom,bt-vdd-rfaOp8-supply = <&S1D>; /* BT RFAOp8 CMN LDO*/ + qcom,bt-vdd-rfa1-supply = <&S7I>; /* BT RFA1.2 LDO */ + qcom,bt-vdd-rfa2-supply = <&S3G>; /* BT RFA1.8 LDO */ + + qcom,bt-vdd18-aon-config = <1800000 1800000 0 1>; + qcom,bt-vdd12-io-config = <1200000 1200000 0 1>; + qcom,bt-ant-ldo-config = <1800000 1800000 0 1>; + qcom,bt-vdd-aon-config = <916000 1100000 0 1>; + qcom,bt-vdd-rfaOp8-config = <916000 1100000 0 1>; + qcom,bt-vdd-rfa1-config = <1316000 1340000 0 1>; + qcom,bt-vdd-rfa2-config = <1864000 2000000 0 1>; + + qcom,pdc_init_table = + "{class: wlan_pdc, ss: rf, res: s3g.v, upval: 1856}", + "{class: wlan_pdc, ss: rf, res: s3g.v, dwnval: 1844}", + "{class: wlan_pdc, ss: rf, res: s7i.v, upval: 1316}", + "{class: wlan_pdc, ss: rf, res: s7i.v, dwnval: 972}", + "{class: wlan_pdc, ss: rf, res: s1d.m, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s1d.v, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s1d.v, upval: 916}", + "{class: wlan_pdc, ss: rf, res: s1d.v, dwnval: 880}"; + }; + + slim_msm: slim@6C40000 { + status = "ok"; + ngd@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <1>; + //slimbus child nodes + slimbus: btfmslim-driver { + compatible = "slim217,221"; + reg = <1 0>; + qcom,btslim-address = <0x0>; /* BT SLIM EP address*/ + qcom,btslimtx-channels = <159 160>; /* slimbus FM_Tx, SCO_Tx channels */ + qcom,btslimrx-channels = <157 158>; /* slimbus SCO_A2DP_Rx A2DP_Rx */ + }; + }; + }; +}; + +// FM changes +&qupv3_se5_i2c { + status = "ok"; + nq@64 { + compatible = "rtc6226"; + reg = <0x64>; + fmint-gpio = <&tlmm 84 0>; + vdd-supply = <&L16B>; + rtc6226,vdd-supply-voltage = <2800000 2800000>; + rtc6226,vdd-load = <15000>; + vio-supply = <&L15B>; + rtc6226,vio-supply-voltage = <1800000 1800000>; + }; +}; + +//uart instance +&qupv3_se14_4uart { + status = "ok"; +}; diff --git a/sun-peach-bt-v8.dts b/sun-peach-bt-v8.dts new file mode 100644 index 00000000..9618747b --- /dev/null +++ b/sun-peach-bt-v8.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-peach-bt-v8.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun SoCs"; + compatible = "qcom,sun", "qcom,sunp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, + <639 0x10000>, <639 0x20000>; + qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>; +}; diff --git a/sun-peach-bt-v8.dtsi b/sun-peach-bt-v8.dtsi new file mode 100644 index 00000000..b1dd995f --- /dev/null +++ b/sun-peach-bt-v8.dtsi @@ -0,0 +1,96 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&pm8550vs_f_gpios { + bt_uwb_en: bt_uwb_en { + pins = "gpio3"; + function = "normal"; + input-disable; + output-enable; + bias-disable; + power-source = <1>; + }; +}; + +&tlmm { + cnss_bt_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio18"; + function = "wcn_sw_ctrl"; + }; + }; +}; + +&soc { + bluetooth: bt_peach { + compatible = "qcom,peach-bt"; + qcom,peach-bt; + pinctrl-names = "bt_uwb_en", "sw_ctrl"; + pinctrl-0 = <&bt_uwb_en>; + pinctrl-1 = <&cnss_bt_sw_ctrl>; + /* List of GPIOs to be setup for interrupt wakeup capable*/ + mpm_wake_set_gpios = <18>; + qcom,wl-reset-gpio = <&tlmm 16 0>; /* WL_EN */ + qcom,bt-sw-ctrl-gpio = <&tlmm 18 0>; /* SW_CTRL */ + qcom,bt-reset-gpio = <&pm8550vs_f_gpios 3 0>; /* BT_EN */ + qcom,qmp = <&aoss_qmp>; + + qcom,bt-vdd18-aon-supply = <&L3F>; /* VDD1P8_AON */ + qcom,bt-vdd12-io-supply = <&L2F>; /* VDD1P2_IO */ + qcom,bt-ant-ldo-supply = <&L6K>; /* AV91C_VDD Extractor */ + qcom,bt-vdd-dig-supply = <&S5F>; /* BT CX_MX LDO */ + qcom,bt-vdd-aon-supply = <&S5F>; /* RFA_CMN/AON */ + qcom,bt-vdd-rfa0p75-supply = <&S5F>; /* RFA_OP75 */ + qcom,bt-vdd-rfa1p8-supply = <&S3G>; /* RFA_1P8 */ + qcom,bt-vdd-rfa1p25-supply = <&S7I>; /* RFA_1P2 */ + + qcom,bt-vdd18-aon-config = <1800000 1800000 0 1>; + qcom,bt-vdd12-io-config = <1200000 1200000 0 1>; + qcom,bt-ant-ldo-config = <1800000 1860000 0 1>; + qcom,bt-vdd-aon-config = <876000 1000000 0 1>; + qcom,bt-vdd-dig-config = <876000 1000000 0 1>; + qcom,bt-vdd-rfa0p75-config = <876000 1000000 0 1>; + qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1>; + qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1>; + + qcom,pdc_init_table= + "{class: wlan_pdc, ss: rf, res: s5f.v, upval: 876}", + "{class: wlan_pdc, ss: rf, res: s5f.v, dwnval:660}", + "{class: wlan_pdc, ss: rf, res: s7i.v, upval: 1312}", + "{class: wlan_pdc, ss: rf, res: s7i.v, dwnval:1244}", + "{class: wlan_pdc, ss: rf, res: s3g.v, upval: 1860}", + "{class: wlan_pdc, ss: rf, res: s3g.v, dwnval: 0}"; + }; +}; + +&swr4 { + btswr_slave: btswr-slave { + compatible = "qcom,btfmswr_slave"; + reg = <0x02 0x08170220>; + }; +}; + +// FM changes +&qupv3_se5_i2c { + status = "ok"; + nq@64 { + compatible = "rtc6226"; + reg = <0x64>; + fmint-gpio = <&tlmm 84 0>; + vdd-supply = <&L16B>; + rtc6226,vdd-supply-voltage = <2800000 2800000>; + rtc6226,vdd-load = <15000>; + vio-supply = <&L15B>; + rtc6226,vio-supply-voltage = <1800000 1800000>; + }; +}; + +//uart instance +&qupv3_se14_4uart { + status = "ok"; +}; diff --git a/sun-peach-bt.dts b/sun-peach-bt.dts new file mode 100644 index 00000000..e3c8f133 --- /dev/null +++ b/sun-peach-bt.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-peach-bt.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun SoCs"; + compatible = "qcom,sun", "qcom,sunp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, + <639 0x10000>, <639 0x20000>; + qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x2000B 0>, <0x3000B 0>; +}; diff --git a/sun-peach-bt.dtsi b/sun-peach-bt.dtsi new file mode 100644 index 00000000..8c00394a --- /dev/null +++ b/sun-peach-bt.dtsi @@ -0,0 +1,101 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&pm8550vs_f_gpios { + bt_uwb_en: bt_uwb_en { + pins = "gpio3"; + function = "normal"; + input-disable; + output-enable; + bias-disable; + power-source = <1>; + }; +}; + +&tlmm { + cnss_bt_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio18"; + function = "wcn_sw_ctrl"; + }; + }; +}; + +&soc { + bluetooth: bt_peach { + compatible = "qcom,peach-bt"; + qcom,peach-bt; + pinctrl-names = "bt_uwb_en", "sw_ctrl"; + pinctrl-0 = <&bt_uwb_en>; + pinctrl-1 = <&cnss_bt_sw_ctrl>; + /* List of GPIOs to be setup for interrupt wakeup capable*/ + mpm_wake_set_gpios = <18>; + qcom,wl-reset-gpio = <&tlmm 16 0>; /* WL_EN */ + qcom,bt-sw-ctrl-gpio = <&tlmm 18 0>; /* SW_CTRL */ + qcom,bt-reset-gpio = <&pm8550vs_f_gpios 3 0>; /* BT_EN */ + qcom,qmp = <&aoss_qmp>; + + qcom,bt-vdd18-aon-supply = <&L3F>; /* VDD1P8_AON */ + qcom,bt-vdd12-io-supply = <&L2F>; /* VDD1P2_IO */ + qcom,bt-ant-ldo-supply = <&L6K>; /* AV91C_VDD Extractor */ + qcom,bt-vdd-dig-supply = <&S4J>; /* BT CX_MX LDO */ + qcom,bt-vdd-aon-supply = <&S4J>; /* RFA_CMN/AON */ + qcom,bt-vdd-rfa0p75-supply = <&S4J>; /* RFA_OP75 */ + qcom,bt-vdd-rfa1p8-supply = <&S3G>; /* RFA_1P8 */ + qcom,bt-vdd-rfa1p25-supply = <&S7I>; /* RFA_1P2 */ + + qcom,bt-vdd18-aon-config = <1800000 1800000 0 1>; + qcom,bt-vdd12-io-config = <1200000 1200000 0 1>; + qcom,bt-ant-ldo-config = <1800000 1860000 0 1>; + qcom,bt-vdd-aon-config = <876000 1000000 0 1>; + qcom,bt-vdd-dig-config = <876000 1000000 0 1>; + qcom,bt-vdd-rfa0p75-config = <876000 1000000 0 1>; + qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1>; + qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1>; + + qcom,pdc_init_table= + "{class: wlan_pdc, ss: rf, res: s4j.v, upval: 876}", + "{class: wlan_pdc, ss: rf, res: s4j.v, dwnval:660}", + "{class: wlan_pdc, ss: rf, res: s7i.v, upval: 1312}", + "{class: wlan_pdc, ss: rf, res: s7i.v, dwnval:1244}", + "{class: wlan_pdc, ss: rf, res: s3g.v, upval: 1860}", + "{class: wlan_pdc, ss: rf, res: s3g.v, dwnval: 0}"; + }; +}; + +&swr4 { + btswr_slave: btswr-slave { + compatible = "qcom,btfmswr_slave"; + reg = <0x02 0x08170220>; + }; +}; + +// FM changes +&qupv3_se5_i2c { + status = "ok"; + nq@64 { + compatible = "rtc6226"; + reg = <0x64>; + fmint-gpio = <&tlmm 84 0>; + vdd-supply = <&L16B>; + rtc6226,vdd-supply-voltage = <2800000 2800000>; + rtc6226,vdd-load = <15000>; + vio-supply = <&L15B>; + rtc6226,vio-supply-voltage = <1800000 1800000>; + }; +}; + +//uart instance +&qupv3_se14_4uart { + status = "ok"; +}; + +//q2spi instance +&qupv3_se13_q2spi { + status = "ok"; +}; From 198ed1cd092abf48ccf2fb300ab54797e4ae8327 Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Fri, 22 Dec 2023 10:00:58 +0530 Subject: [PATCH 03/57] btfm: dts: msm: Add support for kiwi in v8 sun target Add support for kiwi in v8 sun target Change-Id: I5bda39009e553cfacd32b15235b6f58ce803bb8a Signed-off-by: Hemant Gupta --- Kbuild | 1 + sun-kiwi-bt-v8.dts | 17 +++++++++++++++++ sun-kiwi-bt-v8.dtsi | 7 +++++++ 3 files changed, 25 insertions(+) create mode 100644 sun-kiwi-bt-v8.dts create mode 100644 sun-kiwi-bt-v8.dtsi diff --git a/Kbuild b/Kbuild index 3533af96..afbc4195 100644 --- a/Kbuild +++ b/Kbuild @@ -6,6 +6,7 @@ ifeq ($(CONFIG_ARCH_SUN), y) dtbo-y += sun-peach-bt.dtbo dtbo-y += sun-kiwi-bt.dtbo dtbo-y += sun-peach-bt-v8.dtbo +dtbo-y += sun-kiwi-bt-v8.dtbo endif always-y := $(dtb-y) $(dtbo-y) diff --git a/sun-kiwi-bt-v8.dts b/sun-kiwi-bt-v8.dts new file mode 100644 index 00000000..5d52bc58 --- /dev/null +++ b/sun-kiwi-bt-v8.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-kiwi-bt-v8.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun SoCs"; + compatible = "qcom,sun", "qcom,sunp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,board-id = <0x60001 0>, <0x50008 0>; +}; diff --git a/sun-kiwi-bt-v8.dtsi b/sun-kiwi-bt-v8.dtsi new file mode 100644 index 00000000..290d14fb --- /dev/null +++ b/sun-kiwi-bt-v8.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include "sun-kiwi-bt.dtsi" \ No newline at end of file From 58ed18c1b8521a73a3e9230a8b5ae22c7787a7fd Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Sat, 23 Dec 2023 21:38:22 +0530 Subject: [PATCH 04/57] btfm: dts: msm: Enable q2spi node in v8 sun target Enable q2spi node in v8 sun target Change-Id: I4bda39009e553cfacd32b15235b6f58ce803bb8a Signed-off-by: Hemant Gupta --- sun-peach-bt-v8.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sun-peach-bt-v8.dtsi b/sun-peach-bt-v8.dtsi index b1dd995f..e9a596ad 100644 --- a/sun-peach-bt-v8.dtsi +++ b/sun-peach-bt-v8.dtsi @@ -94,3 +94,10 @@ &qupv3_se14_4uart { status = "ok"; }; + +//q2spi instance +&qupv3_se13_q2spi { + status = "ok"; +}; + + From ef9639de6ec607c53144c463727b77a6c7e47e36 Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Thu, 28 Dec 2023 19:59:47 +0530 Subject: [PATCH 05/57] btfm: dts: msm: Use correct GPIO for UWB_BT_EN GPIO for v8 PMIC Use correct GPIO for UWB_BT_EN GPIO for v8 PMIC. Change-Id: I45da39009e553cfacd32b15235b6f58ce803bb8a Signed-off-by: Hemant Gupta --- sun-kiwi-bt-v8.dtsi | 100 ++++++++++++++++++++++++++++++++++++++++++- sun-peach-bt-v8.dtsi | 6 +-- 2 files changed, 101 insertions(+), 5 deletions(-) diff --git a/sun-kiwi-bt-v8.dtsi b/sun-kiwi-bt-v8.dtsi index 290d14fb..4dc543f8 100644 --- a/sun-kiwi-bt-v8.dtsi +++ b/sun-kiwi-bt-v8.dtsi @@ -4,4 +4,102 @@ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ -#include "sun-kiwi-bt.dtsi" \ No newline at end of file +#include + +&pm8550ve_f_gpios { + bt_uwb_en: bt_uwb_en { + pins = "gpio3"; + function = "normal"; + input-disable; + output-enable; + bias-disable; + power-source = <1>; + }; +}; + +&tlmm { + cnss_bt_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio18"; + function = "wcn_sw_ctrl"; + }; + }; +}; + +&soc { + bluetooth: bt_kiwi { + compatible = "qcom,kiwi"; + pinctrl-names = "bt_uwb_en", "sw_ctrl"; + pinctrl-0 = <&bt_uwb_en>; + pinctrl-1 = <&cnss_bt_sw_ctrl>; + /* List of GPIOs to be setup for interrupt wakeup capable*/ + mpm_wake_set_gpios = <18>; + qcom,wl-reset-gpio = <&tlmm 16 0>; /* WL_EN */ + qcom,bt-sw-ctrl-gpio = <&tlmm 18 0>; /* SW_CTRL */ + qcom,bt-reset-gpio = <&pm8550ve_f_gpios 3 0>; /* BT_EN */ + qcom,qmp = <&aoss_qmp>; + + qcom,bt-vdd18-aon-supply = <&L3F>; /* BT VDD1.8 AON */ + qcom,bt-vdd12-io-supply = <&L2F>; /* BT VDD1.2V IO */ + qcom,bt-ant-ldo-supply = <&L6K>; /* BT ANT - AV91C_VDD */ + qcom,bt-vdd-aon-supply = <&S1D>; /* BT AON LDO*/ + qcom,bt-vdd-rfaOp8-supply = <&S1D>; /* BT RFAOp8 CMN LDO*/ + qcom,bt-vdd-rfa1-supply = <&S7I>; /* BT RFA1.2 LDO */ + qcom,bt-vdd-rfa2-supply = <&S3G>; /* BT RFA1.8 LDO */ + + qcom,bt-vdd18-aon-config = <1800000 1800000 0 1>; + qcom,bt-vdd12-io-config = <1200000 1200000 0 1>; + qcom,bt-ant-ldo-config = <1800000 1800000 0 1>; + qcom,bt-vdd-aon-config = <916000 1100000 0 1>; + qcom,bt-vdd-rfaOp8-config = <916000 1100000 0 1>; + qcom,bt-vdd-rfa1-config = <1316000 1340000 0 1>; + qcom,bt-vdd-rfa2-config = <1864000 2000000 0 1>; + + qcom,pdc_init_table = + "{class: wlan_pdc, ss: rf, res: s3g.v, upval: 1856}", + "{class: wlan_pdc, ss: rf, res: s3g.v, dwnval: 1844}", + "{class: wlan_pdc, ss: rf, res: s7i.v, upval: 1316}", + "{class: wlan_pdc, ss: rf, res: s7i.v, dwnval: 972}", + "{class: wlan_pdc, ss: rf, res: s1d.m, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s1d.v, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s1d.v, upval: 916}", + "{class: wlan_pdc, ss: rf, res: s1d.v, dwnval: 880}"; + }; + + slim_msm: slim@6C40000 { + status = "ok"; + ngd@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <1>; + //slimbus child nodes + slimbus: btfmslim-driver { + compatible = "slim217,221"; + reg = <1 0>; + qcom,btslim-address = <0x0>; /* BT SLIM EP address*/ + qcom,btslimtx-channels = <159 160>; /* slimbus FM_Tx, SCO_Tx channels */ + qcom,btslimrx-channels = <157 158>; /* slimbus SCO_A2DP_Rx A2DP_Rx */ + }; + }; + }; +}; + +// FM changes +&qupv3_se5_i2c { + status = "ok"; + nq@64 { + compatible = "rtc6226"; + reg = <0x64>; + fmint-gpio = <&tlmm 84 0>; + vdd-supply = <&L16B>; + rtc6226,vdd-supply-voltage = <2800000 2800000>; + rtc6226,vdd-load = <15000>; + vio-supply = <&L15B>; + rtc6226,vio-supply-voltage = <1800000 1800000>; + }; +}; + +//uart instance +&qupv3_se14_4uart { + status = "ok"; +}; diff --git a/sun-peach-bt-v8.dtsi b/sun-peach-bt-v8.dtsi index e9a596ad..9c3cfaa7 100644 --- a/sun-peach-bt-v8.dtsi +++ b/sun-peach-bt-v8.dtsi @@ -6,7 +6,7 @@ #include -&pm8550vs_f_gpios { +&pm8550ve_f_gpios { bt_uwb_en: bt_uwb_en { pins = "gpio3"; function = "normal"; @@ -37,7 +37,7 @@ mpm_wake_set_gpios = <18>; qcom,wl-reset-gpio = <&tlmm 16 0>; /* WL_EN */ qcom,bt-sw-ctrl-gpio = <&tlmm 18 0>; /* SW_CTRL */ - qcom,bt-reset-gpio = <&pm8550vs_f_gpios 3 0>; /* BT_EN */ + qcom,bt-reset-gpio = <&pm8550ve_f_gpios 3 0>; /* BT_EN */ qcom,qmp = <&aoss_qmp>; qcom,bt-vdd18-aon-supply = <&L3F>; /* VDD1P8_AON */ @@ -99,5 +99,3 @@ &qupv3_se13_q2spi { status = "ok"; }; - - From 73766d0a7013651eaef7aeb5f2a1a249933468a3 Mon Sep 17 00:00:00 2001 From: Suqun Peng Date: Tue, 26 Dec 2023 15:08:07 +0800 Subject: [PATCH 06/57] btfm: dts: msm: Add support for QRD of Sun+Peach with V8 power grid Add device tree files to enable BT device for QRD of Sun+Peach using V8 power grid. Change-Id: I41449ad986a242a91a5cb20ae36cada9d09c7295 CRs-Fixed: 3695428 --- sun-peach-bt-v8.dts | 2 +- sun-peach-bt.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sun-peach-bt-v8.dts b/sun-peach-bt-v8.dts index 9618747b..00abe17c 100644 --- a/sun-peach-bt-v8.dts +++ b/sun-peach-bt-v8.dts @@ -14,5 +14,5 @@ compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>; + qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>; }; diff --git a/sun-peach-bt.dts b/sun-peach-bt.dts index e3c8f133..453917b9 100644 --- a/sun-peach-bt.dts +++ b/sun-peach-bt.dts @@ -14,5 +14,5 @@ compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x2000B 0>, <0x3000B 0>; + qcom,board-id = <1 0>, <8 0>, <0x1000B 0>; }; From 6e09c43dd26387a78542b454a5d95305af4122ca Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Sun, 7 Jan 2024 22:37:05 +0530 Subject: [PATCH 07/57] btfm: dts: msm: Add support for WCN788x Add support for WCN788x Change-Id: I4bda39109e553cfacd32b15235b6f58ce803bb8a Signed-off-by: Hemant Gupta --- Kbuild | 1 + sun-wcn788x-v8.dts | 17 ++++++++ sun-wcn788x-v8.dtsi | 96 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 sun-wcn788x-v8.dts create mode 100644 sun-wcn788x-v8.dtsi diff --git a/Kbuild b/Kbuild index afbc4195..4318b43d 100644 --- a/Kbuild +++ b/Kbuild @@ -7,6 +7,7 @@ dtbo-y += sun-peach-bt.dtbo dtbo-y += sun-kiwi-bt.dtbo dtbo-y += sun-peach-bt-v8.dtbo dtbo-y += sun-kiwi-bt-v8.dtbo +dtbo-y += sun-wcn788x-v8.dtbo endif always-y := $(dtb-y) $(dtbo-y) diff --git a/sun-wcn788x-v8.dts b/sun-wcn788x-v8.dts new file mode 100644 index 00000000..f74fde62 --- /dev/null +++ b/sun-wcn788x-v8.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-wcn788x-v8.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun SoCs"; + compatible = "qcom,sun", "qcom,sunp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,board-id = <0x30008 0>, <0x40001 0>; +}; diff --git a/sun-wcn788x-v8.dtsi b/sun-wcn788x-v8.dtsi new file mode 100644 index 00000000..14952ca7 --- /dev/null +++ b/sun-wcn788x-v8.dtsi @@ -0,0 +1,96 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&pm8550ve_f_gpios { + bt_en: bt_en { + pins = "gpio3"; + function = "normal"; + input-disable; + output-enable; + bias-disable; + power-source = <1>; + }; +}; + +&tlmm { + cnss_bt_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio18"; + function = "wcn_sw_ctrl"; + }; + }; +}; + +&soc { + bluetooth: wcn788x { + compatible = "qcom,wcn788x"; + qcom,wcn788x; + pinctrl-names = "bt_en", "sw_ctrl"; + pinctrl-0 = <&bt_en>; + pinctrl-1 = <&cnss_bt_sw_ctrl>; + /* List of GPIOs to be setup for interrupt wakeup capable*/ + mpm_wake_set_gpios = <18>; + qcom,wl-reset-gpio = <&tlmm 16 0>; /* WL_EN */ + qcom,bt-sw-ctrl-gpio = <&tlmm 18 0>; /* SW_CTRL */ + qcom,bt-reset-gpio = <&pm8550ve_f_gpios 3 0>; /* BT_EN */ + qcom,qmp = <&aoss_qmp>; + + qcom,bt-vdd18-aon-supply = <&L3F>; /* VDD1P8_AON */ + qcom,bt-vdd12-io-supply = <&L2F>; /* VDD1P2_IO */ + qcom,bt-ant-ldo-supply = <&L6K>; /* AV91C_VDD Extractor */ + qcom,bt-vdd-dig-supply = <&S5F>; /* BT CX_MX LDO */ + qcom,bt-vdd-aon-supply = <&S5F>; /* RFA_CMN/AON */ + qcom,bt-vdd-rfa0p75-supply = <&S5F>; /* RFA_OP75 */ + qcom,bt-vdd-rfa1p8-supply = <&S3G>; /* RFA_1P8 */ + qcom,bt-vdd-rfa1p25-supply = <&S7I>; /* RFA_1P2 */ + + qcom,bt-vdd18-aon-config = <1800000 1800000 0 1>; + qcom,bt-vdd12-io-config = <1200000 1200000 0 1>; + qcom,bt-ant-ldo-config = <1800000 1860000 0 1>; + qcom,bt-vdd-aon-config = <876000 1000000 0 1>; + qcom,bt-vdd-dig-config = <876000 1000000 0 1>; + qcom,bt-vdd-rfa0p75-config = <876000 1000000 0 1>; + qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1>; + qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1>; + + qcom,pdc_init_table= + "{class: wlan_pdc, ss: rf, res: s5f.v, upval: 876}", + "{class: wlan_pdc, ss: rf, res: s5f.v, dwnval:660}", + "{class: wlan_pdc, ss: rf, res: s7i.v, upval: 1312}", + "{class: wlan_pdc, ss: rf, res: s7i.v, dwnval:1244}", + "{class: wlan_pdc, ss: rf, res: s3g.v, upval: 1860}", + "{class: wlan_pdc, ss: rf, res: s3g.v, dwnval: 0}"; + }; +}; + +&swr4 { + btswr_slave: btswr-slave { + compatible = "qcom,btfmswr_slave"; + reg = <0x02 0x08170220>; + }; +}; + +// FM changes +&qupv3_se5_i2c { + status = "ok"; + nq@64 { + compatible = "rtc6226"; + reg = <0x64>; + fmint-gpio = <&tlmm 84 0>; + vdd-supply = <&L16B>; + rtc6226,vdd-supply-voltage = <2800000 2800000>; + rtc6226,vdd-load = <15000>; + vio-supply = <&L15B>; + rtc6226,vio-supply-voltage = <1800000 1800000>; + }; +}; + +//uart instance +&qupv3_se14_4uart { + status = "ok"; +}; \ No newline at end of file From ea3448d0cc75747798c0730f11845b0c40cf9870 Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Sat, 13 Jan 2024 14:43:41 +0530 Subject: [PATCH 08/57] btfm: dts: msm: Add support for RCM for sun target Add support for RCM for sun target Change-Id: I4bda49109e553cfacd32b15235b6f58ce803bb8a Signed-off-by: Hemant Gupta --- sun-kiwi-bt-v8.dts | 2 +- sun-kiwi-bt.dts | 2 +- sun-peach-bt-v8.dts | 2 +- sun-peach-bt.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sun-kiwi-bt-v8.dts b/sun-kiwi-bt-v8.dts index 5d52bc58..20608ca9 100644 --- a/sun-kiwi-bt-v8.dts +++ b/sun-kiwi-bt-v8.dts @@ -13,5 +13,5 @@ model = "Qualcomm Technologies, Inc. Sun SoCs"; compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <0x60001 0>, <0x50008 0>; + qcom,board-id = <0x60001 0>, <0x50008 0>, <0x20015 0>; }; diff --git a/sun-kiwi-bt.dts b/sun-kiwi-bt.dts index 94f693ff..76f6e15a 100644 --- a/sun-kiwi-bt.dts +++ b/sun-kiwi-bt.dts @@ -13,5 +13,5 @@ model = "Qualcomm Technologies, Inc. Sun SoCs"; compatible = "qcom,sun", "qcom,sunp", "qcom,sun-mtp", "qcom,sun-cdp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <0x20001 0>, <0x20008 0>; + qcom,board-id = <0x20001 0>, <0x20008 0>, <0x40015 0>; }; diff --git a/sun-peach-bt-v8.dts b/sun-peach-bt-v8.dts index 00abe17c..2c99405a 100644 --- a/sun-peach-bt-v8.dts +++ b/sun-peach-bt-v8.dts @@ -14,5 +14,5 @@ compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>; + qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>, <0x30015 0>; }; diff --git a/sun-peach-bt.dts b/sun-peach-bt.dts index 453917b9..80392ff5 100644 --- a/sun-peach-bt.dts +++ b/sun-peach-bt.dts @@ -14,5 +14,5 @@ compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <1 0>, <8 0>, <0x1000B 0>; + qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x15 0>; }; From 7b3922de601b67a613e8fee39e3df0bdf4865b71 Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Sat, 27 Jan 2024 18:31:52 +0530 Subject: [PATCH 09/57] btfm: dts: msm: Add Support for ATP for sun target Add Support for ATP for sun target having V8 PMIC. Change-Id: I4bdb39009e553cfacd32b15235b6f58ce803bb8a Signed-off-by: Hemant Gupta --- sun-peach-bt-v8.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sun-peach-bt-v8.dts b/sun-peach-bt-v8.dts index 2c99405a..78d0ea32 100644 --- a/sun-peach-bt-v8.dts +++ b/sun-peach-bt-v8.dts @@ -14,5 +14,6 @@ compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>, <0x30015 0>; + qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>, + <0x30015 0>, <0x10021 0>; }; From 8dc143150b8c1d10377fe1c6f9b2e439a216fbfa Mon Sep 17 00:00:00 2001 From: Balakrishna Godavarthi Date: Tue, 6 Feb 2024 12:26:45 +0530 Subject: [PATCH 10/57] btfm: dts: msm: match pdc table with WLAN This change will matches pdc table with wlan. Change-Id: I35a73fd3611315b1d60230d33d34d29a4728364d Signed-off-by: Balakrishna Godavarthi --- sun-peach-bt-v8.dtsi | 10 ++++------ sun-peach-bt.dtsi | 10 ++++------ sun-wcn788x-v8.dtsi | 12 +++++------- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/sun-peach-bt-v8.dtsi b/sun-peach-bt-v8.dtsi index 9c3cfaa7..d9ed5a5e 100644 --- a/sun-peach-bt-v8.dtsi +++ b/sun-peach-bt-v8.dtsi @@ -58,13 +58,11 @@ qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1>; qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1>; - qcom,pdc_init_table= + qcom,pdc_init_table = + "{class: wlan_pdc, ss: rf, res: s5f.m, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s5f.v, enable: 1}", "{class: wlan_pdc, ss: rf, res: s5f.v, upval: 876}", - "{class: wlan_pdc, ss: rf, res: s5f.v, dwnval:660}", - "{class: wlan_pdc, ss: rf, res: s7i.v, upval: 1312}", - "{class: wlan_pdc, ss: rf, res: s7i.v, dwnval:1244}", - "{class: wlan_pdc, ss: rf, res: s3g.v, upval: 1860}", - "{class: wlan_pdc, ss: rf, res: s3g.v, dwnval: 0}"; + "{class: wlan_pdc, ss: rf, res: s5f.v, dwnval: 876}"; }; }; diff --git a/sun-peach-bt.dtsi b/sun-peach-bt.dtsi index 8c00394a..24a330d0 100644 --- a/sun-peach-bt.dtsi +++ b/sun-peach-bt.dtsi @@ -58,13 +58,11 @@ qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1>; qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1>; - qcom,pdc_init_table= + qcom,pdc_init_table = + "{class: wlan_pdc, ss: rf, res: s4j.m, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s4j.v, enable: 1}", "{class: wlan_pdc, ss: rf, res: s4j.v, upval: 876}", - "{class: wlan_pdc, ss: rf, res: s4j.v, dwnval:660}", - "{class: wlan_pdc, ss: rf, res: s7i.v, upval: 1312}", - "{class: wlan_pdc, ss: rf, res: s7i.v, dwnval:1244}", - "{class: wlan_pdc, ss: rf, res: s3g.v, upval: 1860}", - "{class: wlan_pdc, ss: rf, res: s3g.v, dwnval: 0}"; + "{class: wlan_pdc, ss: rf, res: s4j.v, dwnval: 876}"; }; }; diff --git a/sun-wcn788x-v8.dtsi b/sun-wcn788x-v8.dtsi index 14952ca7..25a05c42 100644 --- a/sun-wcn788x-v8.dtsi +++ b/sun-wcn788x-v8.dtsi @@ -58,13 +58,11 @@ qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1>; qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1>; - qcom,pdc_init_table= + qcom,pdc_init_table = + "{class: wlan_pdc, ss: rf, res: s5f.m, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s5f.v, enable: 1}", "{class: wlan_pdc, ss: rf, res: s5f.v, upval: 876}", - "{class: wlan_pdc, ss: rf, res: s5f.v, dwnval:660}", - "{class: wlan_pdc, ss: rf, res: s7i.v, upval: 1312}", - "{class: wlan_pdc, ss: rf, res: s7i.v, dwnval:1244}", - "{class: wlan_pdc, ss: rf, res: s3g.v, upval: 1860}", - "{class: wlan_pdc, ss: rf, res: s3g.v, dwnval: 0}"; + "{class: wlan_pdc, ss: rf, res: s5f.v, dwnval: 876}"; }; }; @@ -93,4 +91,4 @@ //uart instance &qupv3_se14_4uart { status = "ok"; -}; \ No newline at end of file +}; From 50da5dc8f67d55886226a67618c902244a05f7fa Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Tue, 27 Feb 2024 00:58:43 +0530 Subject: [PATCH 11/57] btfm: dts: msm: Add support for 3.5mm Jack for sun target Add support for 3.5mm Jack for sun target Change-Id: I4bda49109e543cfacd32b15235b6f58ce803bb8a Signed-off-by: Hemant Gupta --- sun-peach-bt-v8.dts | 2 +- sun-peach-bt.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sun-peach-bt-v8.dts b/sun-peach-bt-v8.dts index 78d0ea32..f2143297 100644 --- a/sun-peach-bt-v8.dts +++ b/sun-peach-bt-v8.dts @@ -15,5 +15,5 @@ qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>, - <0x30015 0>, <0x10021 0>; + <0x30015 0>, <0x10021 0>, <0x60008 0>; }; diff --git a/sun-peach-bt.dts b/sun-peach-bt.dts index 80392ff5..7540f5fe 100644 --- a/sun-peach-bt.dts +++ b/sun-peach-bt.dts @@ -14,5 +14,5 @@ compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x15 0>; + qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x15 0>, <0x60008 0>; }; From 3527245dbd610ae2f25e8f86c3db6f092cf12b4e Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Tue, 27 Feb 2024 15:36:24 +0530 Subject: [PATCH 12/57] btfm: dts: msm: Add support for QMP1000 MTP for sun target Add support for QMP1000 MTP for sun target Change-Id: I5bda49109e543cfacd32b15235b6f58ce803bb8a Signed-off-by: Hemant Gupta --- sun-peach-bt-v8.dts | 2 +- sun-peach-bt.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sun-peach-bt-v8.dts b/sun-peach-bt-v8.dts index f2143297..5a5a8c4c 100644 --- a/sun-peach-bt-v8.dts +++ b/sun-peach-bt-v8.dts @@ -15,5 +15,5 @@ qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>, - <0x30015 0>, <0x10021 0>, <0x60008 0>; + <0x30015 0>, <0x10021 0>, <0x60008 0>, <0x40108, 0>; }; diff --git a/sun-peach-bt.dts b/sun-peach-bt.dts index 7540f5fe..a912afb4 100644 --- a/sun-peach-bt.dts +++ b/sun-peach-bt.dts @@ -14,5 +14,5 @@ compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x15 0>, <0x60008 0>; + qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x15 0>, <0x60008 0>, <0x10108, 0>; }; From 15d7e9a790ef6de4893f5894b10ec25fb624bc82 Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Wed, 28 Feb 2024 11:53:55 +0530 Subject: [PATCH 13/57] btfm: dts: msm: Add support for QMP1000 MTP for sun target Add support for QMP1000 MTP for sun target Change-Id: I5baa49109e543cfacd32b15235b6f58ce803bb8a Signed-off-by: Hemant Gupta --- sun-peach-bt-v8.dts | 2 +- sun-peach-bt.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sun-peach-bt-v8.dts b/sun-peach-bt-v8.dts index 5a5a8c4c..13b6c454 100644 --- a/sun-peach-bt-v8.dts +++ b/sun-peach-bt-v8.dts @@ -15,5 +15,5 @@ qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>, - <0x30015 0>, <0x10021 0>, <0x60008 0>, <0x40108, 0>; + <0x30015 0>, <0x10021 0>, <0x60008 0>, <0x40108 0>; }; diff --git a/sun-peach-bt.dts b/sun-peach-bt.dts index a912afb4..613e941e 100644 --- a/sun-peach-bt.dts +++ b/sun-peach-bt.dts @@ -14,5 +14,5 @@ compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x15 0>, <0x60008 0>, <0x10108, 0>; + qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x15 0>, <0x60008 0>, <0x10108 0>; }; From 5831ae02f4bf89db429d8816aa01f33607a0f023 Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Fri, 15 Mar 2024 09:24:51 +0530 Subject: [PATCH 14/57] btfm: dts: msm: Remove support for 3.5mm Jack board id for V6 sun target Add support for 3.5mm Jack board id for V6 sun peach target Change-Id: I4bda49109e543cfacd32b15135b6f58ce803bb8a Signed-off-by: Hemant Gupta --- sun-peach-bt.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun-peach-bt.dts b/sun-peach-bt.dts index 613e941e..d6b9fe56 100644 --- a/sun-peach-bt.dts +++ b/sun-peach-bt.dts @@ -14,5 +14,5 @@ compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x15 0>, <0x60008 0>, <0x10108 0>; + qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x15 0>, <0x10108 0>; }; From 905572ce34ca1704b573c5bd85e37214a6403dde Mon Sep 17 00:00:00 2001 From: janardhana rao bokka Date: Mon, 11 Mar 2024 11:29:01 +0530 Subject: [PATCH 15/57] sun: dts: Add FMD support for sun DTS - Add support for setting SDAM bit for FMD. - Add support for Reference CLK voting. - Add support for FMD Enable GPIO 6 configuration. CRs-Fixed: 3766911 Change-Id: I81d82684299611099f4a02107118d789b30b9168 --- sun-kiwi-bt-v8.dtsi | 35 +++++++++++++++++++++++++---------- sun-kiwi-bt.dtsi | 14 +++++++------- sun-peach-bt-v8.dtsi | 35 +++++++++++++++++++++++++---------- sun-peach-bt.dtsi | 16 ++++++++-------- sun-wcn788x-v8.dtsi | 35 +++++++++++++++++++++++++---------- 5 files changed, 90 insertions(+), 45 deletions(-) diff --git a/sun-kiwi-bt-v8.dtsi b/sun-kiwi-bt-v8.dtsi index 4dc543f8..80dc5b46 100644 --- a/sun-kiwi-bt-v8.dtsi +++ b/sun-kiwi-bt-v8.dtsi @@ -5,9 +5,10 @@ */ #include +#include &pm8550ve_f_gpios { - bt_uwb_en: bt_uwb_en { + bt_en: bt_en { pins = "gpio3"; function = "normal"; input-disable; @@ -15,6 +16,14 @@ bias-disable; power-source = <1>; }; + bt_fmd_clk_en: bt_fmd_clk_en { + pins = "gpio6"; + function = "normal"; + input-enable; + output-disable; + bias-disable; + power-source = <1>; + }; }; &tlmm { @@ -29,13 +38,19 @@ &soc { bluetooth: bt_kiwi { compatible = "qcom,kiwi"; - pinctrl-names = "bt_uwb_en", "sw_ctrl"; - pinctrl-0 = <&bt_uwb_en>; + nvmem-cells = <&fmd_set>; + nvmem-cell-names = "fmd_set"; + clocks = <&rpmhcc RPMH_RF_CLK1>; + clock-names = "bt_rf_clk1"; + pinctrl-names = "bt_en", "sw_ctrl", "bt_fmd_clk_en"; + pinctrl-0 = <&bt_en>; pinctrl-1 = <&cnss_bt_sw_ctrl>; + pinctrl-2 = <&bt_fmd_clk_en>; /* List of GPIOs to be setup for interrupt wakeup capable*/ mpm_wake_set_gpios = <18>; qcom,wl-reset-gpio = <&tlmm 16 0>; /* WL_EN */ qcom,bt-sw-ctrl-gpio = <&tlmm 18 0>; /* SW_CTRL */ + qcom,bt-fmd-clk-gpio = <&pm8550ve_f_gpios 6 0>; /* FMD_CLK_CTRL */ qcom,bt-reset-gpio = <&pm8550ve_f_gpios 3 0>; /* BT_EN */ qcom,qmp = <&aoss_qmp>; @@ -47,13 +62,13 @@ qcom,bt-vdd-rfa1-supply = <&S7I>; /* BT RFA1.2 LDO */ qcom,bt-vdd-rfa2-supply = <&S3G>; /* BT RFA1.8 LDO */ - qcom,bt-vdd18-aon-config = <1800000 1800000 0 1>; - qcom,bt-vdd12-io-config = <1200000 1200000 0 1>; - qcom,bt-ant-ldo-config = <1800000 1800000 0 1>; - qcom,bt-vdd-aon-config = <916000 1100000 0 1>; - qcom,bt-vdd-rfaOp8-config = <916000 1100000 0 1>; - qcom,bt-vdd-rfa1-config = <1316000 1340000 0 1>; - qcom,bt-vdd-rfa2-config = <1864000 2000000 0 1>; + qcom,bt-vdd18-aon-config = <1800000 1800000 0 1 1>; + qcom,bt-vdd12-io-config = <1200000 1200000 0 1 1>; + qcom,bt-ant-ldo-config = <1800000 1800000 0 1 0>; + qcom,bt-vdd-aon-config = <916000 1100000 0 1 0>; + qcom,bt-vdd-rfaOp8-config = <916000 1100000 0 1 0>; + qcom,bt-vdd-rfa1-config = <1316000 1340000 0 1 0>; + qcom,bt-vdd-rfa2-config = <1864000 2000000 0 1 0>; qcom,pdc_init_table = "{class: wlan_pdc, ss: rf, res: s3g.v, upval: 1856}", diff --git a/sun-kiwi-bt.dtsi b/sun-kiwi-bt.dtsi index cbb6cb43..1719c052 100644 --- a/sun-kiwi-bt.dtsi +++ b/sun-kiwi-bt.dtsi @@ -47,13 +47,13 @@ qcom,bt-vdd-rfa1-supply = <&S7I>; /* BT RFA1.2 LDO */ qcom,bt-vdd-rfa2-supply = <&S3G>; /* BT RFA1.8 LDO */ - qcom,bt-vdd18-aon-config = <1800000 1800000 0 1>; - qcom,bt-vdd12-io-config = <1200000 1200000 0 1>; - qcom,bt-ant-ldo-config = <1800000 1800000 0 1>; - qcom,bt-vdd-aon-config = <916000 1100000 0 1>; - qcom,bt-vdd-rfaOp8-config = <916000 1100000 0 1>; - qcom,bt-vdd-rfa1-config = <1316000 1340000 0 1>; - qcom,bt-vdd-rfa2-config = <1864000 2000000 0 1>; + qcom,bt-vdd18-aon-config = <1800000 1800000 0 1 0>; + qcom,bt-vdd12-io-config = <1200000 1200000 0 1 0>; + qcom,bt-ant-ldo-config = <1800000 1800000 0 1 0>; + qcom,bt-vdd-aon-config = <916000 1100000 0 1 0>; + qcom,bt-vdd-rfaOp8-config = <916000 1100000 0 1 0>; + qcom,bt-vdd-rfa1-config = <1316000 1340000 0 1 0>; + qcom,bt-vdd-rfa2-config = <1864000 2000000 0 1 0>; qcom,pdc_init_table = "{class: wlan_pdc, ss: rf, res: s3g.v, upval: 1856}", diff --git a/sun-peach-bt-v8.dtsi b/sun-peach-bt-v8.dtsi index d9ed5a5e..c19457ec 100644 --- a/sun-peach-bt-v8.dtsi +++ b/sun-peach-bt-v8.dtsi @@ -5,6 +5,7 @@ */ #include +#include &pm8550ve_f_gpios { bt_uwb_en: bt_uwb_en { @@ -15,6 +16,14 @@ bias-disable; power-source = <1>; }; + bt_fmd_clk_en: bt_fmd_clk_en { + pins = "gpio6"; + function = "normal"; + input-enable; + output-disable; + bias-disable; + power-source = <1>; + }; }; &tlmm { @@ -29,14 +38,20 @@ &soc { bluetooth: bt_peach { compatible = "qcom,peach-bt"; + nvmem-cells = <&fmd_set>; + nvmem-cell-names = "fmd_set"; + clocks = <&rpmhcc RPMH_RF_CLK1>; + clock-names = "bt_rf_clk1"; qcom,peach-bt; - pinctrl-names = "bt_uwb_en", "sw_ctrl"; + pinctrl-names = "bt_uwb_en", "sw_ctrl", "bt_fmd_clk_en"; pinctrl-0 = <&bt_uwb_en>; pinctrl-1 = <&cnss_bt_sw_ctrl>; + pinctrl-2 = <&bt_fmd_clk_en>; /* List of GPIOs to be setup for interrupt wakeup capable*/ - mpm_wake_set_gpios = <18>; + mpm_wake_set_gpios = <18 9>; qcom,wl-reset-gpio = <&tlmm 16 0>; /* WL_EN */ qcom,bt-sw-ctrl-gpio = <&tlmm 18 0>; /* SW_CTRL */ + qcom,bt-fmd-clk-gpio = <&pm8550ve_f_gpios 6 0>; /* FMD_CLK_CTRL */ qcom,bt-reset-gpio = <&pm8550ve_f_gpios 3 0>; /* BT_EN */ qcom,qmp = <&aoss_qmp>; @@ -49,14 +64,14 @@ qcom,bt-vdd-rfa1p8-supply = <&S3G>; /* RFA_1P8 */ qcom,bt-vdd-rfa1p25-supply = <&S7I>; /* RFA_1P2 */ - qcom,bt-vdd18-aon-config = <1800000 1800000 0 1>; - qcom,bt-vdd12-io-config = <1200000 1200000 0 1>; - qcom,bt-ant-ldo-config = <1800000 1860000 0 1>; - qcom,bt-vdd-aon-config = <876000 1000000 0 1>; - qcom,bt-vdd-dig-config = <876000 1000000 0 1>; - qcom,bt-vdd-rfa0p75-config = <876000 1000000 0 1>; - qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1>; - qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1>; + qcom,bt-vdd18-aon-config = <1800000 1800000 0 1 1>; + qcom,bt-vdd12-io-config = <1200000 1200000 0 1 1>; + qcom,bt-ant-ldo-config = <1800000 1860000 0 1 0>; + qcom,bt-vdd-aon-config = <876000 1000000 0 1 0>; + qcom,bt-vdd-dig-config = <876000 1000000 0 1 0>; + qcom,bt-vdd-rfa0p75-config = <876000 1000000 0 1 0>; + qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1 0>; + qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1 0>; qcom,pdc_init_table = "{class: wlan_pdc, ss: rf, res: s5f.m, enable: 1}", diff --git a/sun-peach-bt.dtsi b/sun-peach-bt.dtsi index 24a330d0..5c392ed0 100644 --- a/sun-peach-bt.dtsi +++ b/sun-peach-bt.dtsi @@ -49,14 +49,14 @@ qcom,bt-vdd-rfa1p8-supply = <&S3G>; /* RFA_1P8 */ qcom,bt-vdd-rfa1p25-supply = <&S7I>; /* RFA_1P2 */ - qcom,bt-vdd18-aon-config = <1800000 1800000 0 1>; - qcom,bt-vdd12-io-config = <1200000 1200000 0 1>; - qcom,bt-ant-ldo-config = <1800000 1860000 0 1>; - qcom,bt-vdd-aon-config = <876000 1000000 0 1>; - qcom,bt-vdd-dig-config = <876000 1000000 0 1>; - qcom,bt-vdd-rfa0p75-config = <876000 1000000 0 1>; - qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1>; - qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1>; + qcom,bt-vdd18-aon-config = <1800000 1800000 0 1 0>; + qcom,bt-vdd12-io-config = <1200000 1200000 0 1 0>; + qcom,bt-ant-ldo-config = <1800000 1860000 0 1 0>; + qcom,bt-vdd-aon-config = <876000 1000000 0 1 0>; + qcom,bt-vdd-dig-config = <876000 1000000 0 1 0>; + qcom,bt-vdd-rfa0p75-config = <876000 1000000 0 1 0>; + qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1 0>; + qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1 0>; qcom,pdc_init_table = "{class: wlan_pdc, ss: rf, res: s4j.m, enable: 1}", diff --git a/sun-wcn788x-v8.dtsi b/sun-wcn788x-v8.dtsi index 25a05c42..39b6ce65 100644 --- a/sun-wcn788x-v8.dtsi +++ b/sun-wcn788x-v8.dtsi @@ -5,6 +5,7 @@ */ #include +#include &pm8550ve_f_gpios { bt_en: bt_en { @@ -15,6 +16,14 @@ bias-disable; power-source = <1>; }; + bt_fmd_clk_en: bt_fmd_clk_en { + pins = "gpio6"; + function = "normal"; + input-enable; + output-disable; + bias-disable; + power-source = <1>; + }; }; &tlmm { @@ -29,14 +38,20 @@ &soc { bluetooth: wcn788x { compatible = "qcom,wcn788x"; + nvmem-cells = <&fmd_set>; + nvmem-cell-names = "fmd_set"; + clocks = <&rpmhcc RPMH_RF_CLK1>; + clock-names = "bt_rf_clk1"; qcom,wcn788x; - pinctrl-names = "bt_en", "sw_ctrl"; + pinctrl-names = "bt_en", "sw_ctrl", "bt_fmd_clk_en"; pinctrl-0 = <&bt_en>; pinctrl-1 = <&cnss_bt_sw_ctrl>; + pinctrl-2 = <&bt_fmd_clk_en>; /* List of GPIOs to be setup for interrupt wakeup capable*/ - mpm_wake_set_gpios = <18>; + mpm_wake_set_gpios = <18 9>; qcom,wl-reset-gpio = <&tlmm 16 0>; /* WL_EN */ qcom,bt-sw-ctrl-gpio = <&tlmm 18 0>; /* SW_CTRL */ + qcom,bt-fmd-clk-gpio = <&pm8550ve_f_gpios 6 0>; /* FMD_CLK_CTRL */ qcom,bt-reset-gpio = <&pm8550ve_f_gpios 3 0>; /* BT_EN */ qcom,qmp = <&aoss_qmp>; @@ -49,14 +64,14 @@ qcom,bt-vdd-rfa1p8-supply = <&S3G>; /* RFA_1P8 */ qcom,bt-vdd-rfa1p25-supply = <&S7I>; /* RFA_1P2 */ - qcom,bt-vdd18-aon-config = <1800000 1800000 0 1>; - qcom,bt-vdd12-io-config = <1200000 1200000 0 1>; - qcom,bt-ant-ldo-config = <1800000 1860000 0 1>; - qcom,bt-vdd-aon-config = <876000 1000000 0 1>; - qcom,bt-vdd-dig-config = <876000 1000000 0 1>; - qcom,bt-vdd-rfa0p75-config = <876000 1000000 0 1>; - qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1>; - qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1>; + qcom,bt-vdd18-aon-config = <1800000 1800000 0 1 1>; + qcom,bt-vdd12-io-config = <1200000 1200000 0 1 1>; + qcom,bt-ant-ldo-config = <1800000 1860000 0 1 0>; + qcom,bt-vdd-aon-config = <876000 1000000 0 1 0>; + qcom,bt-vdd-dig-config = <876000 1000000 0 1 0>; + qcom,bt-vdd-rfa0p75-config = <876000 1000000 0 1 0>; + qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1 0>; + qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1 0>; qcom,pdc_init_table = "{class: wlan_pdc, ss: rf, res: s5f.m, enable: 1}", From 40b04c66cc449c6f402073a9c5127ffde98d93af Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Wed, 20 Mar 2024 10:43:06 +0530 Subject: [PATCH 16/57] btfm: dts: msm: Add support for thick and thin MSM id's sun target Add support for thick and thin MSM id's Change-Id: I4bda49109e543cfacd32b15135b6f58ce803bb3a Signed-off-by: Hemant Gupta --- sun-kiwi-bt-v8.dts | 4 +++- sun-kiwi-bt.dts | 4 +++- sun-peach-bt-v8.dts | 6 ++++-- sun-peach-bt.dts | 4 +++- sun-wcn788x-v8.dts | 4 +++- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/sun-kiwi-bt-v8.dts b/sun-kiwi-bt-v8.dts index 20608ca9..7c36a5cc 100644 --- a/sun-kiwi-bt-v8.dts +++ b/sun-kiwi-bt-v8.dts @@ -12,6 +12,8 @@ / { model = "Qualcomm Technologies, Inc. Sun SoCs"; compatible = "qcom,sun", "qcom,sunp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x60001 0>, <0x50008 0>, <0x20015 0>; }; diff --git a/sun-kiwi-bt.dts b/sun-kiwi-bt.dts index 76f6e15a..d804f43c 100644 --- a/sun-kiwi-bt.dts +++ b/sun-kiwi-bt.dts @@ -12,6 +12,8 @@ / { model = "Qualcomm Technologies, Inc. Sun SoCs"; compatible = "qcom,sun", "qcom,sunp", "qcom,sun-mtp", "qcom,sun-cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x20001 0>, <0x20008 0>, <0x40015 0>; }; diff --git a/sun-peach-bt-v8.dts b/sun-peach-bt-v8.dts index 13b6c454..918bee2d 100644 --- a/sun-peach-bt-v8.dts +++ b/sun-peach-bt-v8.dts @@ -13,7 +13,9 @@ model = "Qualcomm Technologies, Inc. Sun SoCs"; compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, - <639 0x10000>, <639 0x20000>; + <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>, - <0x30015 0>, <0x10021 0>, <0x60008 0>, <0x40108 0>; + <0x30015 0>, <0x10021 0>, <0x60008 0>, <0x40108 0>; }; diff --git a/sun-peach-bt.dts b/sun-peach-bt.dts index d6b9fe56..c08c8300 100644 --- a/sun-peach-bt.dts +++ b/sun-peach-bt.dts @@ -13,6 +13,8 @@ model = "Qualcomm Technologies, Inc. Sun SoCs"; compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, - <639 0x10000>, <639 0x20000>; + <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x15 0>, <0x10108 0>; }; diff --git a/sun-wcn788x-v8.dts b/sun-wcn788x-v8.dts index f74fde62..9dd3d7f7 100644 --- a/sun-wcn788x-v8.dts +++ b/sun-wcn788x-v8.dts @@ -12,6 +12,8 @@ / { model = "Qualcomm Technologies, Inc. Sun SoCs"; compatible = "qcom,sun", "qcom,sunp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x30008 0>, <0x40001 0>; }; From b563a54327492606c684a76885b254080e3671c9 Mon Sep 17 00:00:00 2001 From: Suqun Peng Date: Thu, 7 Mar 2024 14:20:45 +0800 Subject: [PATCH 17/57] btfm: dts: msm: Add support for SunP HDK Add support for SunP HDK Change-Id: I4ddbe8caf7c710debc57aec713aa255a2f226a3c Signed-off-by: Suqun Peng --- Kbuild | 1 + sun-peach-bt-v8.dtsi | 2 +- sunp-hdk-peach-bt-v8.dts | 17 +++++++++++++++++ sunp-hdk-peach-bt-v8.dtsi | 14 ++++++++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 sunp-hdk-peach-bt-v8.dts create mode 100644 sunp-hdk-peach-bt-v8.dtsi diff --git a/Kbuild b/Kbuild index 4318b43d..f2c15e1b 100644 --- a/Kbuild +++ b/Kbuild @@ -8,6 +8,7 @@ dtbo-y += sun-kiwi-bt.dtbo dtbo-y += sun-peach-bt-v8.dtbo dtbo-y += sun-kiwi-bt-v8.dtbo dtbo-y += sun-wcn788x-v8.dtbo +dtbo-y += sunp-hdk-peach-bt-v8.dtbo endif always-y := $(dtb-y) $(dtbo-y) diff --git a/sun-peach-bt-v8.dtsi b/sun-peach-bt-v8.dtsi index d9ed5a5e..5789308e 100644 --- a/sun-peach-bt-v8.dtsi +++ b/sun-peach-bt-v8.dtsi @@ -76,7 +76,7 @@ // FM changes &qupv3_se5_i2c { status = "ok"; - nq@64 { + fm_rtc6226: nq@64 { compatible = "rtc6226"; reg = <0x64>; fmint-gpio = <&tlmm 84 0>; diff --git a/sunp-hdk-peach-bt-v8.dts b/sunp-hdk-peach-bt-v8.dts new file mode 100644 index 00000000..3b626513 --- /dev/null +++ b/sunp-hdk-peach-bt-v8.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sunp-hdk-peach-bt-v8.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun SoCs HDK"; + compatible = "qcom,sunp-hdk", "qcom,sunp", "qcom,hdk"; + qcom,msm-id = <639 0x10000>, <639 0x20000>, <618 0x10000>, <618 0x20000>; + qcom,board-id = <0x1001f 0>; +}; diff --git a/sunp-hdk-peach-bt-v8.dtsi b/sunp-hdk-peach-bt-v8.dtsi new file mode 100644 index 00000000..24588768 --- /dev/null +++ b/sunp-hdk-peach-bt-v8.dtsi @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include "sun-peach-bt-v8.dtsi" + +/delete-node/ &fm_rtc6226; + +&bluetooth { + /delete-property/ qcom,bt-ant-ldo-supply; + /delete-property/ qcom,bt-ant-ldo-config; +}; \ No newline at end of file From 7c1787aa4da91e5205c75979edc320c9a48b0149 Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Fri, 29 Mar 2024 00:29:36 +0530 Subject: [PATCH 18/57] btfm: dts: msm: Update board id for QMP1000 on MTP for V6 sun peach target Update board id for QMP1000 on MTP for V6 sun peach target Change-Id: I4fda49109e543cfacd32b15135b6f58ce803bb8a Signed-off-by: Hemant Gupta --- sun-peach-bt.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun-peach-bt.dts b/sun-peach-bt.dts index c08c8300..abfe3f1a 100644 --- a/sun-peach-bt.dts +++ b/sun-peach-bt.dts @@ -16,5 +16,5 @@ <639 0x10000>, <639 0x20000>, <0x100026a 0x10000>, <0x100026a 0x20000>, <0x100027f 0x10000>, <0x100027f 0x20000>; - qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x15 0>, <0x10108 0>; + qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x15 0>, <0x108 0>; }; From 19d486101e79803387188afdb59ea8cdf7dd5158 Mon Sep 17 00:00:00 2001 From: Suqun Peng Date: Tue, 23 Apr 2024 10:03:16 +0800 Subject: [PATCH 19/57] btfm: dts: msm: Update board id for VIVO on QRD for V8 sun peach target Update board id for VIVO on QRD for V8 sun peach target Signed-off-by: Suqun Peng CRs-Fixed: 3793000 Change-Id: Id365ec4a45b76259669e6354b5a24aa5bb26a99a --- sun-peach-bt-v8.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun-peach-bt-v8.dts b/sun-peach-bt-v8.dts index 918bee2d..cb69fcef 100644 --- a/sun-peach-bt-v8.dts +++ b/sun-peach-bt-v8.dts @@ -16,6 +16,6 @@ <639 0x10000>, <639 0x20000>, <0x100026a 0x10000>, <0x100026a 0x20000>, <0x100027f 0x10000>, <0x100027f 0x20000>; - qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>, + qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x3000B 1>,<0x2000B 0>, <0x30015 0>, <0x10021 0>, <0x60008 0>, <0x40108 0>; }; From e81e178cd3d9d06aa148b62a591a141a018e928e Mon Sep 17 00:00:00 2001 From: Suqun Peng Date: Fri, 26 Apr 2024 09:41:54 +0800 Subject: [PATCH 20/57] btfm: dts: msm: Add support for thick and thin MSM id's sun HDK Add support for thick and thin MSM id's sun HDK Change-Id: I0a5279fbb71688eb8631570ecb45379c299056d4 Signed-off-by: Suqun Peng --- sunp-hdk-peach-bt-v8.dts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sunp-hdk-peach-bt-v8.dts b/sunp-hdk-peach-bt-v8.dts index 3b626513..230d6179 100644 --- a/sunp-hdk-peach-bt-v8.dts +++ b/sunp-hdk-peach-bt-v8.dts @@ -12,6 +12,8 @@ / { model = "Qualcomm Technologies, Inc. Sun SoCs HDK"; compatible = "qcom,sunp-hdk", "qcom,sunp", "qcom,hdk"; - qcom,msm-id = <639 0x10000>, <639 0x20000>, <618 0x10000>, <618 0x20000>; + qcom,msm-id = <639 0x10000>, <639 0x20000>, <618 0x10000>, <618 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x1001f 0>; }; From 6d96a9f04b31246cc229e12b7e7aca60ac069488 Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Thu, 18 Jan 2024 09:50:59 +0530 Subject: [PATCH 21/57] btfm: dts: msm: Set Load on L2F/L3F regulators for NPM mode Set Load on L2F/L3F regulators for NPM mode. Change-Id: I4bca39109e553cfacd32b15235b6f58ce803bb8a Signed-off-by: Hemant Gupta --- sun-kiwi-bt-v8.dtsi | 4 ++-- sun-kiwi-bt.dtsi | 4 ++-- sun-peach-bt-v8.dtsi | 4 ++-- sun-peach-bt.dtsi | 4 ++-- sun-wcn788x-v8.dtsi | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sun-kiwi-bt-v8.dtsi b/sun-kiwi-bt-v8.dtsi index 80dc5b46..992781bd 100644 --- a/sun-kiwi-bt-v8.dtsi +++ b/sun-kiwi-bt-v8.dtsi @@ -62,8 +62,8 @@ qcom,bt-vdd-rfa1-supply = <&S7I>; /* BT RFA1.2 LDO */ qcom,bt-vdd-rfa2-supply = <&S3G>; /* BT RFA1.8 LDO */ - qcom,bt-vdd18-aon-config = <1800000 1800000 0 1 1>; - qcom,bt-vdd12-io-config = <1200000 1200000 0 1 1>; + qcom,bt-vdd18-aon-config = <1800000 1800000 30000 1 1>; + qcom,bt-vdd12-io-config = <1200000 1200000 30000 1 1>; qcom,bt-ant-ldo-config = <1800000 1800000 0 1 0>; qcom,bt-vdd-aon-config = <916000 1100000 0 1 0>; qcom,bt-vdd-rfaOp8-config = <916000 1100000 0 1 0>; diff --git a/sun-kiwi-bt.dtsi b/sun-kiwi-bt.dtsi index 1719c052..0f502278 100644 --- a/sun-kiwi-bt.dtsi +++ b/sun-kiwi-bt.dtsi @@ -47,8 +47,8 @@ qcom,bt-vdd-rfa1-supply = <&S7I>; /* BT RFA1.2 LDO */ qcom,bt-vdd-rfa2-supply = <&S3G>; /* BT RFA1.8 LDO */ - qcom,bt-vdd18-aon-config = <1800000 1800000 0 1 0>; - qcom,bt-vdd12-io-config = <1200000 1200000 0 1 0>; + qcom,bt-vdd18-aon-config = <1800000 1800000 30000 1 0>; + qcom,bt-vdd12-io-config = <1200000 1200000 30000 1 0>; qcom,bt-ant-ldo-config = <1800000 1800000 0 1 0>; qcom,bt-vdd-aon-config = <916000 1100000 0 1 0>; qcom,bt-vdd-rfaOp8-config = <916000 1100000 0 1 0>; diff --git a/sun-peach-bt-v8.dtsi b/sun-peach-bt-v8.dtsi index 0acbcb2b..fd3b3506 100644 --- a/sun-peach-bt-v8.dtsi +++ b/sun-peach-bt-v8.dtsi @@ -64,8 +64,8 @@ qcom,bt-vdd-rfa1p8-supply = <&S3G>; /* RFA_1P8 */ qcom,bt-vdd-rfa1p25-supply = <&S7I>; /* RFA_1P2 */ - qcom,bt-vdd18-aon-config = <1800000 1800000 0 1 1>; - qcom,bt-vdd12-io-config = <1200000 1200000 0 1 1>; + qcom,bt-vdd18-aon-config = <1800000 1800000 30000 1 1>; + qcom,bt-vdd12-io-config = <1200000 1200000 30000 1 1>; qcom,bt-ant-ldo-config = <1800000 1860000 0 1 0>; qcom,bt-vdd-aon-config = <876000 1000000 0 1 0>; qcom,bt-vdd-dig-config = <876000 1000000 0 1 0>; diff --git a/sun-peach-bt.dtsi b/sun-peach-bt.dtsi index 5c392ed0..0ef4c18b 100644 --- a/sun-peach-bt.dtsi +++ b/sun-peach-bt.dtsi @@ -49,8 +49,8 @@ qcom,bt-vdd-rfa1p8-supply = <&S3G>; /* RFA_1P8 */ qcom,bt-vdd-rfa1p25-supply = <&S7I>; /* RFA_1P2 */ - qcom,bt-vdd18-aon-config = <1800000 1800000 0 1 0>; - qcom,bt-vdd12-io-config = <1200000 1200000 0 1 0>; + qcom,bt-vdd18-aon-config = <1800000 1800000 30000 1 0>; + qcom,bt-vdd12-io-config = <1200000 1200000 30000 1 0>; qcom,bt-ant-ldo-config = <1800000 1860000 0 1 0>; qcom,bt-vdd-aon-config = <876000 1000000 0 1 0>; qcom,bt-vdd-dig-config = <876000 1000000 0 1 0>; diff --git a/sun-wcn788x-v8.dtsi b/sun-wcn788x-v8.dtsi index 39b6ce65..96cb39d6 100644 --- a/sun-wcn788x-v8.dtsi +++ b/sun-wcn788x-v8.dtsi @@ -64,8 +64,8 @@ qcom,bt-vdd-rfa1p8-supply = <&S3G>; /* RFA_1P8 */ qcom,bt-vdd-rfa1p25-supply = <&S7I>; /* RFA_1P2 */ - qcom,bt-vdd18-aon-config = <1800000 1800000 0 1 1>; - qcom,bt-vdd12-io-config = <1200000 1200000 0 1 1>; + qcom,bt-vdd18-aon-config = <1800000 1800000 30000 1 1>; + qcom,bt-vdd12-io-config = <1200000 1200000 30000 1 1>; qcom,bt-ant-ldo-config = <1800000 1860000 0 1 0>; qcom,bt-vdd-aon-config = <876000 1000000 0 1 0>; qcom,bt-vdd-dig-config = <876000 1000000 0 1 0>; From d3dd31616298cafdc3b634496e1e5ed587841cb1 Mon Sep 17 00:00:00 2001 From: Girish BN Date: Wed, 8 May 2024 22:34:37 +0530 Subject: [PATCH 22/57] btpower: Add wlan regulator for FMD Operation - Add S4D wlan buck for FMD operation Change-Id: Ibf61e3f4b1ea7c1079450a8b1adcac58a35bda56 Signed-off-by: Girish BN --- sun-peach-bt-v8.dtsi | 4 ++++ sun-wcn788x-v8.dtsi | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sun-peach-bt-v8.dtsi b/sun-peach-bt-v8.dtsi index fd3b3506..8d5b74bb 100644 --- a/sun-peach-bt-v8.dtsi +++ b/sun-peach-bt-v8.dtsi @@ -73,6 +73,10 @@ qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1 0>; qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1 0>; + /* WLAN regulator for FMD feature */ + qcom,bt-vdd-wlan-aon-supply = <&S4D>; + qcom,bt-vdd-wlan-aon-config = <876000 1036000 0 0 1>; + qcom,pdc_init_table = "{class: wlan_pdc, ss: rf, res: s5f.m, enable: 1}", "{class: wlan_pdc, ss: rf, res: s5f.v, enable: 1}", diff --git a/sun-wcn788x-v8.dtsi b/sun-wcn788x-v8.dtsi index 96cb39d6..c207ad33 100644 --- a/sun-wcn788x-v8.dtsi +++ b/sun-wcn788x-v8.dtsi @@ -73,6 +73,10 @@ qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1 0>; qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1 0>; + /* WLAN regulator for FMD operation, and to be used only in GNG/BRH 2.0 */ + qcom,bt-vdd-wlan-aon-supply = <&S4D>; + qcom,bt-vdd-wlan-aon-config = <876000 1036000 0 0 1>; + qcom,pdc_init_table = "{class: wlan_pdc, ss: rf, res: s5f.m, enable: 1}", "{class: wlan_pdc, ss: rf, res: s5f.v, enable: 1}", From 9b2c2c78f262ef8410683270700bd82e5e4e100f Mon Sep 17 00:00:00 2001 From: Girish BN Date: Tue, 11 Jun 2024 10:53:10 +0530 Subject: [PATCH 23/57] Regulator S5F dtsi change for FMD operation. - Enable S5F for FMD operation Change-Id: I0a37df55643ab3f016cf68bca36e8fdad7df7837 Signed-off-by: Girish BN --- sun-peach-bt-v8.dtsi | 2 +- sun-wcn788x-v8.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sun-peach-bt-v8.dtsi b/sun-peach-bt-v8.dtsi index 8d5b74bb..f2bef0c5 100644 --- a/sun-peach-bt-v8.dtsi +++ b/sun-peach-bt-v8.dtsi @@ -68,7 +68,7 @@ qcom,bt-vdd12-io-config = <1200000 1200000 30000 1 1>; qcom,bt-ant-ldo-config = <1800000 1860000 0 1 0>; qcom,bt-vdd-aon-config = <876000 1000000 0 1 0>; - qcom,bt-vdd-dig-config = <876000 1000000 0 1 0>; + qcom,bt-vdd-dig-config = <876000 1000000 0 1 1>; qcom,bt-vdd-rfa0p75-config = <876000 1000000 0 1 0>; qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1 0>; qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1 0>; diff --git a/sun-wcn788x-v8.dtsi b/sun-wcn788x-v8.dtsi index c207ad33..75d5ecb2 100644 --- a/sun-wcn788x-v8.dtsi +++ b/sun-wcn788x-v8.dtsi @@ -68,7 +68,7 @@ qcom,bt-vdd12-io-config = <1200000 1200000 30000 1 1>; qcom,bt-ant-ldo-config = <1800000 1860000 0 1 0>; qcom,bt-vdd-aon-config = <876000 1000000 0 1 0>; - qcom,bt-vdd-dig-config = <876000 1000000 0 1 0>; + qcom,bt-vdd-dig-config = <876000 1000000 0 1 1>; qcom,bt-vdd-rfa0p75-config = <876000 1000000 0 1 0>; qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1 0>; qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1 0>; From cffcc7f2b2050afb6929a192775b92d05639a6ff Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Wed, 26 Jun 2024 07:39:59 +0530 Subject: [PATCH 24/57] btfm: dts: msm: Add support for 3.5mm Jack for V8 kiwi target Add support for 3.5mm Jack for V8 sun kiwi target Change-Id: I4bda49109e543ffacd32b15135b6f58ce803bb8a Signed-off-by: Hemant Gupta --- sun-kiwi-bt-v8.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun-kiwi-bt-v8.dts b/sun-kiwi-bt-v8.dts index 7c36a5cc..5170bc27 100644 --- a/sun-kiwi-bt-v8.dts +++ b/sun-kiwi-bt-v8.dts @@ -15,5 +15,5 @@ qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, <0x100026a 0x10000>, <0x100026a 0x20000>, <0x100027f 0x10000>, <0x100027f 0x20000>; - qcom,board-id = <0x60001 0>, <0x50008 0>, <0x20015 0>; + qcom,board-id = <0x60001 0>, <0x50008 0>, <0x20015 0>, <0x60108 0>; }; From 523eb1e50453ca62019b4c8b89a94e712922bf16 Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Fri, 28 Jun 2024 13:37:20 +0530 Subject: [PATCH 25/57] btfm: dts: msm: Rename wcn788x to wcn786x Rename wcn788x to wcn786x Change-Id: I4bda49109e543ffacd32b15135b6f58ce803bb8b Signed-off-by: Hemant Gupta --- Kbuild | 2 +- sun-wcn788x-v8.dts => sun-wcn786x-v8.dts | 2 +- sun-wcn788x-v8.dtsi => sun-wcn786x-v8.dtsi | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename sun-wcn788x-v8.dts => sun-wcn786x-v8.dts (93%) rename sun-wcn788x-v8.dtsi => sun-wcn786x-v8.dtsi (97%) diff --git a/Kbuild b/Kbuild index f2c15e1b..cf4fd8d6 100644 --- a/Kbuild +++ b/Kbuild @@ -7,7 +7,7 @@ dtbo-y += sun-peach-bt.dtbo dtbo-y += sun-kiwi-bt.dtbo dtbo-y += sun-peach-bt-v8.dtbo dtbo-y += sun-kiwi-bt-v8.dtbo -dtbo-y += sun-wcn788x-v8.dtbo +dtbo-y += sun-wcn786x-v8.dtbo dtbo-y += sunp-hdk-peach-bt-v8.dtbo endif diff --git a/sun-wcn788x-v8.dts b/sun-wcn786x-v8.dts similarity index 93% rename from sun-wcn788x-v8.dts rename to sun-wcn786x-v8.dts index 9dd3d7f7..058ce1ad 100644 --- a/sun-wcn788x-v8.dts +++ b/sun-wcn786x-v8.dts @@ -7,7 +7,7 @@ /dts-v1/; /plugin/; -#include "sun-wcn788x-v8.dtsi" +#include "sun-wcn786x-v8.dtsi" / { model = "Qualcomm Technologies, Inc. Sun SoCs"; diff --git a/sun-wcn788x-v8.dtsi b/sun-wcn786x-v8.dtsi similarity index 97% rename from sun-wcn788x-v8.dtsi rename to sun-wcn786x-v8.dtsi index 75d5ecb2..f3560e31 100644 --- a/sun-wcn788x-v8.dtsi +++ b/sun-wcn786x-v8.dtsi @@ -36,13 +36,13 @@ }; &soc { - bluetooth: wcn788x { - compatible = "qcom,wcn788x"; + bluetooth: wcn786x { + compatible = "qcom,wcn786x"; nvmem-cells = <&fmd_set>; nvmem-cell-names = "fmd_set"; clocks = <&rpmhcc RPMH_RF_CLK1>; clock-names = "bt_rf_clk1"; - qcom,wcn788x; + qcom,wcn786x; pinctrl-names = "bt_en", "sw_ctrl", "bt_fmd_clk_en"; pinctrl-0 = <&bt_en>; pinctrl-1 = <&cnss_bt_sw_ctrl>; From fc611ec6beb4e2ad5f0659f692304d675ef29af7 Mon Sep 17 00:00:00 2001 From: Girish BN Date: Tue, 23 Jul 2024 18:07:24 +0530 Subject: [PATCH 26/57] btpower: Add NVMEM cells for FMD operation - Add NVMEM cells for FMD operation Change-Id: I6ea0473ecc5af21f883cf722670ef9d9a5f0b6b4 Signed-off-by: Girish BN --- sun-kiwi-bt-v8.dtsi | 4 ++-- sun-peach-bt-v8.dtsi | 4 ++-- sun-wcn786x-v8.dtsi | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sun-kiwi-bt-v8.dtsi b/sun-kiwi-bt-v8.dtsi index 992781bd..3fc921d3 100644 --- a/sun-kiwi-bt-v8.dtsi +++ b/sun-kiwi-bt-v8.dtsi @@ -38,8 +38,8 @@ &soc { bluetooth: bt_kiwi { compatible = "qcom,kiwi"; - nvmem-cells = <&fmd_set>; - nvmem-cell-names = "fmd_set"; + nvmem-cells = <&fmd_set>, <&fmd_chg_pon>, <&fmd_cnt2_stop>; + nvmem-cell-names = "fmd_set", "fmd_chg_pon", "fmd_cnt2_stop"; clocks = <&rpmhcc RPMH_RF_CLK1>; clock-names = "bt_rf_clk1"; pinctrl-names = "bt_en", "sw_ctrl", "bt_fmd_clk_en"; diff --git a/sun-peach-bt-v8.dtsi b/sun-peach-bt-v8.dtsi index f2bef0c5..12a51baa 100644 --- a/sun-peach-bt-v8.dtsi +++ b/sun-peach-bt-v8.dtsi @@ -38,8 +38,8 @@ &soc { bluetooth: bt_peach { compatible = "qcom,peach-bt"; - nvmem-cells = <&fmd_set>; - nvmem-cell-names = "fmd_set"; + nvmem-cells = <&fmd_set>, <&fmd_chg_pon>, <&fmd_cnt2_stop>; + nvmem-cell-names = "fmd_set", "fmd_chg_pon", "fmd_cnt2_stop"; clocks = <&rpmhcc RPMH_RF_CLK1>; clock-names = "bt_rf_clk1"; qcom,peach-bt; diff --git a/sun-wcn786x-v8.dtsi b/sun-wcn786x-v8.dtsi index f3560e31..9583b210 100644 --- a/sun-wcn786x-v8.dtsi +++ b/sun-wcn786x-v8.dtsi @@ -38,8 +38,8 @@ &soc { bluetooth: wcn786x { compatible = "qcom,wcn786x"; - nvmem-cells = <&fmd_set>; - nvmem-cell-names = "fmd_set"; + nvmem-cells = <&fmd_set>, <&fmd_chg_pon>, <&fmd_cnt2_stop>; + nvmem-cell-names = "fmd_set", "fmd_chg_pon", "fmd_cnt2_stop"; clocks = <&rpmhcc RPMH_RF_CLK1>; clock-names = "bt_rf_clk1"; qcom,wcn786x; From e071a704141a56b5dc9f6d3c8159d983ba74751d Mon Sep 17 00:00:00 2001 From: Adesh Mohanrao Pathare Date: Thu, 25 Jul 2024 11:05:01 +0530 Subject: [PATCH 27/57] ARM: dts: qcom: bluetooth node for ravelin Added bluetooth dtsi node for ravelin. Change-Id: Id15b1f851eee0d3229fe7fafe4373724bdb3926d --- Kbuild | 4 ++++ ravelin-bt.dts | 17 +++++++++++++++++ ravelin-bt.dtsi | 31 +++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+) mode change 100644 => 100755 Kbuild create mode 100755 ravelin-bt.dts create mode 100755 ravelin-bt.dtsi diff --git a/Kbuild b/Kbuild old mode 100644 new mode 100755 index cf4fd8d6..45071359 --- a/Kbuild +++ b/Kbuild @@ -11,6 +11,10 @@ dtbo-y += sun-wcn786x-v8.dtbo dtbo-y += sunp-hdk-peach-bt-v8.dtbo endif +ifeq ($(CONFIG_ARCH_RAVELIN), y) +dtbo-y += ravelin-bt.dtbo +endif + always-y := $(dtb-y) $(dtbo-y) subdir-y := $(dts-dirs) clean-files := *.dtb *.dtbo diff --git a/ravelin-bt.dts b/ravelin-bt.dts new file mode 100755 index 00000000..6112fea0 --- /dev/null +++ b/ravelin-bt.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "ravelin-bt.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Ravelin SoC"; + compatible = "qcom,ravelin"; + qcom,msm-id = <568 0x10000>, <581 0x10000>, <582 0x10000>, <602 0x10000>, <653 0x10000>, <654 0x10000>; + qcom,board-id = <0 0>; +}; + diff --git a/ravelin-bt.dtsi b/ravelin-bt.dtsi new file mode 100755 index 00000000..d4dc9b86 --- /dev/null +++ b/ravelin-bt.dtsi @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include +#include +#include + +&soc { + bluetooth: bt_wcn3990 { + compatible = "qcom,wcn3990"; + qcom,bt-sw-ctrl-gpio = <&tlmm 56 GPIO_ACTIVE_HIGH>; + qcom,bt-vdd-io-supply = <&L21B>; + qcom,bt-vdd-core-supply = <&L14B>; + qcom,bt-vdd-pa-supply = <&L7E>; + qcom,bt-vdd-xtal-supply = <&L23B>; + + qcom,bt-vdd-io-config = <1700000 1900000 1 0>; + qcom,bt-vdd-core-config = <1304000 1304000 1 0>; + qcom,bt-vdd-pa-config = <3000000 3312000 1 0>; + qcom,bt-vdd-xtal-config = <1700000 1900000 1 0>; + }; +}; + +//uart instance +&qupv3_se2_4uart { + status = "ok"; +}; + From 735f5fc169f37dedbf80097ca09690bf19f430c4 Mon Sep 17 00:00:00 2001 From: Adesh Mohanrao Pathare Date: Thu, 25 Jul 2024 21:15:08 +0530 Subject: [PATCH 28/57] ARM: dts: qcom: bluetooth node for parrot66 Added bluetooth dtsi node for parrot66. Change-Id: I443c4e659744ea7025f270460a8853bc585e8bea --- Kbuild | 6 ++++ parrot-wcn3990-bt.dts | 18 ++++++++++ parrot-wcn3990-bt.dtsi | 63 ++++++++++++++++++++++++++++++++++ parrot-wcn6750-bt.dts | 18 ++++++++++ parrot-wcn6750-bt.dtsi | 78 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 183 insertions(+) mode change 100755 => 100644 Kbuild create mode 100644 parrot-wcn3990-bt.dts create mode 100644 parrot-wcn3990-bt.dtsi create mode 100644 parrot-wcn6750-bt.dts create mode 100644 parrot-wcn6750-bt.dtsi diff --git a/Kbuild b/Kbuild old mode 100755 new mode 100644 index 45071359..06e4e5b5 --- a/Kbuild +++ b/Kbuild @@ -15,6 +15,12 @@ ifeq ($(CONFIG_ARCH_RAVELIN), y) dtbo-y += ravelin-bt.dtbo endif +ifeq ($(CONFIG_ARCH_PARROT), y) +dtbo-y += parrot-wcn3990-bt.dtbo +dtbo-y += parrot-wcn6750-bt.dtbo +endif + always-y := $(dtb-y) $(dtbo-y) subdir-y := $(dts-dirs) clean-files := *.dtb *.dtbo + diff --git a/parrot-wcn3990-bt.dts b/parrot-wcn3990-bt.dts new file mode 100644 index 00000000..3ca56979 --- /dev/null +++ b/parrot-wcn3990-bt.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "parrot-wcn3990-bt.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot SoC"; + compatible = "qcom,parrot"; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,board-id = <33 0>, <34 1>, <34 3>, <34 0x601>, <34 0x603>; +}; + diff --git a/parrot-wcn3990-bt.dtsi b/parrot-wcn3990-bt.dtsi new file mode 100644 index 00000000..2633619c --- /dev/null +++ b/parrot-wcn3990-bt.dtsi @@ -0,0 +1,63 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include +#include + +&soc { + bluetooth: bt_wcn3990 { + compatible = "qcom,wcn3990"; + qcom,bt-sw-ctrl-gpio = <&tlmm 61 GPIO_ACTIVE_HIGH>; + qcom,bt-vdd-io-supply = <&L22B>; /* IO */ + qcom,bt-vdd-core-supply = <&L14B>; /* RFA */ + qcom,bt-vdd-pa-supply = <&L10E>; /* CH0 */ + qcom,bt-vdd-xtal-supply = <&L1E>; /* XO */ + + qcom,bt-vdd-io-config = <1700000 1900000 1 0>; + qcom,bt-vdd-core-config = <1304000 1304000 1 0>; + qcom,bt-vdd-pa-config = <3000000 3312000 1 0>; + qcom,bt-vdd-xtal-config = <1700000 1900000 1 0>; + }; + + slim_msm: slim@3340000 { + status = "ok"; + ngd@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <1>; + //slimbus child nodes + slimbus: btfmslim-driver { + compatible = "slim217,221"; + reg = <1 0>; + qcom,btslim-address = <0x0>; /* BT SLIM EP address*/ + qcom,btslimtx-channels = <159 160>; + qcom,btslimrx-channels = <157 158>; + }; + }; + }; +}; + +//FM changes +&qupv3_se2_i2c { + status = "ok"; + nq@64 { + compatible = "rtc6226"; + reg = <0x64>; + fmint-gpio = <&tlmm 105 0>; + vdd-supply = <&L5E>; + rtc6226,vdd-supply-voltage = <2800000 2800000>; + rtc6226,vdd-load = <15000>; + vio-supply = <&L22B>; + rtc6226,vio-supply-voltage = <1800000 1800000>; + }; +}; + +//uart instance +&qupv3_se11_4uart { + status = "ok"; +}; + + diff --git a/parrot-wcn6750-bt.dts b/parrot-wcn6750-bt.dts new file mode 100644 index 00000000..14900c3f --- /dev/null +++ b/parrot-wcn6750-bt.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "parrot-wcn6750-bt.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot SoC"; + compatible = "qcom,parrot"; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,board-id = <34 0>, <34 2>, <34 4>, <34 5>, <34 6>, <34 0x600>, <34 0x602>, <34 0x604>, <0x1000B 1>, <0x1000B 2>, <0x1000B 0x601>; +}; + diff --git a/parrot-wcn6750-bt.dtsi b/parrot-wcn6750-bt.dtsi new file mode 100644 index 00000000..9dffa707 --- /dev/null +++ b/parrot-wcn6750-bt.dtsi @@ -0,0 +1,78 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&soc { + bluetooth: bt_wcn6750 { + compatible = "qcom,wcn6750-bt"; + pinctrl-names = "default"; + pinctrl-0 = <&bt_en_sleep>; + qcom,bt-reset-gpio = <&tlmm 35 0>; /* BT_EN */ + qcom,bt-sw-ctrl-gpio = <&tlmm 61 0>; /* SW_CTRL */ + qcom,wl-reset-gpio = <&tlmm 36 0>; /* WL_EN */ + tsens = "quiet-therm"; + + qcom,bt-vdd-io-supply = <&L22B>; /* IO */ + qcom,bt-vdd-aon-supply = <&S7B>; + qcom,bt-vdd-dig-supply = <&S7B>; /* BT_CX_MX */ + qcom,bt-vdd-rfacmn-supply = <&S7B>; + qcom,bt-vdd-rfa-0p8-supply = <&S7B>; + qcom,bt-vdd-rfa1-supply = <&S8E>; /*RFA 1p7*/ + qcom,bt-vdd-rfa2-supply = <&S8B>; /*RFA 1p2*/ + qcom,bt-vdd-ipa-2p2-supply = <&S9B>; /*IPA 2p2*/ + //qcom,bt-vdd-asd-supply = <&L11C>; + + /* max voltage are set to regulator max voltage supported */ + qcom,bt-vdd-io-config = <1800000 2000000 0 1>; + qcom,bt-vdd-aon-config = <824000 1174000 0 1>; + qcom,bt-vdd-dig-config = <824000 1174000 0 1>; + qcom,bt-vdd-rfacmn-config = <824000 1174000 0 1>; + qcom,bt-vdd-rfa-0p8-config = <824000 1174000 0 1>; + qcom,bt-vdd-rfa1-config = <1872000 2040000 0 1>; + qcom,bt-vdd-rfa2-config = <1256000 1654000 0 1>; + qcom,bt-vdd-ipa-2p2-config = <2200000 2208000 0 1>; + //qcom,bt-vdd-asd-config = <2800000 3544000 0 1>; + }; + + slim_msm: slim@3340000 { + status = "ok"; + ngd@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <1>; + //slimbus child nodes + slimbus: btfmslim-driver { + compatible = "slim217,221"; + reg = <1 0>; + qcom,btslim-address = <0x0>; /* BT SLIM EP address*/ + qcom,btslimtx-channels = <159 160>; + qcom,btslimrx-channels = <157 158>; + }; + }; + }; +}; + +//FM changes +&qupv3_se2_i2c { + status = "ok"; + nq@64 { + compatible = "rtc6226"; + reg = <0x64>; + fmint-gpio = <&tlmm 105 0>; + vdd-supply = <&L5E>; + rtc6226,vdd-supply-voltage = <2800000 2800000>; + rtc6226,vdd-load = <15000>; + vio-supply = <&L22B>; + rtc6226,vio-supply-voltage = <1800000 1800000>; + }; +}; + +//uart instance +&qupv3_se11_4uart { + status = "ok"; +}; + From 2e053b8d477dd15e82f0ce4a3b12e15643a7608a Mon Sep 17 00:00:00 2001 From: Venkatesh Sharma Date: Wed, 7 Aug 2024 16:49:52 +0530 Subject: [PATCH 29/57] ARM: dts: qcom: Slimbus change for ravelin for BT audio Added support for BT slimbus in ravelin for supporting BT audio usecases. CRs-Fixed: 3899444 Change-Id: If5ed41125fd9ec66da5911de25f04008e9fe3df4 --- ravelin-bt.dtsi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ravelin-bt.dtsi b/ravelin-bt.dtsi index d4dc9b86..1a6b864a 100755 --- a/ravelin-bt.dtsi +++ b/ravelin-bt.dtsi @@ -22,6 +22,23 @@ qcom,bt-vdd-pa-config = <3000000 3312000 1 0>; qcom,bt-vdd-xtal-config = <1700000 1900000 1 0>; }; + + slim_msm: slim@3340000 { + status = "ok"; + ngd@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <1>; + //slimbus child nodes + slimbus: btfmslim-driver { + compatible = "slim217,221"; + reg = <1 0>; + qcom,btslim-address = <0x0>; /* BT SLIM EP address*/ + qcom,btslimtx-channels = <159 160>; + qcom,btslimrx-channels = <157 158>; + }; + }; + }; }; //uart instance From 2aa14929ed5510a448f7898faa1d4956e7827a6b Mon Sep 17 00:00:00 2001 From: Hemant gupta Date: Sat, 31 Aug 2024 12:08:39 +0530 Subject: [PATCH 30/57] ARM: dts: qcom: Add supported board-id's for ravelin Add supported board-id's for ravelin. Change-Id: Id15b1f851eee0d3229fe7fafe4373724bdb3926a Signed-off-by: Hemant Gupta --- ravelin-bt.dts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ravelin-bt.dts b/ravelin-bt.dts index 6112fea0..29f9dabb 100755 --- a/ravelin-bt.dts +++ b/ravelin-bt.dts @@ -11,7 +11,8 @@ / { model = "Qualcomm Technologies, Inc. Ravelin SoC"; compatible = "qcom,ravelin"; - qcom,msm-id = <568 0x10000>, <581 0x10000>, <582 0x10000>, <602 0x10000>, <653 0x10000>, <654 0x10000>; - qcom,board-id = <0 0>; + qcom,msm-id = <568 0x10000>, <581 0x10000>, <582 0x10000>, <602 0x10000>, <653 0x10000>, + <654 0x10000>; + qcom,board-id = <0 0>, <0x1000B 0>, <0x1000B 0x600>, <33 0>, <34 0>, <34 0x601>, <34 2>; }; From 4d8933c239ccd5e8a67e83b25f281a81dbb6a0c2 Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Tue, 9 Jul 2024 21:56:33 +0530 Subject: [PATCH 31/57] btfm: dts: msm: vote for s4d This change will enable s4d. This buck will be enabled during BT ON. Change-Id: I983648b49d7f8545298ee6a267d6789c275418ad Signed-off-by: Balakrishna Godavarthi --- sun-peach-bt-v8.dtsi | 7 ++++--- sun-wcn786x-v8.dtsi | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sun-peach-bt-v8.dtsi b/sun-peach-bt-v8.dtsi index f2bef0c5..134e6fce 100644 --- a/sun-peach-bt-v8.dtsi +++ b/sun-peach-bt-v8.dtsi @@ -58,7 +58,8 @@ qcom,bt-vdd18-aon-supply = <&L3F>; /* VDD1P8_AON */ qcom,bt-vdd12-io-supply = <&L2F>; /* VDD1P2_IO */ qcom,bt-ant-ldo-supply = <&L6K>; /* AV91C_VDD Extractor */ - qcom,bt-vdd-dig-supply = <&S5F>; /* BT CX_MX LDO */ + /* This buck is added for HW WAR */ + qcom,bt-vdd-dig-supply = <&S4D>; /* BT CX_MX LDO */ qcom,bt-vdd-aon-supply = <&S5F>; /* RFA_CMN/AON */ qcom,bt-vdd-rfa0p75-supply = <&S5F>; /* RFA_OP75 */ qcom,bt-vdd-rfa1p8-supply = <&S3G>; /* RFA_1P8 */ @@ -67,8 +68,8 @@ qcom,bt-vdd18-aon-config = <1800000 1800000 30000 1 1>; qcom,bt-vdd12-io-config = <1200000 1200000 30000 1 1>; qcom,bt-ant-ldo-config = <1800000 1860000 0 1 0>; - qcom,bt-vdd-aon-config = <876000 1000000 0 1 0>; - qcom,bt-vdd-dig-config = <876000 1000000 0 1 1>; + qcom,bt-vdd-aon-config = <876000 1000000 0 1 1>; + qcom,bt-vdd-dig-config = <560000 1036000 0 1 0>; qcom,bt-vdd-rfa0p75-config = <876000 1000000 0 1 0>; qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1 0>; qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1 0>; diff --git a/sun-wcn786x-v8.dtsi b/sun-wcn786x-v8.dtsi index f3560e31..75c2311e 100644 --- a/sun-wcn786x-v8.dtsi +++ b/sun-wcn786x-v8.dtsi @@ -58,7 +58,8 @@ qcom,bt-vdd18-aon-supply = <&L3F>; /* VDD1P8_AON */ qcom,bt-vdd12-io-supply = <&L2F>; /* VDD1P2_IO */ qcom,bt-ant-ldo-supply = <&L6K>; /* AV91C_VDD Extractor */ - qcom,bt-vdd-dig-supply = <&S5F>; /* BT CX_MX LDO */ + /* This buck is added for HW WAR */ + qcom,bt-vdd-dig-supply = <&S4D>; /* BT CX_MX LDO */ qcom,bt-vdd-aon-supply = <&S5F>; /* RFA_CMN/AON */ qcom,bt-vdd-rfa0p75-supply = <&S5F>; /* RFA_OP75 */ qcom,bt-vdd-rfa1p8-supply = <&S3G>; /* RFA_1P8 */ @@ -67,8 +68,8 @@ qcom,bt-vdd18-aon-config = <1800000 1800000 30000 1 1>; qcom,bt-vdd12-io-config = <1200000 1200000 30000 1 1>; qcom,bt-ant-ldo-config = <1800000 1860000 0 1 0>; - qcom,bt-vdd-aon-config = <876000 1000000 0 1 0>; - qcom,bt-vdd-dig-config = <876000 1000000 0 1 1>; + qcom,bt-vdd-aon-config = <876000 1000000 0 1 1>; + qcom,bt-vdd-dig-config = <560000 1036000 0 1 0>; qcom,bt-vdd-rfa0p75-config = <876000 1000000 0 1 0>; qcom,bt-vdd-rfa1p8-config = <1860000 2000000 0 1 0>; qcom,bt-vdd-rfa1p25-config = <1312000 1340000 0 1 0>; From 9cfa81d67b015aed6f760403330c8da193433ba8 Mon Sep 17 00:00:00 2001 From: Balakrishna Godavarthi Date: Wed, 23 Oct 2024 17:25:39 +0530 Subject: [PATCH 32/57] ARM: dts: qcom: Add bluetooth node for QRD This change adds bluetooth node for parrot QRD. Change-Id: Ibbaeaa0af0cba6d6bf888eba5af82f3202007e44 Signed-off-by: Balakrishna Godavarthi --- parrot-wcn3990-bt.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parrot-wcn3990-bt.dts b/parrot-wcn3990-bt.dts index 3ca56979..b61c5cee 100644 --- a/parrot-wcn3990-bt.dts +++ b/parrot-wcn3990-bt.dts @@ -13,6 +13,6 @@ model = "Qualcomm Technologies, Inc. Parrot SoC"; compatible = "qcom,parrot"; qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; - qcom,board-id = <33 0>, <34 1>, <34 3>, <34 0x601>, <34 0x603>; + qcom,board-id = <33 0>, <34 1>, <34 3>, <34 0x601>, <34 0x603>, <0x1000B 0x600>, <0x1000B 0>; }; From 209ac900b097512d25414cea77c057e2e8138c8c Mon Sep 17 00:00:00 2001 From: Girish BN Date: Thu, 26 Sep 2024 14:53:57 +0530 Subject: [PATCH 33/57] ARM: dts: msm: add wcn7750, kiwi bt node for tuna - This change adds wcn7750 and kiwi bt node for tuna Change-Id: I26936e00a3d9bd15cb6c3331e1bf967af05b327b Signed-off-by: Girish BN --- Kbuild | 5 +++ tuna-kiwi-bt.dts | 19 ++++++++++ tuna-kiwi-bt.dtsi | 90 ++++++++++++++++++++++++++++++++++++++++++++ tuna-wcn7750-bt.dts | 20 ++++++++++ tuna-wcn7750-bt.dtsi | 84 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 218 insertions(+) create mode 100644 tuna-kiwi-bt.dts create mode 100644 tuna-kiwi-bt.dtsi create mode 100644 tuna-wcn7750-bt.dts create mode 100644 tuna-wcn7750-bt.dtsi diff --git a/Kbuild b/Kbuild index 06e4e5b5..40222efc 100644 --- a/Kbuild +++ b/Kbuild @@ -2,6 +2,11 @@ ifeq ($(CONFIG_ARCH_PINEAPPLE),y) dtbo-y += pineapple-kiwi-bt.dtbo endif +ifeq ($(CONFIG_ARCH_TUNA),y) +dtbo-y += tuna-wcn7750-bt.dtbo +dtbo-y += tuna-kiwi-bt.dtbo +endif + ifeq ($(CONFIG_ARCH_SUN), y) dtbo-y += sun-peach-bt.dtbo dtbo-y += sun-kiwi-bt.dtbo diff --git a/tuna-kiwi-bt.dts b/tuna-kiwi-bt.dts new file mode 100644 index 00000000..ce66fdb0 --- /dev/null +++ b/tuna-kiwi-bt.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "tuna-kiwi-bt.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Tuna"; + compatible = "qcom,tuna-rcm", "qcom,tunap-rcm", "qcom,rcm", + "qcom,tuna-mtp", "qcom,tunap-mtp", "qcom,mtp", + "qcom,tuna-atp", "qcom,tunap-atp", "qcom,atp", + "qcom,tuna", "qcom,tunap"; + qcom,msm-id = <681 0x10000>, <655 0x10000>; + qcom,board-id = <21 1>, <8 2>, <33 0>; +}; \ No newline at end of file diff --git a/tuna-kiwi-bt.dtsi b/tuna-kiwi-bt.dtsi new file mode 100644 index 00000000..a323f7c4 --- /dev/null +++ b/tuna-kiwi-bt.dtsi @@ -0,0 +1,90 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include +#include +#include + +&pm8550vs_g_gpios { + bt_en: bt_en { + pins = "gpio4"; + function = "normal"; + input-disable; + output-enable; + bias-disable; + power-source = <1>; + }; + bt_fmd_clk_en: bt_fmd_clk_en { + pins = "gpio3"; + function = "normal"; + input-enable; + output-disable; + bias-disable; + power-source = <1>; + }; +}; + +&tlmm { + cnss_bt_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio80"; + function = "wcn_sw_ctrl"; + }; + }; +}; + +&soc { + bluetooth: bt_kiwi { + compatible = "qcom,kiwi"; + + nvmem-cells = <&fmd_set>, <&fmd_chg_pon>, <&fmd_cnt2_stop>; + nvmem-cell-names = "fmd_set", "fmd_chg_pon", "fmd_cnt2_stop"; + + clock-names = "bt_rf_clk1"; + clocks = <&rpmhcc RPMH_RF_CLK1>; + + pinctrl-0 = <&bt_en>; + pinctrl-1 = <&cnss_bt_sw_ctrl>; + pinctrl-2 = <&bt_fmd_clk_en>; + pinctrl-names = "bt_en", "sw_ctrl", "bt_fmd_clk_en"; + + /* List of GPIOs to be setup for interrupt wakeup capable*/ + mpm_wake_set_gpios = <80>; + qcom,wl-reset-gpio = <&tlmm 35 0>; /* WL_EN */ + qcom,bt-sw-ctrl-gpio = <&tlmm 80 0>; /* SW_CTRL */ + + qcom,bt-fmd-clk-gpio = <&pm8550vs_g_gpios 3 0>; /* FMD_CLK_EN */ + qcom,bt-reset-gpio = <&pm8550vs_g_gpios 4 0>; /* WCN_BT_EN */ + + qcom,qmp = <&aoss_qmp>; + + qcom,bt-vdd18-aon-supply = <&L3G>; /* BT VDD1.8 AON */ + qcom,bt-vdd12-io-supply = <&L2G>; /* BT VDD1.2V IO */ + qcom,bt-ant-ldo-supply = <&L6K>; /* BT ANT - AV91C_VDD */ + qcom,bt-vdd-aon-supply = <&S3B>; /* BT AON LDO*/ + qcom,bt-vdd-rfaOp8-supply = <&S3B>; /* BT RFAOp8 CMN LDO*/ + qcom,bt-vdd-rfa1-supply = <&S2B>; /* BT RFA1.2 LDO */ + qcom,bt-vdd-rfa2-supply = <&S1B>; /* BT RFA1.8 LDO */ + + qcom,bt-vdd18-aon-config = <1800000 1800000 30000 1 0>; + qcom,bt-vdd12-io-config = <1200000 1200000 30000 1 0>; + qcom,bt-ant-ldo-config = <1800000 2000000 0 1 0>; + qcom,bt-vdd-aon-config = <976000 1040000 0 1 0>; + qcom,bt-vdd-rfaOp8-config = <976000 1040000 0 1 0>; + qcom,bt-vdd-rfa1-config = <1316000 1408000 0 1 0>; + qcom,bt-vdd-rfa2-config = <1864000 2104000 0 1 0>; + + qcom,pdc_init_table = + " {class: wlan_pdc, ss: rf, res: s3b.v, upval: 976}", + " {class: wlan_pdc, ss: rf, res: s3b.v, dwnval: 616}", + " {class: wlan_pdc, ss: bb, res: pdc, enable: 1}"; + }; +}; + +//uart instance +&qupv3_se14_4uart { + status = "ok"; +}; diff --git a/tuna-wcn7750-bt.dts b/tuna-wcn7750-bt.dts new file mode 100644 index 00000000..2f82cd49 --- /dev/null +++ b/tuna-wcn7750-bt.dts @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "tuna-wcn7750-bt.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Tuna"; + compatible = "qcom,tuna-rcm", "qcom,tunap-rcm", "qcom,rcm", + "qcom,tuna-mtp", "qcom,tunap-mtp", "qcom,mtp", + "qcom,tuna-cdp", "qcom,tunap-cdp", "qcom,cdp", + "qcom,tuna-qrd", "qcom,tunap-qrd", "qcom,qrd", + "qcom,tuna", "qcom,tunap"; + qcom,msm-id = <681 0x10000>, <655 0x10000>; + qcom,board-id = <8 0>, <8 1>, <1 0>, <11 0>, <21 0>, <33 0>; +}; \ No newline at end of file diff --git a/tuna-wcn7750-bt.dtsi b/tuna-wcn7750-bt.dtsi new file mode 100644 index 00000000..3949949f --- /dev/null +++ b/tuna-wcn7750-bt.dtsi @@ -0,0 +1,84 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include +#include +#include + +&pm8550vs_g_gpios { + bt_en: bt_en { + pins = "gpio4"; + function = "normal"; + input-disable; + output-enable; + bias-disable; + power-source = <1>; + }; + bt_fmd_clk_en: bt_fmd_clk_en { + pins = "gpio3"; + function = "normal"; + input-enable; + output-disable; + bias-disable; + power-source = <1>; + }; +}; + +&tlmm { + cnss_bt_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio80"; + function = "wcn_sw_ctrl"; + }; + }; +}; + +&soc { + bluetooth: bt_tuna { + compatible = "qcom,wcn7750-bt"; + qcom,wcn7750-bt; + + nvmem-cell-names = "fmd_set", "fmd_chg_pon", "fmd_cnt2_stop"; + nvmem-cells = <&fmd_set>, <&fmd_chg_pon>, <&fmd_cnt2_stop>; + + pinctrl-names = "bt_en", "sw_ctrl", "bt_fmd_clk_en"; + pinctrl-0 = <&bt_en>; + pinctrl-1 = <&cnss_bt_sw_ctrl>; + pinctrl-2 = <&bt_fmd_clk_en>; + + clock-names = "bt_rf_clk1"; + clocks = <&rpmhcc RPMH_RF_CLK1>; + + mpm_wake_set_gpios = <80>; + qcom,wl-reset-gpio = <&tlmm 35 0>; /* WCN_WLAN_EN */ + qcom,bt-sw-ctrl-gpio = <&tlmm 80 0>; /* HST_SW_CTRL */ + qcom,bt-fmd-clk-gpio = <&pm8550vs_g_gpios 3 0>; /* FMD_CLK_EN */ + qcom,bt-reset-gpio = <&pm8550vs_g_gpios 4 0>; /* WCN_BT_EN */ + + qcom,bt-vdd-io-supply = <&L3G>; /* WCN_1P8_IO */ + qcom,bt-vdd-aon-supply = <&S3B>; /* AON LDO */ + qcom,bt-vdd-rfacmn-supply = <&S3B>; /* RF 0p8/CMN */ + qcom,bt-vdd-dig-supply = <&S3B>; /* BT LDO/BT_CX_MX */ + qcom,bt-vdd-rfa-0p8-supply = <&L6K>; /* RFA 0p8 / AV91C_VDD */ + qcom,bt-vdd-rfa1-supply = <&S1B>; /* RFA 1p7 */ + qcom,bt-vdd-rfa2-supply = <&S2B>; /* RFA 1p2 */ + qcom,bt-vdd-ipa-2p2-supply = <&S1G>; /* WCN_2p2_RFA */ + + qcom,bt-vdd-io-config = <1620000 1800000 0 1 0>; + qcom,bt-vdd-aon-config = <900000 1040000 0 1 0>; + qcom,bt-vdd-rfacmn-config = <900000 1040000 0 1 0>; + qcom,bt-vdd-dig-config = <900000 1040000 0 1 0>; + qcom,bt-vdd-rfa-0p8-config = <900000 2000000 0 1 0>; + qcom,bt-vdd-rfa1-config = <1900000 2104000 0 1 0>; + qcom,bt-vdd-rfa2-config = <1330000 1408000 0 1 0>; + qcom,bt-vdd-ipa-2p2-config = <2156000 2400000 0 1 0>; + }; +}; + +//uart instance +&qupv3_se14_4uart { + status = "ok"; +}; From d6d6239a68e90d279549fa7189934b32363a745d Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Sun, 3 Nov 2024 19:44:53 +0530 Subject: [PATCH 34/57] ARM: dts: msm: Update board-id support for Tuna Remove FMD support from Kiwi and update board id for Tuna CRs-Fixed: 3965338 Change-Id: I26936e00a3d9bd15cb6c3331e2bf967af05b327b Signed-off-by: Hemant Gupta --- tuna-kiwi-bt.dts | 4 ++-- tuna-kiwi-bt.dtsi | 15 +-------------- tuna-wcn7750-bt.dts | 4 ++-- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/tuna-kiwi-bt.dts b/tuna-kiwi-bt.dts index ce66fdb0..91d22d95 100644 --- a/tuna-kiwi-bt.dts +++ b/tuna-kiwi-bt.dts @@ -15,5 +15,5 @@ "qcom,tuna-atp", "qcom,tunap-atp", "qcom,atp", "qcom,tuna", "qcom,tunap"; qcom,msm-id = <681 0x10000>, <655 0x10000>; - qcom,board-id = <21 1>, <8 2>, <33 0>; -}; \ No newline at end of file + qcom,board-id = <21 1>, <8 2>, <8 3>; +}; diff --git a/tuna-kiwi-bt.dtsi b/tuna-kiwi-bt.dtsi index a323f7c4..71d43ed9 100644 --- a/tuna-kiwi-bt.dtsi +++ b/tuna-kiwi-bt.dtsi @@ -17,14 +17,6 @@ bias-disable; power-source = <1>; }; - bt_fmd_clk_en: bt_fmd_clk_en { - pins = "gpio3"; - function = "normal"; - input-enable; - output-disable; - bias-disable; - power-source = <1>; - }; }; &tlmm { @@ -40,23 +32,18 @@ bluetooth: bt_kiwi { compatible = "qcom,kiwi"; - nvmem-cells = <&fmd_set>, <&fmd_chg_pon>, <&fmd_cnt2_stop>; - nvmem-cell-names = "fmd_set", "fmd_chg_pon", "fmd_cnt2_stop"; - clock-names = "bt_rf_clk1"; clocks = <&rpmhcc RPMH_RF_CLK1>; pinctrl-0 = <&bt_en>; pinctrl-1 = <&cnss_bt_sw_ctrl>; - pinctrl-2 = <&bt_fmd_clk_en>; - pinctrl-names = "bt_en", "sw_ctrl", "bt_fmd_clk_en"; + pinctrl-names = "bt_en", "sw_ctrl"; /* List of GPIOs to be setup for interrupt wakeup capable*/ mpm_wake_set_gpios = <80>; qcom,wl-reset-gpio = <&tlmm 35 0>; /* WL_EN */ qcom,bt-sw-ctrl-gpio = <&tlmm 80 0>; /* SW_CTRL */ - qcom,bt-fmd-clk-gpio = <&pm8550vs_g_gpios 3 0>; /* FMD_CLK_EN */ qcom,bt-reset-gpio = <&pm8550vs_g_gpios 4 0>; /* WCN_BT_EN */ qcom,qmp = <&aoss_qmp>; diff --git a/tuna-wcn7750-bt.dts b/tuna-wcn7750-bt.dts index 2f82cd49..be2aaea8 100644 --- a/tuna-wcn7750-bt.dts +++ b/tuna-wcn7750-bt.dts @@ -16,5 +16,5 @@ "qcom,tuna-qrd", "qcom,tunap-qrd", "qcom,qrd", "qcom,tuna", "qcom,tunap"; qcom,msm-id = <681 0x10000>, <655 0x10000>; - qcom,board-id = <8 0>, <8 1>, <1 0>, <11 0>, <21 0>, <33 0>; -}; \ No newline at end of file + qcom,board-id = <1 0>, <8 0>, <8 1>, <8 4>, <11 0>, <21 0>, <33 0>; +}; From 3af86825779d95bf8d5ee600f995e21d10a6eeca Mon Sep 17 00:00:00 2001 From: Satish Kumar Kodishala Date: Thu, 14 Nov 2024 22:26:48 +0530 Subject: [PATCH 35/57] ARM: dts: msm: Add support for BT Slimbus for Tuna Added support for BT Slimbus for Tuna. CRs-Fixed: 3974337 Change-Id: Ic01c28f20c01712f330a5f9346b890a97638edf2 Signed-off-by: Satish Kumar Kodishala --- tuna-kiwi-bt.dtsi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tuna-kiwi-bt.dtsi b/tuna-kiwi-bt.dtsi index 71d43ed9..ffeeeb5e 100644 --- a/tuna-kiwi-bt.dtsi +++ b/tuna-kiwi-bt.dtsi @@ -69,6 +69,23 @@ " {class: wlan_pdc, ss: rf, res: s3b.v, dwnval: 616}", " {class: wlan_pdc, ss: bb, res: pdc, enable: 1}"; }; + + slim_msm: slim@6C40000 { + status = "ok"; + ngd@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <1>; + //slimbus child nodes + slimbus: btfmslim-driver { + compatible = "slim217,221"; + reg = <1 0>; + qcom,btslim-address = <0x0>; + qcom,btslimtx-channels = <159 160>; + qcom,btslimrx-channels = <157 158>; + }; + }; + }; }; //uart instance From 68555cbf965cd0944db603a9dd85a6b72fcdc9cb Mon Sep 17 00:00:00 2001 From: Satish Kumar Kodishala Date: Thu, 14 Nov 2024 22:23:32 +0530 Subject: [PATCH 36/57] ARM: dts: msm: Add support for BT SoundWire for Tuna Added support for BT SoundWire for Tuna. CRs-Fixed: 3974336 Change-Id: Ie3bbb3e5abb8c9e8c8d62a33f4adff65f3d4cd9d Signed-off-by: Satish Kumar Kodishala --- tuna-wcn7750-bt.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tuna-wcn7750-bt.dtsi b/tuna-wcn7750-bt.dtsi index 3949949f..2c1407b7 100644 --- a/tuna-wcn7750-bt.dtsi +++ b/tuna-wcn7750-bt.dtsi @@ -78,6 +78,13 @@ }; }; +&swr4 { + btswr_slave: btswr-slave { + compatible = "qcom,btfmswr_slave"; + reg = <0x02 0x08170220>; + }; +}; + //uart instance &qupv3_se14_4uart { status = "ok"; From 1f9f3bb527556842ddb37b905ada8ac2e8cf7290 Mon Sep 17 00:00:00 2001 From: Satish Kumar Kodishala Date: Tue, 19 Nov 2024 19:33:41 +0530 Subject: [PATCH 37/57] Add support for RTC6226 FM Added support for RTC6226 FM functionality. CRs-Fixed: 3978334 Change-Id: I547944b5fef31cff6fa70b1be1e9a49bb736af82 Signed-off-by: Satish Kumar Kodishala --- tuna-kiwi-bt.dtsi | 15 +++++++++++++++ tuna-wcn7750-bt.dtsi | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/tuna-kiwi-bt.dtsi b/tuna-kiwi-bt.dtsi index ffeeeb5e..bfd34493 100644 --- a/tuna-kiwi-bt.dtsi +++ b/tuna-kiwi-bt.dtsi @@ -88,6 +88,21 @@ }; }; +// FM changes +&qupv3_se5_i2c { + status = "ok"; + nq@64 { + compatible = "rtc6226"; + reg = <0x64>; + fmint-gpio = <&tlmm 29 0>; + vdd-supply = <&L18B>; + rtc6226,vdd-supply-voltage = <2800000 2800000>; + rtc6226,vdd-load = <15000>; + vio-supply = <&S1B>; + rtc6226,vio-supply-voltage = <1856000 1856000>; + }; +}; + //uart instance &qupv3_se14_4uart { status = "ok"; diff --git a/tuna-wcn7750-bt.dtsi b/tuna-wcn7750-bt.dtsi index 2c1407b7..fafcb279 100644 --- a/tuna-wcn7750-bt.dtsi +++ b/tuna-wcn7750-bt.dtsi @@ -89,3 +89,18 @@ &qupv3_se14_4uart { status = "ok"; }; + +// FM changes +&qupv3_se5_i2c { + status = "ok"; + nq@64 { + compatible = "rtc6226"; + reg = <0x64>; + fmint-gpio = <&tlmm 29 0>; + vdd-supply = <&L18B>; + rtc6226,vdd-supply-voltage = <2800000 2800000>; + rtc6226,vdd-load = <15000>; + vio-supply = <&S1B>; + rtc6226,vio-supply-voltage = <1856000 1856000>; + }; +}; From be98f828c3b402f9466f00c4ddfeeb1562454cbc Mon Sep 17 00:00:00 2001 From: Satish Kumar Kodishala Date: Thu, 14 Nov 2024 22:23:32 +0530 Subject: [PATCH 38/57] ARM: dts: msm: Add support for BT SoundWire for Tuna Added support for BT SoundWire for Tuna. CRs-Fixed: 3974336 Change-Id: Ie3bbb3e5abb8c9e8c8d62a33f4adff65f3d4cd9d Signed-off-by: Satish Kumar Kodishala (cherry picked from commit 68555cbf965cd0944db603a9dd85a6b72fcdc9cb) --- tuna-wcn7750-bt.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tuna-wcn7750-bt.dtsi b/tuna-wcn7750-bt.dtsi index 3949949f..2c1407b7 100644 --- a/tuna-wcn7750-bt.dtsi +++ b/tuna-wcn7750-bt.dtsi @@ -78,6 +78,13 @@ }; }; +&swr4 { + btswr_slave: btswr-slave { + compatible = "qcom,btfmswr_slave"; + reg = <0x02 0x08170220>; + }; +}; + //uart instance &qupv3_se14_4uart { status = "ok"; From 740c4fcd883562b298609daf4ad93e1146013da9 Mon Sep 17 00:00:00 2001 From: Satish Kumar Kodishala Date: Thu, 14 Nov 2024 22:26:48 +0530 Subject: [PATCH 39/57] ARM: dts: msm: Add support for BT Slimbus for Tuna Added support for BT Slimbus for Tuna. CRs-Fixed: 3974337 Change-Id: Ic01c28f20c01712f330a5f9346b890a97638edf2 Signed-off-by: Satish Kumar Kodishala (cherry picked from commit 3af86825779d95bf8d5ee600f995e21d10a6eeca) --- tuna-kiwi-bt.dtsi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tuna-kiwi-bt.dtsi b/tuna-kiwi-bt.dtsi index 71d43ed9..ffeeeb5e 100644 --- a/tuna-kiwi-bt.dtsi +++ b/tuna-kiwi-bt.dtsi @@ -69,6 +69,23 @@ " {class: wlan_pdc, ss: rf, res: s3b.v, dwnval: 616}", " {class: wlan_pdc, ss: bb, res: pdc, enable: 1}"; }; + + slim_msm: slim@6C40000 { + status = "ok"; + ngd@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <1>; + //slimbus child nodes + slimbus: btfmslim-driver { + compatible = "slim217,221"; + reg = <1 0>; + qcom,btslim-address = <0x0>; + qcom,btslimtx-channels = <159 160>; + qcom,btslimrx-channels = <157 158>; + }; + }; + }; }; //uart instance From b449557025e5c933c2e3a4792c452f01739901b0 Mon Sep 17 00:00:00 2001 From: Satish Kumar Kodishala Date: Tue, 19 Nov 2024 19:33:41 +0530 Subject: [PATCH 40/57] Add support for RTC6226 FM Added support for RTC6226 FM functionality. CRs-Fixed: 3978334 Change-Id: I547944b5fef31cff6fa70b1be1e9a49bb736af82 Signed-off-by: Satish Kumar Kodishala (cherry picked from commit 1f9f3bb527556842ddb37b905ada8ac2e8cf7290) --- tuna-kiwi-bt.dtsi | 15 +++++++++++++++ tuna-wcn7750-bt.dtsi | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/tuna-kiwi-bt.dtsi b/tuna-kiwi-bt.dtsi index 71d43ed9..835f5cf8 100644 --- a/tuna-kiwi-bt.dtsi +++ b/tuna-kiwi-bt.dtsi @@ -71,6 +71,21 @@ }; }; +// FM changes +&qupv3_se5_i2c { + status = "ok"; + nq@64 { + compatible = "rtc6226"; + reg = <0x64>; + fmint-gpio = <&tlmm 29 0>; + vdd-supply = <&L18B>; + rtc6226,vdd-supply-voltage = <2800000 2800000>; + rtc6226,vdd-load = <15000>; + vio-supply = <&S1B>; + rtc6226,vio-supply-voltage = <1856000 1856000>; + }; +}; + //uart instance &qupv3_se14_4uart { status = "ok"; diff --git a/tuna-wcn7750-bt.dtsi b/tuna-wcn7750-bt.dtsi index 3949949f..74e39f50 100644 --- a/tuna-wcn7750-bt.dtsi +++ b/tuna-wcn7750-bt.dtsi @@ -82,3 +82,18 @@ &qupv3_se14_4uart { status = "ok"; }; + +// FM changes +&qupv3_se5_i2c { + status = "ok"; + nq@64 { + compatible = "rtc6226"; + reg = <0x64>; + fmint-gpio = <&tlmm 29 0>; + vdd-supply = <&L18B>; + rtc6226,vdd-supply-voltage = <2800000 2800000>; + rtc6226,vdd-load = <15000>; + vio-supply = <&S1B>; + rtc6226,vio-supply-voltage = <1856000 1856000>; + }; +}; From 3df8c02ca8ddbfa1daf2e4b65e459eb00aba9310 Mon Sep 17 00:00:00 2001 From: Girish BN Date: Wed, 27 Nov 2024 21:23:25 +0530 Subject: [PATCH 41/57] Add changes to enable FMD fetaure on wcn7750 - Add changes to enable FMD fetaure on wcn7750 Change-Id: Ic781a229672723a9f7a88f1d627ffa6685b78465 Signed-off-by: Girish BN --- tuna-wcn7750-bt.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tuna-wcn7750-bt.dtsi b/tuna-wcn7750-bt.dtsi index fafcb279..dab790be 100644 --- a/tuna-wcn7750-bt.dtsi +++ b/tuna-wcn7750-bt.dtsi @@ -67,14 +67,14 @@ qcom,bt-vdd-rfa2-supply = <&S2B>; /* RFA 1p2 */ qcom,bt-vdd-ipa-2p2-supply = <&S1G>; /* WCN_2p2_RFA */ - qcom,bt-vdd-io-config = <1620000 1800000 0 1 0>; - qcom,bt-vdd-aon-config = <900000 1040000 0 1 0>; - qcom,bt-vdd-rfacmn-config = <900000 1040000 0 1 0>; - qcom,bt-vdd-dig-config = <900000 1040000 0 1 0>; - qcom,bt-vdd-rfa-0p8-config = <900000 2000000 0 1 0>; - qcom,bt-vdd-rfa1-config = <1900000 2104000 0 1 0>; - qcom,bt-vdd-rfa2-config = <1330000 1408000 0 1 0>; - qcom,bt-vdd-ipa-2p2-config = <2156000 2400000 0 1 0>; + qcom,bt-vdd-io-config = <1620000 1800000 0 1 1>; + qcom,bt-vdd-aon-config = <900000 1040000 0 1 1>; + qcom,bt-vdd-rfacmn-config = <900000 1040000 0 1 1>; + qcom,bt-vdd-dig-config = <900000 1040000 0 1 1>; + qcom,bt-vdd-rfa-0p8-config = <900000 2000000 0 1 1>; + qcom,bt-vdd-rfa1-config = <1900000 2104000 0 1 1>; + qcom,bt-vdd-rfa2-config = <1330000 1408000 0 1 1>; + qcom,bt-vdd-ipa-2p2-config = <2156000 2400000 0 1 1>; }; }; From 8cc995955e9876579b986d06e2748a80ab65ffe7 Mon Sep 17 00:00:00 2001 From: Satish Kumar Kodishala Date: Tue, 26 Nov 2024 16:01:02 +0530 Subject: [PATCH 42/57] ARM: dts: msm: Align BT slimbus node with core slimbus node Align BT slimbus node with core slimbus node. CRs-Fixed: 3987946 Change-Id: Ic19bad5943ad3095edc1919c8841f072b7004d1f Signed-off-by: Satish Kumar Kodishala --- tuna-kiwi-bt.dtsi | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tuna-kiwi-bt.dtsi b/tuna-kiwi-bt.dtsi index bfd34493..d558f321 100644 --- a/tuna-kiwi-bt.dtsi +++ b/tuna-kiwi-bt.dtsi @@ -69,21 +69,21 @@ " {class: wlan_pdc, ss: rf, res: s3b.v, dwnval: 616}", " {class: wlan_pdc, ss: bb, res: pdc, enable: 1}"; }; +}; - slim_msm: slim@6C40000 { - status = "ok"; - ngd@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <1>; - //slimbus child nodes - slimbus: btfmslim-driver { - compatible = "slim217,221"; - reg = <1 0>; - qcom,btslim-address = <0x0>; - qcom,btslimtx-channels = <159 160>; - qcom,btslimrx-channels = <157 158>; - }; +&slim_msm { + status = "ok"; + ngd@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <1>; + //slimbus child nodes + slimbus: btfmslim-driver { + compatible = "slim217,221"; + reg = <1 0>; + qcom,btslim-address = <0x0>; + qcom,btslimtx-channels = <159 160>; + qcom,btslimrx-channels = <157 158>; }; }; }; From 1d6854ec88d3a0fe3156ce3ff4c91fd22db6d934 Mon Sep 17 00:00:00 2001 From: Balakrishna Godavarthi Date: Tue, 3 Dec 2024 16:34:55 +0530 Subject: [PATCH 43/57] btfm: update board ids for tuna This change add supports for HMT in atp platform. Change-Id: I58986aea71e67dd63bc87cd639f6e41c3b3125e0 Signed-off-by: Balakrishna Godavarthi --- tuna-kiwi-bt.dts | 4 ++-- tuna-wcn7750-bt.dts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tuna-kiwi-bt.dts b/tuna-kiwi-bt.dts index 91d22d95..bbdae060 100644 --- a/tuna-kiwi-bt.dts +++ b/tuna-kiwi-bt.dts @@ -14,6 +14,6 @@ "qcom,tuna-mtp", "qcom,tunap-mtp", "qcom,mtp", "qcom,tuna-atp", "qcom,tunap-atp", "qcom,atp", "qcom,tuna", "qcom,tunap"; - qcom,msm-id = <681 0x10000>, <655 0x10000>; - qcom,board-id = <21 1>, <8 2>, <8 3>; + qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>; + qcom,board-id = <21 1>, <8 2>, <8 3>, <33 0>; }; diff --git a/tuna-wcn7750-bt.dts b/tuna-wcn7750-bt.dts index be2aaea8..ad84007a 100644 --- a/tuna-wcn7750-bt.dts +++ b/tuna-wcn7750-bt.dts @@ -15,6 +15,6 @@ "qcom,tuna-cdp", "qcom,tunap-cdp", "qcom,cdp", "qcom,tuna-qrd", "qcom,tunap-qrd", "qcom,qrd", "qcom,tuna", "qcom,tunap"; - qcom,msm-id = <681 0x10000>, <655 0x10000>; - qcom,board-id = <1 0>, <8 0>, <8 1>, <8 4>, <11 0>, <21 0>, <33 0>; + qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>; + qcom,board-id = <1 0>, <8 0>, <8 1>, <8 4>, <11 0>, <21 0>; }; From 7241c3d65c3ed8e831b545d210741d9be7e9a82b Mon Sep 17 00:00:00 2001 From: Sai Teja Aluvala Date: Thu, 28 Nov 2024 17:21:45 +0530 Subject: [PATCH 44/57] ARM: dts: msm: Add soc id 696 for Pineapple Add soc id to support Pineapple new variant used for tablet. Change-Id: Ifc99f8ef37235dfe8859a56e232e5e504c8c1353 Signed-off-by: Sai Teja Aluvala --- pineapple-kiwi-bt.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pineapple-kiwi-bt.dts b/pineapple-kiwi-bt.dts index 9243e7b4..bfef341e 100644 --- a/pineapple-kiwi-bt.dts +++ b/pineapple-kiwi-bt.dts @@ -12,6 +12,7 @@ / { model = "Qualcomm Technologies, Inc. Pineapple SoCs"; compatible = "qcom,pineapple", "qcom,pineapplep"; - qcom,msm-id = <557 0x10000>, <577 0x10000>, <557 0x20000>, <577 0x20000>; + qcom,msm-id = <557 0x10000>, <577 0x10000>, <557 0x20000>, <577 0x20000>, + <696 0x20000>; qcom,board-id = <0 0>; }; From 9f3e2390f760eed6e9b2d788d14d1a2f352f22d3 Mon Sep 17 00:00:00 2001 From: Girish BN Date: Sun, 3 Nov 2024 23:09:53 +0530 Subject: [PATCH 45/57] ARM: dts: msm: Add BT wcn7750 and wcn6750 node for Kera - This change adds DT enteries of BT nodes wcn7750 and wcn6750 for Kera. Change-Id: Ia04c4e742fcf0cd0b7aaf57d7c1e3a875b764e1b Signed-off-by: Girish BN --- Kbuild | 5 +++ kera-qca6750-bt.dts | 21 +++++++++++ kera-qca6750-bt.dtsi | 68 +++++++++++++++++++++++++++++++++++ kera-wcn7750-bt.dts | 20 +++++++++++ kera-wcn7750-bt.dtsi | 84 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 198 insertions(+) create mode 100644 kera-qca6750-bt.dts create mode 100644 kera-qca6750-bt.dtsi create mode 100644 kera-wcn7750-bt.dts create mode 100644 kera-wcn7750-bt.dtsi diff --git a/Kbuild b/Kbuild index 40222efc..fda148df 100644 --- a/Kbuild +++ b/Kbuild @@ -7,6 +7,11 @@ dtbo-y += tuna-wcn7750-bt.dtbo dtbo-y += tuna-kiwi-bt.dtbo endif +ifeq ($(CONFIG_ARCH_KERA), y) +dtbo-y += kera-qca6750-bt.dtbo +dtbo-y += kera-wcn7750-bt.dtbo +endif + ifeq ($(CONFIG_ARCH_SUN), y) dtbo-y += sun-peach-bt.dtbo dtbo-y += sun-kiwi-bt.dtbo diff --git a/kera-qca6750-bt.dts b/kera-qca6750-bt.dts new file mode 100644 index 00000000..112c5eae --- /dev/null +++ b/kera-qca6750-bt.dts @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "kera-qca6750-bt.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera"; + compatible = "qcom,kera-atp", "qcom,kera", "qcom,atp", + "qcom,kera-cdp", "qcom,cdp", "qcom,kera-mtp", + "qcom,mtp", "qcom,kera-rcm", "qcom,rcm"; + qcom,msm-id = <686 0x10000>, <659 0x10000>; + qcom,board-id = <0x000021 0>, <0x010001 0>, <0x020001 0>, + <0x030001 0>, <0x040001 0>, <0x010008 0>, + <0x020008 0>, <0x030008 0>, <0x010015 0>, + <0x020015 0>; +}; diff --git a/kera-qca6750-bt.dtsi b/kera-qca6750-bt.dtsi new file mode 100644 index 00000000..6f915426 --- /dev/null +++ b/kera-qca6750-bt.dtsi @@ -0,0 +1,68 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include +#include +#include + +&pm8550vs_g_gpios { + bt_en: bt_en { + pins = "gpio4"; + function = "normal"; + input-disable; + output-enable; + bias-disable; + power-source = <1>; + }; +}; + +&tlmm { + cnss_bt_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio81"; + function = "wcn_sw_ctrl"; + }; + }; +}; + +&soc { + bluetooth: bt_wcn6750 { + compatible = "qcom,wcn6750-bt"; + + pinctrl-names = "bt_en", "sw_ctrl"; + pinctrl-0 = <&bt_en>; + pinctrl-1 = <&cnss_bt_sw_ctrl>; + + qcom,wl-reset-gpio = <&tlmm 35 0>; /* WCN_WLAN_EN */ + qcom,bt-sw-ctrl-gpio = <&tlmm 81 0>; /* WCN_SW_CTRL */ + qcom,bt-reset-gpio = <&pm8550vs_g_gpios 4 0>; /* WCN_BT_EN */ + + qcom,bt-vdd-io-supply = <&L11B>; /* IO */ + qcom,bt-vdd-aon-supply = <&S3B>; + qcom,bt-vdd-dig-supply = <&S3B>; /* BT_CX_MX */ + qcom,bt-vdd-rfacmn-supply = <&S3B>; + qcom,bt-vdd-rfa-0p8-supply = <&S3B>; + qcom,bt-vdd-rfa1-supply = <&S1B>; /*RFA 1p7*/ + qcom,bt-vdd-rfa2-supply = <&S2B>; /*RFA 1p2*/ + qcom,bt-vdd-ipa-2p2-supply = <&S4B>; /*IPA 2p2*/ + + /* max voltage are set to regulator max voltage supported */ + qcom,bt-vdd-io-config = <1620000 1800000 0 1>; + qcom,bt-vdd-aon-config = <920000 2736000 0 1>; + qcom,bt-vdd-dig-config = <920000 2736000 0 1>; + qcom,bt-vdd-rfacmn-config = <920000 2736000 0 1>; + qcom,bt-vdd-rfa-0p8-config = <920000 2736000 0 1>; + qcom,bt-vdd-rfa1-config = <1856000 2044000 0 1>; + qcom,bt-vdd-rfa2-config = <1256000 2092000 0 1>; + qcom,bt-vdd-ipa-2p2-config = <2200000 2700000 0 1>; + }; + +}; + +//uart instance +&qupv3_se5_4uart { + status = "ok"; +}; diff --git a/kera-wcn7750-bt.dts b/kera-wcn7750-bt.dts new file mode 100644 index 00000000..af23dd62 --- /dev/null +++ b/kera-wcn7750-bt.dts @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "kera-wcn7750-bt.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera"; + compatible = "qcom,kera-mtp", "qcom,kera", "qcom,mtp", + "qcom,kera-qrd", "qcom,qrd", "qcom,kera-rcm", + "qcom,rcm"; + qcom,msm-id = <686 0x10000>, <659 0x10000>; + qcom,board-id = <0x010008 1>, <0x020008 1>, <0x030008 1>, + <0x01000B 0>, <0x02000B 0>, <0x03000B 0>, + <0x010015 1>, <0x020015 1>; +}; \ No newline at end of file diff --git a/kera-wcn7750-bt.dtsi b/kera-wcn7750-bt.dtsi new file mode 100644 index 00000000..83d36435 --- /dev/null +++ b/kera-wcn7750-bt.dtsi @@ -0,0 +1,84 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include +#include +#include + +&pm8550vs_g_gpios { + bt_en: bt_en { + pins = "gpio4"; + function = "normal"; + input-disable; + output-enable; + bias-disable; + power-source = <1>; + }; + bt_fmd_clk_en: bt_fmd_clk_en { + pins = "gpio3"; + function = "normal"; + input-enable; + output-disable; + bias-disable; + power-source = <1>; + }; +}; + +&tlmm { + cnss_bt_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio81"; + function = "wcn_sw_ctrl"; + }; + }; +}; + +&soc { + bluetooth: bt_kera { + compatible = "qcom,wcn7750-bt"; + qcom,wcn7750-bt; + + nvmem-cell-names = "fmd_set", "fmd_chg_pon", "fmd_cnt2_stop"; + nvmem-cells = <&fmd_set>, <&fmd_chg_pon>, <&fmd_cnt2_stop>; + + pinctrl-names = "bt_en", "sw_ctrl", "bt_fmd_clk_en"; + pinctrl-0 = <&bt_en>; + pinctrl-1 = <&cnss_bt_sw_ctrl>; + pinctrl-2 = <&bt_fmd_clk_en>; + + clock-names = "bt_rf_clk1"; + clocks = <&rpmhcc RPMH_RF_CLK1>; + + mpm_wake_set_gpios = <81>; + qcom,wl-reset-gpio = <&tlmm 35 0>; /* WCN_WIFI_EN */ + qcom,bt-sw-ctrl-gpio = <&tlmm 81 0>; /* WCN_SW_CTRL */ + qcom,bt-fmd-clk-gpio = <&pm8550vs_g_gpios 3 0>; /* FMD_CLK_EN */ + qcom,bt-reset-gpio = <&pm8550vs_g_gpios 4 0>; /* WCN_BT_EN */ + + qcom,bt-vdd-io-supply = <&L7B>; /* WCN_1P8_IO */ + qcom,bt-vdd-aon-supply = <&L11B>; /* AON LDO */ + qcom,bt-vdd-rfacmn-supply = <&S3B>; /* RF 0p8/CMN */ + qcom,bt-vdd-dig-supply = <&S3B>; /* BT LDO/BT_CX_MX */ + qcom,bt-vdd-rfa-0p8-supply = <&L6K>; /* RFA 0p8 / AV91C_VDD */ + qcom,bt-vdd-rfa1-supply = <&S1B>; /* RFA 1p7 */ + qcom,bt-vdd-rfa2-supply = <&S2B>; /* RFA 1p2 */ + qcom,bt-vdd-ipa-2p2-supply = <&S4B>; /* WCN_2p2_RFA */ + + qcom,bt-vdd-io-config = <1620000 1800000 0 1 1>; + qcom,bt-vdd-aon-config = <1800000 1800000 0 1 1>; + qcom,bt-vdd-rfacmn-config = <880000 2736000 0 1 1>; + qcom,bt-vdd-dig-config = <880000 2736000 0 1 1>; + qcom,bt-vdd-rfa-0p8-config = <900000 2000000 0 1 1>; + qcom,bt-vdd-rfa1-config = <1856000 2044000 0 1 1>; + qcom,bt-vdd-rfa2-config = <1256000 2092000 0 1 1>; + qcom,bt-vdd-ipa-2p2-config = <2156000 2700000 0 1 1>; + }; +}; + +//uart instance +&qupv3_se5_4uart { + status = "ok"; +}; From 7871563a323e66b7c8e4404dc300a9b5732ae444 Mon Sep 17 00:00:00 2001 From: Satish Kumar Kodishala Date: Mon, 9 Dec 2024 23:15:10 +0530 Subject: [PATCH 46/57] ARM: dts: msm: Add BT SoundWire and BT Slimbus nodes for Kera Add BT SoundWire(for WCN775x) and BT Slimbus nodes (for WCN675x) for Kera. CRs-Fixed: 3995949 Change-Id: Ib480857522e6c46407137ba43a330ab26d1d4a00 Signed-off-by: Satish Kumar Kodishala --- kera-qca6750-bt.dtsi | 17 +++++++++++++++++ kera-wcn7750-bt.dtsi | 7 +++++++ 2 files changed, 24 insertions(+) diff --git a/kera-qca6750-bt.dtsi b/kera-qca6750-bt.dtsi index 6f915426..ef159f53 100644 --- a/kera-qca6750-bt.dtsi +++ b/kera-qca6750-bt.dtsi @@ -62,6 +62,23 @@ }; +&slim_msm { + status = "ok"; + ngd@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <1>; + //slimbus child nodes + slimbus: btfmslim-driver { + compatible = "slim217,221"; + reg = <1 0>; + qcom,btslim-address = <0x0>; + qcom,btslimtx-channels = <159 160>; + qcom,btslimrx-channels = <157 158>; + }; + }; +}; + //uart instance &qupv3_se5_4uart { status = "ok"; diff --git a/kera-wcn7750-bt.dtsi b/kera-wcn7750-bt.dtsi index 83d36435..711b3404 100644 --- a/kera-wcn7750-bt.dtsi +++ b/kera-wcn7750-bt.dtsi @@ -78,6 +78,13 @@ }; }; +&swr4 { + btswr_slave: btswr-slave { + compatible = "qcom,btfmswr_slave"; + reg = <0x02 0x08170220>; + }; +}; + //uart instance &qupv3_se5_4uart { status = "ok"; From 4d83523d113ecdee7102cbf312d2e3a398953598 Mon Sep 17 00:00:00 2001 From: Girish BN Date: Wed, 27 Nov 2024 21:23:25 +0530 Subject: [PATCH 47/57] Add changes to enable FMD fetaure on wcn7750 - Add changes to enable FMD fetaure on wcn7750 Change-Id: Ic781a229672723a9f7a88f1d627ffa6685b78465 Signed-off-by: Girish BN (cherry picked from commit 3df8c02ca8ddbfa1daf2e4b65e459eb00aba9310) --- tuna-wcn7750-bt.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tuna-wcn7750-bt.dtsi b/tuna-wcn7750-bt.dtsi index fafcb279..dab790be 100644 --- a/tuna-wcn7750-bt.dtsi +++ b/tuna-wcn7750-bt.dtsi @@ -67,14 +67,14 @@ qcom,bt-vdd-rfa2-supply = <&S2B>; /* RFA 1p2 */ qcom,bt-vdd-ipa-2p2-supply = <&S1G>; /* WCN_2p2_RFA */ - qcom,bt-vdd-io-config = <1620000 1800000 0 1 0>; - qcom,bt-vdd-aon-config = <900000 1040000 0 1 0>; - qcom,bt-vdd-rfacmn-config = <900000 1040000 0 1 0>; - qcom,bt-vdd-dig-config = <900000 1040000 0 1 0>; - qcom,bt-vdd-rfa-0p8-config = <900000 2000000 0 1 0>; - qcom,bt-vdd-rfa1-config = <1900000 2104000 0 1 0>; - qcom,bt-vdd-rfa2-config = <1330000 1408000 0 1 0>; - qcom,bt-vdd-ipa-2p2-config = <2156000 2400000 0 1 0>; + qcom,bt-vdd-io-config = <1620000 1800000 0 1 1>; + qcom,bt-vdd-aon-config = <900000 1040000 0 1 1>; + qcom,bt-vdd-rfacmn-config = <900000 1040000 0 1 1>; + qcom,bt-vdd-dig-config = <900000 1040000 0 1 1>; + qcom,bt-vdd-rfa-0p8-config = <900000 2000000 0 1 1>; + qcom,bt-vdd-rfa1-config = <1900000 2104000 0 1 1>; + qcom,bt-vdd-rfa2-config = <1330000 1408000 0 1 1>; + qcom,bt-vdd-ipa-2p2-config = <2156000 2400000 0 1 1>; }; }; From 5fa0a842cf37ec8f89912ce82d62f0880f8b0927 Mon Sep 17 00:00:00 2001 From: Balakrishna Godavarthi Date: Tue, 3 Dec 2024 16:34:55 +0530 Subject: [PATCH 48/57] btfm: update board ids for tuna This change add supports for HMT in atp platform. Change-Id: I58986aea71e67dd63bc87cd639f6e41c3b3125e0 Signed-off-by: Balakrishna Godavarthi (cherry picked from commit 1d6854ec88d3a0fe3156ce3ff4c91fd22db6d934) --- tuna-kiwi-bt.dts | 4 ++-- tuna-wcn7750-bt.dts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tuna-kiwi-bt.dts b/tuna-kiwi-bt.dts index 91d22d95..bbdae060 100644 --- a/tuna-kiwi-bt.dts +++ b/tuna-kiwi-bt.dts @@ -14,6 +14,6 @@ "qcom,tuna-mtp", "qcom,tunap-mtp", "qcom,mtp", "qcom,tuna-atp", "qcom,tunap-atp", "qcom,atp", "qcom,tuna", "qcom,tunap"; - qcom,msm-id = <681 0x10000>, <655 0x10000>; - qcom,board-id = <21 1>, <8 2>, <8 3>; + qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>; + qcom,board-id = <21 1>, <8 2>, <8 3>, <33 0>; }; diff --git a/tuna-wcn7750-bt.dts b/tuna-wcn7750-bt.dts index be2aaea8..ad84007a 100644 --- a/tuna-wcn7750-bt.dts +++ b/tuna-wcn7750-bt.dts @@ -15,6 +15,6 @@ "qcom,tuna-cdp", "qcom,tunap-cdp", "qcom,cdp", "qcom,tuna-qrd", "qcom,tunap-qrd", "qcom,qrd", "qcom,tuna", "qcom,tunap"; - qcom,msm-id = <681 0x10000>, <655 0x10000>; - qcom,board-id = <1 0>, <8 0>, <8 1>, <8 4>, <11 0>, <21 0>, <33 0>; + qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>; + qcom,board-id = <1 0>, <8 0>, <8 1>, <8 4>, <11 0>, <21 0>; }; From cbaa37a8d5c5d9003b36a87e3e2c9ea4f6db34fc Mon Sep 17 00:00:00 2001 From: "V S Ganga VaraPrasad (VARA) Adabala" Date: Thu, 19 Dec 2024 00:02:53 +0530 Subject: [PATCH 49/57] Removed duplicate code Change-Id: I14a63c30f45ef0a299c516c77489b8cfdc58edd6 --- tuna-kiwi-bt.dtsi | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/tuna-kiwi-bt.dtsi b/tuna-kiwi-bt.dtsi index e4e40ef0..d558f321 100644 --- a/tuna-kiwi-bt.dtsi +++ b/tuna-kiwi-bt.dtsi @@ -69,38 +69,6 @@ " {class: wlan_pdc, ss: rf, res: s3b.v, dwnval: 616}", " {class: wlan_pdc, ss: bb, res: pdc, enable: 1}"; }; - - slim_msm: slim@6C40000 { - status = "ok"; - ngd@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <1>; - //slimbus child nodes - slimbus: btfmslim-driver { - compatible = "slim217,221"; - reg = <1 0>; - qcom,btslim-address = <0x0>; - qcom,btslimtx-channels = <159 160>; - qcom,btslimrx-channels = <157 158>; - }; - }; - }; -}; - -// FM changes -&qupv3_se5_i2c { - status = "ok"; - nq@64 { - compatible = "rtc6226"; - reg = <0x64>; - fmint-gpio = <&tlmm 29 0>; - vdd-supply = <&L18B>; - rtc6226,vdd-supply-voltage = <2800000 2800000>; - rtc6226,vdd-load = <15000>; - vio-supply = <&S1B>; - rtc6226,vio-supply-voltage = <1856000 1856000>; - }; }; &slim_msm { From 674ca4e2c5bfb1e02c6ac19a6284a874475a411b Mon Sep 17 00:00:00 2001 From: Satish Kumar Kodishala Date: Mon, 23 Dec 2024 18:58:19 +0530 Subject: [PATCH 50/57] ARM: dts: msm: Add support for RTC6226 FM Added support for RTC6226 FM. Change-Id: Ibefb60c3dde6eb68fa1d22b4be7f44678b52e90e Signed-off-by: Satish Kumar Kodishala --- kera-qca6750-bt.dtsi | 15 +++++++++++++++ kera-wcn7750-bt.dtsi | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/kera-qca6750-bt.dtsi b/kera-qca6750-bt.dtsi index ef159f53..2bb610a9 100644 --- a/kera-qca6750-bt.dtsi +++ b/kera-qca6750-bt.dtsi @@ -83,3 +83,18 @@ &qupv3_se5_4uart { status = "ok"; }; + +// FM changes +&qupv3_se4_i2c { + status = "ok"; + nq@64 { + compatible = "rtc6226"; + reg = <0x64>; + fmint-gpio = <&tlmm 130 0>; + vdd-supply = <&L18B>; + rtc6226,vdd-supply-voltage = <2800000 2800000>; + rtc6226,vdd-load = <15000>; + vio-supply = <&L7B>; + rtc6226,vio-supply-voltage = <1800000 1800000>; + }; +}; diff --git a/kera-wcn7750-bt.dtsi b/kera-wcn7750-bt.dtsi index 711b3404..ca554a3e 100644 --- a/kera-wcn7750-bt.dtsi +++ b/kera-wcn7750-bt.dtsi @@ -89,3 +89,18 @@ &qupv3_se5_4uart { status = "ok"; }; + +// FM changes +&qupv3_se4_i2c { + status = "ok"; + nq@64 { + compatible = "rtc6226"; + reg = <0x64>; + fmint-gpio = <&tlmm 130 0>; + vdd-supply = <&L18B>; + rtc6226,vdd-supply-voltage = <2800000 2800000>; + rtc6226,vdd-load = <15000>; + vio-supply = <&L7B>; + rtc6226,vio-supply-voltage = <1800000 1800000>; + }; +}; From 95d86561915653c54d5d1fe3c191a3eedfff8cf5 Mon Sep 17 00:00:00 2001 From: Girish BN Date: Mon, 13 Jan 2025 12:44:54 +0530 Subject: [PATCH 51/57] ARM: dts: msm: Add rcm, iot and qrd platform support for kera - Add rcm, iot and qrd platform support for kera Change-Id: I254e78fdc3091a339bcfe2a8bf327bae475df90a Signed-off-by: Girish BN --- kera-qca6750-bt.dts | 3 ++- kera-wcn7750-bt.dts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kera-qca6750-bt.dts b/kera-qca6750-bt.dts index 112c5eae..e4d1e549 100644 --- a/kera-qca6750-bt.dts +++ b/kera-qca6750-bt.dts @@ -17,5 +17,6 @@ qcom,board-id = <0x000021 0>, <0x010001 0>, <0x020001 0>, <0x030001 0>, <0x040001 0>, <0x010008 0>, <0x020008 0>, <0x030008 0>, <0x010015 0>, - <0x020015 0>; + <0x020015 0>, <0x030015 0>, <0x03000B 1>, + <0x050001 0>; }; diff --git a/kera-wcn7750-bt.dts b/kera-wcn7750-bt.dts index af23dd62..2ca4919b 100644 --- a/kera-wcn7750-bt.dts +++ b/kera-wcn7750-bt.dts @@ -16,5 +16,5 @@ qcom,msm-id = <686 0x10000>, <659 0x10000>; qcom,board-id = <0x010008 1>, <0x020008 1>, <0x030008 1>, <0x01000B 0>, <0x02000B 0>, <0x03000B 0>, - <0x010015 1>, <0x020015 1>; + <0x010015 1>, <0x020015 1>, <0x030015 1>; }; \ No newline at end of file From 587544824dfbbcdff861e368d7b2aed4c49abe61 Mon Sep 17 00:00:00 2001 From: Girish BN Date: Mon, 13 Jan 2025 12:44:54 +0530 Subject: [PATCH 52/57] ARM: dts: msm: Add rcm, iot and qrd platform support for kera - Add rcm, iot and qrd platform support for kera Change-Id: I254e78fdc3091a339bcfe2a8bf327bae475df90a Signed-off-by: Girish BN (cherry picked from commit 95d86561915653c54d5d1fe3c191a3eedfff8cf5) --- kera-qca6750-bt.dts | 3 ++- kera-wcn7750-bt.dts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kera-qca6750-bt.dts b/kera-qca6750-bt.dts index 112c5eae..e4d1e549 100644 --- a/kera-qca6750-bt.dts +++ b/kera-qca6750-bt.dts @@ -17,5 +17,6 @@ qcom,board-id = <0x000021 0>, <0x010001 0>, <0x020001 0>, <0x030001 0>, <0x040001 0>, <0x010008 0>, <0x020008 0>, <0x030008 0>, <0x010015 0>, - <0x020015 0>; + <0x020015 0>, <0x030015 0>, <0x03000B 1>, + <0x050001 0>; }; diff --git a/kera-wcn7750-bt.dts b/kera-wcn7750-bt.dts index af23dd62..2ca4919b 100644 --- a/kera-wcn7750-bt.dts +++ b/kera-wcn7750-bt.dts @@ -16,5 +16,5 @@ qcom,msm-id = <686 0x10000>, <659 0x10000>; qcom,board-id = <0x010008 1>, <0x020008 1>, <0x030008 1>, <0x01000B 0>, <0x02000B 0>, <0x03000B 0>, - <0x010015 1>, <0x020015 1>; + <0x010015 1>, <0x020015 1>, <0x030015 1>; }; \ No newline at end of file From 3ce60d9d93059e5af007b8ba062ac96faedc7783 Mon Sep 17 00:00:00 2001 From: Manish Kumar Sharma Date: Tue, 4 Feb 2025 10:43:46 +0530 Subject: [PATCH 53/57] BT_Transport: FMD retention change - Only necessary regulators are enabled for FMD retention changes. Change-Id: I709d15b019e187a67098eeb7a436f83954ac8051 --- tuna-wcn7750-bt.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tuna-wcn7750-bt.dtsi b/tuna-wcn7750-bt.dtsi index dab790be..948a7e86 100644 --- a/tuna-wcn7750-bt.dtsi +++ b/tuna-wcn7750-bt.dtsi @@ -68,12 +68,12 @@ qcom,bt-vdd-ipa-2p2-supply = <&S1G>; /* WCN_2p2_RFA */ qcom,bt-vdd-io-config = <1620000 1800000 0 1 1>; - qcom,bt-vdd-aon-config = <900000 1040000 0 1 1>; - qcom,bt-vdd-rfacmn-config = <900000 1040000 0 1 1>; - qcom,bt-vdd-dig-config = <900000 1040000 0 1 1>; - qcom,bt-vdd-rfa-0p8-config = <900000 2000000 0 1 1>; - qcom,bt-vdd-rfa1-config = <1900000 2104000 0 1 1>; - qcom,bt-vdd-rfa2-config = <1330000 1408000 0 1 1>; + qcom,bt-vdd-aon-config = <900000 1040000 0 1 0>; + qcom,bt-vdd-rfacmn-config = <900000 1040000 0 1 0>; + qcom,bt-vdd-dig-config = <900000 1040000 0 1 0>; + qcom,bt-vdd-rfa-0p8-config = <900000 2000000 0 1 0>; + qcom,bt-vdd-rfa1-config = <1900000 2104000 0 1 0>; + qcom,bt-vdd-rfa2-config = <1330000 1408000 0 1 0>; qcom,bt-vdd-ipa-2p2-config = <2156000 2400000 0 1 1>; }; }; From bc72a67acce815dc834744e2aa28865603879dd2 Mon Sep 17 00:00:00 2001 From: Manish Kumar Sharma Date: Mon, 10 Feb 2025 11:47:34 +0530 Subject: [PATCH 54/57] BT_Transport: FMD Retention Changes - Only necessary regulators are enabled for FMD retention changes. Change-Id: I50f66413132ae60aaa4b6db6f7bebc4a1d23b743 --- kera-wcn7750-bt.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kera-wcn7750-bt.dtsi b/kera-wcn7750-bt.dtsi index ca554a3e..cbce8468 100644 --- a/kera-wcn7750-bt.dtsi +++ b/kera-wcn7750-bt.dtsi @@ -68,12 +68,12 @@ qcom,bt-vdd-ipa-2p2-supply = <&S4B>; /* WCN_2p2_RFA */ qcom,bt-vdd-io-config = <1620000 1800000 0 1 1>; - qcom,bt-vdd-aon-config = <1800000 1800000 0 1 1>; - qcom,bt-vdd-rfacmn-config = <880000 2736000 0 1 1>; - qcom,bt-vdd-dig-config = <880000 2736000 0 1 1>; - qcom,bt-vdd-rfa-0p8-config = <900000 2000000 0 1 1>; - qcom,bt-vdd-rfa1-config = <1856000 2044000 0 1 1>; - qcom,bt-vdd-rfa2-config = <1256000 2092000 0 1 1>; + qcom,bt-vdd-aon-config = <1800000 1800000 0 1 0>; + qcom,bt-vdd-rfacmn-config = <880000 2736000 0 1 0>; + qcom,bt-vdd-dig-config = <880000 2736000 0 1 0>; + qcom,bt-vdd-rfa-0p8-config = <900000 2000000 0 1 0>; + qcom,bt-vdd-rfa1-config = <1856000 2044000 0 1 0>; + qcom,bt-vdd-rfa2-config = <1256000 2092000 0 1 0>; qcom,bt-vdd-ipa-2p2-config = <2156000 2700000 0 1 1>; }; }; From 4eff48c0b7f93b11140749f4e74278ce2c6767fc Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Wed, 2 Apr 2025 20:07:16 +0530 Subject: [PATCH 55/57] BTPower: Update power-source to 2 for certain chipsets Update power-source to 2 for chipsets to use 1.2 V for BT_EN CRs-Fixed: 4065538 Change-Id: I72ec6863be8d40b40cdeefbb837f1ac652319173 Signed-off-by: Hemant Gupta --- kera-wcn7750-bt.dtsi | 4 ++-- sun-kiwi-bt-v8.dtsi | 4 ++-- tuna-kiwi-bt.dtsi | 2 +- tuna-wcn7750-bt.dtsi | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kera-wcn7750-bt.dtsi b/kera-wcn7750-bt.dtsi index cbce8468..ec9075b0 100644 --- a/kera-wcn7750-bt.dtsi +++ b/kera-wcn7750-bt.dtsi @@ -15,7 +15,7 @@ input-disable; output-enable; bias-disable; - power-source = <1>; + power-source = <2>; }; bt_fmd_clk_en: bt_fmd_clk_en { pins = "gpio3"; @@ -23,7 +23,7 @@ input-enable; output-disable; bias-disable; - power-source = <1>; + power-source = <2>; }; }; diff --git a/sun-kiwi-bt-v8.dtsi b/sun-kiwi-bt-v8.dtsi index 3fc921d3..2932d11d 100644 --- a/sun-kiwi-bt-v8.dtsi +++ b/sun-kiwi-bt-v8.dtsi @@ -14,7 +14,7 @@ input-disable; output-enable; bias-disable; - power-source = <1>; + power-source = <2>; }; bt_fmd_clk_en: bt_fmd_clk_en { pins = "gpio6"; @@ -22,7 +22,7 @@ input-enable; output-disable; bias-disable; - power-source = <1>; + power-source = <2>; }; }; diff --git a/tuna-kiwi-bt.dtsi b/tuna-kiwi-bt.dtsi index d558f321..10f6dc38 100644 --- a/tuna-kiwi-bt.dtsi +++ b/tuna-kiwi-bt.dtsi @@ -15,7 +15,7 @@ input-disable; output-enable; bias-disable; - power-source = <1>; + power-source = <2>; }; }; diff --git a/tuna-wcn7750-bt.dtsi b/tuna-wcn7750-bt.dtsi index 948a7e86..16572cd3 100644 --- a/tuna-wcn7750-bt.dtsi +++ b/tuna-wcn7750-bt.dtsi @@ -15,7 +15,7 @@ input-disable; output-enable; bias-disable; - power-source = <1>; + power-source = <2>; }; bt_fmd_clk_en: bt_fmd_clk_en { pins = "gpio3"; @@ -23,7 +23,7 @@ input-enable; output-disable; bias-disable; - power-source = <1>; + power-source = <2>; }; }; From d736c864446ed88338aaeaa2aab1ea662c232666 Mon Sep 17 00:00:00 2001 From: Manish Kumar Sharma Date: Tue, 15 Apr 2025 10:18:51 +0530 Subject: [PATCH 56/57] dts: msm: Added new soc-ID's to parrot target - Added new SOC-ID's to support parrot target Change-Id: I75a3db97b95a365e01a94a69b68cf6d41dd1e8b6 Signed-off-by: Manish Kumar Sharma --- parrot-wcn3990-bt.dts | 6 +++++- parrot-wcn6750-bt.dts | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/parrot-wcn3990-bt.dts b/parrot-wcn3990-bt.dts index b61c5cee..5f4b2c38 100644 --- a/parrot-wcn3990-bt.dts +++ b/parrot-wcn3990-bt.dts @@ -12,7 +12,11 @@ / { model = "Qualcomm Technologies, Inc. Parrot SoC"; compatible = "qcom,parrot"; - qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,msm-id = <537 0x10000>, <583 0x10000>, + <613 0x10000>, <631 0x10000>, + <633 0x10000>, <634 0x10000>, + <638 0x10000>, <663 0x10000>, + <713 0x10000>, <714 0x10000>; qcom,board-id = <33 0>, <34 1>, <34 3>, <34 0x601>, <34 0x603>, <0x1000B 0x600>, <0x1000B 0>; }; diff --git a/parrot-wcn6750-bt.dts b/parrot-wcn6750-bt.dts index 14900c3f..0746a3f3 100644 --- a/parrot-wcn6750-bt.dts +++ b/parrot-wcn6750-bt.dts @@ -12,7 +12,11 @@ / { model = "Qualcomm Technologies, Inc. Parrot SoC"; compatible = "qcom,parrot"; - qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,msm-id = <537 0x10000>, <583 0x10000>, + <613 0x10000>, <631 0x10000>, + <633 0x10000>, <634 0x10000>, + <638 0x10000>, <663 0x10000>, + <713 0x10000>, <714 0x10000>; qcom,board-id = <34 0>, <34 2>, <34 4>, <34 5>, <34 6>, <34 0x600>, <34 0x602>, <34 0x604>, <0x1000B 1>, <0x1000B 2>, <0x1000B 0x601>; }; From 02c9a65967815c02556b4673d3530b775b5109bc Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Wed, 2 Apr 2025 20:07:16 +0530 Subject: [PATCH 57/57] BTPower: Update power-source to 2 for certain chipsets Update power-source to 2 for chipsets to use 1.2 V for BT_EN CRs-Fixed: 4065538 Change-Id: I72ec6863be8d40b40cdeefbb837f1ac652319173 Signed-off-by: Hemant Gupta (cherry picked from commit 4eff48c0b7f93b11140749f4e74278ce2c6767fc) --- kera-wcn7750-bt.dtsi | 4 ++-- sun-kiwi-bt-v8.dtsi | 4 ++-- tuna-kiwi-bt.dtsi | 2 +- tuna-wcn7750-bt.dtsi | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kera-wcn7750-bt.dtsi b/kera-wcn7750-bt.dtsi index cbce8468..ec9075b0 100644 --- a/kera-wcn7750-bt.dtsi +++ b/kera-wcn7750-bt.dtsi @@ -15,7 +15,7 @@ input-disable; output-enable; bias-disable; - power-source = <1>; + power-source = <2>; }; bt_fmd_clk_en: bt_fmd_clk_en { pins = "gpio3"; @@ -23,7 +23,7 @@ input-enable; output-disable; bias-disable; - power-source = <1>; + power-source = <2>; }; }; diff --git a/sun-kiwi-bt-v8.dtsi b/sun-kiwi-bt-v8.dtsi index 3fc921d3..2932d11d 100644 --- a/sun-kiwi-bt-v8.dtsi +++ b/sun-kiwi-bt-v8.dtsi @@ -14,7 +14,7 @@ input-disable; output-enable; bias-disable; - power-source = <1>; + power-source = <2>; }; bt_fmd_clk_en: bt_fmd_clk_en { pins = "gpio6"; @@ -22,7 +22,7 @@ input-enable; output-disable; bias-disable; - power-source = <1>; + power-source = <2>; }; }; diff --git a/tuna-kiwi-bt.dtsi b/tuna-kiwi-bt.dtsi index d558f321..10f6dc38 100644 --- a/tuna-kiwi-bt.dtsi +++ b/tuna-kiwi-bt.dtsi @@ -15,7 +15,7 @@ input-disable; output-enable; bias-disable; - power-source = <1>; + power-source = <2>; }; }; diff --git a/tuna-wcn7750-bt.dtsi b/tuna-wcn7750-bt.dtsi index 948a7e86..16572cd3 100644 --- a/tuna-wcn7750-bt.dtsi +++ b/tuna-wcn7750-bt.dtsi @@ -15,7 +15,7 @@ input-disable; output-enable; bias-disable; - power-source = <1>; + power-source = <2>; }; bt_fmd_clk_en: bt_fmd_clk_en { pins = "gpio3"; @@ -23,7 +23,7 @@ input-enable; output-disable; bias-disable; - power-source = <1>; + power-source = <2>; }; };