Commit 24d1c217 authored by Kunihiko Hayashi's avatar Kunihiko Hayashi Committed by Linus Walleij
Browse files

pinctrl: uniphier: add spi pin-mux settings 



Add pin-mux settings for spi controller.

Signed-off-by: default avatarKunihiko Hayashi <hayashi.kunihiko@socionext.com>
Signed-off-by: default avatarKeiji Hayashibara <hayashibara.keiji@socionext.com>
Acked-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 17ac5268

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

+10 −0
Original line number Diff line number Diff line
@@ -517,6 +517,10 @@ static const int i2c4_muxvals[] = {1, 1}; 
static const unsigned nand_pins[] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,

				     15, 16, 17};

static const int nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};

static const unsigned spi0_pins[] = {56, 57, 58, 59};

static const int spi0_muxvals[] = {0, 0, 0, 0};

static const unsigned spi1_pins[] = {169, 170, 171, 172};

static const int spi1_muxvals[] = {1, 1, 1, 1};

static const unsigned system_bus_pins[] = {1, 2, 6, 7, 8, 9, 10, 11, 12, 13,

					   14, 15, 16, 17};

static const int system_bus_muxvals[] = {0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -596,6 +600,8 @@ static const struct uniphier_pinctrl_group uniphier_ld11_groups[] = { 
	UNIPHIER_PINCTRL_GROUP(i2c3),

	UNIPHIER_PINCTRL_GROUP(i2c4),

	UNIPHIER_PINCTRL_GROUP(nand),

	UNIPHIER_PINCTRL_GROUP(spi0),

	UNIPHIER_PINCTRL_GROUP(spi1),

	UNIPHIER_PINCTRL_GROUP(system_bus),

	UNIPHIER_PINCTRL_GROUP(system_bus_cs1),

	UNIPHIER_PINCTRL_GROUP(uart0),
@@ -632,6 +638,8 @@ static const char * const i2c1_groups[] = {"i2c1"}; 
static const char * const i2c3_groups[] = {"i2c3"};

static const char * const i2c4_groups[] = {"i2c4"};

static const char * const nand_groups[] = {"nand"};

static const char * const spi0_groups[] = {"spi0"};

static const char * const spi1_groups[] = {"spi1"};

static const char * const system_bus_groups[] = {"system_bus",

						 "system_bus_cs1"};

static const char * const uart0_groups[] = {"uart0"};
@@ -657,6 +665,8 @@ static const struct uniphier_pinmux_function uniphier_ld11_functions[] = { 
	UNIPHIER_PINMUX_FUNCTION(i2c3),

	UNIPHIER_PINMUX_FUNCTION(i2c4),

	UNIPHIER_PINMUX_FUNCTION(nand),

	UNIPHIER_PINMUX_FUNCTION(spi0),

	UNIPHIER_PINMUX_FUNCTION(spi1),

	UNIPHIER_PINMUX_FUNCTION(system_bus),

	UNIPHIER_PINMUX_FUNCTION(uart0),

	UNIPHIER_PINMUX_FUNCTION(uart1),

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

+20 −0
Original line number Diff line number Diff line
@@ -606,6 +606,14 @@ static const unsigned nand_pins[] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 
static const int nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};

static const unsigned sd_pins[] = {10, 11, 12, 13, 14, 15, 16, 17};

static const int sd_muxvals[] = {3, 3, 3, 3, 3, 3, 3, 3};  /* No SDVOLC */

static const unsigned spi0_pins[] = {56, 57, 58, 59};

static const int spi0_muxvals[] = {0, 0, 0, 0};

static const unsigned spi1_pins[] = {169, 170, 171, 172};

static const int spi1_muxvals[] = {1, 1, 1, 1};

static const unsigned spi2_pins[] = {86, 87, 88, 89};

static const int spi2_muxvals[] = {1, 1, 1, 1};

static const unsigned spi3_pins[] = {74, 75, 76, 77};

static const int spi3_muxvals[] = {1, 1, 1, 1};

static const unsigned system_bus_pins[] = {1, 2, 6, 7, 8, 9, 10, 11, 12, 13,

					   14, 15, 16, 17};

static const int system_bus_muxvals[] = {0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -685,6 +693,10 @@ static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = { 
	UNIPHIER_PINCTRL_GROUP(i2c4),

	UNIPHIER_PINCTRL_GROUP(nand),

	UNIPHIER_PINCTRL_GROUP(sd),

	UNIPHIER_PINCTRL_GROUP(spi0),

	UNIPHIER_PINCTRL_GROUP(spi1),

	UNIPHIER_PINCTRL_GROUP(spi2),

	UNIPHIER_PINCTRL_GROUP(spi3),

	UNIPHIER_PINCTRL_GROUP(system_bus),

	UNIPHIER_PINCTRL_GROUP(system_bus_cs1),

	UNIPHIER_PINCTRL_GROUP(uart0),
@@ -722,6 +734,10 @@ static const char * const i2c3_groups[] = {"i2c3"}; 
static const char * const i2c4_groups[] = {"i2c4"};

static const char * const nand_groups[] = {"nand"};

static const char * const sd_groups[] = {"sd"};

static const char * const spi0_groups[] = {"spi0"};

static const char * const spi1_groups[] = {"spi1"};

static const char * const spi2_groups[] = {"spi2"};

static const char * const spi3_groups[] = {"spi3"};

static const char * const system_bus_groups[] = {"system_bus",

						 "system_bus_cs1"};

static const char * const uart0_groups[] = {"uart0"};
@@ -751,6 +767,10 @@ static const struct uniphier_pinmux_function uniphier_ld20_functions[] = { 
	UNIPHIER_PINMUX_FUNCTION(i2c4),

	UNIPHIER_PINMUX_FUNCTION(nand),

	UNIPHIER_PINMUX_FUNCTION(sd),

	UNIPHIER_PINMUX_FUNCTION(spi0),

	UNIPHIER_PINMUX_FUNCTION(spi1),

	UNIPHIER_PINMUX_FUNCTION(spi2),

	UNIPHIER_PINMUX_FUNCTION(spi3),

	UNIPHIER_PINMUX_FUNCTION(system_bus),

	UNIPHIER_PINMUX_FUNCTION(uart0),

	UNIPHIER_PINMUX_FUNCTION(uart1),

drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c

+5 −0
Original line number Diff line number Diff line
@@ -576,6 +576,8 @@ static const unsigned nand_cs1_pins[] = {22, 23}; 
static const int nand_cs1_muxvals[] = {0, 0};

static const unsigned sd_pins[] = {44, 45, 46, 47, 48, 49, 50, 51, 52};

static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};

static const unsigned spi0_pins[] = {135, 136, 137, 138};

static const int spi0_muxvals[] = {12, 12, 12, 12};

static const unsigned system_bus_pins[] = {16, 17, 18, 19, 20, 165, 166, 167,

					   168, 169, 170, 171, 172, 173};

static const int system_bus_muxvals[] = {0, 0, 0, 0, 0, -1, -1, -1, -1, -1, -1,
@@ -640,6 +642,7 @@ static const struct uniphier_pinctrl_group uniphier_ld4_groups[] = { 
	UNIPHIER_PINCTRL_GROUP(nand),

	UNIPHIER_PINCTRL_GROUP(nand_cs1),

	UNIPHIER_PINCTRL_GROUP(sd),

	UNIPHIER_PINCTRL_GROUP(spi0),

	UNIPHIER_PINCTRL_GROUP(system_bus),

	UNIPHIER_PINCTRL_GROUP(system_bus_cs0),

	UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
@@ -667,6 +670,7 @@ static const char * const i2c2_groups[] = {"i2c2"}; 
static const char * const i2c3_groups[] = {"i2c3"};

static const char * const nand_groups[] = {"nand", "nand_cs1"};

static const char * const sd_groups[] = {"sd"};

static const char * const spi0_groups[] = {"spi0"};

static const char * const system_bus_groups[] = {"system_bus",

						 "system_bus_cs0",

						 "system_bus_cs1",
@@ -690,6 +694,7 @@ static const struct uniphier_pinmux_function uniphier_ld4_functions[] = { 
	UNIPHIER_PINMUX_FUNCTION(i2c3),

	UNIPHIER_PINMUX_FUNCTION(nand),

	UNIPHIER_PINMUX_FUNCTION(sd),

	UNIPHIER_PINMUX_FUNCTION(spi0),

	UNIPHIER_PINMUX_FUNCTION(system_bus),

	UNIPHIER_PINMUX_FUNCTION(uart0),

	UNIPHIER_PINMUX_FUNCTION(uart1),

drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c

+10 −0
Original line number Diff line number Diff line
@@ -769,6 +769,10 @@ static const unsigned nand_cs1_pins[] = {37, 38}; 
static const int nand_cs1_muxvals[] = {0, 0};

static const unsigned sd_pins[] = {47, 48, 49, 50, 51, 52, 53, 54, 55};

static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};

static const unsigned spi0_pins[] = {199, 200, 201, 202};

static const int spi0_muxvals[] = {8, 8, 8, 8};

static const unsigned spi1_pins[] = {93, 94, 95, 96};

static const int spi1_muxvals[] = {1, 1, 1, 1};

static const unsigned system_bus_pins[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,

					   11, 12, 13};

static const int system_bus_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -851,6 +855,8 @@ static const struct uniphier_pinctrl_group uniphier_ld6b_groups[] = { 
	UNIPHIER_PINCTRL_GROUP(nand),

	UNIPHIER_PINCTRL_GROUP(nand_cs1),

	UNIPHIER_PINCTRL_GROUP(sd),

	UNIPHIER_PINCTRL_GROUP(spi0),

	UNIPHIER_PINCTRL_GROUP(spi1),

	UNIPHIER_PINCTRL_GROUP(system_bus),

	UNIPHIER_PINCTRL_GROUP(system_bus_cs1),

	UNIPHIER_PINCTRL_GROUP(system_bus_cs2),
@@ -882,6 +888,8 @@ static const char * const i2c2_groups[] = {"i2c2"}; 
static const char * const i2c3_groups[] = {"i2c3"};

static const char * const nand_groups[] = {"nand", "nand_cs1"};

static const char * const sd_groups[] = {"sd"};

static const char * const spi0_groups[] = {"spi0"};

static const char * const spi1_groups[] = {"spi1"};

static const char * const system_bus_groups[] = {"system_bus",

						 "system_bus_cs1",

						 "system_bus_cs2",
@@ -907,6 +915,8 @@ static const struct uniphier_pinmux_function uniphier_ld6b_functions[] = { 
	UNIPHIER_PINMUX_FUNCTION(i2c3),

	UNIPHIER_PINMUX_FUNCTION(nand),

	UNIPHIER_PINMUX_FUNCTION(sd),

	UNIPHIER_PINMUX_FUNCTION(spi0),

	UNIPHIER_PINMUX_FUNCTION(spi1),

	UNIPHIER_PINMUX_FUNCTION(system_bus),

	UNIPHIER_PINMUX_FUNCTION(uart0),

	UNIPHIER_PINMUX_FUNCTION(uart1),

drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c

+10 −0
Original line number Diff line number Diff line
@@ -1050,6 +1050,10 @@ static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0}; 
static const unsigned sd1_pins[] = {319, 320, 321, 322, 323, 324, 325, 326,

				    327};

static const int sd1_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};

static const unsigned spi0_pins[] = {199, 200, 201, 202};

static const int spi0_muxvals[] = {11, 11, 11, 11};

static const unsigned spi1_pins[] = {195, 196, 197, 198, 235, 238, 239};

static const int spi1_muxvals[] = {11, 11, 11, 11, 11, 11, 11};

static const unsigned system_bus_pins[] = {25, 26, 27, 28, 29, 30, 31, 32, 33,

					   34, 35, 36, 37, 38};

static const int system_bus_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1138,6 +1142,8 @@ static const struct uniphier_pinctrl_group uniphier_pro4_groups[] = { 
	UNIPHIER_PINCTRL_GROUP(nand_cs1),

	UNIPHIER_PINCTRL_GROUP(sd),

	UNIPHIER_PINCTRL_GROUP(sd1),

	UNIPHIER_PINCTRL_GROUP(spi0),

	UNIPHIER_PINCTRL_GROUP(spi1),

	UNIPHIER_PINCTRL_GROUP(system_bus),

	UNIPHIER_PINCTRL_GROUP(system_bus_cs0),

	UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
@@ -1171,6 +1177,8 @@ static const char * const i2c6_groups[] = {"i2c6"}; 
static const char * const nand_groups[] = {"nand", "nand_cs1"};

static const char * const sd_groups[] = {"sd"};

static const char * const sd1_groups[] = {"sd1"};

static const char * const spi0_groups[] = {"spi0"};

static const char * const spi1_groups[] = {"spi1"};

static const char * const system_bus_groups[] = {"system_bus",

						 "system_bus_cs0",

						 "system_bus_cs1",
@@ -1202,6 +1210,8 @@ static const struct uniphier_pinmux_function uniphier_pro4_functions[] = { 
	UNIPHIER_PINMUX_FUNCTION(nand),

	UNIPHIER_PINMUX_FUNCTION(sd),

	UNIPHIER_PINMUX_FUNCTION(sd1),

	UNIPHIER_PINMUX_FUNCTION(spi0),

	UNIPHIER_PINMUX_FUNCTION(spi1),

	UNIPHIER_PINMUX_FUNCTION(system_bus),

	UNIPHIER_PINMUX_FUNCTION(uart0),

	UNIPHIER_PINMUX_FUNCTION(uart1),

CRA Git | Maintained and supported by SUSTech CRA and CCSE