samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge f238c7389c on remote branch

Browse Source 
Change-Id: I9b0c1892c23660cd897c0351ebe671e67161d3fb
This commit is contained in:
Linux Build Service Account
2024-04-11 09:43:19 -07:00
parent aa0e3715b6 f238c7389c
commit 2b8f7293ad
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nfc/common.c
View File

@@ -69,16 +69,19 @@ int nfc_parse_dt(struct device *dev, struct platform_configs *nfc_configs,
pr_warn("NxpDrv: %s: dwl_req gpio invalid %d\n", __func__, pr_warn("NxpDrv: %s: dwl_req gpio invalid %d\n", __func__,
nfc_gpio->dwl_req); nfc_gpio->dwl_req);
} }
/* Read clock request gpio configuration if MGPIO configurations are not preasent */ /* Read clock request gpio configuration if MGPIO configurations are not preasent */
if (of_property_read_string(np, DTS_CLKSRC_GPIO_STR, &nfc_configs->clk_src_name)) { if (of_property_read_string(np, DTS_CLKSRC_GPIO_STR, &nfc_configs->clk_src_name)) {
nfc_configs->clk_pin_voting = false; nfc_configs->clk_pin_voting = false;
} else
nfc_configs->clk_pin_voting = true;
/* Read clkreq GPIO pin number from DTSI */
nfc_gpio->clkreq = of_get_named_gpio(np, DTS_CLKREQ_GPIO_STR, 0); nfc_gpio->clkreq = of_get_named_gpio(np, DTS_CLKREQ_GPIO_STR, 0);
if (!gpio_is_valid(nfc_gpio->clkreq)) { if (!gpio_is_valid(nfc_gpio->clkreq)) {
dev_err(dev, "NxpDrv: clkreq gpio invalid %d\n", nfc_gpio->clkreq); dev_err(dev, "NxpDrv: clkreq gpio invalid %d\n", nfc_gpio->clkreq);
return -EINVAL; return -EINVAL;
} }
} else
nfc_configs->clk_pin_voting = true;
#ifdef NFC_SECURE_PERIPHERAL_ENABLED #ifdef NFC_SECURE_PERIPHERAL_ENABLED
/* Read DTS_SZONE_STR to check secure zone support */ /* Read DTS_SZONE_STR to check secure zone support */
@@ -494,7 +497,6 @@ int nfc_post_init(struct nfc_dev *nfc_dev)
__func__, nfc_gpio->dwl_req); __func__, nfc_gpio->dwl_req);
} }
if (!(nfc_configs.clk_pin_voting)) {
/* Read clkreq GPIO number from device tree*/ /* Read clkreq GPIO number from device tree*/
ret = of_property_read_u32_index(nfc_dev->i2c_dev.client->dev.of_node, ret = of_property_read_u32_index(nfc_dev->i2c_dev.client->dev.of_node,
DTS_CLKREQ_GPIO_STR, 1, &clkreq_gpio); DTS_CLKREQ_GPIO_STR, 1, &clkreq_gpio);
@@ -510,7 +512,6 @@ int nfc_post_init(struct nfc_dev *nfc_dev)
__func__, clkreq_gpio, ret); __func__, clkreq_gpio, ret);
return ret; return ret;
} }
}
ret = nfcc_hw_check(nfc_dev); ret = nfcc_hw_check(nfc_dev);
if (ret || nfc_dev->nfc_state == NFC_STATE_UNKNOWN) { if (ret || nfc_dev->nfc_state == NFC_STATE_UNKNOWN) {