* [PATCH 0/2] pinctrl: meson-gx: Add HDMI HDP/DDC pins functions @ 2017-01-17 12:05 Neil Armstrong 2017-01-17 12:05 ` [PATCH 1/2] pinctrl: meson: Add HDMI HPD/DDC " Neil Armstrong 2017-01-17 12:05 ` [PATCH 2/2] ARM64: dts: meson-gx: Add HDMI HPD/DDC pinctrl nodes Neil Armstrong 0 siblings, 2 replies; 6+ messages in thread From: Neil Armstrong @ 2017-01-17 12:05 UTC (permalink / raw) To: khilman, carlo, linus.walleij Cc: Neil Armstrong, linux-amlogic, linux-gpio, linux-arm-kernel, devicetree, linux-kernel In order to support HDMI HPD and DDC, add missing functions in pinctrl driver and add corresponding nodes in dts for GXBB and GXL. Neil Armstrong (2): pinctrl: meson: Add HDMI HPD/DDC pins functions ARM64: dts: meson-gx: Add HDMI HPD/DDC pinctrl nodes arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 14 ++++++++++++++ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 14 ++++++++++++++ drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 19 +++++++++++++++++++ drivers/pinctrl/meson/pinctrl-meson-gxl.c | 19 +++++++++++++++++++ 4 files changed, 66 insertions(+) -- 1.9.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] pinctrl: meson: Add HDMI HPD/DDC pins functions 2017-01-17 12:05 [PATCH 0/2] pinctrl: meson-gx: Add HDMI HDP/DDC pins functions Neil Armstrong @ 2017-01-17 12:05 ` Neil Armstrong 2017-01-18 12:27 ` Linus Walleij 2017-01-17 12:05 ` [PATCH 2/2] ARM64: dts: meson-gx: Add HDMI HPD/DDC pinctrl nodes Neil Armstrong 1 sibling, 1 reply; 6+ messages in thread From: Neil Armstrong @ 2017-01-17 12:05 UTC (permalink / raw) To: khilman, carlo, linus.walleij Cc: Neil Armstrong, linux-amlogic, linux-gpio, linux-arm-kernel, devicetree, linux-kernel Add pinctrl functions for HDMI HPD pin and DDC pins on Amlogic Meson GXL and GXBB SoCs. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 19 +++++++++++++++++++ drivers/pinctrl/meson/pinctrl-meson-gxl.c | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c index c3928aa..0d9ad36 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c @@ -232,6 +232,10 @@ 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 @@ 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 @@ "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 @@ 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[] = { diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c index 25694f7..7703a46 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c @@ -197,6 +197,10 @@ 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 @@ 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 @@ "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 @@ FUNCTION(i2c_c), FUNCTION(eth), FUNCTION(pwm_e), + FUNCTION(hdmi_hpd), + FUNCTION(hdmi_i2c), }; static struct meson_pmx_func meson_gxl_aobus_functions[] = { -- 1.9.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] pinctrl: meson: Add HDMI HPD/DDC pins functions 2017-01-17 12:05 ` [PATCH 1/2] pinctrl: meson: Add HDMI HPD/DDC " Neil Armstrong @ 2017-01-18 12:27 ` Linus Walleij 0 siblings, 0 replies; 6+ messages in thread From: Linus Walleij @ 2017-01-18 12:27 UTC (permalink / raw) To: Neil Armstrong Cc: Kevin Hilman, Carlo Caione, open list:ARM/Amlogic Meson..., linux-gpio, linux-arm-kernel, devicetree, linux-kernel On Tue, Jan 17, 2017 at 1:05 PM, Neil Armstrong <narmstrong@baylibre.com> wrote: > Add pinctrl functions for HDMI HPD pin and DDC pins on Amlogic Meson > GXL and GXBB SoCs. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Patch applied. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] ARM64: dts: meson-gx: Add HDMI HPD/DDC pinctrl nodes 2017-01-17 12:05 [PATCH 0/2] pinctrl: meson-gx: Add HDMI HDP/DDC pins functions Neil Armstrong 2017-01-17 12:05 ` [PATCH 1/2] pinctrl: meson: Add HDMI HPD/DDC " Neil Armstrong @ 2017-01-17 12:05 ` Neil Armstrong 2017-01-18 12:28 ` Linus Walleij 2017-01-18 22:32 ` Kevin Hilman 1 sibling, 2 replies; 6+ messages in thread From: Neil Armstrong @ 2017-01-17 12:05 UTC (permalink / raw) To: khilman, carlo, linus.walleij Cc: Neil Armstrong, linux-amlogic, linux-gpio, linux-arm-kernel, devicetree, linux-kernel Add pinctrl nodes for HDMI HPD and DDC pins modes for Amlogic Meson GXL and GXBB SoCs. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 14 ++++++++++++++ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index 596240c..31d64a1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -463,6 +463,20 @@ function = "pwm_f_y"; }; }; + + hdmi_hpd_pins: hdmi_hpd { + mux { + groups = "hdmi_hpd"; + function = "hdmi_hpd"; + }; + }; + + hdmi_i2c_pins: hdmi_i2c { + mux { + groups = "hdmi_sda", "hdmi_scl"; + function = "hdmi_i2c"; + }; + }; }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index 6921624..17dbcf6 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -229,6 +229,20 @@ function = "pwm_e"; }; }; + + hdmi_hpd_pins: hdmi_hpd { + mux { + groups = "hdmi_hpd"; + function = "hdmi_hpd"; + }; + }; + + hdmi_i2c_pins: hdmi_i2c { + mux { + groups = "hdmi_sda", "hdmi_scl"; + function = "hdmi_i2c"; + }; + }; }; eth-phy-mux { -- 1.9.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ARM64: dts: meson-gx: Add HDMI HPD/DDC pinctrl nodes 2017-01-17 12:05 ` [PATCH 2/2] ARM64: dts: meson-gx: Add HDMI HPD/DDC pinctrl nodes Neil Armstrong @ 2017-01-18 12:28 ` Linus Walleij 2017-01-18 22:32 ` Kevin Hilman 1 sibling, 0 replies; 6+ messages in thread From: Linus Walleij @ 2017-01-18 12:28 UTC (permalink / raw) To: Neil Armstrong Cc: Kevin Hilman, Carlo Caione, open list:ARM/Amlogic Meson..., linux-gpio, linux-arm-kernel, devicetree, linux-kernel On Tue, Jan 17, 2017 at 1:05 PM, Neil Armstrong <narmstrong@baylibre.com> wrote: > Add pinctrl nodes for HDMI HPD and DDC pins modes for Amlogic Meson GXL > and GXBB SoCs. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Please merge this through ARM SoC. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ARM64: dts: meson-gx: Add HDMI HPD/DDC pinctrl nodes 2017-01-17 12:05 ` [PATCH 2/2] ARM64: dts: meson-gx: Add HDMI HPD/DDC pinctrl nodes Neil Armstrong 2017-01-18 12:28 ` Linus Walleij @ 2017-01-18 22:32 ` Kevin Hilman 1 sibling, 0 replies; 6+ messages in thread From: Kevin Hilman @ 2017-01-18 22:32 UTC (permalink / raw) To: Neil Armstrong Cc: carlo, linus.walleij, linux-amlogic, linux-gpio, linux-arm-kernel, devicetree, linux-kernel Neil Armstrong <narmstrong@baylibre.com> writes: > Add pinctrl nodes for HDMI HPD and DDC pins modes for Amlogic Meson GXL > and GXBB SoCs. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Applied to v4.11/dt64 with Linus' ack. Kevin ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-01-18 22:33 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-01-17 12:05 [PATCH 0/2] pinctrl: meson-gx: Add HDMI HDP/DDC pins functions Neil Armstrong 2017-01-17 12:05 ` [PATCH 1/2] pinctrl: meson: Add HDMI HPD/DDC " Neil Armstrong 2017-01-18 12:27 ` Linus Walleij 2017-01-17 12:05 ` [PATCH 2/2] ARM64: dts: meson-gx: Add HDMI HPD/DDC pinctrl nodes Neil Armstrong 2017-01-18 12:28 ` Linus Walleij 2017-01-18 22:32 ` Kevin Hilman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).