From 3df8c02ca8ddbfa1daf2e4b65e459eb00aba9310 Mon Sep 17 00:00:00 2001 From: Girish BN Date: Wed, 27 Nov 2024 21:23:25 +0530 Subject: [PATCH 1/6] 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 1d6854ec88d3a0fe3156ce3ff4c91fd22db6d934 Mon Sep 17 00:00:00 2001 From: Balakrishna Godavarthi Date: Tue, 3 Dec 2024 16:34:55 +0530 Subject: [PATCH 2/6] 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 3/6] 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 4/6] 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 5/6] 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 674ca4e2c5bfb1e02c6ac19a6284a874475a411b Mon Sep 17 00:00:00 2001 From: Satish Kumar Kodishala Date: Mon, 23 Dec 2024 18:58:19 +0530 Subject: [PATCH 6/6] 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>; + }; +};