All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] dt: bindings: add binding for Allwinner A64 R_PIO pinctrl
@ 2016-08-01 14:59 ` Icenowy Zheng
  0 siblings, 0 replies; 20+ messages in thread
From: Icenowy Zheng @ 2016-08-01 14:59 UTC (permalink / raw)
  To: Rob Herring, Maxime Ripard, Chen-Yu Tsai, Andre Przywara,
	Linus Walleij, Jens Kuske
  Cc: Mark Rutland, devicetree, Vishnu Patekar, linux-gpio,
	linux-kernel, Masahiro Yamada, linux-arm-kernel,
	Krzysztof Adamski, Icenowy Zheng

Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
---
 Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
index 6961722..ee73f9f 100644
--- a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
@@ -23,6 +23,7 @@ Required properties:
   "allwinner,sun8i-h3-pinctrl"
   "allwinner,sun8i-h3-r-pinctrl"
   "allwinner,sun50i-a64-pinctrl"
+  "allwinner,sun50i-a64-r-pinctrl"
 
 - reg: Should contain the register physical address and length for the
   pin controller.
-- 
2.9.0

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [PATCH 1/2] dt: bindings: add binding for Allwinner A64 R_PIO pinctrl
@ 2016-08-01 14:59 ` Icenowy Zheng
  0 siblings, 0 replies; 20+ messages in thread
From: Icenowy Zheng @ 2016-08-01 14:59 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
---
 Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
index 6961722..ee73f9f 100644
--- a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
@@ -23,6 +23,7 @@ Required properties:
   "allwinner,sun8i-h3-pinctrl"
   "allwinner,sun8i-h3-r-pinctrl"
   "allwinner,sun50i-a64-pinctrl"
+  "allwinner,sun50i-a64-r-pinctrl"
 
 - reg: Should contain the register physical address and length for the
   pin controller.
-- 
2.9.0

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [PATCH 2/2] pinctrl: sunxi: Add A64 R_PIO controller support
  2016-08-01 14:59 ` Icenowy Zheng
@ 2016-08-01 14:59   ` Icenowy Zheng
  -1 siblings, 0 replies; 20+ messages in thread
From: Icenowy Zheng @ 2016-08-01 14:59 UTC (permalink / raw)
  To: Rob Herring, Maxime Ripard, Chen-Yu Tsai, Andre Przywara,
	Linus Walleij, Jens Kuske
  Cc: Mark Rutland, devicetree, Vishnu Patekar, linux-gpio,
	linux-kernel, Masahiro Yamada, linux-arm-kernel,
	Krzysztof Adamski, Icenowy Zheng

The A64 has a R_PIO pin controller, similar to the one found on the H3 SoCs.
Add support for the pins controlled by the R_PIO controller.

Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
---
 drivers/pinctrl/sunxi/Kconfig                |   5 +
 drivers/pinctrl/sunxi/Makefile               |   1 +
 drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 148 +++++++++++++++++++++++++++
 3 files changed, 154 insertions(+)
 create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c

diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
index aaf075b..c4b476f 100644
--- a/drivers/pinctrl/sunxi/Kconfig
+++ b/drivers/pinctrl/sunxi/Kconfig
@@ -72,4 +72,9 @@ config PINCTRL_SUN50I_A64
 	bool
 	select PINCTRL_SUNXI
 
+config PINCTRL_SUN50I_A64_R
+	bool
+	depends on RESET_CONTROLLER
+	select PINCTRL_SUNXI
+
 endif
diff --git a/drivers/pinctrl/sunxi/Makefile b/drivers/pinctrl/sunxi/Makefile
index 2d8b64e..d6eabdd 100644
--- a/drivers/pinctrl/sunxi/Makefile
+++ b/drivers/pinctrl/sunxi/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_PINCTRL_SUN8I_A23)		+= pinctrl-sun8i-a23.o
 obj-$(CONFIG_PINCTRL_SUN8I_A23_R)	+= pinctrl-sun8i-a23-r.o
 obj-$(CONFIG_PINCTRL_SUN8I_A33)		+= pinctrl-sun8i-a33.o
 obj-$(CONFIG_PINCTRL_SUN50I_A64)	+= pinctrl-sun50i-a64.o
+obj-$(CONFIG_PINCTRL_SUN50I_A64_R)	+= pinctrl-sun50i-a64-r.o
 obj-$(CONFIG_PINCTRL_SUN8I_A83T)	+= pinctrl-sun8i-a83t.o
 obj-$(CONFIG_PINCTRL_SUN8I_H3)		+= pinctrl-sun8i-h3.o
 obj-$(CONFIG_PINCTRL_SUN8I_H3_R)	+= pinctrl-sun8i-h3-r.o
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
new file mode 100644
index 0000000..b836264
--- /dev/null
+++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
@@ -0,0 +1,148 @@
+/*
+ * Allwinner A64 SoCs special pins pinctrl driver.
+ *
+ * Based on pinctrl-sun8i-a23-r.c
+ *
+ * Copyright (C) 2016 Icenowy Zheng
+ * Icenowy Zheng <icenowy@aosc.xyz>
+ *
+ * Copyright (C) 2014 Chen-Yu Tsai
+ * Chen-Yu Tsai <wens@csie.org>
+ *
+ * Copyright (C) 2014 Boris Brezillon
+ * Boris Brezillon <boris.brezillon@free-electrons.com>
+ *
+ * Copyright (C) 2014 Maxime Ripard
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/pinctrl/pinctrl.h>
+#include <linux/reset.h>
+
+#include "pinctrl-sunxi.h"
+
+static const struct sunxi_desc_pin sun50i_a64_r_pins[] = {
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 0),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x2, "s_rsb"),		/* SCK */
+		  SUNXI_FUNCTION(0x3, "s_twi"),		/* SCK */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 0)),	/* PL_EINT0 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 1),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x2, "s_rsb"),		/* SDA */
+		  SUNXI_FUNCTION(0x3, "s_twi"),		/* SDA */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 1)),	/* PL_EINT1 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 2),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x2, "s_uart"),	/* TX */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 2)),	/* PL_EINT2 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 3),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x2, "s_uart"),	/* RX */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 3)),	/* PL_EINT3 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 4),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x3, "s_jtag"),	/* MS */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 4)),	/* PL_EINT4 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 5),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x3, "s_jtag"),	/* CK */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 5)),	/* PL_EINT5 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 6),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x3, "s_jtag"),	/* DO */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 6)),	/* PL_EINT6 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 7),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x3, "s_jtag"),	/* DI */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 7)),	/* PL_EINT7 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 8),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x2, "s_twi"),		/* SCK */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 8)),	/* PL_EINT8 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 9),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x2, "s_twi"),		/* SDA */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 9)),	/* PL_EINT9 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 10),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x2, "s_pwm"),
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 10)),	/* PL_EINT10 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 11),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x2, "s_cir_rx"),
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 11)),	/* PL_EINT11 */
+};
+
+static const struct sunxi_pinctrl_desc sun50i_a64_r_pinctrl_data = {
+	.pins = sun50i_a64_r_pins,
+	.npins = ARRAY_SIZE(sun50i_a64_r_pins),
+	.pin_base = PL_BASE,
+	.irq_banks = 1,
+};
+
+static int sun50i_a64_r_pinctrl_probe(struct platform_device *pdev)
+{
+	struct reset_control *rstc;
+	int ret;
+
+	rstc = devm_reset_control_get(&pdev->dev, NULL);
+	if (IS_ERR(rstc)) {
+		dev_err(&pdev->dev, "Reset controller missing\n");
+		return PTR_ERR(rstc);
+	}
+
+	ret = reset_control_deassert(rstc);
+	if (ret)
+		return ret;
+
+	ret = sunxi_pinctrl_init(pdev,
+				 &sun50i_a64_r_pinctrl_data);
+
+	if (ret)
+		reset_control_assert(rstc);
+
+	return ret;
+}
+
+static const struct of_device_id sun50i_a64_r_pinctrl_match[] = {
+	{ .compatible = "allwinner,sun50i-a64-r-pinctrl", },
+	{}
+};
+MODULE_DEVICE_TABLE(of, sun50i_a64_r_pinctrl_match);
+
+static struct platform_driver sun50i_a64_r_pinctrl_driver = {
+	.probe	= sun50i_a64_r_pinctrl_probe,
+	.driver	= {
+		.name		= "sun50i-a64-r-pinctrl",
+		.of_match_table	= sun50i_a64_r_pinctrl_match,
+	},
+};
+module_platform_driver(sun50i_a64_r_pinctrl_driver);
+
+MODULE_AUTHOR("Icenowy Zheng <icenowy@aosc.xyz>");
+MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
+MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com");
+MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
+MODULE_DESCRIPTION("Allwinner A64 R_PIO pinctrl driver");
+MODULE_LICENSE("GPL");
-- 
2.9.0

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [PATCH 2/2] pinctrl: sunxi: Add A64 R_PIO controller support
@ 2016-08-01 14:59   ` Icenowy Zheng
  0 siblings, 0 replies; 20+ messages in thread
From: Icenowy Zheng @ 2016-08-01 14:59 UTC (permalink / raw)
  To: linux-arm-kernel

The A64 has a R_PIO pin controller, similar to the one found on the H3 SoCs.
Add support for the pins controlled by the R_PIO controller.

Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
---
 drivers/pinctrl/sunxi/Kconfig                |   5 +
 drivers/pinctrl/sunxi/Makefile               |   1 +
 drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 148 +++++++++++++++++++++++++++
 3 files changed, 154 insertions(+)
 create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c

diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
index aaf075b..c4b476f 100644
--- a/drivers/pinctrl/sunxi/Kconfig
+++ b/drivers/pinctrl/sunxi/Kconfig
@@ -72,4 +72,9 @@ config PINCTRL_SUN50I_A64
 	bool
 	select PINCTRL_SUNXI
 
+config PINCTRL_SUN50I_A64_R
+	bool
+	depends on RESET_CONTROLLER
+	select PINCTRL_SUNXI
+
 endif
diff --git a/drivers/pinctrl/sunxi/Makefile b/drivers/pinctrl/sunxi/Makefile
index 2d8b64e..d6eabdd 100644
--- a/drivers/pinctrl/sunxi/Makefile
+++ b/drivers/pinctrl/sunxi/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_PINCTRL_SUN8I_A23)		+= pinctrl-sun8i-a23.o
 obj-$(CONFIG_PINCTRL_SUN8I_A23_R)	+= pinctrl-sun8i-a23-r.o
 obj-$(CONFIG_PINCTRL_SUN8I_A33)		+= pinctrl-sun8i-a33.o
 obj-$(CONFIG_PINCTRL_SUN50I_A64)	+= pinctrl-sun50i-a64.o
+obj-$(CONFIG_PINCTRL_SUN50I_A64_R)	+= pinctrl-sun50i-a64-r.o
 obj-$(CONFIG_PINCTRL_SUN8I_A83T)	+= pinctrl-sun8i-a83t.o
 obj-$(CONFIG_PINCTRL_SUN8I_H3)		+= pinctrl-sun8i-h3.o
 obj-$(CONFIG_PINCTRL_SUN8I_H3_R)	+= pinctrl-sun8i-h3-r.o
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
new file mode 100644
index 0000000..b836264
--- /dev/null
+++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
@@ -0,0 +1,148 @@
+/*
+ * Allwinner A64 SoCs special pins pinctrl driver.
+ *
+ * Based on pinctrl-sun8i-a23-r.c
+ *
+ * Copyright (C) 2016 Icenowy Zheng
+ * Icenowy Zheng <icenowy@aosc.xyz>
+ *
+ * Copyright (C) 2014 Chen-Yu Tsai
+ * Chen-Yu Tsai <wens@csie.org>
+ *
+ * Copyright (C) 2014 Boris Brezillon
+ * Boris Brezillon <boris.brezillon@free-electrons.com>
+ *
+ * Copyright (C) 2014 Maxime Ripard
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/pinctrl/pinctrl.h>
+#include <linux/reset.h>
+
+#include "pinctrl-sunxi.h"
+
+static const struct sunxi_desc_pin sun50i_a64_r_pins[] = {
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 0),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x2, "s_rsb"),		/* SCK */
+		  SUNXI_FUNCTION(0x3, "s_twi"),		/* SCK */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 0)),	/* PL_EINT0 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 1),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x2, "s_rsb"),		/* SDA */
+		  SUNXI_FUNCTION(0x3, "s_twi"),		/* SDA */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 1)),	/* PL_EINT1 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 2),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x2, "s_uart"),	/* TX */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 2)),	/* PL_EINT2 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 3),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x2, "s_uart"),	/* RX */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 3)),	/* PL_EINT3 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 4),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x3, "s_jtag"),	/* MS */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 4)),	/* PL_EINT4 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 5),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x3, "s_jtag"),	/* CK */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 5)),	/* PL_EINT5 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 6),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x3, "s_jtag"),	/* DO */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 6)),	/* PL_EINT6 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 7),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x3, "s_jtag"),	/* DI */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 7)),	/* PL_EINT7 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 8),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x2, "s_twi"),		/* SCK */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 8)),	/* PL_EINT8 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 9),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x2, "s_twi"),		/* SDA */
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 9)),	/* PL_EINT9 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 10),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x2, "s_pwm"),
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 10)),	/* PL_EINT10 */
+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 11),
+		  SUNXI_FUNCTION(0x0, "gpio_in"),
+		  SUNXI_FUNCTION(0x1, "gpio_out"),
+		  SUNXI_FUNCTION(0x2, "s_cir_rx"),
+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 11)),	/* PL_EINT11 */
+};
+
+static const struct sunxi_pinctrl_desc sun50i_a64_r_pinctrl_data = {
+	.pins = sun50i_a64_r_pins,
+	.npins = ARRAY_SIZE(sun50i_a64_r_pins),
+	.pin_base = PL_BASE,
+	.irq_banks = 1,
+};
+
+static int sun50i_a64_r_pinctrl_probe(struct platform_device *pdev)
+{
+	struct reset_control *rstc;
+	int ret;
+
+	rstc = devm_reset_control_get(&pdev->dev, NULL);
+	if (IS_ERR(rstc)) {
+		dev_err(&pdev->dev, "Reset controller missing\n");
+		return PTR_ERR(rstc);
+	}
+
+	ret = reset_control_deassert(rstc);
+	if (ret)
+		return ret;
+
+	ret = sunxi_pinctrl_init(pdev,
+				 &sun50i_a64_r_pinctrl_data);
+
+	if (ret)
+		reset_control_assert(rstc);
+
+	return ret;
+}
+
+static const struct of_device_id sun50i_a64_r_pinctrl_match[] = {
+	{ .compatible = "allwinner,sun50i-a64-r-pinctrl", },
+	{}
+};
+MODULE_DEVICE_TABLE(of, sun50i_a64_r_pinctrl_match);
+
+static struct platform_driver sun50i_a64_r_pinctrl_driver = {
+	.probe	= sun50i_a64_r_pinctrl_probe,
+	.driver	= {
+		.name		= "sun50i-a64-r-pinctrl",
+		.of_match_table	= sun50i_a64_r_pinctrl_match,
+	},
+};
+module_platform_driver(sun50i_a64_r_pinctrl_driver);
+
+MODULE_AUTHOR("Icenowy Zheng <icenowy@aosc.xyz>");
+MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
+MODULE_AUTHOR("Boris Brezillon <boris.brezillon at free-electrons.com");
+MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
+MODULE_DESCRIPTION("Allwinner A64 R_PIO pinctrl driver");
+MODULE_LICENSE("GPL");
-- 
2.9.0

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* Re: [PATCH 1/2] dt: bindings: add binding for Allwinner A64 R_PIO pinctrl
  2016-08-01 14:59 ` Icenowy Zheng
  (?)
