Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

authored by

Rajendra Nayak and committed by
Linus Walleij
81898a44 0b329285

+10 -8
+10 -8
drivers/pinctrl/qcom/pinctrl-sc7180.c
··· 77 77 .intr_cfg_reg = 0, \ 78 78 .intr_status_reg = 0, \ 79 79 .intr_target_reg = 0, \ 80 + .tile = SOUTH, \ 80 81 .mux_bit = -1, \ 81 82 .pull_bit = pull, \ 82 83 .drv_bit = drv, \ ··· 103 102 .intr_cfg_reg = 0, \ 104 103 .intr_status_reg = 0, \ 105 104 .intr_target_reg = 0, \ 105 + .tile = SOUTH, \ 106 106 .mux_bit = -1, \ 107 107 .pull_bit = 3, \ 108 108 .drv_bit = 0, \ ··· 1089 1087 [116] = PINGROUP(116, WEST, qup04, qup04, _, _, _, _, _, _, _), 1090 1088 [117] = PINGROUP(117, WEST, dp_hot, _, _, _, _, _, _, _, _), 1091 1089 [118] = PINGROUP(118, WEST, _, _, _, _, _, _, _, _, _), 1092 - [119] = UFS_RESET(ufs_reset, 0x97f000), 1093 - [120] = SDC_QDSD_PINGROUP(sdc1_rclk, 0x97a000, 15, 0), 1094 - [121] = SDC_QDSD_PINGROUP(sdc1_clk, 0x97a000, 13, 6), 1095 - [122] = SDC_QDSD_PINGROUP(sdc1_cmd, 0x97a000, 11, 3), 1096 - [123] = SDC_QDSD_PINGROUP(sdc1_data, 0x97a000, 9, 0), 1097 - [124] = SDC_QDSD_PINGROUP(sdc2_clk, 0x97b000, 14, 6), 1098 - [125] = SDC_QDSD_PINGROUP(sdc2_cmd, 0x97b000, 11, 3), 1099 - [126] = SDC_QDSD_PINGROUP(sdc2_data, 0x97b000, 9, 0), 1090 + [119] = UFS_RESET(ufs_reset, 0x7f000), 1091 + [120] = SDC_QDSD_PINGROUP(sdc1_rclk, 0x7a000, 15, 0), 1092 + [121] = SDC_QDSD_PINGROUP(sdc1_clk, 0x7a000, 13, 6), 1093 + [122] = SDC_QDSD_PINGROUP(sdc1_cmd, 0x7a000, 11, 3), 1094 + [123] = SDC_QDSD_PINGROUP(sdc1_data, 0x7a000, 9, 0), 1095 + [124] = SDC_QDSD_PINGROUP(sdc2_clk, 0x7b000, 14, 6), 1096 + [125] = SDC_QDSD_PINGROUP(sdc2_cmd, 0x7b000, 11, 3), 1097 + [126] = SDC_QDSD_PINGROUP(sdc2_data, 0x7b000, 9, 0), 1100 1098 }; 1101 1099 1102 1100 static const struct msm_pinctrl_soc_data sc7180_pinctrl = {