lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 067/639] pinctrl: meson-gxl: remove invalid GPIOX tsin_a pins
    Date
    From: Neil Armstrong <narmstrong@baylibre.com>

    [ Upstream commit d801064cb871806e6843738ecad38993646f53f7 ]

    The GPIOX tsin_a pins wrongly uses the SDCard pinctrl bits, this
    patch completely removes these pins entries until we find out what
    are the correct bits and registers to be used instead.

    Fixes: 5a6ae9b80139 ("pinctrl: meson-gxl: add tsin_a pins")
    Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pinctrl/meson/pinctrl-meson-gxl.c | 12 ++----------
    1 file changed, 2 insertions(+), 10 deletions(-)

    diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
    index 158f618f16957..0c0a5018102b0 100644
    --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
    +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
    @@ -239,13 +239,9 @@ static const unsigned int eth_link_led_pins[] = { GPIOZ_14 };
    static const unsigned int eth_act_led_pins[] = { GPIOZ_15 };

    static const unsigned int tsin_a_d0_pins[] = { GPIODV_0 };
    -static const unsigned int tsin_a_d0_x_pins[] = { GPIOX_10 };
    static const unsigned int tsin_a_clk_pins[] = { GPIODV_8 };
    -static const unsigned int tsin_a_clk_x_pins[] = { GPIOX_11 };
    static const unsigned int tsin_a_sop_pins[] = { GPIODV_9 };
    -static const unsigned int tsin_a_sop_x_pins[] = { GPIOX_8 };
    static const unsigned int tsin_a_d_valid_pins[] = { GPIODV_10 };
    -static const unsigned int tsin_a_d_valid_x_pins[] = { GPIOX_9 };
    static const unsigned int tsin_a_fail_pins[] = { GPIODV_11 };
    static const unsigned int tsin_a_dp_pins[] = {
    GPIODV_1, GPIODV_2, GPIODV_3, GPIODV_4, GPIODV_5, GPIODV_6, GPIODV_7,
    @@ -432,10 +428,6 @@ static struct meson_pmx_group meson_gxl_periphs_groups[] = {
    GROUP(spi_miso, 5, 2),
    GROUP(spi_ss0, 5, 1),
    GROUP(spi_sclk, 5, 0),
    - GROUP(tsin_a_sop_x, 6, 3),
    - GROUP(tsin_a_d_valid_x, 6, 2),
    - GROUP(tsin_a_d0_x, 6, 1),
    - GROUP(tsin_a_clk_x, 6, 0),

    /* Bank Z */
    GROUP(eth_mdio, 4, 23),
    @@ -698,8 +690,8 @@ static const char * const eth_led_groups[] = {
    };

    static const char * const tsin_a_groups[] = {
    - "tsin_a_clk", "tsin_a_clk_x", "tsin_a_sop", "tsin_a_sop_x",
    - "tsin_a_d_valid", "tsin_a_d_valid_x", "tsin_a_d0", "tsin_a_d0_x",
    + "tsin_a_clk", "tsin_a_sop",
    + "tsin_a_d_valid", "tsin_a_d0",
    "tsin_a_dp", "tsin_a_fail",
    };

    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:44    [W:2.472 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site