@ 2016-08-11 11:35   ` Linus Walleij
  -1 siblings, 0 replies; 20+ messages in thread
From: Linus Walleij @ 2016-08-11 11:35 UTC (permalink / raw)
  To: Icenowy Zheng, Maxime Ripard
  Cc: Mark Rutland, devicetree, Vishnu Patekar, linux-gpio,
	Andre Przywara, linux-kernel, Masahiro Yamada, Chen-Yu Tsai,
	Rob Herring, Jens Kuske, Krzysztof Adamski, linux-arm-kernel

On Mon, Aug 1, 2016 at 4:59 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:

> Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
(...)
> +  "allwinner,sun50i-a64-r-pinctrl"

Maxime, can you look at these two patches from Icenowy?

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH 1/2] dt: bindings: add binding for Allwinner A64 R_PIO pinctrl
@ 2016-08-11 11:35   ` Linus Walleij
  0 siblings, 0 replies; 20+ messages in thread
From: Linus Walleij @ 2016-08-11 11:35 UTC (permalink / raw)
  To: Icenowy Zheng, Maxime Ripard
  Cc: Rob Herring, Chen-Yu Tsai, Andre Przywara, Jens Kuske,
	Mark Rutland, Vishnu Patekar, Krzysztof Adamski, Masahiro Yamada,
	linux-gpio, devicetree, linux-arm-kernel, linux-kernel

On Mon, Aug 1, 2016 at 4:59 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:

> Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
(...)
> +  "allwinner,sun50i-a64-r-pinctrl"

Maxime, can you look at these two patches from Icenowy?

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH 1/2] dt: bindings: add binding for Allwinner A64 R_PIO pinctrl
@ 2016-08-11 11:35   ` Linus Walleij
  0 siblings, 0 replies; 20+ messages in thread
From: Linus Walleij @ 2016-08-11 11:35 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Aug 1, 2016 at 4:59 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:

> Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
(...)
> +  "allwinner,sun50i-a64-r-pinctrl"

Maxime, can you look at these two patches from Icenowy?

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH 2/2] pinctrl: sunxi: Add A64 R_PIO controller support
  2016-08-01 14:59   ` Icenowy Zheng
  (?)
@ 2016-08-15 13:55     ` Chen-Yu Tsai
  -1 siblings, 0 replies; 20+ messages in thread
From: Chen-Yu Tsai @ 2016-08-15 13:55 UTC (permalink / raw)
  To: Icenowy Zheng
  Cc: Mark Rutland, devicetree, Vishnu Patekar, linux-gpio,
	Andre Przywara, Linus Walleij, linux-kernel, Masahiro Yamada,
	Chen-Yu Tsai, Rob Herring, Jens Kuske, Maxime Ripard,
	Krzysztof Adamski, linux-arm-kernel

Hi,

On Mon, Aug 1, 2016 at 10:59 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
> The A64 has a R_PIO pin controller, similar to the one found on the H3 SoCs.
> Add support for the pins controlled by the R_PIO controller.
>
> Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
> ---
>  drivers/pinctrl/sunxi/Kconfig                |   5 +
>  drivers/pinctrl/sunxi/Makefile               |   1 +
>  drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 148 +++++++++++++++++++++++++++
>  3 files changed, 154 insertions(+)
>  create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>
> diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
> index aaf075b..c4b476f 100644
> --- a/drivers/pinctrl/sunxi/Kconfig
> +++ b/drivers/pinctrl/sunxi/Kconfig
> @@ -72,4 +72,9 @@ config PINCTRL_SUN50I_A64
>         bool
>         select PINCTRL_SUNXI
>
> +config PINCTRL_SUN50I_A64_R
> +       bool
> +       depends on RESET_CONTROLLER
> +       select PINCTRL_SUNXI
> +
>  endif
> diff --git a/drivers/pinctrl/sunxi/Makefile b/drivers/pinctrl/sunxi/Makefile
> index 2d8b64e..d6eabdd 100644
> --- a/drivers/pinctrl/sunxi/Makefile
> +++ b/drivers/pinctrl/sunxi/Makefile
> @@ -13,6 +13,7 @@ obj-$(CONFIG_PINCTRL_SUN8I_A23)               += pinctrl-sun8i-a23.o
>  obj-$(CONFIG_PINCTRL_SUN8I_A23_R)      += pinctrl-sun8i-a23-r.o
>  obj-$(CONFIG_PINCTRL_SUN8I_A33)                += pinctrl-sun8i-a33.o
>  obj-$(CONFIG_PINCTRL_SUN50I_A64)       += pinctrl-sun50i-a64.o
> +obj-$(CONFIG_PINCTRL_SUN50I_A64_R)     += pinctrl-sun50i-a64-r.o
>  obj-$(CONFIG_PINCTRL_SUN8I_A83T)       += pinctrl-sun8i-a83t.o
>  obj-$(CONFIG_PINCTRL_SUN8I_H3)         += pinctrl-sun8i-h3.o
>  obj-$(CONFIG_PINCTRL_SUN8I_H3_R)       += pinctrl-sun8i-h3-r.o
> diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
> new file mode 100644
> index 0000000..b836264
> --- /dev/null
> +++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
> @@ -0,0 +1,148 @@
> +/*
> + * Allwinner A64 SoCs special pins pinctrl driver.
> + *
> + * Based on pinctrl-sun8i-a23-r.c
> + *
> + * Copyright (C) 2016 Icenowy Zheng
> + * Icenowy Zheng <icenowy@aosc.xyz>
> + *
> + * Copyright (C) 2014 Chen-Yu Tsai
> + * Chen-Yu Tsai <wens@csie.org>
> + *
> + * Copyright (C) 2014 Boris Brezillon
> + * Boris Brezillon <boris.brezillon@free-electrons.com>
> + *
> + * Copyright (C) 2014 Maxime Ripard
> + * Maxime Ripard <maxime.ripard@free-electrons.com>
> + *
> + * This file is licensed under the terms of the GNU General Public
> + * License version 2.  This program is licensed "as is" without any
> + * warranty of any kind, whether express or implied.
> + */
> +
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +#include <linux/of.h>
> +#include <linux/of_device.h>

Please sort the headers.

> +#include <linux/pinctrl/pinctrl.h>
> +#include <linux/reset.h>
> +
> +#include "pinctrl-sunxi.h"
> +
> +static const struct sunxi_desc_pin sun50i_a64_r_pins[] = {
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 0),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_rsb"),         /* SCK */
> +                 SUNXI_FUNCTION(0x3, "s_twi"),         /* SCK */

We use "i2c" instead of "twi".

> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 0)),  /* PL_EINT0 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 1),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_rsb"),         /* SDA */
> +                 SUNXI_FUNCTION(0x3, "s_twi"),         /* SDA */

Same here.

> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 1)),  /* PL_EINT1 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 2),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_uart"),        /* TX */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 2)),  /* PL_EINT2 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 3),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_uart"),        /* RX */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 3)),  /* PL_EINT3 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 4),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x3, "s_jtag"),        /* MS */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 4)),  /* PL_EINT4 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 5),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x3, "s_jtag"),        /* CK */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 5)),  /* PL_EINT5 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 6),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x3, "s_jtag"),        /* DO */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 6)),  /* PL_EINT6 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 7),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x3, "s_jtag"),        /* DI */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 7)),  /* PL_EINT7 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 8),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_twi"),         /* SCK */

Ditto.

> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 8)),  /* PL_EINT8 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 9),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_twi"),         /* SDA */

Ditto.

> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 9)),  /* PL_EINT9 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 10),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_pwm"),
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 10)), /* PL_EINT10 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 11),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_cir_rx"),
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 11)), /* PL_EINT11 */

You missed PL12.

> +};
> +
> +static const struct sunxi_pinctrl_desc sun50i_a64_r_pinctrl_data = {
> +       .pins = sun50i_a64_r_pins,
> +       .npins = ARRAY_SIZE(sun50i_a64_r_pins),
> +       .pin_base = PL_BASE,
> +       .irq_banks = 1,
> +};
> +
> +static int sun50i_a64_r_pinctrl_probe(struct platform_device *pdev)
> +{
> +       struct reset_control *rstc;
> +       int ret;
> +
> +       rstc = devm_reset_control_get(&pdev->dev, NULL);
> +       if (IS_ERR(rstc)) {
> +               dev_err(&pdev->dev, "Reset controller missing\n");
> +               return PTR_ERR(rstc);
> +       }
> +
> +       ret = reset_control_deassert(rstc);
> +       if (ret)
> +               return ret;
> +
> +       ret = sunxi_pinctrl_init(pdev,
> +                                &sun50i_a64_r_pinctrl_data);
> +
> +       if (ret)
> +               reset_control_assert(rstc);
> +
> +       return ret;
> +}
> +
> +static const struct of_device_id sun50i_a64_r_pinctrl_match[] = {
> +       { .compatible = "allwinner,sun50i-a64-r-pinctrl", },
> +       {}
> +};
> +MODULE_DEVICE_TABLE(of, sun50i_a64_r_pinctrl_match);
> +
> +static struct platform_driver sun50i_a64_r_pinctrl_driver = {
> +       .probe  = sun50i_a64_r_pinctrl_probe,
> +       .driver = {
> +               .name           = "sun50i-a64-r-pinctrl",
> +               .of_match_table = sun50i_a64_r_pinctrl_match,
> +       },
> +};
> +module_platform_driver(sun50i_a64_r_pinctrl_driver);
> +
> +MODULE_AUTHOR("Icenowy Zheng <icenowy@aosc.xyz>");
> +MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
> +MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com");
> +MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
> +MODULE_DESCRIPTION("Allwinner A64 R_PIO pinctrl driver");
> +MODULE_LICENSE("GPL");

Since you have a bool Kconfig symbol, you can drop all the module related
stuff. Just use builtin_platform_driver like the A64 main pinctrl driver
does.

Regards
ChenYu

> --
> 2.9.0
>

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH 2/2] pinctrl: sunxi: Add A64 R_PIO controller support
@ 2016-08-15 13:55     ` Chen-Yu Tsai
  0 siblings, 0 replies; 20+ messages in thread
From: Chen-Yu Tsai @ 2016-08-15 13:55 UTC (permalink / raw)
  To: Icenowy Zheng
  Cc: Rob Herring, Maxime Ripard, Chen-Yu Tsai, Andre Przywara,
	Linus Walleij, Jens Kuske, Mark Rutland, Vishnu Patekar,
	Krzysztof Adamski, Masahiro Yamada, linux-gpio, devicetree,
	linux-arm-kernel, linux-kernel

Hi,

On Mon, Aug 1, 2016 at 10:59 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
> The A64 has a R_PIO pin controller, similar to the one found on the H3 SoCs.
> Add support for the pins controlled by the R_PIO controller.
>
> Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
> ---
>  drivers/pinctrl/sunxi/Kconfig                |   5 +
>  drivers/pinctrl/sunxi/Makefile               |   1 +
>  drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 148 +++++++++++++++++++++++++++
>  3 files changed, 154 insertions(+)
>  create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>
> diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
> index aaf075b..c4b476f 100644
> --- a/drivers/pinctrl/sunxi/Kconfig
> +++ b/drivers/pinctrl/sunxi/Kconfig
> @@ -72,4 +72,9 @@ config PINCTRL_SUN50I_A64
>         bool
>         select PINCTRL_SUNXI
>
> +config PINCTRL_SUN50I_A64_R
> +       bool
> +       depends on RESET_CONTROLLER
> +       select PINCTRL_SUNXI
> +
>  endif
> diff --git a/drivers/pinctrl/sunxi/Makefile b/drivers/pinctrl/sunxi/Makefile
> index 2d8b64e..d6eabdd 100644
> --- a/drivers/pinctrl/sunxi/Makefile
> +++ b/drivers/pinctrl/sunxi/Makefile
> @@ -13,6 +13,7 @@ obj-$(CONFIG_PINCTRL_SUN8I_A23)               += pinctrl-sun8i-a23.o
>  obj-$(CONFIG_PINCTRL_SUN8I_A23_R)      += pinctrl-sun8i-a23-r.o
>  obj-$(CONFIG_PINCTRL_SUN8I_A33)                += pinctrl-sun8i-a33.o
>  obj-$(CONFIG_PINCTRL_SUN50I_A64)       += pinctrl-sun50i-a64.o
> +obj-$(CONFIG_PINCTRL_SUN50I_A64_R)     += pinctrl-sun50i-a64-r.o
>  obj-$(CONFIG_PINCTRL_SUN8I_A83T)       += pinctrl-sun8i-a83t.o
>  obj-$(CONFIG_PINCTRL_SUN8I_H3)         += pinctrl-sun8i-h3.o
>  obj-$(CONFIG_PINCTRL_SUN8I_H3_R)       += pinctrl-sun8i-h3-r.o
> diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
> new file mode 100644
> index 0000000..b836264
> --- /dev/null
> +++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
> @@ -0,0 +1,148 @@
> +/*
> + * Allwinner A64 SoCs special pins pinctrl driver.
> + *
> + * Based on pinctrl-sun8i-a23-r.c
> + *
> + * Copyright (C) 2016 Icenowy Zheng
> + * Icenowy Zheng <icenowy@aosc.xyz>
> + *
> + * Copyright (C) 2014 Chen-Yu Tsai
> + * Chen-Yu Tsai <wens@csie.org>
> + *
> + * Copyright (C) 2014 Boris Brezillon
> + * Boris Brezillon <boris.brezillon@free-electrons.com>
> + *
> + * Copyright (C) 2014 Maxime Ripard
> + * Maxime Ripard <maxime.ripard@free-electrons.com>
> + *
> + * This file is licensed under the terms of the GNU General Public
> + * License version 2.  This program is licensed "as is" without any
> + * warranty of any kind, whether express or implied.
> + */
> +
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +#include <linux/of.h>
> +#include <linux/of_device.h>

Please sort the headers.

> +#include <linux/pinctrl/pinctrl.h>
> +#include <linux/reset.h>
> +
> +#include "pinctrl-sunxi.h"
> +
> +static const struct sunxi_desc_pin sun50i_a64_r_pins[] = {
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 0),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_rsb"),         /* SCK */
> +                 SUNXI_FUNCTION(0x3, "s_twi"),         /* SCK */

