From e3666d7fe38ef78f382b80dc395eadc4bad1236e Mon Sep 17 00:00:00 2001 From: Xingyu Chen Date: Mon, 27 Aug 2018 13:41:27 +0800 Subject: [PATCH] pinctrl: fix some mistakes [1/1] PD#172438 Problem: 1. return a negative when parsing the dts property "output-high/output-low" 2. the prefix "bt565" don't meet corepinmux document Solution: 1. add break statement in case PIN_CONFIG_OUTPUT to avoid returning a negative value. 2. rename the "bt565" to "bt656" according to corepinmux document Verify: test pass on U200 Change-Id: Ieeb98367e2269007a6774592abac86ef05ee8f64 Signed-off-by: Xingyu Chen --- drivers/amlogic/pinctrl/pinctrl-meson-g12a.c | 58 ++++++++++++++-------------- drivers/amlogic/pinctrl/pinctrl-meson.c | 1 + 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/drivers/amlogic/pinctrl/pinctrl-meson-g12a.c b/drivers/amlogic/pinctrl/pinctrl-meson-g12a.c index 1f68419..177550a 100644 --- a/drivers/amlogic/pinctrl/pinctrl-meson-g12a.c +++ b/drivers/amlogic/pinctrl/pinctrl-meson-g12a.c @@ -311,18 +311,18 @@ static const unsigned int jtag_b_tdi_pins[] = {GPIOC_1}; static const unsigned int jtag_b_clk_pins[] = {GPIOC_4}; static const unsigned int jtag_b_tms_pins[] = {GPIOC_5}; -/* bt565 */ -static const unsigned int bt565_a_vs_pins[] = {GPIOZ_0}; -static const unsigned int bt565_a_hs_pins[] = {GPIOZ_1}; -static const unsigned int bt565_a_clk_pins[] = {GPIOZ_3}; -static const unsigned int bt565_a_din0_pins[] = {GPIOZ_4}; -static const unsigned int bt565_a_din1_pins[] = {GPIOZ_5}; -static const unsigned int bt565_a_din2_pins[] = {GPIOZ_6}; -static const unsigned int bt565_a_din3_pins[] = {GPIOZ_7}; -static const unsigned int bt565_a_din4_pins[] = {GPIOZ_8}; -static const unsigned int bt565_a_din5_pins[] = {GPIOZ_9}; -static const unsigned int bt565_a_din6_pins[] = {GPIOZ_10}; -static const unsigned int bt565_a_din7_pins[] = {GPIOZ_11}; +/* bt656 */ +static const unsigned int bt656_a_vs_pins[] = {GPIOZ_0}; +static const unsigned int bt656_a_hs_pins[] = {GPIOZ_1}; +static const unsigned int bt656_a_clk_pins[] = {GPIOZ_3}; +static const unsigned int bt656_a_din0_pins[] = {GPIOZ_4}; +static const unsigned int bt656_a_din1_pins[] = {GPIOZ_5}; +static const unsigned int bt656_a_din2_pins[] = {GPIOZ_6}; +static const unsigned int bt656_a_din3_pins[] = {GPIOZ_7}; +static const unsigned int bt656_a_din4_pins[] = {GPIOZ_8}; +static const unsigned int bt656_a_din5_pins[] = {GPIOZ_9}; +static const unsigned int bt656_a_din6_pins[] = {GPIOZ_10}; +static const unsigned int bt656_a_din7_pins[] = {GPIOZ_11}; /* tsin_a */ static const unsigned int tsin_a_valid_pins[] = {GPIOX_2}; @@ -630,17 +630,17 @@ static struct meson_pmx_group meson_g12a_periphs_groups[] = { GROUP(eth_txd3_rgmii, 1), GROUP(eth_link_led, 1), GROUP(eth_act_led, 1), - GROUP(bt565_a_vs, 2), - GROUP(bt565_a_hs, 2), - GROUP(bt565_a_clk, 2), - GROUP(bt565_a_din0, 2), - GROUP(bt565_a_din1, 2), - GROUP(bt565_a_din2, 2), - GROUP(bt565_a_din3, 2), - GROUP(bt565_a_din4, 2), - GROUP(bt565_a_din5, 2), - GROUP(bt565_a_din6, 2), - GROUP(bt565_a_din7, 2), + GROUP(bt656_a_vs, 2), + GROUP(bt656_a_hs, 2), + GROUP(bt656_a_clk, 2), + GROUP(bt656_a_din0, 2), + GROUP(bt656_a_din1, 2), + GROUP(bt656_a_din2, 2), + GROUP(bt656_a_din3, 2), + GROUP(bt656_a_din4, 2), + GROUP(bt656_a_din5, 2), + GROUP(bt656_a_din6, 2), + GROUP(bt656_a_din7, 2), GROUP(tsin_b_valid_z, 3), GROUP(tsin_b_sop_z, 3), GROUP(tsin_b_din0_z, 3), @@ -1166,11 +1166,11 @@ static const char * const jtag_b_groups[] = { "jtag_b_tdi", "jtag_b_tdo", "jtag_b_clk", "jtag_b_tms", }; -static const char * const bt565_groups[] = { - "bt565_a_vs", "bt565_a_hs", "bt565_a_clk", - "bt565_a_din0", "bt565_a_din1", "bt565_a_din2", - "bt565_a_din3", "bt565_a_din4", "bt565_a_din5", - "bt565_a_din6", "bt565_a_din7", +static const char * const bt656_groups[] = { + "bt656_a_vs", "bt656_a_hs", "bt656_a_clk", + "bt656_a_din0", "bt656_a_din1", "bt656_a_din2", + "bt656_a_din3", "bt656_a_din4", "bt656_a_din5", + "bt656_a_din6", "bt656_a_din7", }; static const char * const tsin_a_groups[] = { @@ -1378,7 +1378,7 @@ static struct meson_pmx_func meson_g12a_periphs_functions[] = { FUNCTION(pwm_f), FUNCTION(cec_ao_ee), FUNCTION(jtag_b), - FUNCTION(bt565), + FUNCTION(bt656), FUNCTION(tsin_a), FUNCTION(tsin_b), FUNCTION(hdmitx), diff --git a/drivers/amlogic/pinctrl/pinctrl-meson.c b/drivers/amlogic/pinctrl/pinctrl-meson.c index 8347f15..8f1afde 100644 --- a/drivers/amlogic/pinctrl/pinctrl-meson.c +++ b/drivers/amlogic/pinctrl/pinctrl-meson.c @@ -257,6 +257,7 @@ int meson_pinconf_common_set(struct meson_pinctrl *pc, unsigned int pin, BIT(bit), arg ? BIT(bit) : 0); if (ret) return ret; + break; default: return -ENOTSUPP; } -- 2.7.4