samsung_sm8750/android_kernel_samsung_sm8750-devicetrees
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 674ca4e2c5 on remote branch

Browse Source 
Change-Id: Iccffd794dc4e4d5a8a3579582470f3f844f618cb
This commit is contained in:
Linux Build Service Account
2025-01-04 03:54:21 -08:00
parent cbaa37a8d5 674ca4e2c5
commit d06304f06f
6 changed files with 254 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Kbuild
View File

@@ -7,6 +7,11 @@ dtbo-y += tuna-wcn7750-bt.dtbo
dtbo-y += tuna-kiwi-bt.dtbo dtbo-y += tuna-kiwi-bt.dtbo
endif endif
ifeq ($(CONFIG_ARCH_KERA), y)
dtbo-y += kera-qca6750-bt.dtbo
dtbo-y += kera-wcn7750-bt.dtbo
endif
ifeq ($(CONFIG_ARCH_SUN), y) ifeq ($(CONFIG_ARCH_SUN), y)
dtbo-y += sun-peach-bt.dtbo dtbo-y += sun-peach-bt.dtbo
dtbo-y += sun-kiwi-bt.dtbo dtbo-y += sun-kiwi-bt.dtbo

21
kera-qca6750-bt.dts Normal file
View File

@@ -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>;
};

100
kera-qca6750-bt.dtsi Normal file
View File

@@ -0,0 +1,100 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/interconnect/qcom,kera.h>
#include <dt-bindings/clock/qcom,rpmh.h>
&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>;
};
};
&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";
};
// 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>;
};
};

20
kera-wcn7750-bt.dts Normal file
View File

@@ -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>;
};

106
kera-wcn7750-bt.dtsi Normal file
View File

@@ -0,0 +1,106 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/interconnect/qcom,kera.h>
#include <dt-bindings/clock/qcom,rpmh.h>
&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>;
};
};
&swr4 {
btswr_slave: btswr-slave {
compatible = "qcom,btfmswr_slave";
reg = <0x02 0x08170220>;
};
};
//uart instance
&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>;
};
};

3
pineapple-kiwi-bt.dts
View File

@@ -12,6 +12,7 @@
/ { / {
model = "Qualcomm Technologies, Inc. Pineapple SoCs"; model = "Qualcomm Technologies, Inc. Pineapple SoCs";
compatible = "qcom,pineapple", "qcom,pineapplep"; 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>; qcom,board-id = <0 0>;
}; };