We use "i2c" instead of "twi".

> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 0)),  /* PL_EINT0 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 1),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_rsb"),         /* SDA */
> +                 SUNXI_FUNCTION(0x3, "s_twi"),         /* SDA */

Same here.

> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 1)),  /* PL_EINT1 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 2),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_uart"),        /* TX */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 2)),  /* PL_EINT2 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 3),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_uart"),        /* RX */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 3)),  /* PL_EINT3 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 4),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x3, "s_jtag"),        /* MS */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 4)),  /* PL_EINT4 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 5),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x3, "s_jtag"),        /* CK */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 5)),  /* PL_EINT5 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 6),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x3, "s_jtag"),        /* DO */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 6)),  /* PL_EINT6 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 7),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x3, "s_jtag"),        /* DI */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 7)),  /* PL_EINT7 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 8),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_twi"),         /* SCK */

Ditto.

> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 8)),  /* PL_EINT8 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 9),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_twi"),         /* SDA */

Ditto.

> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 9)),  /* PL_EINT9 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 10),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_pwm"),
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 10)), /* PL_EINT10 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 11),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_cir_rx"),
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 11)), /* PL_EINT11 */

You missed PL12.

> +};
> +
> +static const struct sunxi_pinctrl_desc sun50i_a64_r_pinctrl_data = {
> +       .pins = sun50i_a64_r_pins,
> +       .npins = ARRAY_SIZE(sun50i_a64_r_pins),
> +       .pin_base = PL_BASE,
> +       .irq_banks = 1,
> +};
> +
> +static int sun50i_a64_r_pinctrl_probe(struct platform_device *pdev)
> +{
> +       struct reset_control *rstc;
> +       int ret;
> +
> +       rstc = devm_reset_control_get(&pdev->dev, NULL);
> +       if (IS_ERR(rstc)) {
> +               dev_err(&pdev->dev, "Reset controller missing\n");
> +               return PTR_ERR(rstc);
> +       }
> +
> +       ret = reset_control_deassert(rstc);
> +       if (ret)
> +               return ret;
> +
> +       ret = sunxi_pinctrl_init(pdev,
> +                                &sun50i_a64_r_pinctrl_data);
> +
> +       if (ret)
> +               reset_control_assert(rstc);
> +
> +       return ret;
> +}
> +
> +static const struct of_device_id sun50i_a64_r_pinctrl_match[] = {
> +       { .compatible = "allwinner,sun50i-a64-r-pinctrl", },
> +       {}
> +};
> +MODULE_DEVICE_TABLE(of, sun50i_a64_r_pinctrl_match);
> +
> +static struct platform_driver sun50i_a64_r_pinctrl_driver = {
> +       .probe  = sun50i_a64_r_pinctrl_probe,
> +       .driver = {
> +               .name           = "sun50i-a64-r-pinctrl",
> +               .of_match_table = sun50i_a64_r_pinctrl_match,
> +       },
> +};
> +module_platform_driver(sun50i_a64_r_pinctrl_driver);
> +
> +MODULE_AUTHOR("Icenowy Zheng <icenowy@aosc.xyz>");
> +MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
> +MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com");
> +MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
> +MODULE_DESCRIPTION("Allwinner A64 R_PIO pinctrl driver");
> +MODULE_LICENSE("GPL");

Since you have a bool Kconfig symbol, you can drop all the module related
stuff. Just use builtin_platform_driver like the A64 main pinctrl driver
does.

Regards
ChenYu

> --
> 2.9.0
>

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH 2/2] pinctrl: sunxi: Add A64 R_PIO controller support
@ 2016-08-15 13:55     ` Chen-Yu Tsai
  0 siblings, 0 replies; 20+ messages in thread
From: Chen-Yu Tsai @ 2016-08-15 13:55 UTC (permalink / raw)
  To: linux-arm-kernel

Hi,

On Mon, Aug 1, 2016 at 10:59 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
> The A64 has a R_PIO pin controller, similar to the one found on the H3 SoCs.
> Add support for the pins controlled by the R_PIO controller.
>
> Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
> ---
>  drivers/pinctrl/sunxi/Kconfig                |   5 +
>  drivers/pinctrl/sunxi/Makefile               |   1 +
>  drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 148 +++++++++++++++++++++++++++
>  3 files changed, 154 insertions(+)
>  create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>
> diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
> index aaf075b..c4b476f 100644
> --- a/drivers/pinctrl/sunxi/Kconfig
> +++ b/drivers/pinctrl/sunxi/Kconfig
> @@ -72,4 +72,9 @@ config PINCTRL_SUN50I_A64
>         bool
>         select PINCTRL_SUNXI
>
> +config PINCTRL_SUN50I_A64_R
> +       bool
> +       depends on RESET_CONTROLLER
> +       select PINCTRL_SUNXI
> +
>  endif
> diff --git a/drivers/pinctrl/sunxi/Makefile b/drivers/pinctrl/sunxi/Makefile
> index 2d8b64e..d6eabdd 100644
> --- a/drivers/pinctrl/sunxi/Makefile
> +++ b/drivers/pinctrl/sunxi/Makefile
> @@ -13,6 +13,7 @@ obj-$(CONFIG_PINCTRL_SUN8I_A23)               += pinctrl-sun8i-a23.o
>  obj-$(CONFIG_PINCTRL_SUN8I_A23_R)      += pinctrl-sun8i-a23-r.o
>  obj-$(CONFIG_PINCTRL_SUN8I_A33)                += pinctrl-sun8i-a33.o
>  obj-$(CONFIG_PINCTRL_SUN50I_A64)       += pinctrl-sun50i-a64.o
> +obj-$(CONFIG_PINCTRL_SUN50I_A64_R)     += pinctrl-sun50i-a64-r.o
>  obj-$(CONFIG_PINCTRL_SUN8I_A83T)       += pinctrl-sun8i-a83t.o
>  obj-$(CONFIG_PINCTRL_SUN8I_H3)         += pinctrl-sun8i-h3.o
>  obj-$(CONFIG_PINCTRL_SUN8I_H3_R)       += pinctrl-sun8i-h3-r.o
> diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
> new file mode 100644
> index 0000000..b836264
> --- /dev/null
> +++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
> @@ -0,0 +1,148 @@
> +/*
> + * Allwinner A64 SoCs special pins pinctrl driver.
> + *
> + * Based on pinctrl-sun8i-a23-r.c
> + *
> + * Copyright (C) 2016 Icenowy Zheng
> + * Icenowy Zheng <icenowy@aosc.xyz>
> + *
> + * Copyright (C) 2014 Chen-Yu Tsai
> + * Chen-Yu Tsai <wens@csie.org>
> + *
> + * Copyright (C) 2014 Boris Brezillon
> + * Boris Brezillon <boris.brezillon@free-electrons.com>
> + *
> + * Copyright (C) 2014 Maxime Ripard
> + * Maxime Ripard <maxime.ripard@free-electrons.com>
> + *
> + * This file is licensed under the terms of the GNU General Public
> + * License version 2.  This program is licensed "as is" without any
> + * warranty of any kind, whether express or implied.
> + */
> +
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +#include <linux/of.h>
> +#include <linux/of_device.h>

Please sort the headers.

> +#include <linux/pinctrl/pinctrl.h>
> +#include <linux/reset.h>
> +
> +#include "pinctrl-sunxi.h"
> +
> +static const struct sunxi_desc_pin sun50i_a64_r_pins[] = {
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 0),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_rsb"),         /* SCK */
> +                 SUNXI_FUNCTION(0x3, "s_twi"),         /* SCK */

We use "i2c" instead of "twi".

> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 0)),  /* PL_EINT0 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 1),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_rsb"),         /* SDA */
> +                 SUNXI_FUNCTION(0x3, "s_twi"),         /* SDA */

Same here.

> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 1)),  /* PL_EINT1 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 2),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_uart"),        /* TX */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 2)),  /* PL_EINT2 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 3),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_uart"),        /* RX */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 3)),  /* PL_EINT3 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 4),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x3, "s_jtag"),        /* MS */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 4)),  /* PL_EINT4 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 5),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x3, "s_jtag"),        /* CK */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 5)),  /* PL_EINT5 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 6),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x3, "s_jtag"),        /* DO */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 6)),  /* PL_EINT6 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 7),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x3, "s_jtag"),        /* DI */
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 7)),  /* PL_EINT7 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 8),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_twi"),         /* SCK */

Ditto.

> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 8)),  /* PL_EINT8 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 9),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_twi"),         /* SDA */

Ditto.

> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 9)),  /* PL_EINT9 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 10),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_pwm"),
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 10)), /* PL_EINT10 */
> +       SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 11),
> +                 SUNXI_FUNCTION(0x0, "gpio_in"),
> +                 SUNXI_FUNCTION(0x1, "gpio_out"),
> +                 SUNXI_FUNCTION(0x2, "s_cir_rx"),
> +                 SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 11)), /* PL_EINT11 */

You missed PL12.

> +};
> +
> +static const struct sunxi_pinctrl_desc sun50i_a64_r_pinctrl_data = {
> +       .pins = sun50i_a64_r_pins,
> +       .npins = ARRAY_SIZE(sun50i_a64_r_pins),
> +       .pin_base = PL_BASE,
> +       .irq_banks = 1,
> +};
> +
> +static int sun50i_a64_r_pinctrl_probe(struct platform_device *pdev)
> +{
> +       struct reset_control *rstc;
> +       int ret;
> +
> +       rstc = devm_reset_control_get(&pdev->dev, NULL);
> +       if (IS_ERR(rstc)) {
> +               dev_err(&pdev->dev, "Reset controller missing\n");
> +               return PTR_ERR(rstc);
> +       }
> +
> +       ret = reset_control_deassert(rstc);
> +       if (ret)
> +               return ret;
> +
> +       ret = sunxi_pinctrl_init(pdev,
> +                                &sun50i_a64_r_pinctrl_data);
> +
> +       if (ret)
> +               reset_control_assert(rstc);
> +
> +       return ret;
> +}
> +
> +static const struct of_device_id sun50i_a64_r_pinctrl_match[] = {
> +       { .compatible = "allwinner,sun50i-a64-r-pinctrl", },
> +       {}
> +};
> +MODULE_DEVICE_TABLE(of, sun50i_a64_r_pinctrl_match);
> +
> +static struct platform_driver sun50i_a64_r_pinctrl_driver = {
> +       .probe  = sun50i_a64_r_pinctrl_probe,
> +       .driver = {
> +               .name           = "sun50i-a64-r-pinctrl",
> +               .of_match_table = sun50i_a64_r_pinctrl_match,
> +       },
> +};
> +module_platform_driver(sun50i_a64_r_pinctrl_driver);
> +
> +MODULE_AUTHOR("Icenowy Zheng <icenowy@aosc.xyz>");
> +MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
> +MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com");
> +MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
> +MODULE_DESCRIPTION("Allwinner A64 R_PIO pinctrl driver");
> +MODULE_LICENSE("GPL");

Since you have a bool Kconfig symbol, you can drop all the module related
stuff. Just use builtin_platform_driver like the A64 main pinctrl driver
does.

Regards
ChenYu

> --
> 2.9.0
>

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH 1/2] dt: bindings: add binding for Allwinner A64 R_PIO pinctrl
  2016-08-01 14:59 ` Icenowy Zheng
  (?)
@ 2016-08-15 13:56   ` Chen-Yu Tsai
  -1 siblings, 0 replies; 20+ messages in thread
From: Chen-Yu Tsai @ 2016-08-15 13:56 UTC (permalink / raw)
  To: Icenowy Zheng
  Cc: Mark Rutland, devicetree, Vishnu Patekar, linux-gpio,
	Andre Przywara, Linus Walleij, linux-kernel, Masahiro Yamada,
	Chen-Yu Tsai, Rob Herring, Jens Kuske, Maxime Ripard,
	Krzysztof Adamski, linux-arm-kernel

On Mon, Aug 1, 2016 at 10:59 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
> Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>

A commit message would be nice.

ChenYu

> ---
>  Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
> index 6961722..ee73f9f 100644
> --- a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
> +++ b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
> @@ -23,6 +23,7 @@ Required properties:
>    "allwinner,sun8i-h3-pinctrl"
>    "allwinner,sun8i-h3-r-pinctrl"
>    "allwinner,sun50i-a64-pinctrl"
> +  "allwinner,sun50i-a64-r-pinctrl"
>
>  - reg: Should contain the register physical address and length for the
>    pin controller.
> --
> 2.9.0
>

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH 1/2] dt: bindings: add binding for Allwinner A64 R_PIO pinctrl
@ 2016-08-15 13:56   ` Chen-Yu Tsai
  0 siblings, 0 replies; 20+ messages in thread
From: Chen-Yu Tsai @ 2016-08-15 13:56 UTC (permalink / raw)
  To: Icenowy Zheng
  Cc: Rob Herring, Maxime Ripard, Chen-Yu Tsai, Andre Przywara,
	Linus Walleij, Jens Kuske, Mark Rutland, Vishnu Patekar,
	Krzysztof Adamski, Masahiro Yamada, linux-gpio, devicetree,
	linux-arm-kernel, linux-kernel

On Mon, Aug 1, 2016 at 10:59 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
> Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>

A commit message would be nice.

ChenYu

> ---
>  Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
> index 6961722..ee73f9f 100644
> --- a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
> +++ b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
> @@ -23,6 +23,7 @@ Required properties:
>    "allwinner,sun8i-h3-pinctrl"
>    "allwinner,sun8i-h3-r-pinctrl"
>    "allwinner,sun50i-a64-pinctrl"
> +  "allwinner,sun50i-a64-r-pinctrl"
>
>  - reg: Should contain the register physical address and length for the
>    pin controller.
> --
> 2.9.0
>

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH 1/2] dt: bindings: add binding for Allwinner A64 R_PIO pinctrl
@ 2016-08-15 13:56   ` Chen-Yu Tsai
  0 siblings, 0 replies; 20+ messages in thread
From: Chen-Yu Tsai @ 2016-08-15 13:56 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Aug 1, 2016 at 10:59 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
> Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>

A commit message would be nice.

ChenYu

> ---
>  Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
> index 6961722..ee73f9f 100644
> --- a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
> +++ b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
> @@ -23,6 +23,7 @@ Required properties:
>    "allwinner,sun8i-h3-pinctrl"
>    "allwinner,sun8i-h3-r-pinctrl"
>    "allwinner,sun50i-a64-pinctrl"
> +  "allwinner,sun50i-a64-r-pinctrl"
>
>  - reg: Should contain the register physical address and length for the
>    pin controller.
> --
> 2.9.0
>

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH 2/2] pinctrl: sunxi: Add A64 R_PIO controller support
  2016-08-15 13:55     ` Chen-Yu Tsai
