pinctrl: qcom: sc7180: Add missing tile info in SDC_QDSD_PINGROUP/UFS_RESET

[ Upstream commit 81898a44f288607cb3b11a42aed6efb646891c19 ]

The SDC_QDSD_PINGROUP/UFS_RESET macros are missing the .tile info needed to
calculate the right register offsets. Adding them here and also
adjusting the offsets accordingly.

Fixes: f2ae04c45b1a ("pinctrl: qcom: Add SC7180 pinctrl driver")
Reported-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
Link: https://lore.kernel.org/r/20191021141507.24066-1-rnayak@codeaurora.org
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/pinctrl/qcom/pinctrl-sc7180.c b/drivers/pinctrl/qcom/pinctrl-sc7180.c
index 6399c8a2bc22c24b145542dace25134249e0e2e8..d6cfad7417b1cab8101f6e5af7f1d205715f5373 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sc7180.c
+++ b/drivers/pinctrl/qcom/pinctrl-sc7180.c
@@ -77,6 +77,7 @@ enum {
                .intr_cfg_reg = 0,                      \
                .intr_status_reg = 0,                   \
                .intr_target_reg = 0,                   \
+               .tile = SOUTH,                          \
                .mux_bit = -1,                          \
                .pull_bit = pull,                       \
                .drv_bit = drv,                         \
@@ -102,6 +103,7 @@ enum {
                .intr_cfg_reg = 0,                      \
                .intr_status_reg = 0,                   \
                .intr_target_reg = 0,                   \
+               .tile = SOUTH,                          \
                .mux_bit = -1,                          \
                .pull_bit = 3,                          \
                .drv_bit = 0,                           \
@@ -1087,14 +1089,14 @@ static const struct msm_pingroup sc7180_groups[] = {
        [116] = PINGROUP(116, WEST, qup04, qup04, _, _, _, _, _, _, _),
        [117] = PINGROUP(117, WEST, dp_hot, _, _, _, _, _, _, _, _),
        [118] = PINGROUP(118, WEST, _, _, _, _, _, _, _, _, _),
-       [119] = UFS_RESET(ufs_reset, 0x97f000),
-       [120] = SDC_QDSD_PINGROUP(sdc1_rclk, 0x97a000, 15, 0),
-       [121] = SDC_QDSD_PINGROUP(sdc1_clk, 0x97a000, 13, 6),
-       [122] = SDC_QDSD_PINGROUP(sdc1_cmd, 0x97a000, 11, 3),
-       [123] = SDC_QDSD_PINGROUP(sdc1_data, 0x97a000, 9, 0),
-       [124] = SDC_QDSD_PINGROUP(sdc2_clk, 0x97b000, 14, 6),
-       [125] = SDC_QDSD_PINGROUP(sdc2_cmd, 0x97b000, 11, 3),
-       [126] = SDC_QDSD_PINGROUP(sdc2_data, 0x97b000, 9, 0),
+       [119] = UFS_RESET(ufs_reset, 0x7f000),
+       [120] = SDC_QDSD_PINGROUP(sdc1_rclk, 0x7a000, 15, 0),
+       [121] = SDC_QDSD_PINGROUP(sdc1_clk, 0x7a000, 13, 6),
+       [122] = SDC_QDSD_PINGROUP(sdc1_cmd, 0x7a000, 11, 3),
+       [123] = SDC_QDSD_PINGROUP(sdc1_data, 0x7a000, 9, 0),
+       [124] = SDC_QDSD_PINGROUP(sdc2_clk, 0x7b000, 14, 6),
+       [125] = SDC_QDSD_PINGROUP(sdc2_cmd, 0x7b000, 11, 3),
+       [126] = SDC_QDSD_PINGROUP(sdc2_data, 0x7b000, 9, 0),
 };
 
 static const struct msm_pinctrl_soc_data sc7180_pinctrl = {