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

Commit 1fe8d6cb authored by Neil Armstrong's avatar Neil Armstrong Committed by Linus Walleij
Browse files

pinctrl: meson: Add HDMI HPD/DDC pins functions 



Add pinctrl functions for HDMI HPD pin and DDC pins on Amlogic Meson
GXL and GXBB SoCs.

Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 9635af83

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

+19 −0
Original line number Diff line number Diff line
@@ -232,6 +232,10 @@ static const unsigned int pwm_e_pins[] = { PIN(GPIOX_19, EE_OFF) }; 
static const unsigned int pwm_f_x_pins[]	= { PIN(GPIOX_7, EE_OFF) };

static const unsigned int pwm_f_y_pins[]	= { PIN(GPIOY_15, EE_OFF) };



static const unsigned int hdmi_hpd_pins[]	= { PIN(GPIOH_0, EE_OFF) };

static const unsigned int hdmi_sda_pins[]	= { PIN(GPIOH_1, EE_OFF) };

static const unsigned int hdmi_scl_pins[]	= { PIN(GPIOH_2, EE_OFF) };



static const struct pinctrl_pin_desc meson_gxbb_aobus_pins[] = {

	MESON_PIN(GPIOAO_0, 0),

	MESON_PIN(GPIOAO_1, 0),
@@ -440,6 +444,11 @@ static struct meson_pmx_group meson_gxbb_periphs_groups[] = { 
	GROUP(eth_txd2,		6,	3),

	GROUP(eth_txd3,		6,	2),



	/* Bank H */

	GROUP(hdmi_hpd,		1,	26),

	GROUP(hdmi_sda,		1,	25),

	GROUP(hdmi_scl,		1,	24),



	/* Bank DV */

	GROUP(uart_tx_b,	2,	29),

	GROUP(uart_rx_b,	2,	28),
@@ -636,6 +645,14 @@ static const char * const pwm_f_y_groups[] = { 
	"pwm_f_y",

};



static const char * const hdmi_hpd_groups[] = {

	"hdmi_hpd",

};



static const char * const hdmi_i2c_groups[] = {

	"hdmi_sda", "hdmi_scl",

};



static const char * const gpio_aobus_groups[] = {

	"GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3", "GPIOAO_4",

	"GPIOAO_5", "GPIOAO_6", "GPIOAO_7", "GPIOAO_8", "GPIOAO_9",
@@ -699,6 +716,8 @@ static struct meson_pmx_func meson_gxbb_periphs_functions[] = { 
	FUNCTION(pwm_e),

	FUNCTION(pwm_f_x),

	FUNCTION(pwm_f_y),

	FUNCTION(hdmi_hpd),

	FUNCTION(hdmi_i2c),

};



static struct meson_pmx_func meson_gxbb_aobus_functions[] = {

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

+19 −0
Original line number Diff line number Diff line
@@ -197,6 +197,10 @@ static const unsigned int eth_txd3_pins[] = { PIN(GPIOZ_13, EE_OFF) }; 


static const unsigned int pwm_e_pins[]		= { PIN(GPIOX_16, EE_OFF) };



static const unsigned int hdmi_hpd_pins[]	= { PIN(GPIOH_0, EE_OFF) };

static const unsigned int hdmi_sda_pins[]	= { PIN(GPIOH_1, EE_OFF) };

static const unsigned int hdmi_scl_pins[]	= { PIN(GPIOH_2, EE_OFF) };



static const struct pinctrl_pin_desc meson_gxl_aobus_pins[] = {

	MESON_PIN(GPIOAO_0, 0),

	MESON_PIN(GPIOAO_1, 0),
@@ -363,6 +367,11 @@ static struct meson_pmx_group meson_gxl_periphs_groups[] = { 
	GROUP(eth_txd2,		4,	11),

	GROUP(eth_txd3,		4,	10),



	/* Bank H */

	GROUP(hdmi_hpd,		6,	31),

	GROUP(hdmi_sda,		6,	30),

	GROUP(hdmi_scl,		6,	29),



	/* Bank DV */

	GROUP(uart_tx_b,	2,	16),

	GROUP(uart_rx_b,	2,	15),
@@ -506,6 +515,14 @@ static const char * const pwm_e_groups[] = { 
	"pwm_e",

};



static const char * const hdmi_hpd_groups[] = {

	"hdmi_hpd",

};



static const char * const hdmi_i2c_groups[] = {

	"hdmi_sda", "hdmi_scl",

};



static const char * const gpio_aobus_groups[] = {

	"GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3", "GPIOAO_4",

	"GPIOAO_5", "GPIOAO_6", "GPIOAO_7", "GPIOAO_8", "GPIOAO_9",
@@ -537,6 +554,8 @@ static struct meson_pmx_func meson_gxl_periphs_functions[] = { 
	FUNCTION(i2c_c),

	FUNCTION(eth),

	FUNCTION(pwm_e),

	FUNCTION(hdmi_hpd),

	FUNCTION(hdmi_i2c),

};



static struct meson_pmx_func meson_gxl_aobus_functions[] = {