A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "pinctrl: qcom: Expose ufs_reset as gpio on shima"

Browse source
This commit is contained in:
qctecmdr 2020-04-17 16:31:23 -07:00 • committed by Gerrit - the friendly Code Review server
commit 8121f935fe
1 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

51
drivers/pinctrl/qcom/pinctrl-shima.c
View file

@ -331,14 +331,15 @@ static const struct pinctrl_pin_desc shima_pins[] = {
PINCTRL_PIN(201, "GPIO_201"),
PINCTRL_PIN(202, "GPIO_202"),
PINCTRL_PIN(203, "GPIO_203"),
PINCTRL_PIN(204, "SDC1_RCLK"),
PINCTRL_PIN(205, "SDC1_CLK"),
PINCTRL_PIN(206, "SDC1_CMD"),
PINCTRL_PIN(207, "SDC1_DATA"),
PINCTRL_PIN(208, "SDC2_CLK"),
PINCTRL_PIN(209, "SDC2_CMD"),
PINCTRL_PIN(210, "SDC2_DATA"),
PINCTRL_PIN(211, "UFS_RESET"),
PINCTRL_PIN(204, "UFS_RESET"),
PINCTRL_PIN(205, "SDC1_RCLK"),
PINCTRL_PIN(206, "SDC1_CLK"),
PINCTRL_PIN(207, "SDC1_CMD"),
PINCTRL_PIN(208, "SDC1_DATA"),
PINCTRL_PIN(209, "SDC2_CLK"),
PINCTRL_PIN(210, "SDC2_CMD"),
PINCTRL_PIN(211, "SDC2_DATA"),
};
#define DECLARE_MSM_GPIO_PINS(pin) \
@ -548,14 +549,14 @@ DECLARE_MSM_GPIO_PINS(201);
DECLARE_MSM_GPIO_PINS(202);
DECLARE_MSM_GPIO_PINS(203);
static const unsigned int sdc1_rclk_pins[] = { 204 };
static const unsigned int sdc1_clk_pins[] = { 205 };
static const unsigned int sdc1_cmd_pins[] = { 206 };
static const unsigned int sdc1_data_pins[] = { 207 };
static const unsigned int sdc2_clk_pins[] = { 208 };
static const unsigned int sdc2_cmd_pins[] = { 209 };
static const unsigned int sdc2_data_pins[] = { 210 };
static const unsigned int ufs_reset_pins[] = { 211 };
static const unsigned int sdc1_rclk_pins[] = { 205 };
static const unsigned int sdc1_clk_pins[] = { 206 };
static const unsigned int sdc1_cmd_pins[] = { 207 };
static const unsigned int sdc1_data_pins[] = { 208 };
static const unsigned int sdc2_clk_pins[] = { 209 };
static const unsigned int sdc2_cmd_pins[] = { 210};
static const unsigned int sdc2_data_pins[] = { 211 };
static const unsigned int ufs_reset_pins[] = { 204 };
enum shima_functions {
msm_mux_gpio,
@ -1856,14 +1857,14 @@ static const struct msm_pingroup shima_groups[] = {
0xCC004, 12),
[203] = PINGROUP(203, forced_usb, NA, NA, NA, NA, NA, NA, NA, NA,
0, -1),
[204] = SDC_QDSD_PINGROUP(sdc1_rclk, 0x1d0000, 15, 0),
[205] = SDC_QDSD_PINGROUP(sdc1_clk, 0x1d0000, 13, 6),
[206] = SDC_QDSD_PINGROUP(sdc1_cmd, 0x1d0000, 11, 3),
[207] = SDC_QDSD_PINGROUP(sdc1_data, 0x1d0000, 9, 0),
[208] = SDC_QDSD_PINGROUP(sdc2_clk, 0x1d1000, 14, 6),
[209] = SDC_QDSD_PINGROUP(sdc2_cmd, 0x1d1000, 11, 3),
[210] = SDC_QDSD_PINGROUP(sdc2_data, 0x1d1000, 9, 0),
[211] = UFS_RESET(ufs_reset, 0x1db000),
[204] = UFS_RESET(ufs_reset, 0x1db000),
[205] = SDC_QDSD_PINGROUP(sdc1_rclk, 0x1d0000, 15, 0),
[206] = SDC_QDSD_PINGROUP(sdc1_clk, 0x1d0000, 13, 6),
[207] = SDC_QDSD_PINGROUP(sdc1_cmd, 0x1d0000, 11, 3),
[208] = SDC_QDSD_PINGROUP(sdc1_data, 0x1d0000, 9, 0),
[209] = SDC_QDSD_PINGROUP(sdc2_clk, 0x1d1000, 14, 6),
[210] = SDC_QDSD_PINGROUP(sdc2_cmd, 0x1d1000, 11, 3),
[211] = SDC_QDSD_PINGROUP(sdc2_data, 0x1d1000, 9, 0),
};
static struct pinctrl_qup shima_qup_regs[] = {
QUP_I3C(0, QUP_I3C_0_MODE_OFFSET),
@ -1896,7 +1897,7 @@ static const struct msm_pinctrl_soc_data shima_pinctrl = {
.nfunctions = ARRAY_SIZE(shima_functions),
.groups = shima_groups,
.ngroups = ARRAY_SIZE(shima_groups),
.ngpios = 204,
.ngpios = 205,
.qup_regs = shima_qup_regs,
.nqup_regs = ARRAY_SIZE(shima_qup_regs),
.wakeirq_map = shima_pdc_map,