@ 2016-08-16  0:06       ` Icenowy Zheng
  -1 siblings, 0 replies; 20+ messages in thread
From: Icenowy Zheng @ 2016-08-16  0:06 UTC (permalink / raw)
  To: Chen-Yu Tsai
  Cc: Mark Rutland, devicetree, Vishnu Patekar, linux-gpio,
	Andre Przywara, Linus Walleij, linux-kernel, Masahiro Yamada,
	Rob Herring, Jens Kuske, Maxime Ripard, Krzysztof Adamski,
	linux-arm-kernel



15.08.2016, 21:56, "Chen-Yu Tsai" <wens@csie.org>:
> Hi,
>
> On Mon, Aug 1, 2016 at 10:59 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
>>  The A64 has a R_PIO pin controller, similar to the one found on the H3 SoCs.
>>  Add support for the pins controlled by the R_PIO controller.
>>
>>  Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
>>  ---
>>   drivers/pinctrl/sunxi/Kconfig | 5 +
>>   drivers/pinctrl/sunxi/Makefile | 1 +
>>   drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 148 +++++++++++++++++++++++++++
>>   3 files changed, 154 insertions(+)
>>   create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>
>>  diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
>>  index aaf075b..c4b476f 100644
>>  --- a/drivers/pinctrl/sunxi/Kconfig
>>  +++ b/drivers/pinctrl/sunxi/Kconfig
>>  @@ -72,4 +72,9 @@ config PINCTRL_SUN50I_A64
>>          bool
>>          select PINCTRL_SUNXI
>>
>>  +config PINCTRL_SUN50I_A64_R
>>  + bool
>>  + depends on RESET_CONTROLLER
>>  + select PINCTRL_SUNXI
>>  +
>>   endif
>>  diff --git a/drivers/pinctrl/sunxi/Makefile b/drivers/pinctrl/sunxi/Makefile
>>  index 2d8b64e..d6eabdd 100644
>>  --- a/drivers/pinctrl/sunxi/Makefile
>>  +++ b/drivers/pinctrl/sunxi/Makefile
>>  @@ -13,6 +13,7 @@ obj-$(CONFIG_PINCTRL_SUN8I_A23) += pinctrl-sun8i-a23.o
>>   obj-$(CONFIG_PINCTRL_SUN8I_A23_R) += pinctrl-sun8i-a23-r.o
>>   obj-$(CONFIG_PINCTRL_SUN8I_A33) += pinctrl-sun8i-a33.o
>>   obj-$(CONFIG_PINCTRL_SUN50I_A64) += pinctrl-sun50i-a64.o
>>  +obj-$(CONFIG_PINCTRL_SUN50I_A64_R) += pinctrl-sun50i-a64-r.o
>>   obj-$(CONFIG_PINCTRL_SUN8I_A83T) += pinctrl-sun8i-a83t.o
>>   obj-$(CONFIG_PINCTRL_SUN8I_H3) += pinctrl-sun8i-h3.o
>>   obj-$(CONFIG_PINCTRL_SUN8I_H3_R) += pinctrl-sun8i-h3-r.o
>>  diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>  new file mode 100644
>>  index 0000000..b836264
>>  --- /dev/null
>>  +++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>  @@ -0,0 +1,148 @@
>>  +/*
>>  + * Allwinner A64 SoCs special pins pinctrl driver.
>>  + *
>>  + * Based on pinctrl-sun8i-a23-r.c
>>  + *
>>  + * Copyright (C) 2016 Icenowy Zheng
>>  + * Icenowy Zheng <icenowy@aosc.xyz>
>>  + *
>>  + * Copyright (C) 2014 Chen-Yu Tsai
>>  + * Chen-Yu Tsai <wens@csie.org>
>>  + *
>>  + * Copyright (C) 2014 Boris Brezillon
>>  + * Boris Brezillon <boris.brezillon@free-electrons.com>
>>  + *
>>  + * Copyright (C) 2014 Maxime Ripard
>>  + * Maxime Ripard <maxime.ripard@free-electrons.com>
>>  + *
>>  + * This file is licensed under the terms of the GNU General Public
>>  + * License version 2. This program is licensed "as is" without any
>>  + * warranty of any kind, whether express or implied.
>>  + */
>>  +
>>  +#include <linux/module.h>
>>  +#include <linux/platform_device.h>
>>  +#include <linux/of.h>
>>  +#include <linux/of_device.h>
>
> Please sort the headers.
This file is based on pinctrl-sun8i-a23-r.c and pinctrl-sun8i-h3-r.c, which
both have #include in this sequence.
>
>>  +#include <linux/pinctrl/pinctrl.h>
>>  +#include <linux/reset.h>
>>  +
>>  +#include "pinctrl-sunxi.h"
>>  +
>>  +static const struct sunxi_desc_pin sun50i_a64_r_pins[] = {
>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 0),
>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>  + SUNXI_FUNCTION(0x2, "s_rsb"), /* SCK */
>>  + SUNXI_FUNCTION(0x3, "s_twi"), /* SCK */
>
> We use "i2c" instead of "twi".
So as above, in A23 / H3 R_PIO driver, they're called as "s_twi" other than "s_i2c"
>
>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 0)), /* PL_EINT0 */
>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 1),
>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>  + SUNXI_FUNCTION(0x2, "s_rsb"), /* SDA */
>>  + SUNXI_FUNCTION(0x3, "s_twi"), /* SDA */
>
> Same here.
>
>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 1)), /* PL_EINT1 */
>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 2),
>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>  + SUNXI_FUNCTION(0x2, "s_uart"), /* TX */
>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 2)), /* PL_EINT2 */
>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 3),
>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>  + SUNXI_FUNCTION(0x2, "s_uart"), /* RX */
>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 3)), /* PL_EINT3 */
>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 4),
>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>  + SUNXI_FUNCTION(0x3, "s_jtag"), /* MS */
>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 4)), /* PL_EINT4 */
>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 5),
>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>  + SUNXI_FUNCTION(0x3, "s_jtag"), /* CK */
>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 5)), /* PL_EINT5 */
>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 6),
>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>  + SUNXI_FUNCTION(0x3, "s_jtag"), /* DO */
>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 6)), /* PL_EINT6 */
>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 7),
>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>  + SUNXI_FUNCTION(0x3, "s_jtag"), /* DI */
>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 7)), /* PL_EINT7 */
>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 8),
>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>  + SUNXI_FUNCTION(0x2, "s_twi"), /* SCK */
>
> Ditto.
>
>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 8)), /* PL_EINT8 */
>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 9),
>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>  + SUNXI_FUNCTION(0x2, "s_twi"), /* SDA */
>
> Ditto.
>
>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 9)), /* PL_EINT9 */
>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 10),
>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>  + SUNXI_FUNCTION(0x2, "s_pwm"),
>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 10)), /* PL_EINT10 */
>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 11),
>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>  + SUNXI_FUNCTION(0x2, "s_cir_rx"),
>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 11)), /* PL_EINT11 */
>
> You missed PL12.
Sorry... I forgot to add it...
>
>>  +};
>>  +
>>  +static const struct sunxi_pinctrl_desc sun50i_a64_r_pinctrl_data = {
>>  + .pins = sun50i_a64_r_pins,
>>  + .npins = ARRAY_SIZE(sun50i_a64_r_pins),
>>  + .pin_base = PL_BASE,
>>  + .irq_banks = 1,
>>  +};
>>  +
>>  +static int sun50i_a64_r_pinctrl_probe(struct platform_device *pdev)
>>  +{
>>  + struct reset_control *rstc;
>>  + int ret;
>>  +
>>  + rstc = devm_reset_control_get(&pdev->dev, NULL);
>>  + if (IS_ERR(rstc)) {
>>  + dev_err(&pdev->dev, "Reset controller missing\n");
>>  + return PTR_ERR(rstc);
>>  + }
>>  +
>>  + ret = reset_control_deassert(rstc);
>>  + if (ret)
>>  + return ret;
>>  +
>>  + ret = sunxi_pinctrl_init(pdev,
>>  + &sun50i_a64_r_pinctrl_data);
>>  +
>>  + if (ret)
>>  + reset_control_assert(rstc);
>>  +
>>  + return ret;
>>  +}
>>  +
>>  +static const struct of_device_id sun50i_a64_r_pinctrl_match[] = {
>>  + { .compatible = "allwinner,sun50i-a64-r-pinctrl", },
>>  + {}
>>  +};
>>  +MODULE_DEVICE_TABLE(of, sun50i_a64_r_pinctrl_match);
>>  +
>>  +static struct platform_driver sun50i_a64_r_pinctrl_driver = {
>>  + .probe = sun50i_a64_r_pinctrl_probe,
>>  + .driver = {
>>  + .name = "sun50i-a64-r-pinctrl",
>>  + .of_match_table = sun50i_a64_r_pinctrl_match,
>>  + },
>>  +};
>>  +module_platform_driver(sun50i_a64_r_pinctrl_driver);
>>  +
>>  +MODULE_AUTHOR("Icenowy Zheng <icenowy@aosc.xyz>");
>>  +MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
>>  +MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com");
>>  +MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
>>  +MODULE_DESCRIPTION("Allwinner A64 R_PIO pinctrl driver");
>>  +MODULE_LICENSE("GPL");
>
> Since you have a bool Kconfig symbol, you can drop all the module related
> stuff. Just use builtin_platform_driver like the A64 main pinctrl driver
> does.
>
> Regards
> ChenYu
>
>>  --
>>  2.9.0

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH 2/2] pinctrl: sunxi: Add A64 R_PIO controller support
@ 2016-08-16  0:06       ` Icenowy Zheng
  0 siblings, 0 replies; 20+ messages in thread
From: Icenowy Zheng @ 2016-08-16  0:06 UTC (permalink / raw)
  To: linux-arm-kernel



