Skip to content

Commit 0cc449f

Browse files
masahir0ylinusw
authored andcommitted
pinctrl: uniphier: remove eMMC hardware reset pin-mux
This is handled by the mmc-pwrseq-emmc driver, which controls an eMMC hardware reset via a GPIO line. Remove it from the function pin-mux settings. Signed-off-by: Masahiro Yamada <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
1 parent 4e96fd3 commit 0cc449f

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,8 +472,8 @@ static const struct pinctrl_pin_desc uniphier_ld11_pins[] = {
472472

473473
static const unsigned aout_pins[] = {135, 136, 137, 138, 139, 140, 141, 142};
474474
static const int aout_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0};
475-
static const unsigned emmc_pins[] = {18, 19, 20, 21, 22, 23, 24, 25};
476-
static const int emmc_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0};
475+
static const unsigned int emmc_pins[] = {19, 20, 21, 22, 23, 24, 25};
476+
static const int emmc_muxvals[] = {0, 0, 0, 0, 0, 0, 0};
477477
static const unsigned emmc_dat8_pins[] = {26, 27, 28, 29};
478478
static const int emmc_dat8_muxvals[] = {0, 0, 0, 0};
479479
static const unsigned ether_rmii_pins[] = {6, 7, 8, 9, 10, 11, 12, 13, 14, 15,

drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,8 @@ static const struct pinctrl_pin_desc uniphier_ld20_pins[] = {
553553

554554
static const unsigned aout_pins[] = {135, 136, 137, 138, 139, 140, 141, 142};
555555
static const int aout_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0};
556-
static const unsigned emmc_pins[] = {18, 19, 20, 21, 22, 23, 24, 25};
557-
static const int emmc_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0};
556+
static const unsigned int emmc_pins[] = {19, 20, 21, 22, 23, 24, 25};
557+
static const int emmc_muxvals[] = {0, 0, 0, 0, 0, 0, 0};
558558
static const unsigned emmc_dat8_pins[] = {26, 27, 28, 29};
559559
static const int emmc_dat8_muxvals[] = {0, 0, 0, 0};
560560
static const unsigned ether_rgmii_pins[] = {30, 31, 32, 33, 34, 35, 36, 37, 38,

drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -776,8 +776,8 @@ static const struct pinctrl_pin_desc uniphier_pxs3_pins[] = {
776776
250, UNIPHIER_PIN_PULL_DOWN),
777777
};
778778

779-
static const unsigned int emmc_pins[] = {31, 32, 33, 34, 35, 36, 37, 38};
780-
static const int emmc_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0};
779+
static const unsigned int emmc_pins[] = {32, 33, 34, 35, 36, 37, 38};
780+
static const int emmc_muxvals[] = {0, 0, 0, 0, 0, 0, 0};
781781
static const unsigned int emmc_dat8_pins[] = {39, 40, 41, 42};
782782
static const int emmc_dat8_muxvals[] = {0, 0, 0, 0};
783783
static const unsigned int ether_rgmii_pins[] = {52, 53, 54, 55, 56, 57, 58, 59,

0 commit comments

Comments
 (0)