mawei/agnos-kernel-sdm845
1
0
Fork 0
mirror of https://github.com/commaai/agnos-kernel-sdm845.git synced 2026-06-08 11:24:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

closer

Browse Source
This commit is contained in:
Adeeb Shihadeh
2024-04-17 18:55:45 -07:00
parent a11f28863b
commit cfcdcaceda
8 changed files with 26 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
arch/arm64/boot/dts/qcom/comma_common.dtsi
View File

@@ -545,46 +545,49 @@
subsys-name = "QCA9377_SDIO";
vdd-wlan-supply = <&pm8998_l21>;
vdd-wlan-io-supply = <&pm8998_l13>;
vdd-wlan-dsrc-supply = <&pm8998_l13>;
vdd-wlan-xtal-supply = <&pm8998_l13>;
qcom,skip-wlan-en-toggle;
status = "ok";
};
};
/* SD card + WLAN */
&sdhc_2 {
#address-cells = <1>;
#size-cells = <0>;
vdd-supply = <&pm8998_l21>;
qcom,vdd-voltage-level = <2950000 2960000>;
qcom,vdd-voltage-level = <2950000 3300000>;
qcom,vdd-current-level = <200 800000>;
vdd-io-supply = <&pm8998_l13>;
qcom,vdd-io-voltage-level = <1800000 1800000>;
qcom,vdd-io-current-level = <200 22000>;
status = "ok";
pinctrl-names = "active", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &storage_cd>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &storage_cd>;
status = "ok";
/* SD card */
/*
cd-gpios = <&tlmm 126 GPIO_ACTIVE_LOW>;
*/
/* WLAN config */
//no-sd;
//no-mmc;
bus-width = <4>;
qcom,nonremovable;
non-removable;
keep-power-in-suspend;
mmc-pwrseq = <&pwrseq_simple>;
#address-cells = <1>;
#size-cells = <0>;
wifi: wifi@1 {
reg = <1>;
compatible = "qcom,cnss_sdio";
subsys-name = "QCA9377_SDIO";
//vdd-wlan-supply = <&pm8998_l21>;
//vdd-wlan-io-supply = <&pm8998_l13>;
status = "ok";
compatible = "qcom,cnss_sdio";
};
};
@@ -592,17 +595,4 @@
restart@10ac000 {
qcom,force-warm-reboot;
};
/*
cnss_sdio: qcom,cnss_sdio {
compatible = "qcom,cnss_sdio";
subsys-name = "QCA9377_SDIO";
vdd-wlan-supply = <&pm8998_l21>;
vdd-wlan-io-supply = <&pm8998_l13>;
pinctrl-names = "active", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &storage_cd>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &storage_cd>;
status = "ok";
};
*/
};

2
arch/arm64/boot/dts/qcom/sdm845-regulator.dtsi
View File

@@ -576,7 +576,7 @@
regulator-name = "pm8998_l21";
qcom,set = <RPMH_REGULATOR_SET_ALL>;
regulator-min-microvolt = <2704000>;
regulator-max-microvolt = <2960000>;
regulator-max-microvolt = <3300000>;
qcom,init-voltage = <2704000>;
qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;
};

4
arch/arm64/configs/tici_defconfig
View File

@@ -1904,12 +1904,12 @@ CONFIG_CLD_LL_CORE=y
# CONFIG_WLAN_FEATURE_RX_WAKELOCK is not set
CONFIG_CNSS_UTILS=y
CONFIG_CNSS_GENL=y
CONFIG_WLAN_DEBUG=y
#
# QCACLD 3.0 options (Qualcomm WLAN driver)
#
CONFIG_QCA_CLD_WLAN=m
CONFIG_QCA_CLD_WLAN=y
CONFIG_QCACLD_WLAN_LFR3=y
CONFIG_PRIMA_WLAN_OKC=y
CONFIG_PRIMA_WLAN_11AC_HIGH_TP=y

6
drivers/mmc/host/sdhci.c
View File