15.08.2016, 21:56, "Chen-Yu Tsai" <wens@csie.org>:
> Hi,
>
> On Mon, Aug 1, 2016 at 10:59 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
>> ?The A64 has a R_PIO pin controller, similar to the one found on the H3 SoCs.
>> ?Add support for the pins controlled by the R_PIO controller.
>>
>> ?Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
>> ?---
>> ??drivers/pinctrl/sunxi/Kconfig | 5 +
>> ??drivers/pinctrl/sunxi/Makefile | 1 +
>> ??drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 148 +++++++++++++++++++++++++++
>> ??3 files changed, 154 insertions(+)
>> ??create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>
>> ?diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
>> ?index aaf075b..c4b476f 100644
>> ?--- a/drivers/pinctrl/sunxi/Kconfig
>> ?+++ b/drivers/pinctrl/sunxi/Kconfig
>> ?@@ -72,4 +72,9 @@ config PINCTRL_SUN50I_A64
>> ?????????bool
>> ?????????select PINCTRL_SUNXI
>>
>> ?+config PINCTRL_SUN50I_A64_R
>> ?+ bool
>> ?+ depends on RESET_CONTROLLER
>> ?+ select PINCTRL_SUNXI
>> ?+
>> ??endif
>> ?diff --git a/drivers/pinctrl/sunxi/Makefile b/drivers/pinctrl/sunxi/Makefile
>> ?index 2d8b64e..d6eabdd 100644
>> ?--- a/drivers/pinctrl/sunxi/Makefile
>> ?+++ b/drivers/pinctrl/sunxi/Makefile
>> ?@@ -13,6 +13,7 @@ obj-$(CONFIG_PINCTRL_SUN8I_A23) += pinctrl-sun8i-a23.o
>> ??obj-$(CONFIG_PINCTRL_SUN8I_A23_R) += pinctrl-sun8i-a23-r.o
>> ??obj-$(CONFIG_PINCTRL_SUN8I_A33) += pinctrl-sun8i-a33.o
>> ??obj-$(CONFIG_PINCTRL_SUN50I_A64) += pinctrl-sun50i-a64.o
>> ?+obj-$(CONFIG_PINCTRL_SUN50I_A64_R) += pinctrl-sun50i-a64-r.o
>> ??obj-$(CONFIG_PINCTRL_SUN8I_A83T) += pinctrl-sun8i-a83t.o
>> ??obj-$(CONFIG_PINCTRL_SUN8I_H3) += pinctrl-sun8i-h3.o
>> ??obj-$(CONFIG_PINCTRL_SUN8I_H3_R) += pinctrl-sun8i-h3-r.o
>> ?diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>> ?new file mode 100644
>> ?index 0000000..b836264
>> ?--- /dev/null
>> ?+++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>> ?@@ -0,0 +1,148 @@
>> ?+/*
>> ?+ * Allwinner A64 SoCs special pins pinctrl driver.
>> ?+ *
>> ?+ * Based on pinctrl-sun8i-a23-r.c
>> ?+ *
>> ?+ * Copyright (C) 2016 Icenowy Zheng
>> ?+ * Icenowy Zheng <icenowy@aosc.xyz>
>> ?+ *
>> ?+ * Copyright (C) 2014 Chen-Yu Tsai
>> ?+ * Chen-Yu Tsai <wens@csie.org>
>> ?+ *
>> ?+ * Copyright (C) 2014 Boris Brezillon
>> ?+ * Boris Brezillon <boris.brezillon@free-electrons.com>
>> ?+ *
>> ?+ * Copyright (C) 2014 Maxime Ripard
>> ?+ * Maxime Ripard <maxime.ripard@free-electrons.com>
>> ?+ *
>> ?+ * This file is licensed under the terms of the GNU General Public
>> ?+ * License version 2. This program is licensed "as is" without any
>> ?+ * warranty of any kind, whether express or implied.
>> ?+ */
>> ?+
>> ?+#include <linux/module.h>
>> ?+#include <linux/platform_device.h>
>> ?+#include <linux/of.h>
>> ?+#include <linux/of_device.h>
>
> Please sort the headers.
This file is based on pinctrl-sun8i-a23-r.c and pinctrl-sun8i-h3-r.c, which
both have #include in this sequence.
>
>> ?+#include <linux/pinctrl/pinctrl.h>
>> ?+#include <linux/reset.h>
>> ?+
>> ?+#include "pinctrl-sunxi.h"
>> ?+
>> ?+static const struct sunxi_desc_pin sun50i_a64_r_pins[] = {
>> ?+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 0),
>> ?+ SUNXI_FUNCTION(0x0, "gpio_in"),
>> ?+ SUNXI_FUNCTION(0x1, "gpio_out"),
>> ?+ SUNXI_FUNCTION(0x2, "s_rsb"), /* SCK */
>> ?+ SUNXI_FUNCTION(0x3, "s_twi"), /* SCK */
>
> We use "i2c" instead of "twi".
So as above, in A23 / H3 R_PIO driver, they're called as "s_twi" other than "s_i2c"
>
>> ?+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 0)), /* PL_EINT0 */
>> ?+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 1),
>> ?+ SUNXI_FUNCTION(0x0, "gpio_in"),
>> ?+ SUNXI_FUNCTION(0x1, "gpio_out"),
>> ?+ SUNXI_FUNCTION(0x2, "s_rsb"), /* SDA */
>> ?+ SUNXI_FUNCTION(0x3, "s_twi"), /* SDA */
>
> Same here.
>
>> ?+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 1)), /* PL_EINT1 */
>> ?+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 2),
>> ?+ SUNXI_FUNCTION(0x0, "gpio_in"),
>> ?+ SUNXI_FUNCTION(0x1, "gpio_out"),
>> ?+ SUNXI_FUNCTION(0x2, "s_uart"), /* TX */
>> ?+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 2)), /* PL_EINT2 */
>> ?+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 3),
>> ?+ SUNXI_FUNCTION(0x0, "gpio_in"),
>> ?+ SUNXI_FUNCTION(0x1, "gpio_out"),
>> ?+ SUNXI_FUNCTION(0x2, "s_uart"), /* RX */
>> ?+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 3)), /* PL_EINT3 */
>> ?+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 4),
>> ?+ SUNXI_FUNCTION(0x0, "gpio_in"),
>> ?+ SUNXI_FUNCTION(0x1, "gpio_out"),
>> ?+ SUNXI_FUNCTION(0x3, "s_jtag"), /* MS */
>> ?+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 4)), /* PL_EINT4 */
>> ?+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 5),
>> ?+ SUNXI_FUNCTION(0x0, "gpio_in"),
>> ?+ SUNXI_FUNCTION(0x1, "gpio_out"),
>> ?+ SUNXI_FUNCTION(0x3, "s_jtag"), /* CK */
>> ?+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 5)), /* PL_EINT5 */
>> ?+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 6),
>> ?+ SUNXI_FUNCTION(0x0, "gpio_in"),
>> ?+ SUNXI_FUNCTION(0x1, "gpio_out"),
>> ?+ SUNXI_FUNCTION(0x3, "s_jtag"), /* DO */
>> ?+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 6)), /* PL_EINT6 */
>> ?+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 7),
>> ?+ SUNXI_FUNCTION(0x0, "gpio_in"),
>> ?+ SUNXI_FUNCTION(0x1, "gpio_out"),
>> ?+ SUNXI_FUNCTION(0x3, "s_jtag"), /* DI */
>> ?+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 7)), /* PL_EINT7 */
>> ?+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 8),
>> ?+ SUNXI_FUNCTION(0x0, "gpio_in"),
>> ?+ SUNXI_FUNCTION(0x1, "gpio_out"),
>> ?+ SUNXI_FUNCTION(0x2, "s_twi"), /* SCK */
>
> Ditto.
>
>> ?+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 8)), /* PL_EINT8 */
>> ?+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 9),
>> ?+ SUNXI_FUNCTION(0x0, "gpio_in"),
>> ?+ SUNXI_FUNCTION(0x1, "gpio_out"),
>> ?+ SUNXI_FUNCTION(0x2, "s_twi"), /* SDA */
>
> Ditto.
>
>> ?+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 9)), /* PL_EINT9 */
>> ?+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 10),
>> ?+ SUNXI_FUNCTION(0x0, "gpio_in"),
>> ?+ SUNXI_FUNCTION(0x1, "gpio_out"),
>> ?+ SUNXI_FUNCTION(0x2, "s_pwm"),
>> ?+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 10)), /* PL_EINT10 */
>> ?+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 11),
>> ?+ SUNXI_FUNCTION(0x0, "gpio_in"),
>> ?+ SUNXI_FUNCTION(0x1, "gpio_out"),
>> ?+ SUNXI_FUNCTION(0x2, "s_cir_rx"),
>> ?+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 11)), /* PL_EINT11 */
>
> You missed PL12.
Sorry... I forgot to add it...
>
>> ?+};
>> ?+
>> ?+static const struct sunxi_pinctrl_desc sun50i_a64_r_pinctrl_data = {
>> ?+ .pins = sun50i_a64_r_pins,
>> ?+ .npins = ARRAY_SIZE(sun50i_a64_r_pins),
>> ?+ .pin_base = PL_BASE,
>> ?+ .irq_banks = 1,
>> ?+};
>> ?+
>> ?+static int sun50i_a64_r_pinctrl_probe(struct platform_device *pdev)
>> ?+{
>> ?+ struct reset_control *rstc;
>> ?+ int ret;
>> ?+
>> ?+ rstc = devm_reset_control_get(&pdev->dev, NULL);
>> ?+ if (IS_ERR(rstc)) {
>> ?+ dev_err(&pdev->dev, "Reset controller missing\n");
>> ?+ return PTR_ERR(rstc);
>> ?+ }
>> ?+
>> ?+ ret = reset_control_deassert(rstc);
>> ?+ if (ret)
>> ?+ return ret;
>> ?+
>> ?+ ret = sunxi_pinctrl_init(pdev,
>> ?+ &sun50i_a64_r_pinctrl_data);
>> ?+
>> ?+ if (ret)
>> ?+ reset_control_assert(rstc);
>> ?+
>> ?+ return ret;
>> ?+}
>> ?+
>> ?+static const struct of_device_id sun50i_a64_r_pinctrl_match[] = {
>> ?+ { .compatible = "allwinner,sun50i-a64-r-pinctrl", },
>> ?+ {}
>> ?+};
>> ?+MODULE_DEVICE_TABLE(of, sun50i_a64_r_pinctrl_match);
>> ?+
>> ?+static struct platform_driver sun50i_a64_r_pinctrl_driver = {
>> ?+ .probe = sun50i_a64_r_pinctrl_probe,
>> ?+ .driver = {
>> ?+ .name = "sun50i-a64-r-pinctrl",
>> ?+ .of_match_table = sun50i_a64_r_pinctrl_match,
>> ?+ },
>> ?+};
>> ?+module_platform_driver(sun50i_a64_r_pinctrl_driver);
>> ?+
>> ?+MODULE_AUTHOR("Icenowy Zheng <icenowy@aosc.xyz>");
>> ?+MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
>> ?+MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com");
>> ?+MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
>> ?+MODULE_DESCRIPTION("Allwinner A64 R_PIO pinctrl driver");
>> ?+MODULE_LICENSE("GPL");
>
> Since you have a bool Kconfig symbol, you can drop all the module related
> stuff. Just use builtin_platform_driver like the A64 main pinctrl driver
> does.
>
> Regards
> ChenYu
>
>> ?--
>> ?2.9.0

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH 2/2] pinctrl: sunxi: Add A64 R_PIO controller support
  2016-08-16  0:06       ` Icenowy Zheng
  (?)
@ 2016-08-16  1:27         ` Chen-Yu Tsai
  -1 siblings, 0 replies; 20+ messages in thread
From: Chen-Yu Tsai @ 2016-08-16  1:27 UTC (permalink / raw)
  To: Icenowy Zheng
  Cc: Mark Rutland, devicetree, Vishnu Patekar, linux-gpio,
	Andre Przywara, Linus Walleij, linux-kernel, Masahiro Yamada,
	Chen-Yu Tsai, Rob Herring, Jens Kuske, Maxime Ripard,
	Krzysztof Adamski, linux-arm-kernel

On Tue, Aug 16, 2016 at 8:06 AM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
>
>
> 15.08.2016, 21:56, "Chen-Yu Tsai" <wens@csie.org>:
>> Hi,
>>
>> On Mon, Aug 1, 2016 at 10:59 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
>>>  The A64 has a R_PIO pin controller, similar to the one found on the H3 SoCs.
>>>  Add support for the pins controlled by the R_PIO controller.
>>>
>>>  Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
>>>  ---
>>>   drivers/pinctrl/sunxi/Kconfig | 5 +
>>>   drivers/pinctrl/sunxi/Makefile | 1 +
>>>   drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 148 +++++++++++++++++++++++++++
>>>   3 files changed, 154 insertions(+)
>>>   create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>>
>>>  diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
>>>  index aaf075b..c4b476f 100644
>>>  --- a/drivers/pinctrl/sunxi/Kconfig
>>>  +++ b/drivers/pinctrl/sunxi/Kconfig
>>>  @@ -72,4 +72,9 @@ config PINCTRL_SUN50I_A64
>>>          bool
>>>          select PINCTRL_SUNXI
>>>
>>>  +config PINCTRL_SUN50I_A64_R
>>>  + bool
>>>  + depends on RESET_CONTROLLER
>>>  + select PINCTRL_SUNXI
>>>  +
>>>   endif
>>>  diff --git a/drivers/pinctrl/sunxi/Makefile b/drivers/pinctrl/sunxi/Makefile
>>>  index 2d8b64e..d6eabdd 100644
>>>  --- a/drivers/pinctrl/sunxi/Makefile
>>>  +++ b/drivers/pinctrl/sunxi/Makefile
>>>  @@ -13,6 +13,7 @@ obj-$(CONFIG_PINCTRL_SUN8I_A23) += pinctrl-sun8i-a23.o
>>>   obj-$(CONFIG_PINCTRL_SUN8I_A23_R) += pinctrl-sun8i-a23-r.o
>>>   obj-$(CONFIG_PINCTRL_SUN8I_A33) += pinctrl-sun8i-a33.o
>>>   obj-$(CONFIG_PINCTRL_SUN50I_A64) += pinctrl-sun50i-a64.o
>>>  +obj-$(CONFIG_PINCTRL_SUN50I_A64_R) += pinctrl-sun50i-a64-r.o
>>>   obj-$(CONFIG_PINCTRL_SUN8I_A83T) += pinctrl-sun8i-a83t.o
>>>   obj-$(CONFIG_PINCTRL_SUN8I_H3) += pinctrl-sun8i-h3.o
>>>   obj-$(CONFIG_PINCTRL_SUN8I_H3_R) += pinctrl-sun8i-h3-r.o
>>>  diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>>  new file mode 100644
>>>  index 0000000..b836264
>>>  --- /dev/null
>>>  +++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>>  @@ -0,0 +1,148 @@
>>>  +/*
>>>  + * Allwinner A64 SoCs special pins pinctrl driver.
>>>  + *
>>>  + * Based on pinctrl-sun8i-a23-r.c
>>>  + *
>>>  + * Copyright (C) 2016 Icenowy Zheng
>>>  + * Icenowy Zheng <icenowy@aosc.xyz>
>>>  + *
>>>  + * Copyright (C) 2014 Chen-Yu Tsai
>>>  + * Chen-Yu Tsai <wens@csie.org>
>>>  + *
>>>  + * Copyright (C) 2014 Boris Brezillon
>>>  + * Boris Brezillon <boris.brezillon@free-electrons.com>
>>>  + *
>>>  + * Copyright (C) 2014 Maxime Ripard
>>>  + * Maxime Ripard <maxime.ripard@free-electrons.com>
>>>  + *
>>>  + * This file is licensed under the terms of the GNU General Public
>>>  + * License version 2. This program is licensed "as is" without any
>>>  + * warranty of any kind, whether express or implied.
>>>  + */
>>>  +
>>>  +#include <linux/module.h>
>>>  +#include <linux/platform_device.h>
>>>  +#include <linux/of.h>
>>>  +#include <linux/of_device.h>
>>
>> Please sort the headers.
> This file is based on pinctrl-sun8i-a23-r.c and pinctrl-sun8i-h3-r.c, which
> both have #include in this sequence.

And we should probably fix them too.

>>
>>>  +#include <linux/pinctrl/pinctrl.h>
>>>  +#include <linux/reset.h>
>>>  +
>>>  +#include "pinctrl-sunxi.h"
>>>  +
>>>  +static const struct sunxi_desc_pin sun50i_a64_r_pins[] = {
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 0),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_rsb"), /* SCK */
>>>  + SUNXI_FUNCTION(0x3, "s_twi"), /* SCK */
>>
>> We use "i2c" instead of "twi".
> So as above, in A23 / H3 R_PIO driver, they're called as "s_twi" other than "s_i2c"

These as well.

ChenYu

