summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorJerome Brunet <jbrunet@baylibre.com>2017-03-23 12:50:57 -0400
committerLinus Walleij <linus.walleij@linaro.org>2017-03-28 09:14:12 -0400
commitb840d649f9ec7ede484e47b1a53d16ae6f3d0085 (patch)
treee668c6ac2a7ac9e3234eda4b8a979a243e6c0019 /drivers/pinctrl
parent2899adf0422a29a92c7314fc5b427817c084beee (diff)
pinctrl: meson: gxl: add spdif output pins
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/meson/pinctrl-meson-gxl.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
index e472213fd673..998210eacf37 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
@@ -232,6 +232,8 @@ static const unsigned int i2s_out_ch23_z_pins[] = { PIN(GPIOZ_5, EE_OFF) };
232static const unsigned int i2s_out_ch45_z_pins[] = { PIN(GPIOZ_6, EE_OFF) }; 232static const unsigned int i2s_out_ch45_z_pins[] = { PIN(GPIOZ_6, EE_OFF) };
233static const unsigned int i2s_out_ch67_z_pins[] = { PIN(GPIOZ_7, EE_OFF) }; 233static const unsigned int i2s_out_ch67_z_pins[] = { PIN(GPIOZ_7, EE_OFF) };
234 234
235static const unsigned int spdif_out_h_pins[] = { PIN(GPIOH_4, EE_OFF) };
236
235static const struct pinctrl_pin_desc meson_gxl_aobus_pins[] = { 237static const struct pinctrl_pin_desc meson_gxl_aobus_pins[] = {
236 MESON_PIN(GPIOAO_0, 0), 238 MESON_PIN(GPIOAO_0, 0),
237 MESON_PIN(GPIOAO_1, 0), 239 MESON_PIN(GPIOAO_1, 0),
@@ -272,6 +274,9 @@ static const unsigned int pwm_ao_b_6_pins[] = { PIN(GPIOAO_6, 0) };
272static const unsigned int i2s_out_ch23_ao_pins[] = { PIN(GPIOAO_8, EE_OFF) }; 274static const unsigned int i2s_out_ch23_ao_pins[] = { PIN(GPIOAO_8, EE_OFF) };
273static const unsigned int i2s_out_ch45_ao_pins[] = { PIN(GPIOAO_9, EE_OFF) }; 275static const unsigned int i2s_out_ch45_ao_pins[] = { PIN(GPIOAO_9, EE_OFF) };
274 276
277static const unsigned int spdif_out_ao_6_pins[] = { PIN(GPIOAO_6, EE_OFF) };
278static const unsigned int spdif_out_ao_9_pins[] = { PIN(GPIOAO_9, EE_OFF) };
279
275static struct meson_pmx_group meson_gxl_periphs_groups[] = { 280static struct meson_pmx_group meson_gxl_periphs_groups[] = {
276 GPIO_GROUP(GPIOZ_0, EE_OFF), 281 GPIO_GROUP(GPIOZ_0, EE_OFF),
277 GPIO_GROUP(GPIOZ_1, EE_OFF), 282 GPIO_GROUP(GPIOZ_1, EE_OFF),
@@ -429,6 +434,7 @@ static struct meson_pmx_group meson_gxl_periphs_groups[] = {
429 GROUP(i2s_out_ao_clk, 6, 25), 434 GROUP(i2s_out_ao_clk, 6, 25),
430 GROUP(i2s_out_lr_clk, 6, 24), 435 GROUP(i2s_out_lr_clk, 6, 24),
431 GROUP(i2s_out_ch01, 6, 23), 436 GROUP(i2s_out_ch01, 6, 23),
437 GROUP(spdif_out_h, 6, 28),
432 438
433 /* Bank DV */ 439 /* Bank DV */
434 GROUP(uart_tx_b, 2, 16), 440 GROUP(uart_tx_b, 2, 16),
@@ -510,6 +516,8 @@ static struct meson_pmx_group meson_gxl_aobus_groups[] = {
510 GROUP(pwm_ao_b, 0, 3), 516 GROUP(pwm_ao_b, 0, 3),
511 GROUP(i2s_out_ch23_ao, 1, 0), 517 GROUP(i2s_out_ch23_ao, 1, 0),
512 GROUP(i2s_out_ch45_ao, 1, 1), 518 GROUP(i2s_out_ch45_ao, 1, 1),
519 GROUP(spdif_out_ao_6, 0, 16),
520 GROUP(spdif_out_ao_9, 0, 4),
513}; 521};
514 522
515static const char * const gpio_periphs_groups[] = { 523static const char * const gpio_periphs_groups[] = {
@@ -635,6 +643,10 @@ static const char * const i2s_out_groups[] = {
635 "i2s_out_ch01", "i2s_out_ch23_z", "i2s_out_ch45_z", "i2s_out_ch67_z", 643 "i2s_out_ch01", "i2s_out_ch23_z", "i2s_out_ch45_z", "i2s_out_ch67_z",
636}; 644};
637 645
646static const char * const spdif_out_groups[] = {
647 "spdif_out_h",
648};
649
638static const char * const gpio_aobus_groups[] = { 650static const char * const gpio_aobus_groups[] = {
639 "GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3", "GPIOAO_4", 651 "GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3", "GPIOAO_4",
640 "GPIOAO_5", "GPIOAO_6", "GPIOAO_7", "GPIOAO_8", "GPIOAO_9", 652 "GPIOAO_5", "GPIOAO_6", "GPIOAO_7", "GPIOAO_8", "GPIOAO_9",
@@ -673,6 +685,10 @@ static const char * const i2s_out_ao_groups[] = {
673 "i2s_out_ch23_ao", "i2s_out_ch45_ao", 685 "i2s_out_ch23_ao", "i2s_out_ch45_ao",
674}; 686};
675 687
688static const char * const spdif_out_ao_groups[] = {
689 "spdif_out_ao_6", "spdif_out_ao_9",
690};
691
676static struct meson_pmx_func meson_gxl_periphs_functions[] = { 692static struct meson_pmx_func meson_gxl_periphs_functions[] = {
677 FUNCTION(gpio_periphs), 693 FUNCTION(gpio_periphs),
678 FUNCTION(emmc), 694 FUNCTION(emmc),
@@ -696,6 +712,7 @@ static struct meson_pmx_func meson_gxl_periphs_functions[] = {
696 FUNCTION(hdmi_hpd), 712 FUNCTION(hdmi_hpd),
697 FUNCTION(hdmi_i2c), 713 FUNCTION(hdmi_i2c),
698 FUNCTION(i2s_out), 714 FUNCTION(i2s_out),
715 FUNCTION(spdif_out),
699}; 716};
700 717
701static struct meson_pmx_func meson_gxl_aobus_functions[] = { 718static struct meson_pmx_func meson_gxl_aobus_functions[] = {
@@ -708,6 +725,7 @@ static struct meson_pmx_func meson_gxl_aobus_functions[] = {
708 FUNCTION(pwm_ao_a), 725 FUNCTION(pwm_ao_a),
709 FUNCTION(pwm_ao_b), 726 FUNCTION(pwm_ao_b),
710 FUNCTION(i2s_out_ao), 727 FUNCTION(i2s_out_ao),
728 FUNCTION(spdif_out_ao),
711}; 729};
712 730
713static struct meson_bank meson_gxl_periphs_banks[] = { 731static struct meson_bank meson_gxl_periphs_banks[] = {