Skip to content

Commit 5ed7986

Browse files
JIaxygalinusw
authored andcommitted
pinctrl: qcom: pinctrl-sm7150: Fix sdc1 and ufs special pins regs
SDC1 and UFS_RESET special pins are located in the west memory bank. SDC1 have address 0x359a000: 0x3500000 (TLMM BASE) + 0x0 (WEST) + 0x9a000 (SDC1_OFFSET) = 0x359a000 UFS_RESET have address 0x359f000: 0x3500000 (TLMM BASE) + 0x0 (WEST) + 0x9f000 (UFS_OFFSET) = 0x359a000 Fixes: b915395 ("pinctrl: qcom: Add SM7150 pinctrl driver") Signed-off-by: Danila Tikhonov <[email protected]> Message-ID: <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
1 parent 083f667 commit 5ed7986

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

drivers/pinctrl/qcom/pinctrl-sm7150.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ enum {
6565
.intr_detection_width = 2, \
6666
}
6767

68-
#define SDC_QDSD_PINGROUP(pg_name, ctl, pull, drv) \
68+
#define SDC_QDSD_PINGROUP(pg_name, _tile, ctl, pull, drv) \
6969
{ \
7070
.grp = PINCTRL_PINGROUP(#pg_name, \
7171
pg_name##_pins, \
@@ -75,7 +75,7 @@ enum {
7575
.intr_cfg_reg = 0, \
7676
.intr_status_reg = 0, \
7777
.intr_target_reg = 0, \
78-
.tile = SOUTH, \
78+
.tile = _tile, \
7979
.mux_bit = -1, \
8080
.pull_bit = pull, \
8181
.drv_bit = drv, \
@@ -101,7 +101,7 @@ enum {
101101
.intr_cfg_reg = 0, \
102102
.intr_status_reg = 0, \
103103
.intr_target_reg = 0, \
104-
.tile = SOUTH, \
104+
.tile = WEST, \
105105
.mux_bit = -1, \
106106
.pull_bit = 3, \
107107
.drv_bit = 0, \
@@ -1199,13 +1199,13 @@ static const struct msm_pingroup sm7150_groups[] = {
11991199
[117] = PINGROUP(117, NORTH, _, _, _, _, _, _, _, _, _),
12001200
[118] = PINGROUP(118, NORTH, _, _, _, _, _, _, _, _, _),
12011201
[119] = UFS_RESET(ufs_reset, 0x9f000),
1202-
[120] = SDC_QDSD_PINGROUP(sdc1_rclk, 0x9a000, 15, 0),
1203-
[121] = SDC_QDSD_PINGROUP(sdc1_clk, 0x9a000, 13, 6),
1204-
[122] = SDC_QDSD_PINGROUP(sdc1_cmd, 0x9a000, 11, 3),
1205-
[123] = SDC_QDSD_PINGROUP(sdc1_data, 0x9a000, 9, 0),
1206-
[124] = SDC_QDSD_PINGROUP(sdc2_clk, 0x98000, 14, 6),
1207-
[125] = SDC_QDSD_PINGROUP(sdc2_cmd, 0x98000, 11, 3),
1208-
[126] = SDC_QDSD_PINGROUP(sdc2_data, 0x98000, 9, 0),
1202+
[120] = SDC_QDSD_PINGROUP(sdc1_rclk, WEST, 0x9a000, 15, 0),
1203+
[121] = SDC_QDSD_PINGROUP(sdc1_clk, WEST, 0x9a000, 13, 6),
1204+
[122] = SDC_QDSD_PINGROUP(sdc1_cmd, WEST, 0x9a000, 11, 3),
1205+
[123] = SDC_QDSD_PINGROUP(sdc1_data, WEST, 0x9a000, 9, 0),
1206+
[124] = SDC_QDSD_PINGROUP(sdc2_clk, SOUTH, 0x98000, 14, 6),
1207+
[125] = SDC_QDSD_PINGROUP(sdc2_cmd, SOUTH, 0x98000, 11, 3),
1208+
[126] = SDC_QDSD_PINGROUP(sdc2_data, SOUTH, 0x98000, 9, 0),
12091209
};
12101210

12111211
static const struct msm_gpio_wakeirq_map sm7150_pdc_map[] = {

0 commit comments

Comments
 (0)