>>
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 0)), /* PL_EINT0 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 1),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_rsb"), /* SDA */
>>>  + SUNXI_FUNCTION(0x3, "s_twi"), /* SDA */
>>
>> Same here.
>>
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 1)), /* PL_EINT1 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 2),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_uart"), /* TX */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 2)), /* PL_EINT2 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 3),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_uart"), /* RX */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 3)), /* PL_EINT3 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 4),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x3, "s_jtag"), /* MS */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 4)), /* PL_EINT4 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 5),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x3, "s_jtag"), /* CK */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 5)), /* PL_EINT5 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 6),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x3, "s_jtag"), /* DO */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 6)), /* PL_EINT6 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 7),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x3, "s_jtag"), /* DI */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 7)), /* PL_EINT7 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 8),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_twi"), /* SCK */
>>
>> Ditto.
>>
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 8)), /* PL_EINT8 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 9),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_twi"), /* SDA */
>>
>> Ditto.
>>
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 9)), /* PL_EINT9 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 10),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_pwm"),
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 10)), /* PL_EINT10 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 11),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_cir_rx"),
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 11)), /* PL_EINT11 */
>>
>> You missed PL12.
> Sorry... I forgot to add it...
>>
>>>  +};
>>>  +
>>>  +static const struct sunxi_pinctrl_desc sun50i_a64_r_pinctrl_data = {
>>>  + .pins = sun50i_a64_r_pins,
>>>  + .npins = ARRAY_SIZE(sun50i_a64_r_pins),
>>>  + .pin_base = PL_BASE,
>>>  + .irq_banks = 1,
>>>  +};
>>>  +
>>>  +static int sun50i_a64_r_pinctrl_probe(struct platform_device *pdev)
>>>  +{
>>>  + struct reset_control *rstc;
>>>  + int ret;
>>>  +
>>>  + rstc = devm_reset_control_get(&pdev->dev, NULL);
>>>  + if (IS_ERR(rstc)) {
>>>  + dev_err(&pdev->dev, "Reset controller missing\n");
>>>  + return PTR_ERR(rstc);
>>>  + }
>>>  +
>>>  + ret = reset_control_deassert(rstc);
>>>  + if (ret)
>>>  + return ret;
>>>  +
>>>  + ret = sunxi_pinctrl_init(pdev,
>>>  + &sun50i_a64_r_pinctrl_data);
>>>  +
>>>  + if (ret)
>>>  + reset_control_assert(rstc);
>>>  +
>>>  + return ret;
>>>  +}
>>>  +
>>>  +static const struct of_device_id sun50i_a64_r_pinctrl_match[] = {
>>>  + { .compatible = "allwinner,sun50i-a64-r-pinctrl", },
>>>  + {}
>>>  +};
>>>  +MODULE_DEVICE_TABLE(of, sun50i_a64_r_pinctrl_match);
>>>  +
>>>  +static struct platform_driver sun50i_a64_r_pinctrl_driver = {
>>>  + .probe = sun50i_a64_r_pinctrl_probe,
>>>  + .driver = {
>>>  + .name = "sun50i-a64-r-pinctrl",
>>>  + .of_match_table = sun50i_a64_r_pinctrl_match,
>>>  + },
>>>  +};
>>>  +module_platform_driver(sun50i_a64_r_pinctrl_driver);
>>>  +
>>>  +MODULE_AUTHOR("Icenowy Zheng <icenowy@aosc.xyz>");
>>>  +MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
>>>  +MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com");
>>>  +MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
>>>  +MODULE_DESCRIPTION("Allwinner A64 R_PIO pinctrl driver");
>>>  +MODULE_LICENSE("GPL");
>>
>> Since you have a bool Kconfig symbol, you can drop all the module related
>> stuff. Just use builtin_platform_driver like the A64 main pinctrl driver
>> does.
>>
>> Regards
>> ChenYu
>>
>>>  --
>>>  2.9.0

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH 2/2] pinctrl: sunxi: Add A64 R_PIO controller support
@ 2016-08-16  1:27         ` Chen-Yu Tsai
  0 siblings, 0 replies; 20+ messages in thread
From: Chen-Yu Tsai @ 2016-08-16  1:27 UTC (permalink / raw)
  To: Icenowy Zheng
  Cc: Chen-Yu Tsai, Rob Herring, Maxime Ripard, Andre Przywara,
	Linus Walleij, Jens Kuske, Mark Rutland, Vishnu Patekar,
	Krzysztof Adamski, Masahiro Yamada, linux-gpio, devicetree,
	linux-arm-kernel, linux-kernel

On Tue, Aug 16, 2016 at 8:06 AM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
>
>
> 15.08.2016, 21:56, "Chen-Yu Tsai" <wens@csie.org>:
>> Hi,
>>
>> On Mon, Aug 1, 2016 at 10:59 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
>>>  The A64 has a R_PIO pin controller, similar to the one found on the H3 SoCs.
>>>  Add support for the pins controlled by the R_PIO controller.
>>>
>>>  Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
>>>  ---
>>>   drivers/pinctrl/sunxi/Kconfig | 5 +
>>>   drivers/pinctrl/sunxi/Makefile | 1 +
>>>   drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 148 +++++++++++++++++++++++++++
>>>   3 files changed, 154 insertions(+)
>>>   create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>>
>>>  diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
>>>  index aaf075b..c4b476f 100644
>>>  --- a/drivers/pinctrl/sunxi/Kconfig
>>>  +++ b/drivers/pinctrl/sunxi/Kconfig
>>>  @@ -72,4 +72,9 @@ config PINCTRL_SUN50I_A64
>>>          bool
>>>          select PINCTRL_SUNXI
>>>
>>>  +config PINCTRL_SUN50I_A64_R
>>>  + bool
>>>  + depends on RESET_CONTROLLER
>>>  + select PINCTRL_SUNXI
>>>  +
>>>   endif
>>>  diff --git a/drivers/pinctrl/sunxi/Makefile b/drivers/pinctrl/sunxi/Makefile
>>>  index 2d8b64e..d6eabdd 100644
>>>  --- a/drivers/pinctrl/sunxi/Makefile
>>>  +++ b/drivers/pinctrl/sunxi/Makefile
>>>  @@ -13,6 +13,7 @@ obj-$(CONFIG_PINCTRL_SUN8I_A23) += pinctrl-sun8i-a23.o
>>>   obj-$(CONFIG_PINCTRL_SUN8I_A23_R) += pinctrl-sun8i-a23-r.o
>>>   obj-$(CONFIG_PINCTRL_SUN8I_A33) += pinctrl-sun8i-a33.o
>>>   obj-$(CONFIG_PINCTRL_SUN50I_A64) += pinctrl-sun50i-a64.o
>>>  +obj-$(CONFIG_PINCTRL_SUN50I_A64_R) += pinctrl-sun50i-a64-r.o
>>>   obj-$(CONFIG_PINCTRL_SUN8I_A83T) += pinctrl-sun8i-a83t.o
>>>   obj-$(CONFIG_PINCTRL_SUN8I_H3) += pinctrl-sun8i-h3.o
>>>   obj-$(CONFIG_PINCTRL_SUN8I_H3_R) += pinctrl-sun8i-h3-r.o
>>>  diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>>  new file mode 100644
>>>  index 0000000..b836264
>>>  --- /dev/null
>>>  +++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>>  @@ -0,0 +1,148 @@
>>>  +/*
>>>  + * Allwinner A64 SoCs special pins pinctrl driver.
>>>  + *
>>>  + * Based on pinctrl-sun8i-a23-r.c
>>>  + *
>>>  + * Copyright (C) 2016 Icenowy Zheng
>>>  + * Icenowy Zheng <icenowy@aosc.xyz>
>>>  + *
>>>  + * Copyright (C) 2014 Chen-Yu Tsai
>>>  + * Chen-Yu Tsai <wens@csie.org>
>>>  + *
>>>  + * Copyright (C) 2014 Boris Brezillon
>>>  + * Boris Brezillon <boris.brezillon@free-electrons.com>
>>>  + *
>>>  + * Copyright (C) 2014 Maxime Ripard
>>>  + * Maxime Ripard <maxime.ripard@free-electrons.com>
>>>  + *
>>>  + * This file is licensed under the terms of the GNU General Public
>>>  + * License version 2. This program is licensed "as is" without any
>>>  + * warranty of any kind, whether express or implied.
>>>  + */
>>>  +
>>>  +#include <linux/module.h>
>>>  +#include <linux/platform_device.h>
>>>  +#include <linux/of.h>
>>>  +#include <linux/of_device.h>
>>
>> Please sort the headers.
> This file is based on pinctrl-sun8i-a23-r.c and pinctrl-sun8i-h3-r.c, which
> both have #include in this sequence.

And we should probably fix them too.

>>
>>>  +#include <linux/pinctrl/pinctrl.h>
>>>  +#include <linux/reset.h>
>>>  +
>>>  +#include "pinctrl-sunxi.h"
>>>  +
>>>  +static const struct sunxi_desc_pin sun50i_a64_r_pins[] = {
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 0),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_rsb"), /* SCK */
>>>  + SUNXI_FUNCTION(0x3, "s_twi"), /* SCK */
>>
>> We use "i2c" instead of "twi".
> So as above, in A23 / H3 R_PIO driver, they're called as "s_twi" other than "s_i2c"

These as well.

ChenYu

>>
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 0)), /* PL_EINT0 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 1),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_rsb"), /* SDA */
>>>  + SUNXI_FUNCTION(0x3, "s_twi"), /* SDA */
>>
>> Same here.
>>
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 1)), /* PL_EINT1 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 2),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_uart"), /* TX */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 2)), /* PL_EINT2 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 3),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_uart"), /* RX */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 3)), /* PL_EINT3 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 4),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x3, "s_jtag"), /* MS */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 4)), /* PL_EINT4 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 5),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x3, "s_jtag"), /* CK */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 5)), /* PL_EINT5 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 6),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x3, "s_jtag"), /* DO */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 6)), /* PL_EINT6 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 7),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x3, "s_jtag"), /* DI */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 7)), /* PL_EINT7 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 8),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_twi"), /* SCK */
>>
>> Ditto.
>>
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 8)), /* PL_EINT8 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 9),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_twi"), /* SDA */
>>
>> Ditto.
>>
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 9)), /* PL_EINT9 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 10),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_pwm"),
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 10)), /* PL_EINT10 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 11),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_cir_rx"),
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 11)), /* PL_EINT11 */
>>
>> You missed PL12.
> Sorry... I forgot to add it...
>>
>>>  +};
>>>  +
>>>  +static const struct sunxi_pinctrl_desc sun50i_a64_r_pinctrl_data = {
>>>  + .pins = sun50i_a64_r_pins,
>>>  + .npins = ARRAY_SIZE(sun50i_a64_r_pins),
>>>  + .pin_base = PL_BASE,
>>>  + .irq_banks = 1,
>>>  +};
>>>  +
>>>  +static int sun50i_a64_r_pinctrl_probe(struct platform_device *pdev)
>>>  +{
>>>  + struct reset_control *rstc;
>>>  + int ret;
>>>  +
>>>  + rstc = devm_reset_control_get(&pdev->dev, NULL);
>>>  + if (IS_ERR(rstc)) {
>>>  + dev_err(&pdev->dev, "Reset controller missing\n");
>>>  + return PTR_ERR(rstc);
>>>  + }
>>>  +
>>>  + ret = reset_control_deassert(rstc);
>>>  + if (ret)
>>>  + return ret;
>>>  +
>>>  + ret = sunxi_pinctrl_init(pdev,
>>>  + &sun50i_a64_r_pinctrl_data);
>>>  +
>>>  + if (ret)
>>>  + reset_control_assert(rstc);
>>>  +
>>>  + return ret;
>>>  +}
>>>  +
>>>  +static const struct of_device_id sun50i_a64_r_pinctrl_match[] = {
>>>  + { .compatible = "allwinner,sun50i-a64-r-pinctrl", },
>>>  + {}
>>>  +};
>>>  +MODULE_DEVICE_TABLE(of, sun50i_a64_r_pinctrl_match);
>>>  +
>>>  +static struct platform_driver sun50i_a64_r_pinctrl_driver = {
>>>  + .probe = sun50i_a64_r_pinctrl_probe,
>>>  + .driver = {
>>>  + .name = "sun50i-a64-r-pinctrl",
>>>  + .of_match_table = sun50i_a64_r_pinctrl_match,
>>>  + },
>>>  +};
>>>  +module_platform_driver(sun50i_a64_r_pinctrl_driver);
>>>  +
>>>  +MODULE_AUTHOR("Icenowy Zheng <icenowy@aosc.xyz>");
>>>  +MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
>>>  +MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com");
>>>  +MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
>>>  +MODULE_DESCRIPTION("Allwinner A64 R_PIO pinctrl driver");
>>>  +MODULE_LICENSE("GPL");
>>
>> Since you have a bool Kconfig symbol, you can drop all the module related
>> stuff. Just use builtin_platform_driver like the A64 main pinctrl driver
>> does.
>>
>> Regards
>> ChenYu
>>
>>>  --
>>>  2.9.0

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH 2/2] pinctrl: sunxi: Add A64 R_PIO controller support
@ 2016-08-16  1:27         ` Chen-Yu Tsai
  0 siblings, 0 replies; 20+ messages in thread
From: Chen-Yu Tsai @ 2016-08-16  1:27 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Aug 16, 2016 at 8:06 AM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
>
>
> 15.08.2016, 21:56, "Chen-Yu Tsai" <wens@csie.org>:
>> Hi,
>>
>> On Mon, Aug 1, 2016 at 10:59 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
>>>  The A64 has a R_PIO pin controller, similar to the one found on the H3 SoCs.
>>>  Add support for the pins controlled by the R_PIO controller.
>>>
>>>  Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
>>>  ---
>>>   drivers/pinctrl/sunxi/Kconfig | 5 +
>>>   drivers/pinctrl/sunxi/Makefile | 1 +
>>>   drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 148 +++++++++++++++++++++++++++
>>>   3 files changed, 154 insertions(+)
>>>   create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>>
>>>  diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
>>>  index aaf075b..c4b476f 100644
>>>  --- a/drivers/pinctrl/sunxi/Kconfig
>>>  +++ b/drivers/pinctrl/sunxi/Kconfig
>>>  @@ -72,4 +72,9 @@ config PINCTRL_SUN50I_A64
>>>          bool
>>>          select PINCTRL_SUNXI
>>>
>>>  +config PINCTRL_SUN50I_A64_R
>>>  + bool
>>>  + depends on RESET_CONTROLLER
>>>  + select PINCTRL_SUNXI
>>>  +
>>>   endif
>>>  diff --git a/drivers/pinctrl/sunxi/Makefile b/drivers/pinctrl/sunxi/Makefile
>>>  index 2d8b64e..d6eabdd 100644
>>>  --- a/drivers/pinctrl/sunxi/Makefile
>>>  +++ b/drivers/pinctrl/sunxi/Makefile
>>>  @@ -13,6 +13,7 @@ obj-$(CONFIG_PINCTRL_SUN8I_A23) += pinctrl-sun8i-a23.o
>>>   obj-$(CONFIG_PINCTRL_SUN8I_A23_R) += pinctrl-sun8i-a23-r.o
>>>   obj-$(CONFIG_PINCTRL_SUN8I_A33) += pinctrl-sun8i-a33.o
>>>   obj-$(CONFIG_PINCTRL_SUN50I_A64) += pinctrl-sun50i-a64.o
>>>  +obj-$(CONFIG_PINCTRL_SUN50I_A64_R) += pinctrl-sun50i-a64-r.o
>>>   obj-$(CONFIG_PINCTRL_SUN8I_A83T) += pinctrl-sun8i-a83t.o
>>>   obj-$(CONFIG_PINCTRL_SUN8I_H3) += pinctrl-sun8i-h3.o
>>>   obj-$(CONFIG_PINCTRL_SUN8I_H3_R) += pinctrl-sun8i-h3-r.o
>>>  diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>>  new file mode 100644
>>>  index 0000000..b836264
>>>  --- /dev/null
>>>  +++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>>  @@ -0,0 +1,148 @@
>>>  +/*
>>>  + * Allwinner A64 SoCs special pins pinctrl driver.
>>>  + *
>>>  + * Based on pinctrl-sun8i-a23-r.c
>>>  + *
>>>  + * Copyright (C) 2016 Icenowy Zheng
>>>  + * Icenowy Zheng <icenowy@aosc.xyz>
>>>  + *
>>>  + * Copyright (C) 2014 Chen-Yu Tsai
>>>  + * Chen-Yu Tsai <wens@csie.org>
>>>  + *
>>>  + * Copyright (C) 2014 Boris Brezillon
>>>  + * Boris Brezillon <boris.brezillon@free-electrons.com>
>>>  + *
>>>  + * Copyright (C) 2014 Maxime Ripard
>>>  + * Maxime Ripard <maxime.ripard@free-electrons.com>
>>>  + *
>>>  + * This file is licensed under the terms of the GNU General Public
>>>  + * License version 2. This program is licensed "as is" without any
>>>  + * warranty of any kind, whether express or implied.
>>>  + */
>>>  +
>>>  +#include <linux/module.h>
>>>  +#include <linux/platform_device.h>
>>>  +#include <linux/of.h>
>>>  +#include <linux/of_device.h>
>>
>> Please sort the headers.
> This file is based on pinctrl-sun8i-a23-r.c and pinctrl-sun8i-h3-r.c, which
> both have #include in this sequence.

And we should probably fix them too.

>>
>>>  +#include <linux/pinctrl/pinctrl.h>
>>>  +#include <linux/reset.h>
>>>  +
>>>  +#include "pinctrl-sunxi.h"
>>>  +
>>>  +static const struct sunxi_desc_pin sun50i_a64_r_pins[] = {
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 0),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_rsb"), /* SCK */
>>>  + SUNXI_FUNCTION(0x3, "s_twi"), /* SCK */
>>
>> We use "i2c" instead of "twi".
> So as above, in A23 / H3 R_PIO driver, they're called as "s_twi" other than "s_i2c"

These as well.

ChenYu

