From: Konstantin Porotchkin <[email protected]>
These patches are fixing the CP110 pin control driver and the related
documentation.
Current CP110 pin control driver uses two different MPP functions named
the same (sdio) in MPP54 and MPP55 definitions.
Since these names are used for the MPP functionality selection, all
function names within single MPP group should be unique.
This patches series fixes function names in MPP54 and MPP55 pin
definitions.
Konstantin Porotchkin (2):
doc: cp110-system-controller: fix the pin function names
drivers/pinctrl: armada-cp110 - fix MPP54/MPP55 functions
.../bindings/arm/marvell/cp110-system-controller.txt | 4 ++--
drivers/pinctrl/mvebu/pinctrl-armada-cp110.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--
2.17.1
From: Konstantin Porotchkin <[email protected]>
Fix the pin function names for MPP54 and MPP55.
Signed-off-by: Konstantin Porotchkin <[email protected]>
---
Documentation/devicetree/bindings/arm/marvell/cp110-system-controller.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/marvell/cp110-system-controller.txt b/Documentation/devicetree/bindings/arm/marvell/cp110-system-controller.txt
index a21f7709596c..0705e765f432 100644
--- a/Documentation/devicetree/bindings/arm/marvell/cp110-system-controller.txt
+++ b/Documentation/devicetree/bindings/arm/marvell/cp110-system-controller.txt
@@ -142,8 +142,8 @@ mpp50 50 gpio, ge1(rxclk), mss_i2c(sda), spi1(csn0), uart2(txd), uart0(rxd), xg(
mpp51 51 gpio, ge1(rxd0), mss_i2c(sck), spi1(csn1), uart2(rxd), uart0(cts), sdio(pwr10)
mpp52 52 gpio, ge1(rxd1), synce1(clk), synce2(clk), spi1(csn2), uart1(cts), led(clk), pcie(rstoutn), pcie0(clkreq)
mpp53 53 gpio, ge1(rxd2), ptp(clk), spi1(csn3), uart1(rxd), led(stb), sdio(led)
-mpp54 54 gpio, ge1(rxd3), synce2(clk), ptp(pclk_out), synce1(clk), led(data), sdio(hw_rst), sdio(wr_protect)
-mpp55 55 gpio, ge1(rxctl_rxdv), ptp(pulse), sdio(led), sdio(card_detect)
+mpp54 54 gpio, ge1(rxd3), synce2(clk), ptp(pclk_out), synce1(clk), led(data), sdio(hw_rst), sdio_wp(wr_protect)
+mpp55 55 gpio, ge1(rxctl_rxdv), ptp(pulse), sdio(led), sdio_cd(card_detect)
mpp56 56 gpio, tdm(drx), au(i2sdo_spdifo), spi0(clk), uart1(rxd), sata1(present_act), sdio(clk)
mpp57 57 gpio, mss_i2c(sda), ptp(pclk_out), tdm(intn), au(i2sbclk), spi0(mosi), uart1(txd), sata0(present_act), sdio(cmd)
mpp58 58 gpio, mss_i2c(sck), ptp(clk), tdm(rstn), au(i2sdi), spi0(miso), uart1(cts), led(clk), sdio(d0)
--
2.17.1
From: Konstantin Porotchkin <[email protected]>
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 <[email protected]>
---
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
On Tue, Feb 16, 2021 at 12:31 PM <[email protected]> wrote:
> From: Konstantin Porotchkin <[email protected]>
>
> These patches are fixing the CP110 pin control driver and the related
> documentation.
> Current CP110 pin control driver uses two different MPP functions named
> the same (sdio) in MPP54 and MPP55 definitions.
> Since these names are used for the MPP functionality selection, all
> function names within single MPP group should be unique.
> This patches series fixes function names in MPP54 and MPP55 pin
> definitions.
Excellent fix, patches applied!
Yours,
Linus Walleij