Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d51b989b authored by Jerome Brunet's avatar Jerome Brunet Committed by Linus Walleij
Browse files

pinctrl: meson-gx: add TEST_N i2s pinmux 



Add TEST_N pinmux for channel 6 and 7 of the i2s output

Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Reviewed-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1356d86f

drivers/pinctrl/meson/pinctrl-meson-gxbb.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -288,6 +288,7 @@ static const unsigned int i2s_out_lr_clk_pins[] = { GPIOAO_10 }; 
static const unsigned int i2s_out_ch01_ao_pins[] = { GPIOAO_11 };

static const unsigned int i2s_out_ch01_ao_pins[] = { GPIOAO_11 };

static const unsigned int i2s_out_ch23_ao_pins[] = { GPIOAO_12 };

static const unsigned int i2s_out_ch23_ao_pins[] = { GPIOAO_12 };

static const unsigned int i2s_out_ch45_ao_pins[] = { GPIOAO_13 };

static const unsigned int i2s_out_ch45_ao_pins[] = { GPIOAO_13 };

static const unsigned int i2s_out_ch67_ao_pins[] = { GPIO_TEST_N };





static const unsigned int spdif_out_ao_6_pins[]	= { GPIOAO_6 };

static const unsigned int spdif_out_ao_6_pins[]	= { GPIOAO_6 };

static const unsigned int spdif_out_ao_13_pins[] = { GPIOAO_13 };

static const unsigned int spdif_out_ao_13_pins[] = { GPIOAO_13 };
@@ -562,6 +563,9 @@ static struct meson_pmx_group meson_gxbb_aobus_groups[] = { 
	GROUP(spdif_out_ao_13,	0,	4),

	GROUP(spdif_out_ao_13,	0,	4),

	GROUP(ao_cec,           0,      15),

	GROUP(ao_cec,           0,      15),

	GROUP(ee_cec,           0,      14),

	GROUP(ee_cec,           0,      14),



	/* test n pin */

	GROUP(i2s_out_ch67_ao,	1,	2),

};

};





static const char * const gpio_periphs_groups[] = {

static const char * const gpio_periphs_groups[] = {
@@ -748,6 +752,7 @@ static const char * const pwm_ao_b_groups[] = { 
static const char * const i2s_out_ao_groups[] = {

static const char * const i2s_out_ao_groups[] = {

	"i2s_am_clk", "i2s_out_ao_clk", "i2s_out_lr_clk",

	"i2s_am_clk", "i2s_out_ao_clk", "i2s_out_lr_clk",

	"i2s_out_ch01_ao", "i2s_out_ch23_ao", "i2s_out_ch45_ao",

	"i2s_out_ch01_ao", "i2s_out_ch23_ao", "i2s_out_ch45_ao",

	"i2s_out_ch67_ao",

};

};





static const char * const spdif_out_ao_groups[] = {

static const char * const spdif_out_ao_groups[] = {

drivers/pinctrl/meson/pinctrl-meson-gxl.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -291,6 +291,7 @@ static const unsigned int pwm_ao_b_6_pins[] = { GPIOAO_6 }; 




static const unsigned int i2s_out_ch23_ao_pins[] = { GPIOAO_8 };

static const unsigned int i2s_out_ch23_ao_pins[] = { GPIOAO_8 };

static const unsigned int i2s_out_ch45_ao_pins[] = { GPIOAO_9 };

static const unsigned int i2s_out_ch45_ao_pins[] = { GPIOAO_9 };

static const unsigned int i2s_out_ch67_ao_pins[] = { GPIO_TEST_N };





static const unsigned int spdif_out_ao_6_pins[] = { GPIOAO_6 };

static const unsigned int spdif_out_ao_6_pins[] = { GPIOAO_6 };

static const unsigned int spdif_out_ao_9_pins[] = { GPIOAO_9 };

static const unsigned int spdif_out_ao_9_pins[] = { GPIOAO_9 };
@@ -557,6 +558,9 @@ static struct meson_pmx_group meson_gxl_aobus_groups[] = { 
	GROUP(spdif_out_ao_9,	0,	4),

	GROUP(spdif_out_ao_9,	0,	4),

	GROUP(ao_cec,		0,	15),

	GROUP(ao_cec,		0,	15),

	GROUP(ee_cec,		0,	14),

	GROUP(ee_cec,		0,	14),



	/* test n pin */

	GROUP(i2s_out_ch67_ao,	1,	2),

};

};





static const char * const gpio_periphs_groups[] = {

static const char * const gpio_periphs_groups[] = {
@@ -735,7 +739,7 @@ static const char * const pwm_ao_b_groups[] = { 
};

};





static const char * const i2s_out_ao_groups[] = {

static const char * const i2s_out_ao_groups[] = {

	"i2s_out_ch23_ao", "i2s_out_ch45_ao",

	"i2s_out_ch23_ao", "i2s_out_ch45_ao", "i2s_out_ch67_ao",

};

};





static const char * const spdif_out_ao_groups[] = {

static const char * const spdif_out_ao_groups[] = {