>>
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 0)), /* PL_EINT0 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 1),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_rsb"), /* SDA */
>>>  + SUNXI_FUNCTION(0x3, "s_twi"), /* SDA */
>>
>> Same here.
>>
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 1)), /* PL_EINT1 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 2),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_uart"), /* TX */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 2)), /* PL_EINT2 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 3),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_uart"), /* RX */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 3)), /* PL_EINT3 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 4),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x3, "s_jtag"), /* MS */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 4)), /* PL_EINT4 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 5),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x3, "s_jtag"), /* CK */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 5)), /* PL_EINT5 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 6),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x3, "s_jtag"), /* DO */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 6)), /* PL_EINT6 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 7),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x3, "s_jtag"), /* DI */
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 7)), /* PL_EINT7 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 8),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_twi"), /* SCK */
>>
>> Ditto.
>>
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 8)), /* PL_EINT8 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 9),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_twi"), /* SDA */
>>
>> Ditto.
>>
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 9)), /* PL_EINT9 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 10),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_pwm"),
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 10)), /* PL_EINT10 */
>>>  + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 11),
>>>  + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>  + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>  + SUNXI_FUNCTION(0x2, "s_cir_rx"),
>>>  + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 11)), /* PL_EINT11 */
>>
>> You missed PL12.
> Sorry... I forgot to add it...
>>
>>>  +};
>>>  +
>>>  +static const struct sunxi_pinctrl_desc sun50i_a64_r_pinctrl_data = {
>>>  + .pins = sun50i_a64_r_pins,
>>>  + .npins = ARRAY_SIZE(sun50i_a64_r_pins),
>>>  + .pin_base = PL_BASE,
>>>  + .irq_banks = 1,
>>>  +};
>>>  +
>>>  +static int sun50i_a64_r_pinctrl_probe(struct platform_device *pdev)
>>>  +{
>>>  + struct reset_control *rstc;
>>>  + int ret;
>>>  +
>>>  + rstc = devm_reset_control_get(&pdev->dev, NULL);
>>>  + if (IS_ERR(rstc)) {
>>>  + dev_err(&pdev->dev, "Reset controller missing\n");
>>>  + return PTR_ERR(rstc);
>>>  + }
>>>  +
>>>  + ret = reset_control_deassert(rstc);
>>>  + if (ret)
>>>  + return ret;
>>>  +
>>>  + ret = sunxi_pinctrl_init(pdev,
>>>  + &sun50i_a64_r_pinctrl_data);
>>>  +
>>>  + if (ret)
>>>  + reset_control_assert(rstc);
>>>  +
>>>  + return ret;
>>>  +}
>>>  +
>>>  +static const struct of_device_id sun50i_a64_r_pinctrl_match[] = {
>>>  + { .compatible = "allwinner,sun50i-a64-r-pinctrl", },
>>>  + {}
>>>  +};
>>>  +MODULE_DEVICE_TABLE(of, sun50i_a64_r_pinctrl_match);
>>>  +
>>>  +static struct platform_driver sun50i_a64_r_pinctrl_driver = {
>>>  + .probe = sun50i_a64_r_pinctrl_probe,
>>>  + .driver = {
>>>  + .name = "sun50i-a64-r-pinctrl",
>>>  + .of_match_table = sun50i_a64_r_pinctrl_match,
>>>  + },
>>>  +};
>>>  +module_platform_driver(sun50i_a64_r_pinctrl_driver);
>>>  +
>>>  +MODULE_AUTHOR("Icenowy Zheng <icenowy@aosc.xyz>");
>>>  +MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
>>>  +MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com");
>>>  +MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
>>>  +MODULE_DESCRIPTION("Allwinner A64 R_PIO pinctrl driver");
>>>  +MODULE_LICENSE("GPL");
>>
>> Since you have a bool Kconfig symbol, you can drop all the module related
>> stuff. Just use builtin_platform_driver like the A64 main pinctrl driver
>> does.
>>
>> Regards
>> ChenYu
>>
>>>  --
>>>  2.9.0

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH 2/2] pinctrl: sunxi: Add A64 R_PIO controller support
  2016-08-16  1:27         ` Chen-Yu Tsai
@ 2016-08-16  3:03           ` Icenowy Zheng
  -1 siblings, 0 replies; 20+ messages in thread
From: Icenowy Zheng @ 2016-08-16  3:03 UTC (permalink / raw)
  To: Chen-Yu Tsai
  Cc: Mark Rutland, devicetree, Vishnu Patekar, linux-gpio,
	Andre Przywara, Linus Walleij, linux-kernel, Masahiro Yamada,
	Rob Herring, Jens Kuske, Maxime Ripard, Krzysztof Adamski,
	linux-arm-kernel



