Commit 823868fc authored by Marek Behún's avatar Marek Behún Committed by Linus Walleij
Browse files

pinctrl: armada-37xx: Correct mpp definitions 



This is a cleanup and fix of the patch by Ken Ma <make@marvell.com>.

Fix the mpp definitions according to newest revision of the
specification:
  - northbridge:
    fix pmic1 gpio number to 7
    fix pmic0 gpio number to 6
  - southbridge
    split pcie1 group bit mask to BIT(5) and  BIT(9)
    fix ptp group bit mask to BIT(11) | BIT(12) | BIT(13)
    add smi group with bit mask BIT(4)

[gregory: split the pcie group in 2, as at hardware level they can be
configured separately]
Signed-off-by: default avatarMarek Behún <marek.behun@nic.cz>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
Tested-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f05c07b0

Documentation/devicetree/bindings/pinctrl/marvell,armada-37xx-pinctrl.txt

+13 −5
Original line number Diff line number Diff line
@@ -58,11 +58,11 @@ group pwm3 
 - functions pwm, gpio



group pmic1

 - pin 17

 - pin 7

 - functions pmic, gpio



group pmic0

 - pin 16

 - pin 6

 - functions pmic, gpio



group i2c2
@@ -112,17 +112,25 @@ group usb2_drvvbus1 
 - functions drvbus, gpio



group sdio_sb

 - pins 60-64

 - pins 60-65

 - functions sdio, gpio



group rgmii

 - pins 42-55

 - pins 42-53

 - functions mii, gpio



group pcie1

 - pins 39-40

 - pins 39

 - functions pcie, gpio



group pcie1_clkreq

 - pins 40

 - functions pcie, gpio



group smi

 - pins 54-55

 - functions smi, gpio



group ptp

 - pins 56-58

 - functions ptp, gpio

drivers/pinctrl/mvebu/pinctrl-armada-37xx.c

+6 −4
Original line number Diff line number Diff line
@@ -170,8 +170,8 @@ static struct armada_37xx_pin_group armada_37xx_nb_groups[] = { 
	PIN_GRP_GPIO("pwm1", 12, 1, BIT(4), "pwm"),

	PIN_GRP_GPIO("pwm2", 13, 1, BIT(5), "pwm"),

	PIN_GRP_GPIO("pwm3", 14, 1, BIT(6), "pwm"),

	PIN_GRP_GPIO("pmic1", 17, 1, BIT(7), "pmic"),

	PIN_GRP_GPIO("pmic0", 16, 1, BIT(8), "pmic"),

	PIN_GRP_GPIO("pmic1", 7, 1, BIT(7), "pmic"),

	PIN_GRP_GPIO("pmic0", 6, 1, BIT(8), "pmic"),

	PIN_GRP_GPIO("i2c2", 2, 2, BIT(9), "i2c"),

	PIN_GRP_GPIO("i2c1", 0, 2, BIT(10), "i2c"),

	PIN_GRP_GPIO("spi_cs1", 17, 1, BIT(12), "spi"),
@@ -195,8 +195,10 @@ static struct armada_37xx_pin_group armada_37xx_sb_groups[] = { 
	PIN_GRP_GPIO("usb2_drvvbus1", 1, 1, BIT(1), "drvbus"),

	PIN_GRP_GPIO("sdio_sb", 24, 6, BIT(2), "sdio"),

	PIN_GRP_GPIO("rgmii", 6, 12, BIT(3), "mii"),

	PIN_GRP_GPIO("pcie1", 3, 2, BIT(4), "pcie"),

	PIN_GRP_GPIO("ptp", 20, 3, BIT(5), "ptp"),

	PIN_GRP_GPIO("smi", 18, 2, BIT(4), "smi"),

	PIN_GRP_GPIO("pcie1", 3, 1, BIT(5), "pcie"),

	PIN_GRP_GPIO("pcie1_clkreq", 4, 1, BIT(9), "pcie"),

	PIN_GRP_GPIO("ptp", 20, 3, BIT(11) | BIT(12) | BIT(13), "ptp"),

	PIN_GRP("ptp_clk", 21, 1, BIT(6), "ptp", "mii"),

	PIN_GRP("ptp_trig", 22, 1, BIT(7), "ptp", "mii"),

	PIN_GRP_GPIO_3("mii_col", 23, 1, BIT(8) | BIT(14), 0, BIT(8), BIT(14),