From: <kostap@marvell.com> To: <linux-gpio@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org> Cc: <daniel.lezcano@linaro.org>, <amit.kucheria@linaro.org>, <viresh.kumar@linaro.org>, <linus.walleij@linaro.org>, <sebastian.hesselbarth@gmail.com>, <gregory.clement@bootlin.com>, <andrew@lunn.ch>, <robh+dt@kernel.org>, <mw@semihalf.com>, <jaz@semihalf.com>, <nadavh@marvell.com>, <stefanc@marvell.com>, <bpeled@marvell.com>, Konstantin Porotchkin <kostap@marvell.com> Subject: [PATCH 2/2] drivers/pinctrl: armada-cp110 - fix MPP54/MPP55 functions Date: Tue, 16 Feb 2021 13:31:18 +0200 [thread overview] Message-ID: <20210216113118.17484-3-kostap@marvell.com> (raw) In-Reply-To: <20210216113118.17484-1-kostap@marvell.com> From: Konstantin Porotchkin <kostap@marvell.com> The function name is used for selecting MPP functionality and should be unique within function names of the same pin. This patch fixes function names for MPP54 and MPP55 that have two different functions named the same. Signed-off-by: Konstantin Porotchkin <kostap@marvell.com> --- drivers/pinctrl/mvebu/pinctrl-armada-cp110.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-cp110.c b/drivers/pinctrl/mvebu/pinctrl-armada-cp110.c index 17491b27e487..8ba8f3e9121f 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-cp110.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-cp110.c @@ -519,13 +519,13 @@ static struct mvebu_mpp_mode armada_cp110_mpp_modes[] = { MPP_FUNCTION(4, "synce1", "clk"), MPP_FUNCTION(8, "led", "data"), MPP_FUNCTION(10, "sdio", "hw_rst"), - MPP_FUNCTION(11, "sdio", "wr_protect")), + MPP_FUNCTION(11, "sdio_wp", "wr_protect")), MPP_MODE(55, MPP_FUNCTION(0, "gpio", NULL), MPP_FUNCTION(1, "ge1", "rxctl_rxdv"), MPP_FUNCTION(3, "ptp", "pulse"), MPP_FUNCTION(10, "sdio", "led"), - MPP_FUNCTION(11, "sdio", "card_detect")), + MPP_FUNCTION(11, "sdio_cd", "card_detect")), MPP_MODE(56, MPP_FUNCTION(0, "gpio", NULL), MPP_FUNCTION(4, "tdm", "drx"), -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: <kostap@marvell.com> To: <linux-gpio@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org> Cc: bpeled@marvell.com, andrew@lunn.ch, viresh.kumar@linaro.org, linus.walleij@linaro.org, daniel.lezcano@linaro.org, amit.kucheria@linaro.org, nadavh@marvell.com, robh+dt@kernel.org, jaz@semihalf.com, Konstantin Porotchkin <kostap@marvell.com>, stefanc@marvell.com, mw@semihalf.com, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com Subject: [PATCH 2/2] drivers/pinctrl: armada-cp110 - fix MPP54/MPP55 functions Date: Tue, 16 Feb 2021 13:31:18 +0200 [thread overview] Message-ID: <20210216113118.17484-3-kostap@marvell.com> (raw) In-Reply-To: <20210216113118.17484-1-kostap@marvell.com> From: Konstantin Porotchkin <kostap@marvell.com> The function name is used for selecting MPP functionality and should be unique within function names of the same pin. This patch fixes function names for MPP54 and MPP55 that have two different functions named the same. Signed-off-by: Konstantin Porotchkin <kostap@marvell.com> --- drivers/pinctrl/mvebu/pinctrl-armada-cp110.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-cp110.c b/drivers/pinctrl/mvebu/pinctrl-armada-cp110.c index 17491b27e487..8ba8f3e9121f 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-cp110.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-cp110.c @@ -519,13 +519,13 @@ static struct mvebu_mpp_mode armada_cp110_mpp_modes[] = { MPP_FUNCTION(4, "synce1", "clk"), MPP_FUNCTION(8, "led", "data"), MPP_FUNCTION(10, "sdio", "hw_rst"), - MPP_FUNCTION(11, "sdio", "wr_protect")), + MPP_FUNCTION(11, "sdio_wp", "wr_protect")), MPP_MODE(55, MPP_FUNCTION(0, "gpio", NULL), MPP_FUNCTION(1, "ge1", "rxctl_rxdv"), MPP_FUNCTION(3, "ptp", "pulse"), MPP_FUNCTION(10, "sdio", "led"), - MPP_FUNCTION(11, "sdio", "card_detect")), + MPP_FUNCTION(11, "sdio_cd", "card_detect")), MPP_MODE(56, MPP_FUNCTION(0, "gpio", NULL), MPP_FUNCTION(4, "tdm", "drx"), -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-02-16 11:32 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-16 11:31 [PATCH 0/2] Fix Marvell CP110 pin control finction names kostap 2021-02-16 11:31 ` kostap 2021-02-16 11:31 ` [PATCH 1/2] doc: cp110-system-controller: fix the pin function names kostap 2021-02-16 11:31 ` kostap 2021-02-16 11:31 ` kostap [this message] 2021-02-16 11:31 ` [PATCH 2/2] drivers/pinctrl: armada-cp110 - fix MPP54/MPP55 functions kostap 2021-03-02 8:42 ` [PATCH 0/2] Fix Marvell CP110 pin control finction names Linus Walleij 2021-03-02 8:42 ` Linus Walleij
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210216113118.17484-3-kostap@marvell.com \ --to=kostap@marvell.com \ --cc=amit.kucheria@linaro.org \ --cc=andrew@lunn.ch \ --cc=bpeled@marvell.com \ --cc=daniel.lezcano@linaro.org \ --cc=devicetree@vger.kernel.org \ --cc=gregory.clement@bootlin.com \ --cc=jaz@semihalf.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mw@semihalf.com \ --cc=nadavh@marvell.com \ --cc=robh+dt@kernel.org \ --cc=sebastian.hesselbarth@gmail.com \ --cc=stefanc@marvell.com \ --cc=viresh.kumar@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.