16.08.2016, 09:28, "Chen-Yu Tsai" <wens@csie.org>:
> On Tue, Aug 16, 2016 at 8:06 AM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
>>  15.08.2016, 21:56, "Chen-Yu Tsai" <wens@csie.org>:
>>>  Hi,
>>>
>>>  On Mon, Aug 1, 2016 at 10:59 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
>>>>   The A64 has a R_PIO pin controller, similar to the one found on the H3 SoCs.
>>>>   Add support for the pins controlled by the R_PIO controller.
>>>>
>>>>   Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
>>>>   ---
>>>>    drivers/pinctrl/sunxi/Kconfig | 5 +
>>>>    drivers/pinctrl/sunxi/Makefile | 1 +
>>>>    drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 148 +++++++++++++++++++++++++++
>>>>    3 files changed, 154 insertions(+)
>>>>    create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>>>
>>>>   diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
>>>>   index aaf075b..c4b476f 100644
>>>>   --- a/drivers/pinctrl/sunxi/Kconfig
>>>>   +++ b/drivers/pinctrl/sunxi/Kconfig
>>>>   @@ -72,4 +72,9 @@ config PINCTRL_SUN50I_A64
>>>>           bool
>>>>           select PINCTRL_SUNXI
>>>>
>>>>   +config PINCTRL_SUN50I_A64_R
>>>>   + bool
>>>>   + depends on RESET_CONTROLLER
>>>>   + select PINCTRL_SUNXI
>>>>   +
>>>>    endif
>>>>   diff --git a/drivers/pinctrl/sunxi/Makefile b/drivers/pinctrl/sunxi/Makefile
>>>>   index 2d8b64e..d6eabdd 100644
>>>>   --- a/drivers/pinctrl/sunxi/Makefile
>>>>   +++ b/drivers/pinctrl/sunxi/Makefile
>>>>   @@ -13,6 +13,7 @@ obj-$(CONFIG_PINCTRL_SUN8I_A23) += pinctrl-sun8i-a23.o
>>>>    obj-$(CONFIG_PINCTRL_SUN8I_A23_R) += pinctrl-sun8i-a23-r.o
>>>>    obj-$(CONFIG_PINCTRL_SUN8I_A33) += pinctrl-sun8i-a33.o
>>>>    obj-$(CONFIG_PINCTRL_SUN50I_A64) += pinctrl-sun50i-a64.o
>>>>   +obj-$(CONFIG_PINCTRL_SUN50I_A64_R) += pinctrl-sun50i-a64-r.o
>>>>    obj-$(CONFIG_PINCTRL_SUN8I_A83T) += pinctrl-sun8i-a83t.o
>>>>    obj-$(CONFIG_PINCTRL_SUN8I_H3) += pinctrl-sun8i-h3.o
>>>>    obj-$(CONFIG_PINCTRL_SUN8I_H3_R) += pinctrl-sun8i-h3-r.o
>>>>   diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>>>   new file mode 100644
>>>>   index 0000000..b836264
>>>>   --- /dev/null
>>>>   +++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>>>   @@ -0,0 +1,148 @@
>>>>   +/*
>>>>   + * Allwinner A64 SoCs special pins pinctrl driver.
>>>>   + *
>>>>   + * Based on pinctrl-sun8i-a23-r.c
>>>>   + *
>>>>   + * Copyright (C) 2016 Icenowy Zheng
>>>>   + * Icenowy Zheng <icenowy@aosc.xyz>
>>>>   + *
>>>>   + * Copyright (C) 2014 Chen-Yu Tsai
>>>>   + * Chen-Yu Tsai <wens@csie.org>
>>>>   + *
>>>>   + * Copyright (C) 2014 Boris Brezillon
>>>>   + * Boris Brezillon <boris.brezillon@free-electrons.com>
>>>>   + *
>>>>   + * Copyright (C) 2014 Maxime Ripard
>>>>   + * Maxime Ripard <maxime.ripard@free-electrons.com>
>>>>   + *
>>>>   + * This file is licensed under the terms of the GNU General Public
>>>>   + * License version 2. This program is licensed "as is" without any
>>>>   + * warranty of any kind, whether express or implied.
>>>>   + */
>>>>   +
>>>>   +#include <linux/module.h>
>>>>   +#include <linux/platform_device.h>
>>>>   +#include <linux/of.h>
>>>>   +#include <linux/of_device.h>
>>>
>>>  Please sort the headers.
>>  This file is based on pinctrl-sun8i-a23-r.c and pinctrl-sun8i-h3-r.c, which
>>  both have #include in this sequence.
>
> And we should probably fix them too.
>
>>>>   +#include <linux/pinctrl/pinctrl.h>
>>>>   +#include <linux/reset.h>
>>>>   +
>>>>   +#include "pinctrl-sunxi.h"
>>>>   +
>>>>   +static const struct sunxi_desc_pin sun50i_a64_r_pins[] = {
>>>>   + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 0),
>>>>   + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>>   + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>>   + SUNXI_FUNCTION(0x2, "s_rsb"), /* SCK */
>>>>   + SUNXI_FUNCTION(0x3, "s_twi"), /* SCK */
>>>
>>>  We use "i2c" instead of "twi".
>>  So as above, in A23 / H3 R_PIO driver, they're called as "s_twi" other than "s_i2c"
>
> These as well.
I think it become some kind of dt binding... Changing it may cause existing dt
not to work...
Although for A64 we can have s_i2c, of course!
>
> ChenYu
>
>>>>   + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 0)), /* PL_EINT0 */
>>>>   + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 1),
>>>>   + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>>   + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>>   + SUNXI_FUNCTION(0x2, "s_rsb"), /* SDA */
>>>>   + SUNXI_FUNCTION(0x3, "s_twi"), /* SDA */
>>>
>>>  Same here.
>>>
>>>>   + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 1)), /* PL_EINT1 */
>>>>   + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 2),
>>>>   + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>>   + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>>   + SUNXI_FUNCTION(0x2, "s_uart"), /* TX */
>>>>   + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 2)), /* PL_EINT2 */
>>>>   + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 3),
>>>>   + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>>   + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>>   + SUNXI_FUNCTION(0x2, "s_uart"), /* RX */
>>>>   + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 3)), /* PL_EINT3 */
>>>>   + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 4),
>>>>   + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>>   + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>>   + SUNXI_FUNCTION(0x3, "s_jtag"), /* MS */
>>>>   + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 4)), /* PL_EINT4 */
>>>>   + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 5),
>>>>   + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>>   + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>>   + SUNXI_FUNCTION(0x3, "s_jtag"), /* CK */
>>>>   + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 5)), /* PL_EINT5 */
>>>>   + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 6),
>>>>   + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>>   + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>>   + SUNXI_FUNCTION(0x3, "s_jtag"), /* DO */
>>>>   + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 6)), /* PL_EINT6 */
>>>>   + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 7),
>>>>   + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>>   + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>>   + SUNXI_FUNCTION(0x3, "s_jtag"), /* DI */
>>>>   + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 7)), /* PL_EINT7 */
>>>>   + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 8),
>>>>   + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>>   + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>>   + SUNXI_FUNCTION(0x2, "s_twi"), /* SCK */
>>>
>>>  Ditto.
>>>
>>>>   + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 8)), /* PL_EINT8 */
>>>>   + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 9),
>>>>   + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>>   + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>>   + SUNXI_FUNCTION(0x2, "s_twi"), /* SDA */
>>>
>>>  Ditto.
>>>
>>>>   + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 9)), /* PL_EINT9 */
>>>>   + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 10),
>>>>   + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>>   + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>>   + SUNXI_FUNCTION(0x2, "s_pwm"),
>>>>   + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 10)), /* PL_EINT10 */
>>>>   + SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 11),
>>>>   + SUNXI_FUNCTION(0x0, "gpio_in"),
>>>>   + SUNXI_FUNCTION(0x1, "gpio_out"),
>>>>   + SUNXI_FUNCTION(0x2, "s_cir_rx"),
>>>>   + SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 11)), /* PL_EINT11 */
>>>
>>>  You missed PL12.
>>  Sorry... I forgot to add it...
>>>>   +};
>>>>   +
>>>>   +static const struct sunxi_pinctrl_desc sun50i_a64_r_pinctrl_data = {
>>>>   + .pins = sun50i_a64_r_pins,
>>>>   + .npins = ARRAY_SIZE(sun50i_a64_r_pins),
>>>>   + .pin_base = PL_BASE,
>>>>   + .irq_banks = 1,
>>>>   +};
>>>>   +
>>>>   +static int sun50i_a64_r_pinctrl_probe(struct platform_device *pdev)
>>>>   +{
>>>>   + struct reset_control *rstc;
>>>>   + int ret;
>>>>   +
>>>>   + rstc = devm_reset_control_get(&pdev->dev, NULL);
>>>>   + if (IS_ERR(rstc)) {
>>>>   + dev_err(&pdev->dev, "Reset controller missing\n");
>>>>   + return PTR_ERR(rstc);
>>>>   + }
>>>>   +
>>>>   + ret = reset_control_deassert(rstc);
>>>>   + if (ret)
>>>>   + return ret;
>>>>   +
>>>>   + ret = sunxi_pinctrl_init(pdev,
>>>>   + &sun50i_a64_r_pinctrl_data);
>>>>   +
>>>>   + if (ret)
>>>>   + reset_control_assert(rstc);
>>>>   +
>>>>   + return ret;
>>>>   +}
>>>>   +
>>>>   +static const struct of_device_id sun50i_a64_r_pinctrl_match[] = {
>>>>   + { .compatible = "allwinner,sun50i-a64-r-pinctrl", },
>>>>   + {}
>>>>   +};
>>>>   +MODULE_DEVICE_TABLE(of, sun50i_a64_r_pinctrl_match);
>>>>   +
>>>>   +static struct platform_driver sun50i_a64_r_pinctrl_driver = {
>>>>   + .probe = sun50i_a64_r_pinctrl_probe,
>>>>   + .driver = {
>>>>   + .name = "sun50i-a64-r-pinctrl",
>>>>   + .of_match_table = sun50i_a64_r_pinctrl_match,
>>>>   + },
>>>>   +};
>>>>   +module_platform_driver(sun50i_a64_r_pinctrl_driver);
>>>>   +
>>>>   +MODULE_AUTHOR("Icenowy Zheng <icenowy@aosc.xyz>");
>>>>   +MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
>>>>   +MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com");
>>>>   +MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
>>>>   +MODULE_DESCRIPTION("Allwinner A64 R_PIO pinctrl driver");
>>>>   +MODULE_LICENSE("GPL");
>>>
>>>  Since you have a bool Kconfig symbol, you can drop all the module related
>>>  stuff. Just use builtin_platform_driver like the A64 main pinctrl driver
>>>  does.
>>>
>>>  Regards
>>>  ChenYu
>>>
>>>>   --
>>>>   2.9.0

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH 2/2] pinctrl: sunxi: Add A64 R_PIO controller support
@ 2016-08-16  3:03           ` Icenowy Zheng
  0 siblings, 0 replies; 20+ messages in thread
From: Icenowy Zheng @ 2016-08-16  3:03 UTC (permalink / raw)
  To: linux-arm-kernel



16.08.2016, 09:28, "Chen-Yu Tsai" <wens@csie.org>:
> On Tue, Aug 16, 2016 at 8:06 AM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
>> ?15.08.2016, 21:56, "Chen-Yu Tsai" <wens@csie.org>:
>>> ?Hi,
>>>
>>> ?On Mon, Aug 1, 2016 at 10:59 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
>>>> ??The A64 has a R_PIO pin controller, similar to the one found on the H3 SoCs.
>>>> ??Add support for the pins controlled by the R_PIO controller.
>>>>
>>>> ??Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
>>>> ??---
>>>> ???drivers/pinctrl/sunxi/Kconfig | 5 +
>>>> ???drivers/pinctrl/sunxi/Makefile | 1 +
>>>> ???drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 148 +++++++++++++++++++++++++++
>>>> ???3 files changed, 154 insertions(+)
>>>> ???create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>>>
>>>> ??diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
>>>> ??index aaf075b..c4b476f 100644
>>>> ??--- a/drivers/pinctrl/sunxi/Kconfig
>>>> ??+++ b/drivers/pinctrl/sunxi/Kconfig
>>>> ??@@ -72,4 +72,9 @@ config PINCTRL_SUN50I_A64
>>>> ??????????bool
>>>> ??????????select PINCTRL_SUNXI
>>>>
>>>> ??+config PINCTRL_SUN50I_A64_R
>>>> ??+ bool
>>>> ??+ depends on RESET_CONTROLLER
>>>> ??+ select PINCTRL_SUNXI
>>>> ??+
>>>> ???endif
>>>> ??diff --git a/drivers/pinctrl/sunxi/Makefile b/drivers/pinctrl/sunxi/Makefile
>>>> ??index 2d8b64e..d6eabdd 100644
>>>> ??--- a/drivers/pinctrl/sunxi/Makefile
>>>> ??+++ b/drivers/pinctrl/sunxi/Makefile
>>>> ??@@ -13,6 +13,7 @@ obj-$(CONFIG_PINCTRL_SUN8I_A23) += pinctrl-sun8i-a23.o
>>>> ???obj-$(CONFIG_PINCTRL_SUN8I_A23_R) += pinctrl-sun8i-a23-r.o
>>>> ???obj-$(CONFIG_PINCTRL_SUN8I_A33) += pinctrl-sun8i-a33.o
>>>> ???obj-$(CONFIG_PINCTRL_SUN50I_A64) += pinctrl-sun50i-a64.o
>>>> ??+obj-$(CONFIG_PINCTRL_SUN50I_A64_R) += pinctrl-sun50i-a64-r.o
>>>> ???obj-$(CONFIG_PINCTRL_SUN8I_A83T) += pinctrl-sun8i-a83t.o
>>>> ???obj-$(CONFIG_PINCTRL_SUN8I_H3) += pinctrl-sun8i-h3.o
>>>> ???obj-$(CONFIG_PINCTRL_SUN8I_H3_R) += pinctrl-sun8i-h3-r.o
>>>> ??diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>>> ??new file mode 100644
>>>> ??index 0000000..b836264
>>>> ??--- /dev/null
>>>> ??+++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
>>>> ??@@ -0,0 +1,148 @@
>>>> ??+/*
>>>> ??+ * Allwinner A64 SoCs special pins pinctrl driver.
>>>> ??+ *
>>>> ??+ * Based on pinctrl-sun8i-a23-r.c
>>>> ??+ *
>>>> ??+ * Copyright (C) 2016 Icenowy Zheng
>>>> ??+ * Icenowy Zheng <icenowy@aosc.xyz>
>>>> ??+ *
>>>> ??+ * Copyright (C) 2014 Chen-Yu Tsai
>>>> ??+ * Chen-Yu Tsai <wens@csie.org>
>>>> ??+ *
>>>> ??+ * Copyright (C) 2014 Boris Brezillon
>>>> ??+ * Boris Brezillon <boris.brezillon@free-electrons.com>
>>>> ??+ *
>>>> ??+ * Copyright (C) 2014 Maxime Ripard
>>>> ??+ * Maxime Ripard <maxime.ripard@free-electrons.com>
>>>> ??+ *
>>>> ??+ * This file is licensed under the terms of the GNU General Public
>>>> ??+ * License version 2. This program is licensed "as is" without any
>>>> ??+ * warranty of any kind, whether express or implied.
>>>> ??+ */
>>>> ??+
>>>> ??+#include <linux/module.h>
>>>> ??+#include <linux/platform_device.h>
>>>> ??+#include <linux/of.h>
>>>> ??+#include <linux/of_device.h>
>>>
>>> ?Please sort the headers.
>> ?This file is based on pinctrl-sun8i-a23-r.c and pinctrl-sun8i-h3-r.c, which
>> ?both have #include in this sequence.
>
> And we should probably fix them too.
>
>>>> ??+#include <linux/pinctrl/pinctrl.h>
>>>> ??+#include <linux/reset.h>
>>>> ??+
>>>> ??+#include "pinctrl-sunxi.h"
>>>> ??+
>>>> ??+static const struct sunxi_desc_pin sun50i_a64_r_pins[] = {
>>>> ??+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 0),
>>>> ??+ SUNXI_FUNCTION(0x0, "gpio_in"),
>>>> ??+ SUNXI_FUNCTION(0x1, "gpio_out"),
>>>> ??+ SUNXI_FUNCTION(0x2, "s_rsb"), /* SCK */
>>>> ??+ SUNXI_FUNCTION(0x3, "s_twi"), /* SCK */
>>>
>>> ?We use "i2c" instead of "twi".
>> ?So as above, in A23 / H3 R_PIO driver, they're called as "s_twi" other than "s_i2c"
>
> These as well.
I think it become some kind of dt binding... Changing it may cause existing dt
not to work...
Although for A64 we can have s_i2c, of course!
>
> ChenYu
>
>>>> ??+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 0)), /* PL_EINT0 */
>>>> ??+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 1),
>>>> ??+ SUNXI_FUNCTION(0x0, "gpio_in"),
>>>> ??+ SUNXI_FUNCTION(0x1, "gpio_out"),
>>>> ??+ SUNXI_FUNCTION(0x2, "s_rsb"), /* SDA */
>>>> ??+ SUNXI_FUNCTION(0x3, "s_twi"), /* SDA */
>>>
>>> ?Same here.
>>>
>>>> ??+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 1)), /* PL_EINT1 */
>>>> ??+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 2),
>>>> ??+ SUNXI_FUNCTION(0x0, "gpio_in"),
>>>> ??+ SUNXI_FUNCTION(0x1, "gpio_out"),
>>>> ??+ SUNXI_FUNCTION(0x2, "s_uart"), /* TX */
>>>> ??+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 2)), /* PL_EINT2 */
>>>> ??+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 3),
>>>> ??+ SUNXI_FUNCTION(0x0, "gpio_in"),
>>>> ??+ SUNXI_FUNCTION(0x1, "gpio_out"),
>>>> ??+ SUNXI_FUNCTION(0x2, "s_uart"), /* RX */
>>>> ??+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 3)), /* PL_EINT3 */
>>>> ??+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 4),
>>>> ??+ SUNXI_FUNCTION(0x0, "gpio_in"),
>>>> ??+ SUNXI_FUNCTION(0x1, "gpio_out"),
>>>> ??+ SUNXI_FUNCTION(0x3, "s_jtag"), /* MS */
>>>> ??+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 4)), /* PL_EINT4 */
>>>> ??+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 5),
>>>> ??+ SUNXI_FUNCTION(0x0, "gpio_in"),
>>>> ??+ SUNXI_FUNCTION(0x1, "gpio_out"),
>>>> ??+ SUNXI_FUNCTION(0x3, "s_jtag"), /* CK */
>>>> ??+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 5)), /* PL_EINT5 */
>>>> ??+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 6),
>>>> ??+ SUNXI_FUNCTION(0x0, "gpio_in"),
>>>> ??+ SUNXI_FUNCTION(0x1, "gpio_out"),
>>>> ??+ SUNXI_FUNCTION(0x3, "s_jtag"), /* DO */
>>>> ??+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 6)), /* PL_EINT6 */
>>>> ??+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 7),
>>>> ??+ SUNXI_FUNCTION(0x0, "gpio_in"),
>>>> ??+ SUNXI_FUNCTION(0x1, "gpio_out"),
>>>> ??+ SUNXI_FUNCTION(0x3, "s_jtag"), /* DI */
>>>> ??+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 7)), /* PL_EINT7 */
>>>> ??+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 8),
>>>> ??+ SUNXI_FUNCTION(0x0, "gpio_in"),
>>>> ??+ SUNXI_FUNCTION(0x1, "gpio_out"),
>>>> ??+ SUNXI_FUNCTION(0x2, "s_twi"), /* SCK */
>>>
>>> ?Ditto.
>>>
>>>> ??+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 8)), /* PL_EINT8 */
>>>> ??+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 9),
>>>> ??+ SUNXI_FUNCTION(0x0, "gpio_in"),
>>>> ??+ SUNXI_FUNCTION(0x1, "gpio_out"),
>>>> ??+ SUNXI_FUNCTION(0x2, "s_twi"), /* SDA */
>>>
>>> ?Ditto.
>>>
>>>> ??+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 9)), /* PL_EINT9 */
>>>> ??+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 10),
>>>> ??+ SUNXI_FUNCTION(0x0, "gpio_in"),
>>>> ??+ SUNXI_FUNCTION(0x1, "gpio_out"),
>>>> ??+ SUNXI_FUNCTION(0x2, "s_pwm"),
>>>> ??+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 10)), /* PL_EINT10 */
>>>> ??+ SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 11),
>>>> ??+ SUNXI_FUNCTION(0x0, "gpio_in"),
>>>> ??+ SUNXI_FUNCTION(0x1, "gpio_out"),
>>>> ??+ SUNXI_FUNCTION(0x2, "s_cir_rx"),
>>>> ??+ SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 11)), /* PL_EINT11 */
>>>
>>> ?You missed PL12.
>> ?Sorry... I forgot to add it...
>>>> ??+};
>>>> ??+
>>>> ??+static const struct sunxi_pinctrl_desc sun50i_a64_r_pinctrl_data = {
>>>> ??+ .pins = sun50i_a64_r_pins,
>>>> ??+ .npins = ARRAY_SIZE(sun50i_a64_r_pins),
>>>> ??+ .pin_base = PL_BASE,
>>>> ??+ .irq_banks = 1,
>>>> ??+};
>>>> ??+
>>>> ??+static int sun50i_a64_r_pinctrl_probe(struct platform_device *pdev)
>>>> ??+{
>>>> ??+ struct reset_control *rstc;
>>>> ??+ int ret;
>>>> ??+
>>>> ??+ rstc = devm_reset_control_get(&pdev->dev, NULL);
>>>> ??+ if (IS_ERR(rstc)) {
>>>> ??+ dev_err(&pdev->dev, "Reset controller missing\n");
>>>> ??+ return PTR_ERR(rstc);
>>>> ??+ }
>>>> ??+
>>>> ??+ ret = reset_control_deassert(rstc);
>>>> ??+ if (ret)
>>>> ??+ return ret;
>>>> ??+
>>>> ??+ ret = sunxi_pinctrl_init(pdev,
>>>> ??+ &sun50i_a64_r_pinctrl_data);
>>>> ??+
>>>> ??+ if (ret)
>>>> ??+ reset_control_assert(rstc);
>>>> ??+
>>>> ??+ return ret;
>>>> ??+}
>>>> ??+
>>>> ??+static const struct of_device_id sun50i_a64_r_pinctrl_match[] = {
>>>> ??+ { .compatible = "allwinner,sun50i-a64-r-pinctrl", },
>>>> ??+ {}
>>>> ??+};
>>>> ??+MODULE_DEVICE_TABLE(of, sun50i_a64_r_pinctrl_match);
>>>> ??+
>>>> ??+static struct platform_driver sun50i_a64_r_pinctrl_driver = {
>>>> ??+ .probe = sun50i_a64_r_pinctrl_probe,
>>>> ??+ .driver = {
>>>> ??+ .name = "sun50i-a64-r-pinctrl",
>>>> ??+ .of_match_table = sun50i_a64_r_pinctrl_match,
>>>> ??+ },
>>>> ??+};
>>>> ??+module_platform_driver(sun50i_a64_r_pinctrl_driver);
>>>> ??+
>>>> ??+MODULE_AUTHOR("Icenowy Zheng <icenowy@aosc.xyz>");
>>>> ??+MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
>>>> ??+MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com");
>>>> ??+MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
>>>> ??+MODULE_DESCRIPTION("Allwinner A64 R_PIO pinctrl driver");
>>>> ??+MODULE_LICENSE("GPL");
>>>
>>> ?Since you have a bool Kconfig symbol, you can drop all the module related
>>> ?stuff. Just use builtin_platform_driver like the A64 main pinctrl driver
>>> ?does.
>>>
>>> ?Regards
>>> ?ChenYu
>>>
>>>> ??--
>>>> ??2.9.0

^ permalink raw reply	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2016-08-16  3:03 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-01 14:59 [PATCH 1/2] dt: bindings: add binding for Allwinner A64 R_PIO pinctrl Icenowy Zheng
2016-08-01 14:59 ` Icenowy Zheng
2016-08-01 14:59 ` [PATCH 2/2] pinctrl: sunxi: Add A64 R_PIO controller support Icenowy Zheng
2016-08-01 14:59   ` Icenowy Zheng
2016-08-15 13:55   ` Chen-Yu Tsai
2016-08-15 13:55     ` Chen-Yu Tsai
2016-08-15 13:55     ` Chen-Yu Tsai
2016-08-16  0:06     ` Icenowy Zheng
2016-08-16  0:06       ` Icenowy Zheng
2016-08-16  1:27       ` Chen-Yu Tsai
2016-08-16  1:27         ` Chen-Yu Tsai
2016-08-16  1:27         ` Chen-Yu Tsai
2016-08-16  3:03         ` Icenowy Zheng
2016-08-16  3:03           ` Icenowy Zheng
2016-08-11 11:35 ` [PATCH 1/2] dt: bindings: add binding for Allwinner A64 R_PIO pinctrl Linus Walleij
2016-08-11 11:35   ` Linus Walleij
2016-08-11 11:35   ` Linus Walleij
2016-08-15 13:56 ` Chen-Yu Tsai
2016-08-15 13:56   ` Chen-Yu Tsai
2016-08-15 13:56   ` Chen-Yu Tsai

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.