@@ -1731,12 +1731,10 @@ static int sdhci_notify_load(struct mmc_host *mmc, enum mmc_load state)
static bool sdhci_check_state(struct sdhci_host *host)
{
if (!host->clock || !host->pwr) {
pr_err("check state %d %d\n", !host->clock, !host->pwr);
if (!host->clock || !host->pwr)
return true;
} else {
else
return false;
}
}
static bool sdhci_check_auto_tuning(struct sdhci_host *host,

10
drivers/net/wireless/cnss/cnss_sdio.c
View File

@@ -992,10 +992,8 @@ int cnss_sdio_wlan_register_driver(struct cnss_sdio_wlan_driver *driver)
struct device *dev;
int error = -EINVAL;
if (!cnss_pdata) {
pr_err("no device!!!\n");
if (!cnss_pdata)
return -ENODEV;
}
cnss_info = &cnss_pdata->cnss_sdio_info;
dev = cnss_info->dev;
@@ -1401,8 +1399,6 @@ static int cnss_sdio_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct cnss_sdio_info *info;
pr_err("probing!!!\n");
if (pdev->dev.of_node) {
cnss_pdata = devm_kzalloc(
&pdev->dev, sizeof(*cnss_pdata), GFP_KERNEL);
@@ -1412,10 +1408,8 @@ static int cnss_sdio_probe(struct platform_device *pdev)
cnss_pdata = pdev->dev.platform_data;
}
if (!cnss_pdata) {
pr_err("not pdata :(\n");
if (!cnss_pdata)
return -EINVAL;
}
cnss_pdata->pdev = pdev;
info = &cnss_pdata->cnss_sdio_info;

2
drivers/staging/qca-wifi-host-cmn/qdf/linux/src/qdf_mem.c
View File

@@ -319,7 +319,7 @@ qdf_mem_header_assert_valid(struct qdf_mem_header *header,
}
#endif /* MEMORY_DEBUG */
int qdf_dbg_mask;
int qdf_dbg_mask = 0xff;
qdf_declare_param(qdf_dbg_mask, int);
qdf_export_symbol(qdf_dbg_mask);

8
drivers/staging/qcacld-3.0/Kbuild
View File

@@ -1356,7 +1356,6 @@ CDEFINES += -DWCN_PRONTO
CDEFINES += -DWCN_PRONTO_V1
endif
ifeq ($(BUILD_DEBUG_VERSION),1)
CDEFINES += -DWLAN_DEBUG \
-DTRACE_RECORD \
-DLIM_TRACE_RECORD \
@@ -1364,7 +1363,6 @@ CDEFINES += -DWLAN_DEBUG \
-DHDD_TRACE_RECORD \
-DPE_DEBUG_LOGW \
-DPE_DEBUG_LOGE
endif
ifeq ($(CONFIG_SLUB_DEBUG_ON),y)
CDEFINES += -DTIMER_MANAGER
@@ -1871,9 +1869,9 @@ endif
endif
#Flag to enable SMMU S1 support for SDM845
ifeq ($(CONFIG_ARCH_SDM845), y)
CDEFINES += -DENABLE_SMMU_S1_TRANSLATION
endif
#ifeq ($(CONFIG_ARCH_SDM845), y)
#CDEFINES += -DENABLE_SMMU_S1_TRANSLATION
#endif
#Flag to enable SMMU S1 support for SDM670
ifeq ($(CONFIG_ARCH_SDM670), y)

3
drivers/staging/qcacld-3.0/core/pld/src/pld_sdio.c
View File

@@ -56,18 +56,15 @@ static int pld_sdio_probe(struct sdio_func *sdio_func,
pld_context = pld_get_global_context();
if (!pld_context || !sdio_func) {
pr_err("right here %d %d \n", !pld_context, !sdio_func);
ret = -ENODEV;
goto out;
}
pr_err("still going... \n");
dev = &sdio_func->dev;
ret = pld_add_dev(pld_context, dev, PLD_BUS_TYPE_SDIO);
if (ret)
goto out;
pr_err("returning the probe, still going... \n");
return pld_context->ops->probe(dev, PLD_BUS_TYPE_SDIO,
sdio_func, (void *)id);