* [PATCH v5 0/7] arm64: berlin: add pinctrl support
@ 2015-10-09 11:56 Jisheng Zhang
2015-10-09 11:56 ` [PATCH v5 1/7] pinctrl: berlin: introduce berlin_pinctrl_probe_regmap() Jisheng Zhang
` (8 more replies)
0 siblings, 9 replies; 13+ messages in thread
From: Jisheng Zhang @ 2015-10-09 11:56 UTC (permalink / raw)
To: sebastian.hesselbarth, linus.walleij, antoine.tenart
Cc: catalin.marinas, will.deacon, mark.rutland, robh+dt, pawel.moll,
ijc+devicetree, galak, devicetree, linux-arm-kernel, linux-gpio,
linux-kernel, Jisheng Zhang
This series adds support for Marvell berlin4ct pin-controller, allowing
to configure the pin muxing from the device tree.
Since v4:
- drop ARCH_BERLIN dependency for it has been met
- drop COMPILE_TEST dependency but make berlin pinctrl driver visible
if COMPILE_TEST=y, and let this change be a seperate commit.
Since v3:
- fix stupid build error: I missed local changes to berlin-bg4ct.c
Since v2:
- introduce new berlin_pinctrl_probe_regmap() to avoid duplicated code
- renaming such as s/urt/uart etc. but keep the group name as URT* to keep
consistent with HW/ASIC
Since v1:
- use generic name for pin functions
- a new commit to add pinmux for uart0
- correct pinctrl usage in dts
Jisheng Zhang (7):
pinctrl: berlin: introduce berlin_pinctrl_probe_regmap()
pinctrl: berlin: Make berlin pinctrl driver visible if COMPILE_TEST=y
pinctrl: berlin: add the berlin4ct pinctrl driver
arm64: berlin: add the pinctrl dependency for Marvell Berlin SoCs
pinctrl: dt-binding: document berlin4ct SoC pinctrl
arm64: dts: berlin4ct: add the pinctrl node
arm64: dts: berlin4ct: add default pinmux for uart0
.../devicetree/bindings/pinctrl/berlin,pinctrl.txt | 5 +-
arch/arm64/Kconfig.platforms | 1 +
arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 22 +
drivers/pinctrl/berlin/Kconfig | 7 +-
drivers/pinctrl/berlin/Makefile | 1 +
drivers/pinctrl/berlin/berlin-bg4ct.c | 503 +++++++++++++++++++++
drivers/pinctrl/berlin/berlin.c | 26 +-
drivers/pinctrl/berlin/berlin.h | 4 +
8 files changed, 558 insertions(+), 11 deletions(-)
create mode 100644 drivers/pinctrl/berlin/berlin-bg4ct.c
--
2.6.1
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v5 1/7] pinctrl: berlin: introduce berlin_pinctrl_probe_regmap()
2015-10-09 11:56 [PATCH v5 0/7] arm64: berlin: add pinctrl support Jisheng Zhang
@ 2015-10-09 11:56 ` Jisheng Zhang
2015-10-09 11:56 ` [PATCH v5 2/7] pinctrl: berlin: Make berlin pinctrl driver visible if COMPILE_TEST=y Jisheng Zhang
` (7 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Jisheng Zhang @ 2015-10-09 11:56 UTC (permalink / raw)
To: sebastian.hesselbarth, linus.walleij, antoine.tenart
Cc: catalin.marinas, will.deacon, mark.rutland, robh+dt, pawel.moll,
ijc+devicetree, galak, devicetree, linux-arm-kernel, linux-gpio,
linux-kernel, Jisheng Zhang
This is to prepare for the next berlin4ct support, where we won't use
simple-mfd any more.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
drivers/pinctrl/berlin/berlin.c | 26 +++++++++++++++++---------
drivers/pinctrl/berlin/berlin.h | 4 ++++
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/drivers/pinctrl/berlin/berlin.c b/drivers/pinctrl/berlin/berlin.c
index f495806..898afa4 100644
--- a/drivers/pinctrl/berlin/berlin.c
+++ b/drivers/pinctrl/berlin/berlin.c
@@ -292,20 +292,14 @@ static struct pinctrl_desc berlin_pctrl_desc = {
.owner = THIS_MODULE,
};
-int berlin_pinctrl_probe(struct platform_device *pdev,
- const struct berlin_pinctrl_desc *desc)
+int berlin_pinctrl_probe_regmap(struct platform_device *pdev,
+ const struct berlin_pinctrl_desc *desc,
+ struct regmap *regmap)
{
struct device *dev = &pdev->dev;
- struct device_node *parent_np = of_get_parent(dev->of_node);
struct berlin_pinctrl *pctrl;
- struct regmap *regmap;
int ret;
- regmap = syscon_node_to_regmap(parent_np);
- of_node_put(parent_np);
- if (IS_ERR(regmap))
- return PTR_ERR(regmap);
-
pctrl = devm_kzalloc(dev, sizeof(*pctrl), GFP_KERNEL);
if (!pctrl)
return -ENOMEM;
@@ -330,3 +324,17 @@ int berlin_pinctrl_probe(struct platform_device *pdev,
return 0;
}
+
+int berlin_pinctrl_probe(struct platform_device *pdev,
+ const struct berlin_pinctrl_desc *desc)
+{
+ struct device *dev = &pdev->dev;
+ struct device_node *parent_np = of_get_parent(dev->of_node);
+ struct regmap *regmap = syscon_node_to_regmap(parent_np);
+
+ of_node_put(parent_np);
+ if (IS_ERR(regmap))
+ return PTR_ERR(regmap);
+
+ return berlin_pinctrl_probe_regmap(pdev, desc, regmap);
+}
diff --git a/drivers/pinctrl/berlin/berlin.h b/drivers/pinctrl/berlin/berlin.h
index e1aa841..dabbd2a 100644
--- a/drivers/pinctrl/berlin/berlin.h
+++ b/drivers/pinctrl/berlin/berlin.h
@@ -58,4 +58,8 @@ struct berlin_pinctrl_function {
int berlin_pinctrl_probe(struct platform_device *pdev,
const struct berlin_pinctrl_desc *desc);
+int berlin_pinctrl_probe_regmap(struct platform_device *pdev,
+ const struct berlin_pinctrl_desc *desc,
+ struct regmap *regmap);
+
#endif /* __PINCTRL_BERLIN_H */
--
2.6.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v5 2/7] pinctrl: berlin: Make berlin pinctrl driver visible if COMPILE_TEST=y
2015-10-09 11:56 [PATCH v5 0/7] arm64: berlin: add pinctrl support Jisheng Zhang
2015-10-09 11:56 ` [PATCH v5 1/7] pinctrl: berlin: introduce berlin_pinctrl_probe_regmap() Jisheng Zhang
@ 2015-10-09 11:56 ` Jisheng Zhang
2015-10-09 11:56 ` [PATCH v5 3/7] pinctrl: berlin: add the berlin4ct pinctrl driver Jisheng Zhang
` (6 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Jisheng Zhang @ 2015-10-09 11:56 UTC (permalink / raw)
To: sebastian.hesselbarth, linus.walleij, antoine.tenart
Cc: catalin.marinas, will.deacon, mark.rutland, robh+dt, pawel.moll,
ijc+devicetree, galak, devicetree, linux-arm-kernel, linux-gpio,
linux-kernel, Jisheng Zhang
It is good to allow berlin pinctrl driver to build with COMPILE_TEST, so
make the it menu visible when compile-testing.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
drivers/pinctrl/berlin/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pinctrl/berlin/Kconfig b/drivers/pinctrl/berlin/Kconfig
index b18322b..f7e45c8 100644
--- a/drivers/pinctrl/berlin/Kconfig
+++ b/drivers/pinctrl/berlin/Kconfig
@@ -1,4 +1,4 @@
-if ARCH_BERLIN
+if (ARCH_BERLIN || COMPILE_TEST)
config PINCTRL_BERLIN
bool
--
2.6.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v5 3/7] pinctrl: berlin: add the berlin4ct pinctrl driver
2015-10-09 11:56 [PATCH v5 0/7] arm64: berlin: add pinctrl support Jisheng Zhang
2015-10-09 11:56 ` [PATCH v5 1/7] pinctrl: berlin: introduce berlin_pinctrl_probe_regmap() Jisheng Zhang
2015-10-09 11:56 ` [PATCH v5 2/7] pinctrl: berlin: Make berlin pinctrl driver visible if COMPILE_TEST=y Jisheng Zhang
@ 2015-10-09 11:56 ` Jisheng Zhang
2015-10-15 21:52 ` Sebastian Hesselbarth
2015-10-09 11:56 ` [PATCH v5 4/7] arm64: berlin: add the pinctrl dependency for Marvell Berlin SoCs Jisheng Zhang
` (5 subsequent siblings)
8 siblings, 1 reply; 13+ messages in thread
From: Jisheng Zhang @ 2015-10-09 11:56 UTC (permalink / raw)
To: sebastian.hesselbarth, linus.walleij, antoine.tenart
Cc: catalin.marinas, will.deacon, mark.rutland, robh+dt, pawel.moll,
ijc+devicetree, galak, devicetree, linux-arm-kernel, linux-gpio,
linux-kernel, Jisheng Zhang
Add the pin-controller driver for Marvell Berlin BG4CT SoC, with definition
of its groups and functions. This uses the core Berlin pinctrl driver.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
drivers/pinctrl/berlin/Kconfig | 5 +
drivers/pinctrl/berlin/Makefile | 1 +
drivers/pinctrl/berlin/berlin-bg4ct.c | 503 ++++++++++++++++++++++++++++++++++
3 files changed, 509 insertions(+)
create mode 100644 drivers/pinctrl/berlin/berlin-bg4ct.c
diff --git a/drivers/pinctrl/berlin/Kconfig b/drivers/pinctrl/berlin/Kconfig
index f7e45c8..740a136 100644
--- a/drivers/pinctrl/berlin/Kconfig
+++ b/drivers/pinctrl/berlin/Kconfig
@@ -17,4 +17,9 @@ config PINCTRL_BERLIN_BG2Q
bool
select PINCTRL_BERLIN
+config PINCTRL_BERLIN_BG4CT
+ depends on OF
+ bool "Marvell berlin4ct pin controller driver"
+ select PINCTRL_BERLIN
+
endif
diff --git a/drivers/pinctrl/berlin/Makefile b/drivers/pinctrl/berlin/Makefile
index deb0c6b..06f9402 100644
--- a/drivers/pinctrl/berlin/Makefile
+++ b/drivers/pinctrl/berlin/Makefile
@@ -2,3 +2,4 @@ obj-$(CONFIG_PINCTRL_BERLIN) += berlin.o
obj-$(CONFIG_PINCTRL_BERLIN_BG2) += berlin-bg2.o
obj-$(CONFIG_PINCTRL_BERLIN_BG2CD) += berlin-bg2cd.o
obj-$(CONFIG_PINCTRL_BERLIN_BG2Q) += berlin-bg2q.o
+obj-$(CONFIG_PINCTRL_BERLIN_BG4CT) += berlin-bg4ct.o
diff --git a/drivers/pinctrl/berlin/berlin-bg4ct.c b/drivers/pinctrl/berlin/berlin-bg4ct.c
new file mode 100644
index 0000000..0917204
--- /dev/null
+++ b/drivers/pinctrl/berlin/berlin-bg4ct.c
@@ -0,0 +1,503 @@
+/*
+ * Marvell berlin4ct pinctrl driver
+ *
+ * Copyright (C) 2015 Marvell Technology Group Ltd.
+ *
+ * Author: Jisheng Zhang <jszhang@marvell.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+
+#include "berlin.h"
+
+static const struct berlin_desc_group berlin4ct_soc_pinctrl_groups[] = {
+ BERLIN_PINCTRL_GROUP("EMMC_RSTn", 0x0, 0x3, 0x00,
+ BERLIN_PINCTRL_FUNCTION(0x0, "emmc"), /* RSTn */
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio")), /* GPIO47 */
+ BERLIN_PINCTRL_GROUP("NAND_IO0", 0x0, 0x3, 0x03,
+ BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* IO0 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* RXD0 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sd1"), /* CLK */
+ BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO0 */
+ BERLIN_PINCTRL_GROUP("NAND_IO1", 0x0, 0x3, 0x06,
+ BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* IO1 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* RXD1 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sd1"), /* CDn */
+ BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO1 */
+ BERLIN_PINCTRL_GROUP("NAND_IO2", 0x0, 0x3, 0x09,
+ BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* IO2 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* RXD2 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sd1"), /* DAT0 */
+ BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO2 */
+ BERLIN_PINCTRL_GROUP("NAND_IO3", 0x0, 0x3, 0x0c,
+ BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* IO3 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* RXD3 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sd1"), /* DAT1 */
+ BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO3 */
+ BERLIN_PINCTRL_GROUP("NAND_IO4", 0x0, 0x3, 0x0f,
+ BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* IO4 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* RXC */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sd1"), /* DAT2 */
+ BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO4 */
+ BERLIN_PINCTRL_GROUP("NAND_IO5", 0x0, 0x3, 0x12,
+ BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* IO5 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* RXCTL */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sd1"), /* DAT3 */
+ BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO5 */
+ BERLIN_PINCTRL_GROUP("NAND_IO6", 0x0, 0x3, 0x15,
+ BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* IO6 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* MDC */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sd1"), /* CMD */
+ BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO6 */
+ BERLIN_PINCTRL_GROUP("NAND_IO7", 0x0, 0x3, 0x18,
+ BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* IO7 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* MDIO */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sd1"), /* WP */
+ BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO7 */
+ BERLIN_PINCTRL_GROUP("NAND_ALE", 0x0, 0x3, 0x1b,
+ BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* ALE */
+ BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* TXD0 */
+ BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO8 */
+ BERLIN_PINCTRL_GROUP("NAND_CLE", 0x4, 0x3, 0x00,
+ BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* CLE */
+ BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* TXD1 */
+ BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO9 */
+ BERLIN_PINCTRL_GROUP("NAND_WEn", 0x4, 0x3, 0x03,
+ BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* WEn */
+ BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* TXD2 */
+ BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO10 */
+ BERLIN_PINCTRL_GROUP("NAND_REn", 0x4, 0x3, 0x06,
+ BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* REn */
+ BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* TXD3 */
+ BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO11 */
+ BERLIN_PINCTRL_GROUP("NAND_WPn", 0x4, 0x3, 0x09,
+ BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* WPn */
+ BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO12 */
+ BERLIN_PINCTRL_GROUP("NAND_CEn", 0x4, 0x3, 0x0c,
+ BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* CEn */
+ BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* TXC */
+ BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO13 */
+ BERLIN_PINCTRL_GROUP("NAND_RDY", 0x4, 0x3, 0x0f,
+ BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* RDY */
+ BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* TXCTL */
+ BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO14 */
+ BERLIN_PINCTRL_GROUP("SD0_CLK", 0x4, 0x3, 0x12,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO29 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "sd0"), /* CLK*/
+ BERLIN_PINCTRL_FUNCTION(0x2, "sts4"), /* CLK */
+ BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG8 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG8 */
+ BERLIN_PINCTRL_GROUP("SD0_DAT0", 0x4, 0x3, 0x15,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO30 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "sd0"), /* DAT0 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sts4"), /* SOP */
+ BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG9 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG9 */
+ BERLIN_PINCTRL_GROUP("SD0_DAT1", 0x4, 0x3, 0x18,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO31 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "sd0"), /* DAT1 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sts4"), /* SD */
+ BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG10 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG10 */
+ BERLIN_PINCTRL_GROUP("SD0_DAT2", 0x4, 0x3, 0x1b,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO32 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "sd0"), /* DAT2 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sts4"), /* VALD */
+ BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG11 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG11 */
+ BERLIN_PINCTRL_GROUP("SD0_DAT3", 0x8, 0x3, 0x00,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO33 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "sd0"), /* DAT3 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sts5"), /* CLK */
+ BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG12 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG12 */
+ BERLIN_PINCTRL_GROUP("SD0_CDn", 0x8, 0x3, 0x03,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO34 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "sd0"), /* CDn */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sts5"), /* SOP */
+ BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG13 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG13 */
+ BERLIN_PINCTRL_GROUP("SD0_CMD", 0x8, 0x3, 0x06,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO35 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "sd0"), /* CMD */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sts5"), /* SD */
+ BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG14 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG14 */
+ BERLIN_PINCTRL_GROUP("SD0_WP", 0x8, 0x3, 0x09,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO36 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "sd0"), /* WP */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sts5"), /* VALD */
+ BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG15 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG15 */
+ BERLIN_PINCTRL_GROUP("STS0_CLK", 0x8, 0x3, 0x0c,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO21 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "sts0"), /* CLK */
+ BERLIN_PINCTRL_FUNCTION(0x2, "cpupll"), /* CLKO */
+ BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG0 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG0 */
+ BERLIN_PINCTRL_GROUP("STS0_SOP", 0x8, 0x3, 0x0f,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO22 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "sts0"), /* SOP */
+ BERLIN_PINCTRL_FUNCTION(0x2, "syspll"), /* CLKO */
+ BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG1 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG1 */
+ BERLIN_PINCTRL_GROUP("STS0_SD", 0x8, 0x3, 0x12,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO23 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "sts0"), /* SD */
+ BERLIN_PINCTRL_FUNCTION(0x2, "mempll"), /* CLKO */
+ BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG2 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG2 */
+ BERLIN_PINCTRL_GROUP("STS0_VALD", 0x8, 0x3, 0x15,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO24 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "sts0"), /* VALD */
+ BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG3 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG3 */
+ BERLIN_PINCTRL_GROUP("STS1_CLK", 0x8, 0x3, 0x18,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO25 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "sts1"), /* CLK */
+ BERLIN_PINCTRL_FUNCTION(0x2, "pwm0"),
+ BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG4 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG4 */
+ BERLIN_PINCTRL_GROUP("STS1_SOP", 0x8, 0x3, 0x1b,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO26 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "sts1"), /* SOP */
+ BERLIN_PINCTRL_FUNCTION(0x2, "pwm1"),
+ BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG5 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG5 */
+ BERLIN_PINCTRL_GROUP("STS1_SD", 0xc, 0x3, 0x00,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO27 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "sts1"), /* SD */
+ BERLIN_PINCTRL_FUNCTION(0x2, "pwm2"),
+ BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG6 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG6 */
+ BERLIN_PINCTRL_GROUP("STS1_VALD", 0xc, 0x3, 0x03,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO28 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "sts1"), /* VALD */
+ BERLIN_PINCTRL_FUNCTION(0x2, "pwm3"),
+ BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG7 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG7 */
+ BERLIN_PINCTRL_GROUP("SCRD0_RST", 0xc, 0x3, 0x06,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO15 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "scrd0"), /* RST */
+ BERLIN_PINCTRL_FUNCTION(0x3, "sd1a")), /* CLK */
+ BERLIN_PINCTRL_GROUP("SCRD0_DCLK", 0xc, 0x3, 0x09,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO16 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "scrd0"), /* DCLK */
+ BERLIN_PINCTRL_FUNCTION(0x3, "sd1a")), /* CMD */
+ BERLIN_PINCTRL_GROUP("SCRD0_GPIO0", 0xc, 0x3, 0x0c,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO17 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "scrd0"), /* SCRD0 GPIO0 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sif"), /* DIO */
+ BERLIN_PINCTRL_FUNCTION(0x3, "sd1a")), /* DAT0 */
+ BERLIN_PINCTRL_GROUP("SCRD0_GPIO1", 0xc, 0x3, 0x0f,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO18 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "scrd0"), /* SCRD0 GPIO1 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sif"), /* CLK */
+ BERLIN_PINCTRL_FUNCTION(0x3, "sd1a")), /* DAT1 */
+ BERLIN_PINCTRL_GROUP("SCRD0_DIO", 0xc, 0x3, 0x12,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO19 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "scrd0"), /* DIO */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sif"), /* DEN */
+ BERLIN_PINCTRL_FUNCTION(0x3, "sd1a")), /* DAT2 */
+ BERLIN_PINCTRL_GROUP("SCRD0_CRD_PRES", 0xc, 0x3, 0x15,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO20 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "scrd0"), /* crd pres */
+ BERLIN_PINCTRL_FUNCTION(0x1, "sd1a")), /* DAT3 */
+ BERLIN_PINCTRL_GROUP("SPI1_SS0n", 0xc, 0x3, 0x18,
+ BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* SS0n */
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* GPIO37 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sts2")), /* CLK */
+ BERLIN_PINCTRL_GROUP("SPI1_SS1n", 0xc, 0x3, 0x1b,
+ BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* SS1n */
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* GPIO38 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sts2"), /* SOP */
+ BERLIN_PINCTRL_FUNCTION(0x4, "pwm1")),
+ BERLIN_PINCTRL_GROUP("SPI1_SS2n", 0x10, 0x3, 0x00,
+ BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* SS2n */
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* GPIO39 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sts2"), /* SD */
+ BERLIN_PINCTRL_FUNCTION(0x4, "pwm0")),
+ BERLIN_PINCTRL_GROUP("SPI1_SS3n", 0x10, 0x3, 0x03,
+ BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* SS3n */
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* GPIO40 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sts2")), /* VALD */
+ BERLIN_PINCTRL_GROUP("SPI1_SCLK", 0x10, 0x3, 0x06,
+ BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* SCLK */
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* GPIO41 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sts3")), /* CLK */
+ BERLIN_PINCTRL_GROUP("SPI1_SDO", 0x10, 0x3, 0x09,
+ BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* SDO */
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* GPIO42 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sts3")), /* SOP */
+ BERLIN_PINCTRL_GROUP("SPI1_SDI", 0x10, 0x3, 0x0c,
+ BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* SDI */
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* GPIO43 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sts3")), /* SD */
+ BERLIN_PINCTRL_GROUP("USB0_DRV_VBUS", 0x10, 0x3, 0x0f,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO44 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "usb0"), /* VBUS */
+ BERLIN_PINCTRL_FUNCTION(0x2, "sts3")), /* VALD */
+ BERLIN_PINCTRL_GROUP("TW0_SCL", 0x10, 0x3, 0x12,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO45 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "tw0")), /* SCL */
+ BERLIN_PINCTRL_GROUP("TW0_SDA", 0x10, 0x3, 0x15,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO46 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "tw0")), /* SDA */
+};
+
+static const struct berlin_desc_group berlin4ct_avio_pinctrl_groups[] = {
+ BERLIN_PINCTRL_GROUP("TX_EDDC_SCL", 0x0, 0x3, 0x00,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO0 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "tx_eddc"), /* SCL */
+ BERLIN_PINCTRL_FUNCTION(0x2, "tw1")), /* SCL */
+ BERLIN_PINCTRL_GROUP("TX_EDDC_SDA", 0x0, 0x3, 0x03,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO1 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "tx_eddc"), /* SDA */
+ BERLIN_PINCTRL_FUNCTION(0x2, "tw1")), /* SDA */
+ BERLIN_PINCTRL_GROUP("I2S1_LRCKO", 0x0, 0x3, 0x06,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO2 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "i2s1"), /* LRCKO */
+ BERLIN_PINCTRL_FUNCTION(0x3, "sts6"), /* CLK */
+ BERLIN_PINCTRL_FUNCTION(0x4, "adac"), /* DBG0 */
+ BERLIN_PINCTRL_FUNCTION(0x6, "sd1b"), /* CLK */
+ BERLIN_PINCTRL_FUNCTION(0x7, "avio")), /* DBG0 */
+ BERLIN_PINCTRL_GROUP("I2S1_BCLKO", 0x0, 0x3, 0x09,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO3 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "i2s1"), /* BCLKO */
+ BERLIN_PINCTRL_FUNCTION(0x3, "sts6"), /* SOP */
+ BERLIN_PINCTRL_FUNCTION(0x4, "adac"), /* DBG1 */
+ BERLIN_PINCTRL_FUNCTION(0x6, "sd1b"), /* CMD */
+ BERLIN_PINCTRL_FUNCTION(0x7, "avio")), /* DBG1 */
+ BERLIN_PINCTRL_GROUP("I2S1_DO", 0x0, 0x3, 0x0c,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO4 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "i2s1"), /* DO */
+ BERLIN_PINCTRL_FUNCTION(0x3, "sts6"), /* SD */
+ BERLIN_PINCTRL_FUNCTION(0x4, "adac"), /* DBG2 */
+ BERLIN_PINCTRL_FUNCTION(0x6, "sd1b"), /* DAT0 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "avio")), /* DBG2 */
+ BERLIN_PINCTRL_GROUP("I2S1_MCLK", 0x0, 0x3, 0x0f,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO5 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "i2s1"), /* MCLK */
+ BERLIN_PINCTRL_FUNCTION(0x3, "sts6"), /* VALD */
+ BERLIN_PINCTRL_FUNCTION(0x4, "adac_test"), /* MCLK */
+ BERLIN_PINCTRL_FUNCTION(0x6, "sd1b"), /* DAT1 */
+ BERLIN_PINCTRL_FUNCTION(0x7, "avio")), /* DBG3 */
+ BERLIN_PINCTRL_GROUP("SPDIFO", 0x0, 0x3, 0x12,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO6 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "spdifo"),
+ BERLIN_PINCTRL_FUNCTION(0x2, "avpll"), /* CLKO */
+ BERLIN_PINCTRL_FUNCTION(0x4, "adac")), /* DBG3 */
+ BERLIN_PINCTRL_GROUP("I2S2_MCLK", 0x0, 0x3, 0x15,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO7 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "i2s2"), /* MCLK */
+ BERLIN_PINCTRL_FUNCTION(0x4, "hdmi"), /* FBCLK */
+ BERLIN_PINCTRL_FUNCTION(0x5, "pdm")), /* CLKO */
+ BERLIN_PINCTRL_GROUP("I2S2_LRCKI", 0x0, 0x3, 0x18,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO8 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "i2s2"), /* LRCKI */
+ BERLIN_PINCTRL_FUNCTION(0x2, "pwm0"),
+ BERLIN_PINCTRL_FUNCTION(0x3, "sts7"), /* CLK */
+ BERLIN_PINCTRL_FUNCTION(0x4, "adac_test"), /* LRCK */
+ BERLIN_PINCTRL_FUNCTION(0x6, "sd1b")), /* DAT2 */
+ BERLIN_PINCTRL_GROUP("I2S2_BCLKI", 0x0, 0x3, 0x1b,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO9 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "i2s2"), /* BCLKI */
+ BERLIN_PINCTRL_FUNCTION(0x2, "pwm1"),
+ BERLIN_PINCTRL_FUNCTION(0x3, "sts7"), /* SOP */
+ BERLIN_PINCTRL_FUNCTION(0x4, "adac_test"), /* BCLK */
+ BERLIN_PINCTRL_FUNCTION(0x6, "sd1b")), /* DAT3 */
+ BERLIN_PINCTRL_GROUP("I2S2_DI0", 0x4, 0x3, 0x00,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO10 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "i2s2"), /* DI0 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "pwm2"),
+ BERLIN_PINCTRL_FUNCTION(0x3, "sts7"), /* SD */
+ BERLIN_PINCTRL_FUNCTION(0x4, "adac_test"), /* SDIN */
+ BERLIN_PINCTRL_FUNCTION(0x5, "pdm"), /* DI0 */
+ BERLIN_PINCTRL_FUNCTION(0x6, "sd1b")), /* CDn */
+ BERLIN_PINCTRL_GROUP("I2S2_DI1", 0x4, 0x3, 0x03,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO11 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "i2s2"), /* DI1 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "pwm3"),
+ BERLIN_PINCTRL_FUNCTION(0x3, "sts7"), /* VALD */
+ BERLIN_PINCTRL_FUNCTION(0x4, "adac_test"), /* PWMCLK */
+ BERLIN_PINCTRL_FUNCTION(0x5, "pdm"), /* DI1 */
+ BERLIN_PINCTRL_FUNCTION(0x6, "sd1b")), /* WP */
+};
+
+static const struct berlin_desc_group berlin4ct_sysmgr_pinctrl_groups[] = {
+ BERLIN_PINCTRL_GROUP("SM_TW2_SCL", 0x0, 0x3, 0x00,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO19 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "tw2")), /* SCL */
+ BERLIN_PINCTRL_GROUP("SM_TW2_SDA", 0x0, 0x3, 0x03,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO20 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "tw2")), /* SDA */
+ BERLIN_PINCTRL_GROUP("SM_TW3_SCL", 0x0, 0x3, 0x06,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO21 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "tw3")), /* SCL */
+ BERLIN_PINCTRL_GROUP("SM_TW3_SDA", 0x0, 0x3, 0x09,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO22 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "tw3")), /* SDA */
+ BERLIN_PINCTRL_GROUP("SM_TMS", 0x0, 0x3, 0x0c,
+ BERLIN_PINCTRL_FUNCTION(0x0, "jtag"), /* TMS */
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* SM GPIO0 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "pwm0")),
+ BERLIN_PINCTRL_GROUP("SM_TDI", 0x0, 0x3, 0x0f,
+ BERLIN_PINCTRL_FUNCTION(0x0, "jtag"), /* TDI */
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* SM GPIO1 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "pwm1")),
+ BERLIN_PINCTRL_GROUP("SM_TDO", 0x0, 0x3, 0x12,
+ BERLIN_PINCTRL_FUNCTION(0x0, "jtag"), /* TDO */
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio")), /* SM GPIO2 */
+ BERLIN_PINCTRL_GROUP("SM_URT0_TXD", 0x0, 0x3, 0x15,
+ BERLIN_PINCTRL_FUNCTION(0x0, "uart0"), /* TXD */
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio")), /* SM GPIO3 */
+ BERLIN_PINCTRL_GROUP("SM_URT0_RXD", 0x0, 0x3, 0x18,
+ BERLIN_PINCTRL_FUNCTION(0x0, "uart0"), /* RXD */
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio")), /* SM GPIO4 */
+ BERLIN_PINCTRL_GROUP("SM_URT1_TXD", 0x0, 0x3, 0x1b,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO5 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "uart1"), /* TXD */
+ BERLIN_PINCTRL_FUNCTION(0x2, "eth1"), /* RXCLK */
+ BERLIN_PINCTRL_FUNCTION(0x3, "pwm2"),
+ BERLIN_PINCTRL_FUNCTION(0x4, "timer0"),
+ BERLIN_PINCTRL_FUNCTION(0x5, "clk_25m")),
+ BERLIN_PINCTRL_GROUP("SM_URT1_RXD", 0x4, 0x3, 0x00,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO6 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "uart1"), /* RXD */
+ BERLIN_PINCTRL_FUNCTION(0x3, "pwm3"),
+ BERLIN_PINCTRL_FUNCTION(0x4, "timer1")),
+ BERLIN_PINCTRL_GROUP("SM_SPI2_SS0n", 0x4, 0x3, 0x03,
+ BERLIN_PINCTRL_FUNCTION(0x0, "spi2"), /* SS0 n*/
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio")), /* SM GPIO7 */
+ BERLIN_PINCTRL_GROUP("SM_SPI2_SS1n", 0x4, 0x3, 0x06,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO8 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "spi2")), /* SS1n */
+ BERLIN_PINCTRL_GROUP("SM_SPI2_SS2n", 0x4, 0x3, 0x09,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO9 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "spi2"), /* SS2n */
+ BERLIN_PINCTRL_FUNCTION(0x2, "eth1"), /* MDC */
+ BERLIN_PINCTRL_FUNCTION(0x3, "pwm0"),
+ BERLIN_PINCTRL_FUNCTION(0x4, "timer0"),
+ BERLIN_PINCTRL_FUNCTION(0x5, "clk_25m")),
+ BERLIN_PINCTRL_GROUP("SM_SPI2_SS3n", 0x4, 0x3, 0x0c,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO10 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "spi2"), /* SS3n */
+ BERLIN_PINCTRL_FUNCTION(0x2, "eth1"), /* MDIO */
+ BERLIN_PINCTRL_FUNCTION(0x3, "pwm1"),
+ BERLIN_PINCTRL_FUNCTION(0x4, "timer1")),
+ BERLIN_PINCTRL_GROUP("SM_SPI2_SDO", 0x4, 0x3, 0x0f,
+ BERLIN_PINCTRL_FUNCTION(0x0, "spi2"), /* SDO */
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio")), /* SM GPIO11 */
+ BERLIN_PINCTRL_GROUP("SM_SPI2_SDI", 0x4, 0x3, 0x12,
+ BERLIN_PINCTRL_FUNCTION(0x0, "spi2"), /* SDI */
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio")), /* SM GPIO12 */
+ BERLIN_PINCTRL_GROUP("SM_SPI2_SCLK", 0x4, 0x3, 0x15,
+ BERLIN_PINCTRL_FUNCTION(0x0, "spi2"), /* SCLK */
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio")), /* SM GPIO13 */
+ BERLIN_PINCTRL_GROUP("SM_FE_LED0", 0x4, 0x3, 0x18,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO14 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "led")), /* LED0 */
+ BERLIN_PINCTRL_GROUP("SM_FE_LED1", 0x4, 0x3, 0x1b,
+ BERLIN_PINCTRL_FUNCTION(0x0, "pwr"),
+ BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* SM GPIO 15 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "led")), /* LED1 */
+ BERLIN_PINCTRL_GROUP("SM_FE_LED2", 0x8, 0x3, 0x00,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO16 */
+ BERLIN_PINCTRL_FUNCTION(0x2, "led")), /* LED2 */
+ BERLIN_PINCTRL_GROUP("SM_HDMI_HPD", 0x8, 0x3, 0x03,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO17 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "hdmi")), /* HPD */
+ BERLIN_PINCTRL_GROUP("SM_HDMI_CEC", 0x8, 0x3, 0x06,
+ BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO18 */
+ BERLIN_PINCTRL_FUNCTION(0x1, "hdmi")), /* CEC */
+};
+
+static const struct berlin_pinctrl_desc berlin4ct_soc_pinctrl_data = {
+ .groups = berlin4ct_soc_pinctrl_groups,
+ .ngroups = ARRAY_SIZE(berlin4ct_soc_pinctrl_groups),
+};
+
+static const struct berlin_pinctrl_desc berlin4ct_avio_pinctrl_data = {
+ .groups = berlin4ct_avio_pinctrl_groups,
+ .ngroups = ARRAY_SIZE(berlin4ct_avio_pinctrl_groups),
+};
+
+static const struct berlin_pinctrl_desc berlin4ct_sysmgr_pinctrl_data = {
+ .groups = berlin4ct_sysmgr_pinctrl_groups,
+ .ngroups = ARRAY_SIZE(berlin4ct_sysmgr_pinctrl_groups),
+};
+
+static const struct of_device_id berlin4ct_pinctrl_match[] = {
+ {
+ .compatible = "marvell,berlin4ct-soc-pinctrl",
+ .data = &berlin4ct_soc_pinctrl_data,
+ },
+ {
+ .compatible = "marvell,berlin4ct-avio-pinctrl",
+ .data = &berlin4ct_avio_pinctrl_data,
+ },
+ {
+ .compatible = "marvell,berlin4ct-system-pinctrl",
+ .data = &berlin4ct_sysmgr_pinctrl_data,
+ },
+ {}
+};
+MODULE_DEVICE_TABLE(of, berlin4ct_pinctrl_match);
+
+static int berlin4ct_pinctrl_probe(struct platform_device *pdev)
+{
+ const struct of_device_id *match =
+ of_match_device(berlin4ct_pinctrl_match, &pdev->dev);
+ struct regmap_config *rmconfig;
+ struct regmap *regmap;
+ struct resource *res;
+ void __iomem *base;
+
+ rmconfig = devm_kzalloc(&pdev->dev, sizeof(*rmconfig), GFP_KERNEL);
+ if (!rmconfig)
+ return -ENOMEM;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(base))
+ return PTR_ERR(base);
+
+ rmconfig->reg_bits = 32,
+ rmconfig->val_bits = 32,
+ rmconfig->reg_stride = 4,
+ rmconfig->max_register = resource_size(res);
+
+ regmap = devm_regmap_init_mmio(&pdev->dev, base, rmconfig);
+ if (IS_ERR(regmap))
+ return PTR_ERR(regmap);
+
+ return berlin_pinctrl_probe_regmap(pdev, match->data, regmap);
+}
+
+static struct platform_driver berlin4ct_pinctrl_driver = {
+ .probe = berlin4ct_pinctrl_probe,
+ .driver = {
+ .name = "berlin4ct-pinctrl",
+ .of_match_table = berlin4ct_pinctrl_match,
+ },
+};
+module_platform_driver(berlin4ct_pinctrl_driver);
+
+MODULE_AUTHOR("Jisheng Zhang <jszhang@marvell.com>");
+MODULE_DESCRIPTION("Marvell berlin4ct pinctrl driver");
+MODULE_LICENSE("GPL");
--
2.6.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v5 4/7] arm64: berlin: add the pinctrl dependency for Marvell Berlin SoCs
2015-10-09 11:56 [PATCH v5 0/7] arm64: berlin: add pinctrl support Jisheng Zhang
` (2 preceding siblings ...)
2015-10-09 11:56 ` [PATCH v5 3/7] pinctrl: berlin: add the berlin4ct pinctrl driver Jisheng Zhang
@ 2015-10-09 11:56 ` Jisheng Zhang
2015-10-09 11:56 ` [PATCH v5 5/7] pinctrl: dt-binding: document berlin4ct SoC pinctrl Jisheng Zhang
` (4 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Jisheng Zhang @ 2015-10-09 11:56 UTC (permalink / raw)
To: sebastian.hesselbarth, linus.walleij, antoine.tenart
Cc: catalin.marinas, will.deacon, mark.rutland, robh+dt, pawel.moll,
ijc+devicetree, galak, devicetree, linux-arm-kernel, linux-gpio,
linux-kernel, Jisheng Zhang
This is to add the pinctrl dependency for Marvell Berlin SoCs.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
arch/arm64/Kconfig.platforms | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index c6e2c75..3d17ee2 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -9,6 +9,7 @@ config ARCH_BERLIN
bool "Marvell Berlin SoC Family"
select ARCH_REQUIRE_GPIOLIB
select DW_APB_ICTL
+ select PINCTRL
help
This enables support for Marvell Berlin SoC Family
--
2.6.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v5 5/7] pinctrl: dt-binding: document berlin4ct SoC pinctrl
2015-10-09 11:56 [PATCH v5 0/7] arm64: berlin: add pinctrl support Jisheng Zhang
` (3 preceding siblings ...)
2015-10-09 11:56 ` [PATCH v5 4/7] arm64: berlin: add the pinctrl dependency for Marvell Berlin SoCs Jisheng Zhang
@ 2015-10-09 11:56 ` Jisheng Zhang
2015-10-09 11:56 ` [PATCH v5 6/7] arm64: dts: berlin4ct: add the pinctrl node Jisheng Zhang
` (3 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Jisheng Zhang @ 2015-10-09 11:56 UTC (permalink / raw)
To: sebastian.hesselbarth, linus.walleij, antoine.tenart
Cc: catalin.marinas, will.deacon, mark.rutland, robh+dt, pawel.moll,
ijc+devicetree, galak, devicetree, linux-arm-kernel, linux-gpio,
linux-kernel, Jisheng Zhang
Add berlin4ct to existing berlin pinctrl device tree binding.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
Documentation/devicetree/bindings/pinctrl/berlin,pinctrl.txt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/pinctrl/berlin,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/berlin,pinctrl.txt
index a8bb5e2..f8fa28c 100644
--- a/Documentation/devicetree/bindings/pinctrl/berlin,pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/berlin,pinctrl.txt
@@ -20,7 +20,10 @@ Required properties:
"marvell,berlin2cd-soc-pinctrl",
"marvell,berlin2cd-system-pinctrl",
"marvell,berlin2q-soc-pinctrl",
- "marvell,berlin2q-system-pinctrl"
+ "marvell,berlin2q-system-pinctrl",
+ "marvell,berlin4ct-avio-pinctrl",
+ "marvell,berlin4ct-soc-pinctrl",
+ "marvell,berlin4ct-system-pinctrl"
Required subnode-properties:
- groups: a list of strings describing the group names.
--
2.6.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v5 6/7] arm64: dts: berlin4ct: add the pinctrl node
2015-10-09 11:56 [PATCH v5 0/7] arm64: berlin: add pinctrl support Jisheng Zhang
` (4 preceding siblings ...)
2015-10-09 11:56 ` [PATCH v5 5/7] pinctrl: dt-binding: document berlin4ct SoC pinctrl Jisheng Zhang
@ 2015-10-09 11:56 ` Jisheng Zhang
2015-10-09 11:56 ` [PATCH v5 7/7] arm64: dts: berlin4ct: add default pinmux for uart0 Jisheng Zhang
` (2 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Jisheng Zhang @ 2015-10-09 11:56 UTC (permalink / raw)
To: sebastian.hesselbarth, linus.walleij, antoine.tenart
Cc: catalin.marinas, will.deacon, mark.rutland, robh+dt, pawel.moll,
ijc+devicetree, galak, devicetree, linux-arm-kernel, linux-gpio,
linux-kernel, Jisheng Zhang
Add the avio, soc, sm pinctrl nodes for Marvell berlin4ct SoC.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi
index a3b5f1d..8e66355 100644
--- a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi
+++ b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi
@@ -225,6 +225,16 @@
};
};
+ soc_pinctrl: pin-controller@ea8000 {
+ compatible = "marvell,berlin4ct-soc-pinctrl";
+ reg = <0xea8000 0x14>;
+ };
+
+ avio_pinctrl: pin-controller@ea8400 {
+ compatible = "marvell,berlin4ct-avio-pinctrl";
+ reg = <0xea8400 0x8>;
+ };
+
apb@fc0000 {
compatible = "simple-bus";
#address-cells = <1>;
@@ -280,5 +290,10 @@
status = "disabled";
};
};
+
+ system_pinctrl: pin-controller@fe2200 {
+ compatible = "marvell,berlin4ct-system-pinctrl";
+ reg = <0xfe2200 0xc>;
+ };
};
};
--
2.6.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v5 7/7] arm64: dts: berlin4ct: add default pinmux for uart0
2015-10-09 11:56 [PATCH v5 0/7] arm64: berlin: add pinctrl support Jisheng Zhang
` (5 preceding siblings ...)
2015-10-09 11:56 ` [PATCH v5 6/7] arm64: dts: berlin4ct: add the pinctrl node Jisheng Zhang
@ 2015-10-09 11:56 ` Jisheng Zhang
2015-10-10 22:36 ` [PATCH v5 0/7] arm64: berlin: add pinctrl support Antoine Tenart
2015-10-10 22:40 ` Antoine Tenart
8 siblings, 0 replies; 13+ messages in thread
From: Jisheng Zhang @ 2015-10-09 11:56 UTC (permalink / raw)
To: sebastian.hesselbarth, linus.walleij, antoine.tenart
Cc: catalin.marinas, will.deacon, mark.rutland, robh+dt, pawel.moll,
ijc+devicetree, galak, devicetree, linux-arm-kernel, linux-gpio,
linux-kernel, Jisheng Zhang
Add urt0 txd and rxd muxing setup in the dtsi because uart0 always uses
them to work, no other possibilities.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi
index 8e66355..a4a1876 100644
--- a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi
+++ b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi
@@ -288,12 +288,19 @@
clocks = <&osc>;
reg-shift = <2>;
status = "disabled";
+ pinctrl-0 = <&uart0_pmux>;
+ pinctrl-names = "default";
};
};
system_pinctrl: pin-controller@fe2200 {
compatible = "marvell,berlin4ct-system-pinctrl";
reg = <0xfe2200 0xc>;
+
+ uart0_pmux: uart0-pmux {
+ groups = "SM_URT0_TXD", "SM_URT0_RXD";
+ function = "uart0";
+ };
};
};
};
--
2.6.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v5 0/7] arm64: berlin: add pinctrl support
2015-10-09 11:56 [PATCH v5 0/7] arm64: berlin: add pinctrl support Jisheng Zhang
` (6 preceding siblings ...)
2015-10-09 11:56 ` [PATCH v5 7/7] arm64: dts: berlin4ct: add default pinmux for uart0 Jisheng Zhang
@ 2015-10-10 22:36 ` Antoine Tenart
2015-10-12 2:39 ` Jisheng Zhang
2015-10-10 22:40 ` Antoine Tenart
8 siblings, 1 reply; 13+ messages in thread
From: Antoine Tenart @ 2015-10-10 22:36 UTC (permalink / raw)
To: Jisheng Zhang
Cc: sebastian.hesselbarth, linus.walleij, antoine.tenart,
catalin.marinas, will.deacon, mark.rutland, robh+dt, pawel.moll,
ijc+devicetree, galak, devicetree, linux-arm-kernel, linux-gpio,
linux-kernel
Hi Jisheng,
Please keep Acked-by tags when you submit a new version of a series.
Thanks,
Antoine
On Fri, Oct 09, 2015 at 07:56:43PM +0800, Jisheng Zhang wrote:
> This series adds support for Marvell berlin4ct pin-controller, allowing
> to configure the pin muxing from the device tree.
>
> Since v4:
> - drop ARCH_BERLIN dependency for it has been met
> - drop COMPILE_TEST dependency but make berlin pinctrl driver visible
> if COMPILE_TEST=y, and let this change be a seperate commit.
>
> Since v3:
> - fix stupid build error: I missed local changes to berlin-bg4ct.c
>
> Since v2:
> - introduce new berlin_pinctrl_probe_regmap() to avoid duplicated code
> - renaming such as s/urt/uart etc. but keep the group name as URT* to keep
> consistent with HW/ASIC
>
> Since v1:
> - use generic name for pin functions
> - a new commit to add pinmux for uart0
> - correct pinctrl usage in dts
>
>
> Jisheng Zhang (7):
> pinctrl: berlin: introduce berlin_pinctrl_probe_regmap()
> pinctrl: berlin: Make berlin pinctrl driver visible if COMPILE_TEST=y
> pinctrl: berlin: add the berlin4ct pinctrl driver
> arm64: berlin: add the pinctrl dependency for Marvell Berlin SoCs
> pinctrl: dt-binding: document berlin4ct SoC pinctrl
> arm64: dts: berlin4ct: add the pinctrl node
> arm64: dts: berlin4ct: add default pinmux for uart0
>
> .../devicetree/bindings/pinctrl/berlin,pinctrl.txt | 5 +-
> arch/arm64/Kconfig.platforms | 1 +
> arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 22 +
> drivers/pinctrl/berlin/Kconfig | 7 +-
> drivers/pinctrl/berlin/Makefile | 1 +
> drivers/pinctrl/berlin/berlin-bg4ct.c | 503 +++++++++++++++++++++
> drivers/pinctrl/berlin/berlin.c | 26 +-
> drivers/pinctrl/berlin/berlin.h | 4 +
> 8 files changed, 558 insertions(+), 11 deletions(-)
> create mode 100644 drivers/pinctrl/berlin/berlin-bg4ct.c
>
> --
> 2.6.1
>
--
Antoine Ténart, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v5 0/7] arm64: berlin: add pinctrl support
2015-10-09 11:56 [PATCH v5 0/7] arm64: berlin: add pinctrl support Jisheng Zhang
` (7 preceding siblings ...)
2015-10-10 22:36 ` [PATCH v5 0/7] arm64: berlin: add pinctrl support Antoine Tenart
@ 2015-10-10 22:40 ` Antoine Tenart
2015-10-15 21:55 ` Sebastian Hesselbarth
8 siblings, 1 reply; 13+ messages in thread
From: Antoine Tenart @ 2015-10-10 22:40 UTC (permalink / raw)
To: Jisheng Zhang
Cc: sebastian.hesselbarth, linus.walleij, antoine.tenart,
catalin.marinas, will.deacon, mark.rutland, robh+dt, pawel.moll,
ijc+devicetree, galak, devicetree, linux-arm-kernel, linux-gpio,
linux-kernel
Jisheng,
On Fri, Oct 09, 2015 at 07:56:43PM +0800, Jisheng Zhang wrote:
> This series adds support for Marvell berlin4ct pin-controller, allowing
> to configure the pin muxing from the device tree.
For the whole series,
Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Thanks!
Antoine
>
> Since v4:
> - drop ARCH_BERLIN dependency for it has been met
> - drop COMPILE_TEST dependency but make berlin pinctrl driver visible
> if COMPILE_TEST=y, and let this change be a seperate commit.
>
> Since v3:
> - fix stupid build error: I missed local changes to berlin-bg4ct.c
>
> Since v2:
> - introduce new berlin_pinctrl_probe_regmap() to avoid duplicated code
> - renaming such as s/urt/uart etc. but keep the group name as URT* to keep
> consistent with HW/ASIC
>
> Since v1:
> - use generic name for pin functions
> - a new commit to add pinmux for uart0
> - correct pinctrl usage in dts
>
>
> Jisheng Zhang (7):
> pinctrl: berlin: introduce berlin_pinctrl_probe_regmap()
> pinctrl: berlin: Make berlin pinctrl driver visible if COMPILE_TEST=y
> pinctrl: berlin: add the berlin4ct pinctrl driver
> arm64: berlin: add the pinctrl dependency for Marvell Berlin SoCs
> pinctrl: dt-binding: document berlin4ct SoC pinctrl
> arm64: dts: berlin4ct: add the pinctrl node
> arm64: dts: berlin4ct: add default pinmux for uart0
>
> .../devicetree/bindings/pinctrl/berlin,pinctrl.txt | 5 +-
> arch/arm64/Kconfig.platforms | 1 +
> arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 22 +
> drivers/pinctrl/berlin/Kconfig | 7 +-
> drivers/pinctrl/berlin/Makefile | 1 +
> drivers/pinctrl/berlin/berlin-bg4ct.c | 503 +++++++++++++++++++++
> drivers/pinctrl/berlin/berlin.c | 26 +-
> drivers/pinctrl/berlin/berlin.h | 4 +
> 8 files changed, 558 insertions(+), 11 deletions(-)
> create mode 100644 drivers/pinctrl/berlin/berlin-bg4ct.c
>
> --
> 2.6.1
>
--
Antoine Ténart, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v5 0/7] arm64: berlin: add pinctrl support
2015-10-10 22:36 ` [PATCH v5 0/7] arm64: berlin: add pinctrl support Antoine Tenart
@ 2015-10-12 2:39 ` Jisheng Zhang
0 siblings, 0 replies; 13+ messages in thread
From: Jisheng Zhang @ 2015-10-12 2:39 UTC (permalink / raw)
To: Antoine Tenart
Cc: sebastian.hesselbarth, linus.walleij, catalin.marinas,
will.deacon, mark.rutland, robh+dt, pawel.moll, ijc+devicetree,
galak, devicetree, linux-arm-kernel, linux-gpio, linux-kernel
On Sun, 11 Oct 2015 00:36:36 +0200
Antoine Tenart <antoine.tenart@free-electrons.com> wrote:
> Hi Jisheng,
>
> Please keep Acked-by tags when you submit a new version of a series.
Got it. I dunno this before, will take care in the future.
Thanks a lot for your review,
Jisheng
>
> Thanks,
>
> Antoine
>
> On Fri, Oct 09, 2015 at 07:56:43PM +0800, Jisheng Zhang wrote:
> > This series adds support for Marvell berlin4ct pin-controller, allowing
> > to configure the pin muxing from the device tree.
> >
> > Since v4:
> > - drop ARCH_BERLIN dependency for it has been met
> > - drop COMPILE_TEST dependency but make berlin pinctrl driver visible
> > if COMPILE_TEST=y, and let this change be a seperate commit.
> >
> > Since v3:
> > - fix stupid build error: I missed local changes to berlin-bg4ct.c
> >
> > Since v2:
> > - introduce new berlin_pinctrl_probe_regmap() to avoid duplicated code
> > - renaming such as s/urt/uart etc. but keep the group name as URT* to keep
> > consistent with HW/ASIC
> >
> > Since v1:
> > - use generic name for pin functions
> > - a new commit to add pinmux for uart0
> > - correct pinctrl usage in dts
> >
> >
> > Jisheng Zhang (7):
> > pinctrl: berlin: introduce berlin_pinctrl_probe_regmap()
> > pinctrl: berlin: Make berlin pinctrl driver visible if COMPILE_TEST=y
> > pinctrl: berlin: add the berlin4ct pinctrl driver
> > arm64: berlin: add the pinctrl dependency for Marvell Berlin SoCs
> > pinctrl: dt-binding: document berlin4ct SoC pinctrl
> > arm64: dts: berlin4ct: add the pinctrl node
> > arm64: dts: berlin4ct: add default pinmux for uart0
> >
> > .../devicetree/bindings/pinctrl/berlin,pinctrl.txt | 5 +-
> > arch/arm64/Kconfig.platforms | 1 +
> > arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 22 +
> > drivers/pinctrl/berlin/Kconfig | 7 +-
> > drivers/pinctrl/berlin/Makefile | 1 +
> > drivers/pinctrl/berlin/berlin-bg4ct.c | 503 +++++++++++++++++++++
> > drivers/pinctrl/berlin/berlin.c | 26 +-
> > drivers/pinctrl/berlin/berlin.h | 4 +
> > 8 files changed, 558 insertions(+), 11 deletions(-)
> > create mode 100644 drivers/pinctrl/berlin/berlin-bg4ct.c
> >
> > --
> > 2.6.1
> >
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v5 3/7] pinctrl: berlin: add the berlin4ct pinctrl driver
2015-10-09 11:56 ` [PATCH v5 3/7] pinctrl: berlin: add the berlin4ct pinctrl driver Jisheng Zhang
@ 2015-10-15 21:52 ` Sebastian Hesselbarth
0 siblings, 0 replies; 13+ messages in thread
From: Sebastian Hesselbarth @ 2015-10-15 21:52 UTC (permalink / raw)
To: Jisheng Zhang, linus.walleij, antoine.tenart
Cc: catalin.marinas, will.deacon, mark.rutland, robh+dt, pawel.moll,
ijc+devicetree, galak, devicetree, linux-arm-kernel, linux-gpio,
linux-kernel
On 09.10.2015 13:56, Jisheng Zhang wrote:
> Add the pin-controller driver for Marvell Berlin BG4CT SoC, with definition
> of its groups and functions. This uses the core Berlin pinctrl driver.
>
> Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
> ---
> drivers/pinctrl/berlin/Kconfig | 5 +
> drivers/pinctrl/berlin/Makefile | 1 +
> drivers/pinctrl/berlin/berlin-bg4ct.c | 503 ++++++++++++++++++++++++++++++++++
> 3 files changed, 509 insertions(+)
> create mode 100644 drivers/pinctrl/berlin/berlin-bg4ct.c
>
> diff --git a/drivers/pinctrl/berlin/Kconfig b/drivers/pinctrl/berlin/Kconfig
> index f7e45c8..740a136 100644
> --- a/drivers/pinctrl/berlin/Kconfig
> +++ b/drivers/pinctrl/berlin/Kconfig
> @@ -17,4 +17,9 @@ config PINCTRL_BERLIN_BG2Q
> bool
> select PINCTRL_BERLIN
>
> +config PINCTRL_BERLIN_BG4CT
> + depends on OF
> + bool "Marvell berlin4ct pin controller driver"
> + select PINCTRL_BERLIN
As said in Antoine's berlin-pinctrl cleanup series,
please squash in the patch for reordering of the statements.
Sebastian
> endif
> diff --git a/drivers/pinctrl/berlin/Makefile b/drivers/pinctrl/berlin/Makefile
> index deb0c6b..06f9402 100644
> --- a/drivers/pinctrl/berlin/Makefile
> +++ b/drivers/pinctrl/berlin/Makefile
> @@ -2,3 +2,4 @@ obj-$(CONFIG_PINCTRL_BERLIN) += berlin.o
> obj-$(CONFIG_PINCTRL_BERLIN_BG2) += berlin-bg2.o
> obj-$(CONFIG_PINCTRL_BERLIN_BG2CD) += berlin-bg2cd.o
> obj-$(CONFIG_PINCTRL_BERLIN_BG2Q) += berlin-bg2q.o
> +obj-$(CONFIG_PINCTRL_BERLIN_BG4CT) += berlin-bg4ct.o
> diff --git a/drivers/pinctrl/berlin/berlin-bg4ct.c b/drivers/pinctrl/berlin/berlin-bg4ct.c
> new file mode 100644
> index 0000000..0917204
> --- /dev/null
> +++ b/drivers/pinctrl/berlin/berlin-bg4ct.c
> @@ -0,0 +1,503 @@
> +/*
> + * Marvell berlin4ct pinctrl driver
> + *
> + * Copyright (C) 2015 Marvell Technology Group Ltd.
> + *
> + * Author: Jisheng Zhang <jszhang@marvell.com>
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2, as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope it will be useful, but WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> + * more details.
> + *
> + * You should have received a copy of the GNU General Public License along with
> + * this program. If not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#include <linux/module.h>
> +#include <linux/of_device.h>
> +#include <linux/platform_device.h>
> +#include <linux/regmap.h>
> +
> +#include "berlin.h"
> +
> +static const struct berlin_desc_group berlin4ct_soc_pinctrl_groups[] = {
> + BERLIN_PINCTRL_GROUP("EMMC_RSTn", 0x0, 0x3, 0x00,
> + BERLIN_PINCTRL_FUNCTION(0x0, "emmc"), /* RSTn */
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio")), /* GPIO47 */
> + BERLIN_PINCTRL_GROUP("NAND_IO0", 0x0, 0x3, 0x03,
> + BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* IO0 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* RXD0 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sd1"), /* CLK */
> + BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO0 */
> + BERLIN_PINCTRL_GROUP("NAND_IO1", 0x0, 0x3, 0x06,
> + BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* IO1 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* RXD1 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sd1"), /* CDn */
> + BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO1 */
> + BERLIN_PINCTRL_GROUP("NAND_IO2", 0x0, 0x3, 0x09,
> + BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* IO2 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* RXD2 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sd1"), /* DAT0 */
> + BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO2 */
> + BERLIN_PINCTRL_GROUP("NAND_IO3", 0x0, 0x3, 0x0c,
> + BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* IO3 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* RXD3 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sd1"), /* DAT1 */
> + BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO3 */
> + BERLIN_PINCTRL_GROUP("NAND_IO4", 0x0, 0x3, 0x0f,
> + BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* IO4 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* RXC */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sd1"), /* DAT2 */
> + BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO4 */
> + BERLIN_PINCTRL_GROUP("NAND_IO5", 0x0, 0x3, 0x12,
> + BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* IO5 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* RXCTL */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sd1"), /* DAT3 */
> + BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO5 */
> + BERLIN_PINCTRL_GROUP("NAND_IO6", 0x0, 0x3, 0x15,
> + BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* IO6 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* MDC */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sd1"), /* CMD */
> + BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO6 */
> + BERLIN_PINCTRL_GROUP("NAND_IO7", 0x0, 0x3, 0x18,
> + BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* IO7 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* MDIO */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sd1"), /* WP */
> + BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO7 */
> + BERLIN_PINCTRL_GROUP("NAND_ALE", 0x0, 0x3, 0x1b,
> + BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* ALE */
> + BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* TXD0 */
> + BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO8 */
> + BERLIN_PINCTRL_GROUP("NAND_CLE", 0x4, 0x3, 0x00,
> + BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* CLE */
> + BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* TXD1 */
> + BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO9 */
> + BERLIN_PINCTRL_GROUP("NAND_WEn", 0x4, 0x3, 0x03,
> + BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* WEn */
> + BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* TXD2 */
> + BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO10 */
> + BERLIN_PINCTRL_GROUP("NAND_REn", 0x4, 0x3, 0x06,
> + BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* REn */
> + BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* TXD3 */
> + BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO11 */
> + BERLIN_PINCTRL_GROUP("NAND_WPn", 0x4, 0x3, 0x09,
> + BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* WPn */
> + BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO12 */
> + BERLIN_PINCTRL_GROUP("NAND_CEn", 0x4, 0x3, 0x0c,
> + BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* CEn */
> + BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* TXC */
> + BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO13 */
> + BERLIN_PINCTRL_GROUP("NAND_RDY", 0x4, 0x3, 0x0f,
> + BERLIN_PINCTRL_FUNCTION(0x0, "nand"), /* RDY */
> + BERLIN_PINCTRL_FUNCTION(0x1, "rgmii"), /* TXCTL */
> + BERLIN_PINCTRL_FUNCTION(0x3, "gpio")), /* GPIO14 */
> + BERLIN_PINCTRL_GROUP("SD0_CLK", 0x4, 0x3, 0x12,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO29 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "sd0"), /* CLK*/
> + BERLIN_PINCTRL_FUNCTION(0x2, "sts4"), /* CLK */
> + BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG8 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG8 */
> + BERLIN_PINCTRL_GROUP("SD0_DAT0", 0x4, 0x3, 0x15,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO30 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "sd0"), /* DAT0 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sts4"), /* SOP */
> + BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG9 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG9 */
> + BERLIN_PINCTRL_GROUP("SD0_DAT1", 0x4, 0x3, 0x18,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO31 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "sd0"), /* DAT1 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sts4"), /* SD */
> + BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG10 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG10 */
> + BERLIN_PINCTRL_GROUP("SD0_DAT2", 0x4, 0x3, 0x1b,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO32 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "sd0"), /* DAT2 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sts4"), /* VALD */
> + BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG11 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG11 */
> + BERLIN_PINCTRL_GROUP("SD0_DAT3", 0x8, 0x3, 0x00,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO33 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "sd0"), /* DAT3 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sts5"), /* CLK */
> + BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG12 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG12 */
> + BERLIN_PINCTRL_GROUP("SD0_CDn", 0x8, 0x3, 0x03,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO34 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "sd0"), /* CDn */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sts5"), /* SOP */
> + BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG13 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG13 */
> + BERLIN_PINCTRL_GROUP("SD0_CMD", 0x8, 0x3, 0x06,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO35 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "sd0"), /* CMD */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sts5"), /* SD */
> + BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG14 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG14 */
> + BERLIN_PINCTRL_GROUP("SD0_WP", 0x8, 0x3, 0x09,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO36 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "sd0"), /* WP */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sts5"), /* VALD */
> + BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG15 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG15 */
> + BERLIN_PINCTRL_GROUP("STS0_CLK", 0x8, 0x3, 0x0c,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO21 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "sts0"), /* CLK */
> + BERLIN_PINCTRL_FUNCTION(0x2, "cpupll"), /* CLKO */
> + BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG0 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG0 */
> + BERLIN_PINCTRL_GROUP("STS0_SOP", 0x8, 0x3, 0x0f,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO22 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "sts0"), /* SOP */
> + BERLIN_PINCTRL_FUNCTION(0x2, "syspll"), /* CLKO */
> + BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG1 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG1 */
> + BERLIN_PINCTRL_GROUP("STS0_SD", 0x8, 0x3, 0x12,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO23 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "sts0"), /* SD */
> + BERLIN_PINCTRL_FUNCTION(0x2, "mempll"), /* CLKO */
> + BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG2 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG2 */
> + BERLIN_PINCTRL_GROUP("STS0_VALD", 0x8, 0x3, 0x15,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO24 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "sts0"), /* VALD */
> + BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG3 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG3 */
> + BERLIN_PINCTRL_GROUP("STS1_CLK", 0x8, 0x3, 0x18,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO25 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "sts1"), /* CLK */
> + BERLIN_PINCTRL_FUNCTION(0x2, "pwm0"),
> + BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG4 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG4 */
> + BERLIN_PINCTRL_GROUP("STS1_SOP", 0x8, 0x3, 0x1b,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO26 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "sts1"), /* SOP */
> + BERLIN_PINCTRL_FUNCTION(0x2, "pwm1"),
> + BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG5 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG5 */
> + BERLIN_PINCTRL_GROUP("STS1_SD", 0xc, 0x3, 0x00,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO27 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "sts1"), /* SD */
> + BERLIN_PINCTRL_FUNCTION(0x2, "pwm2"),
> + BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG6 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG6 */
> + BERLIN_PINCTRL_GROUP("STS1_VALD", 0xc, 0x3, 0x03,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO28 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "sts1"), /* VALD */
> + BERLIN_PINCTRL_FUNCTION(0x2, "pwm3"),
> + BERLIN_PINCTRL_FUNCTION(0x5, "v4g"), /* DBG7 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "phy")), /* DBG7 */
> + BERLIN_PINCTRL_GROUP("SCRD0_RST", 0xc, 0x3, 0x06,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO15 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "scrd0"), /* RST */
> + BERLIN_PINCTRL_FUNCTION(0x3, "sd1a")), /* CLK */
> + BERLIN_PINCTRL_GROUP("SCRD0_DCLK", 0xc, 0x3, 0x09,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO16 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "scrd0"), /* DCLK */
> + BERLIN_PINCTRL_FUNCTION(0x3, "sd1a")), /* CMD */
> + BERLIN_PINCTRL_GROUP("SCRD0_GPIO0", 0xc, 0x3, 0x0c,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO17 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "scrd0"), /* SCRD0 GPIO0 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sif"), /* DIO */
> + BERLIN_PINCTRL_FUNCTION(0x3, "sd1a")), /* DAT0 */
> + BERLIN_PINCTRL_GROUP("SCRD0_GPIO1", 0xc, 0x3, 0x0f,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO18 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "scrd0"), /* SCRD0 GPIO1 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sif"), /* CLK */
> + BERLIN_PINCTRL_FUNCTION(0x3, "sd1a")), /* DAT1 */
> + BERLIN_PINCTRL_GROUP("SCRD0_DIO", 0xc, 0x3, 0x12,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO19 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "scrd0"), /* DIO */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sif"), /* DEN */
> + BERLIN_PINCTRL_FUNCTION(0x3, "sd1a")), /* DAT2 */
> + BERLIN_PINCTRL_GROUP("SCRD0_CRD_PRES", 0xc, 0x3, 0x15,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO20 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "scrd0"), /* crd pres */
> + BERLIN_PINCTRL_FUNCTION(0x1, "sd1a")), /* DAT3 */
> + BERLIN_PINCTRL_GROUP("SPI1_SS0n", 0xc, 0x3, 0x18,
> + BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* SS0n */
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* GPIO37 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sts2")), /* CLK */
> + BERLIN_PINCTRL_GROUP("SPI1_SS1n", 0xc, 0x3, 0x1b,
> + BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* SS1n */
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* GPIO38 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sts2"), /* SOP */
> + BERLIN_PINCTRL_FUNCTION(0x4, "pwm1")),
> + BERLIN_PINCTRL_GROUP("SPI1_SS2n", 0x10, 0x3, 0x00,
> + BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* SS2n */
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* GPIO39 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sts2"), /* SD */
> + BERLIN_PINCTRL_FUNCTION(0x4, "pwm0")),
> + BERLIN_PINCTRL_GROUP("SPI1_SS3n", 0x10, 0x3, 0x03,
> + BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* SS3n */
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* GPIO40 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sts2")), /* VALD */
> + BERLIN_PINCTRL_GROUP("SPI1_SCLK", 0x10, 0x3, 0x06,
> + BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* SCLK */
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* GPIO41 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sts3")), /* CLK */
> + BERLIN_PINCTRL_GROUP("SPI1_SDO", 0x10, 0x3, 0x09,
> + BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* SDO */
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* GPIO42 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sts3")), /* SOP */
> + BERLIN_PINCTRL_GROUP("SPI1_SDI", 0x10, 0x3, 0x0c,
> + BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* SDI */
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* GPIO43 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sts3")), /* SD */
> + BERLIN_PINCTRL_GROUP("USB0_DRV_VBUS", 0x10, 0x3, 0x0f,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO44 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "usb0"), /* VBUS */
> + BERLIN_PINCTRL_FUNCTION(0x2, "sts3")), /* VALD */
> + BERLIN_PINCTRL_GROUP("TW0_SCL", 0x10, 0x3, 0x12,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO45 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "tw0")), /* SCL */
> + BERLIN_PINCTRL_GROUP("TW0_SDA", 0x10, 0x3, 0x15,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* GPIO46 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "tw0")), /* SDA */
> +};
> +
> +static const struct berlin_desc_group berlin4ct_avio_pinctrl_groups[] = {
> + BERLIN_PINCTRL_GROUP("TX_EDDC_SCL", 0x0, 0x3, 0x00,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO0 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "tx_eddc"), /* SCL */
> + BERLIN_PINCTRL_FUNCTION(0x2, "tw1")), /* SCL */
> + BERLIN_PINCTRL_GROUP("TX_EDDC_SDA", 0x0, 0x3, 0x03,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO1 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "tx_eddc"), /* SDA */
> + BERLIN_PINCTRL_FUNCTION(0x2, "tw1")), /* SDA */
> + BERLIN_PINCTRL_GROUP("I2S1_LRCKO", 0x0, 0x3, 0x06,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO2 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "i2s1"), /* LRCKO */
> + BERLIN_PINCTRL_FUNCTION(0x3, "sts6"), /* CLK */
> + BERLIN_PINCTRL_FUNCTION(0x4, "adac"), /* DBG0 */
> + BERLIN_PINCTRL_FUNCTION(0x6, "sd1b"), /* CLK */
> + BERLIN_PINCTRL_FUNCTION(0x7, "avio")), /* DBG0 */
> + BERLIN_PINCTRL_GROUP("I2S1_BCLKO", 0x0, 0x3, 0x09,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO3 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "i2s1"), /* BCLKO */
> + BERLIN_PINCTRL_FUNCTION(0x3, "sts6"), /* SOP */
> + BERLIN_PINCTRL_FUNCTION(0x4, "adac"), /* DBG1 */
> + BERLIN_PINCTRL_FUNCTION(0x6, "sd1b"), /* CMD */
> + BERLIN_PINCTRL_FUNCTION(0x7, "avio")), /* DBG1 */
> + BERLIN_PINCTRL_GROUP("I2S1_DO", 0x0, 0x3, 0x0c,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO4 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "i2s1"), /* DO */
> + BERLIN_PINCTRL_FUNCTION(0x3, "sts6"), /* SD */
> + BERLIN_PINCTRL_FUNCTION(0x4, "adac"), /* DBG2 */
> + BERLIN_PINCTRL_FUNCTION(0x6, "sd1b"), /* DAT0 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "avio")), /* DBG2 */
> + BERLIN_PINCTRL_GROUP("I2S1_MCLK", 0x0, 0x3, 0x0f,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO5 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "i2s1"), /* MCLK */
> + BERLIN_PINCTRL_FUNCTION(0x3, "sts6"), /* VALD */
> + BERLIN_PINCTRL_FUNCTION(0x4, "adac_test"), /* MCLK */
> + BERLIN_PINCTRL_FUNCTION(0x6, "sd1b"), /* DAT1 */
> + BERLIN_PINCTRL_FUNCTION(0x7, "avio")), /* DBG3 */
> + BERLIN_PINCTRL_GROUP("SPDIFO", 0x0, 0x3, 0x12,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO6 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "spdifo"),
> + BERLIN_PINCTRL_FUNCTION(0x2, "avpll"), /* CLKO */
> + BERLIN_PINCTRL_FUNCTION(0x4, "adac")), /* DBG3 */
> + BERLIN_PINCTRL_GROUP("I2S2_MCLK", 0x0, 0x3, 0x15,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO7 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "i2s2"), /* MCLK */
> + BERLIN_PINCTRL_FUNCTION(0x4, "hdmi"), /* FBCLK */
> + BERLIN_PINCTRL_FUNCTION(0x5, "pdm")), /* CLKO */
> + BERLIN_PINCTRL_GROUP("I2S2_LRCKI", 0x0, 0x3, 0x18,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO8 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "i2s2"), /* LRCKI */
> + BERLIN_PINCTRL_FUNCTION(0x2, "pwm0"),
> + BERLIN_PINCTRL_FUNCTION(0x3, "sts7"), /* CLK */
> + BERLIN_PINCTRL_FUNCTION(0x4, "adac_test"), /* LRCK */
> + BERLIN_PINCTRL_FUNCTION(0x6, "sd1b")), /* DAT2 */
> + BERLIN_PINCTRL_GROUP("I2S2_BCLKI", 0x0, 0x3, 0x1b,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO9 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "i2s2"), /* BCLKI */
> + BERLIN_PINCTRL_FUNCTION(0x2, "pwm1"),
> + BERLIN_PINCTRL_FUNCTION(0x3, "sts7"), /* SOP */
> + BERLIN_PINCTRL_FUNCTION(0x4, "adac_test"), /* BCLK */
> + BERLIN_PINCTRL_FUNCTION(0x6, "sd1b")), /* DAT3 */
> + BERLIN_PINCTRL_GROUP("I2S2_DI0", 0x4, 0x3, 0x00,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO10 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "i2s2"), /* DI0 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "pwm2"),
> + BERLIN_PINCTRL_FUNCTION(0x3, "sts7"), /* SD */
> + BERLIN_PINCTRL_FUNCTION(0x4, "adac_test"), /* SDIN */
> + BERLIN_PINCTRL_FUNCTION(0x5, "pdm"), /* DI0 */
> + BERLIN_PINCTRL_FUNCTION(0x6, "sd1b")), /* CDn */
> + BERLIN_PINCTRL_GROUP("I2S2_DI1", 0x4, 0x3, 0x03,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* AVIO GPIO11 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "i2s2"), /* DI1 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "pwm3"),
> + BERLIN_PINCTRL_FUNCTION(0x3, "sts7"), /* VALD */
> + BERLIN_PINCTRL_FUNCTION(0x4, "adac_test"), /* PWMCLK */
> + BERLIN_PINCTRL_FUNCTION(0x5, "pdm"), /* DI1 */
> + BERLIN_PINCTRL_FUNCTION(0x6, "sd1b")), /* WP */
> +};
> +
> +static const struct berlin_desc_group berlin4ct_sysmgr_pinctrl_groups[] = {
> + BERLIN_PINCTRL_GROUP("SM_TW2_SCL", 0x0, 0x3, 0x00,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO19 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "tw2")), /* SCL */
> + BERLIN_PINCTRL_GROUP("SM_TW2_SDA", 0x0, 0x3, 0x03,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO20 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "tw2")), /* SDA */
> + BERLIN_PINCTRL_GROUP("SM_TW3_SCL", 0x0, 0x3, 0x06,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO21 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "tw3")), /* SCL */
> + BERLIN_PINCTRL_GROUP("SM_TW3_SDA", 0x0, 0x3, 0x09,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO22 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "tw3")), /* SDA */
> + BERLIN_PINCTRL_GROUP("SM_TMS", 0x0, 0x3, 0x0c,
> + BERLIN_PINCTRL_FUNCTION(0x0, "jtag"), /* TMS */
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* SM GPIO0 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "pwm0")),
> + BERLIN_PINCTRL_GROUP("SM_TDI", 0x0, 0x3, 0x0f,
> + BERLIN_PINCTRL_FUNCTION(0x0, "jtag"), /* TDI */
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* SM GPIO1 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "pwm1")),
> + BERLIN_PINCTRL_GROUP("SM_TDO", 0x0, 0x3, 0x12,
> + BERLIN_PINCTRL_FUNCTION(0x0, "jtag"), /* TDO */
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio")), /* SM GPIO2 */
> + BERLIN_PINCTRL_GROUP("SM_URT0_TXD", 0x0, 0x3, 0x15,
> + BERLIN_PINCTRL_FUNCTION(0x0, "uart0"), /* TXD */
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio")), /* SM GPIO3 */
> + BERLIN_PINCTRL_GROUP("SM_URT0_RXD", 0x0, 0x3, 0x18,
> + BERLIN_PINCTRL_FUNCTION(0x0, "uart0"), /* RXD */
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio")), /* SM GPIO4 */
> + BERLIN_PINCTRL_GROUP("SM_URT1_TXD", 0x0, 0x3, 0x1b,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO5 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "uart1"), /* TXD */
> + BERLIN_PINCTRL_FUNCTION(0x2, "eth1"), /* RXCLK */
> + BERLIN_PINCTRL_FUNCTION(0x3, "pwm2"),
> + BERLIN_PINCTRL_FUNCTION(0x4, "timer0"),
> + BERLIN_PINCTRL_FUNCTION(0x5, "clk_25m")),
> + BERLIN_PINCTRL_GROUP("SM_URT1_RXD", 0x4, 0x3, 0x00,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO6 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "uart1"), /* RXD */
> + BERLIN_PINCTRL_FUNCTION(0x3, "pwm3"),
> + BERLIN_PINCTRL_FUNCTION(0x4, "timer1")),
> + BERLIN_PINCTRL_GROUP("SM_SPI2_SS0n", 0x4, 0x3, 0x03,
> + BERLIN_PINCTRL_FUNCTION(0x0, "spi2"), /* SS0 n*/
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio")), /* SM GPIO7 */
> + BERLIN_PINCTRL_GROUP("SM_SPI2_SS1n", 0x4, 0x3, 0x06,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO8 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "spi2")), /* SS1n */
> + BERLIN_PINCTRL_GROUP("SM_SPI2_SS2n", 0x4, 0x3, 0x09,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO9 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "spi2"), /* SS2n */
> + BERLIN_PINCTRL_FUNCTION(0x2, "eth1"), /* MDC */
> + BERLIN_PINCTRL_FUNCTION(0x3, "pwm0"),
> + BERLIN_PINCTRL_FUNCTION(0x4, "timer0"),
> + BERLIN_PINCTRL_FUNCTION(0x5, "clk_25m")),
> + BERLIN_PINCTRL_GROUP("SM_SPI2_SS3n", 0x4, 0x3, 0x0c,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO10 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "spi2"), /* SS3n */
> + BERLIN_PINCTRL_FUNCTION(0x2, "eth1"), /* MDIO */
> + BERLIN_PINCTRL_FUNCTION(0x3, "pwm1"),
> + BERLIN_PINCTRL_FUNCTION(0x4, "timer1")),
> + BERLIN_PINCTRL_GROUP("SM_SPI2_SDO", 0x4, 0x3, 0x0f,
> + BERLIN_PINCTRL_FUNCTION(0x0, "spi2"), /* SDO */
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio")), /* SM GPIO11 */
> + BERLIN_PINCTRL_GROUP("SM_SPI2_SDI", 0x4, 0x3, 0x12,
> + BERLIN_PINCTRL_FUNCTION(0x0, "spi2"), /* SDI */
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio")), /* SM GPIO12 */
> + BERLIN_PINCTRL_GROUP("SM_SPI2_SCLK", 0x4, 0x3, 0x15,
> + BERLIN_PINCTRL_FUNCTION(0x0, "spi2"), /* SCLK */
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio")), /* SM GPIO13 */
> + BERLIN_PINCTRL_GROUP("SM_FE_LED0", 0x4, 0x3, 0x18,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO14 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "led")), /* LED0 */
> + BERLIN_PINCTRL_GROUP("SM_FE_LED1", 0x4, 0x3, 0x1b,
> + BERLIN_PINCTRL_FUNCTION(0x0, "pwr"),
> + BERLIN_PINCTRL_FUNCTION(0x1, "gpio"), /* SM GPIO 15 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "led")), /* LED1 */
> + BERLIN_PINCTRL_GROUP("SM_FE_LED2", 0x8, 0x3, 0x00,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO16 */
> + BERLIN_PINCTRL_FUNCTION(0x2, "led")), /* LED2 */
> + BERLIN_PINCTRL_GROUP("SM_HDMI_HPD", 0x8, 0x3, 0x03,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO17 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "hdmi")), /* HPD */
> + BERLIN_PINCTRL_GROUP("SM_HDMI_CEC", 0x8, 0x3, 0x06,
> + BERLIN_PINCTRL_FUNCTION(0x0, "gpio"), /* SM GPIO18 */
> + BERLIN_PINCTRL_FUNCTION(0x1, "hdmi")), /* CEC */
> +};
> +
> +static const struct berlin_pinctrl_desc berlin4ct_soc_pinctrl_data = {
> + .groups = berlin4ct_soc_pinctrl_groups,
> + .ngroups = ARRAY_SIZE(berlin4ct_soc_pinctrl_groups),
> +};
> +
> +static const struct berlin_pinctrl_desc berlin4ct_avio_pinctrl_data = {
> + .groups = berlin4ct_avio_pinctrl_groups,
> + .ngroups = ARRAY_SIZE(berlin4ct_avio_pinctrl_groups),
> +};
> +
> +static const struct berlin_pinctrl_desc berlin4ct_sysmgr_pinctrl_data = {
> + .groups = berlin4ct_sysmgr_pinctrl_groups,
> + .ngroups = ARRAY_SIZE(berlin4ct_sysmgr_pinctrl_groups),
> +};
> +
> +static const struct of_device_id berlin4ct_pinctrl_match[] = {
> + {
> + .compatible = "marvell,berlin4ct-soc-pinctrl",
> + .data = &berlin4ct_soc_pinctrl_data,
> + },
> + {
> + .compatible = "marvell,berlin4ct-avio-pinctrl",
> + .data = &berlin4ct_avio_pinctrl_data,
> + },
> + {
> + .compatible = "marvell,berlin4ct-system-pinctrl",
> + .data = &berlin4ct_sysmgr_pinctrl_data,
> + },
> + {}
> +};
> +MODULE_DEVICE_TABLE(of, berlin4ct_pinctrl_match);
> +
> +static int berlin4ct_pinctrl_probe(struct platform_device *pdev)
> +{
> + const struct of_device_id *match =
> + of_match_device(berlin4ct_pinctrl_match, &pdev->dev);
> + struct regmap_config *rmconfig;
> + struct regmap *regmap;
> + struct resource *res;
> + void __iomem *base;
> +
> + rmconfig = devm_kzalloc(&pdev->dev, sizeof(*rmconfig), GFP_KERNEL);
> + if (!rmconfig)
> + return -ENOMEM;
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + base = devm_ioremap_resource(&pdev->dev, res);
> + if (IS_ERR(base))
> + return PTR_ERR(base);
> +
> + rmconfig->reg_bits = 32,
> + rmconfig->val_bits = 32,
> + rmconfig->reg_stride = 4,
> + rmconfig->max_register = resource_size(res);
> +
> + regmap = devm_regmap_init_mmio(&pdev->dev, base, rmconfig);
> + if (IS_ERR(regmap))
> + return PTR_ERR(regmap);
> +
> + return berlin_pinctrl_probe_regmap(pdev, match->data, regmap);
> +}
> +
> +static struct platform_driver berlin4ct_pinctrl_driver = {
> + .probe = berlin4ct_pinctrl_probe,
> + .driver = {
> + .name = "berlin4ct-pinctrl",
> + .of_match_table = berlin4ct_pinctrl_match,
> + },
> +};
> +module_platform_driver(berlin4ct_pinctrl_driver);
> +
> +MODULE_AUTHOR("Jisheng Zhang <jszhang@marvell.com>");
> +MODULE_DESCRIPTION("Marvell berlin4ct pinctrl driver");
> +MODULE_LICENSE("GPL");
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v5 0/7] arm64: berlin: add pinctrl support
2015-10-10 22:40 ` Antoine Tenart
@ 2015-10-15 21:55 ` Sebastian Hesselbarth
0 siblings, 0 replies; 13+ messages in thread
From: Sebastian Hesselbarth @ 2015-10-15 21:55 UTC (permalink / raw)
To: Antoine Tenart, Jisheng Zhang
Cc: linus.walleij, catalin.marinas, will.deacon, mark.rutland,
robh+dt, pawel.moll, ijc+devicetree, galak, devicetree,
linux-arm-kernel, linux-gpio, linux-kernel
On 11.10.2015 00:40, Antoine Tenart wrote:
> Jisheng,
>
> On Fri, Oct 09, 2015 at 07:56:43PM +0800, Jisheng Zhang wrote:
>> This series adds support for Marvell berlin4ct pin-controller, allowing
>> to configure the pin muxing from the device tree.
>
> For the whole series,
>
> Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com>
>
Besides the nit-pick on patch 3/7,
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Thanks!
>>
>> Since v4:
>> - drop ARCH_BERLIN dependency for it has been met
>> - drop COMPILE_TEST dependency but make berlin pinctrl driver visible
>> if COMPILE_TEST=y, and let this change be a seperate commit.
>>
>> Since v3:
>> - fix stupid build error: I missed local changes to berlin-bg4ct.c
>>
>> Since v2:
>> - introduce new berlin_pinctrl_probe_regmap() to avoid duplicated code
>> - renaming such as s/urt/uart etc. but keep the group name as URT* to keep
>> consistent with HW/ASIC
>>
>> Since v1:
>> - use generic name for pin functions
>> - a new commit to add pinmux for uart0
>> - correct pinctrl usage in dts
>>
>>
>> Jisheng Zhang (7):
>> pinctrl: berlin: introduce berlin_pinctrl_probe_regmap()
>> pinctrl: berlin: Make berlin pinctrl driver visible if COMPILE_TEST=y
>> pinctrl: berlin: add the berlin4ct pinctrl driver
>> arm64: berlin: add the pinctrl dependency for Marvell Berlin SoCs
>> pinctrl: dt-binding: document berlin4ct SoC pinctrl
>> arm64: dts: berlin4ct: add the pinctrl node
>> arm64: dts: berlin4ct: add default pinmux for uart0
>>
>> .../devicetree/bindings/pinctrl/berlin,pinctrl.txt | 5 +-
>> arch/arm64/Kconfig.platforms | 1 +
>> arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 22 +
>> drivers/pinctrl/berlin/Kconfig | 7 +-
>> drivers/pinctrl/berlin/Makefile | 1 +
>> drivers/pinctrl/berlin/berlin-bg4ct.c | 503 +++++++++++++++++++++
>> drivers/pinctrl/berlin/berlin.c | 26 +-
>> drivers/pinctrl/berlin/berlin.h | 4 +
>> 8 files changed, 558 insertions(+), 11 deletions(-)
>> create mode 100644 drivers/pinctrl/berlin/berlin-bg4ct.c
>>
>> --
>> 2.6.1
>>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2015-10-15 21:55 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-09 11:56 [PATCH v5 0/7] arm64: berlin: add pinctrl support Jisheng Zhang
2015-10-09 11:56 ` [PATCH v5 1/7] pinctrl: berlin: introduce berlin_pinctrl_probe_regmap() Jisheng Zhang
2015-10-09 11:56 ` [PATCH v5 2/7] pinctrl: berlin: Make berlin pinctrl driver visible if COMPILE_TEST=y Jisheng Zhang
2015-10-09 11:56 ` [PATCH v5 3/7] pinctrl: berlin: add the berlin4ct pinctrl driver Jisheng Zhang
2015-10-15 21:52 ` Sebastian Hesselbarth
2015-10-09 11:56 ` [PATCH v5 4/7] arm64: berlin: add the pinctrl dependency for Marvell Berlin SoCs Jisheng Zhang
2015-10-09 11:56 ` [PATCH v5 5/7] pinctrl: dt-binding: document berlin4ct SoC pinctrl Jisheng Zhang
2015-10-09 11:56 ` [PATCH v5 6/7] arm64: dts: berlin4ct: add the pinctrl node Jisheng Zhang
2015-10-09 11:56 ` [PATCH v5 7/7] arm64: dts: berlin4ct: add default pinmux for uart0 Jisheng Zhang
2015-10-10 22:36 ` [PATCH v5 0/7] arm64: berlin: add pinctrl support Antoine Tenart
2015-10-12 2:39 ` Jisheng Zhang
2015-10-10 22:40 ` Antoine Tenart
2015-10-15 21:55 ` Sebastian Hesselbarth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).