Use .remove_new() instead of .remove() for converting to plarform remove
callback returning void. Correct incorrect address offset which used by
ufs and sdc.
Signed-off-by: Tengfei Fan <[email protected]>
---
"[PATCH v4 0/2] pinctl: qcom: Add SM4450 pinctrl driver"
https://lore.kernel.org/linux-arm-msm/[email protected]/
Tengfei Fan (2):
pinctrl: qcom: Convert to platform remove callback returning void
pinctrl: qcom: correct incorrect address offset
drivers/pinctrl/qcom/pinctrl-sm4450.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
base-commit: 1f5c003694fab4b1ba6cbdcc417488b975c088d0
--
2.17.1
Use .remove_new() instead of .remove() for converting to plarform remove
callback returning void.
Signed-off-by: Tengfei Fan <[email protected]>
---
drivers/pinctrl/qcom/pinctrl-sm4450.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pinctrl/qcom/pinctrl-sm4450.c b/drivers/pinctrl/qcom/pinctrl-sm4450.c
index 20ad639087ed..49e2e3a7a9cb 100644
--- a/drivers/pinctrl/qcom/pinctrl-sm4450.c
+++ b/drivers/pinctrl/qcom/pinctrl-sm4450.c
@@ -993,7 +993,7 @@ static struct platform_driver sm4450_tlmm_driver = {
.of_match_table = sm4450_tlmm_of_match,
},
.probe = sm4450_tlmm_probe,
- .remove = msm_pinctrl_remove,
+ .remove_new = msm_pinctrl_remove,
};
MODULE_DEVICE_TABLE(of, sm4450_tlmm_of_match);
--
2.17.1
The address offset of 0x100000 is already provided in SM4450 DTSI, so
subtract 0x100000 from the offset which used by ufs and sdc.
Signed-off-by: Tengfei Fan <[email protected]>
---
drivers/pinctrl/qcom/pinctrl-sm4450.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/pinctrl/qcom/pinctrl-sm4450.c b/drivers/pinctrl/qcom/pinctrl-sm4450.c
index 49e2e3a7a9cb..5496f955ed2a 100644
--- a/drivers/pinctrl/qcom/pinctrl-sm4450.c
+++ b/drivers/pinctrl/qcom/pinctrl-sm4450.c
@@ -936,14 +936,14 @@ static const struct msm_pingroup sm4450_groups[] = {
[133] = PINGROUP(133, _, phase_flag, _, _, _, _, _, _, _),
[134] = PINGROUP(134, tsense_pwm1_out, tsense_pwm2_out, _, _, _, _, _, _, _),
[135] = PINGROUP(135, _, phase_flag, _, _, _, _, _, _, _),
- [136] = UFS_RESET(ufs_reset, 0x197000),
- [137] = SDC_QDSD_PINGROUP(sdc1_rclk, 0x18c004, 0, 0),
- [138] = SDC_QDSD_PINGROUP(sdc1_clk, 0x18c000, 13, 6),
- [139] = SDC_QDSD_PINGROUP(sdc1_cmd, 0x18c000, 11, 3),
- [140] = SDC_QDSD_PINGROUP(sdc1_data, 0x18c000, 9, 0),
- [141] = SDC_QDSD_PINGROUP(sdc2_clk, 0x18f000, 14, 6),
- [142] = SDC_QDSD_PINGROUP(sdc2_cmd, 0x18f000, 11, 3),
- [143] = SDC_QDSD_PINGROUP(sdc2_data, 0x18f000, 9, 0),
+ [136] = UFS_RESET(ufs_reset, 0x97000),
+ [137] = SDC_QDSD_PINGROUP(sdc1_rclk, 0x8c004, 0, 0),
+ [138] = SDC_QDSD_PINGROUP(sdc1_clk, 0x8c000, 13, 6),
+ [139] = SDC_QDSD_PINGROUP(sdc1_cmd, 0x8c000, 11, 3),
+ [140] = SDC_QDSD_PINGROUP(sdc1_data, 0x8c000, 9, 0),
+ [141] = SDC_QDSD_PINGROUP(sdc2_clk, 0x8f000, 14, 6),
+ [142] = SDC_QDSD_PINGROUP(sdc2_cmd, 0x8f000, 11, 3),
+ [143] = SDC_QDSD_PINGROUP(sdc2_data, 0x8f000, 9, 0),
};
static const struct msm_gpio_wakeirq_map sm4450_pdc_map[] = {
--
2.17.1