linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/2] pinctrl: meson: Add SPICC pins
@ 2017-05-22 12:59 Neil Armstrong
  2017-05-22 12:59 ` [PATCH 1/2] pinctrl: meson-gxl: Add SPI pins for the SPICC controller Neil Armstrong
  2017-05-22 12:59 ` [PATCH 2/2] pinctrl: meson-gxbb: Add SPI pins for " Neil Armstrong
  0 siblings, 2 replies; 5+ messages in thread
From: Neil Armstrong @ 2017-05-22 12:59 UTC (permalink / raw)
  To: linus.walleij
  Cc: Neil Armstrong, linux-gpio, linux-arm-kernel, linux-amlogic,
	linux-kernel

This serie adds the SPICC controller pin for GXBB and GXL pinctrl drivers.

Neil Armstrong (2):
  pinctrl: meson-gxl: Add SPI pins for the SPICC controller
  pinctrl: meson-gxbb: Add SPI pins for SPICC controller

 drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 14 ++++++++++++++
 drivers/pinctrl/meson/pinctrl-meson-gxl.c  | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

-- 
1.9.1

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

* [PATCH 1/2] pinctrl: meson-gxl: Add SPI pins for the SPICC controller
  2017-05-22 12:59 [PATCH 0/2] pinctrl: meson: Add SPICC pins Neil Armstrong
@ 2017-05-22 12:59 ` Neil Armstrong
  2017-05-29  8:13   ` Linus Walleij
  2017-05-22 12:59 ` [PATCH 2/2] pinctrl: meson-gxbb: Add SPI pins for " Neil Armstrong
  1 sibling, 1 reply; 5+ messages in thread
From: Neil Armstrong @ 2017-05-22 12:59 UTC (permalink / raw)
  To: linus.walleij
  Cc: Neil Armstrong, linux-gpio, linux-arm-kernel, linux-amlogic,
	linux-kernel

The SPICC controller has dedicated SPI pins, this patchs add the pins
definition in the GXL pinctrl driver.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 drivers/pinctrl/meson/pinctrl-meson-gxl.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
index 998210e..719ff1b 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
@@ -141,6 +141,11 @@
 static const unsigned int nor_c_pins[]		= { PIN(BOOT_13, EE_OFF) };
 static const unsigned int nor_cs_pins[]		= { PIN(BOOT_15, EE_OFF) };
 
+static const unsigned int spi_mosi_pins[]	= { PIN(GPIOX_8, EE_OFF) };
+static const unsigned int spi_miso_pins[]	= { PIN(GPIOX_9, EE_OFF) };
+static const unsigned int spi_ss0_pins[]	= { PIN(GPIOX_10, EE_OFF) };
+static const unsigned int spi_sclk_pins[]	= { PIN(GPIOX_11, EE_OFF) };
+
 static const unsigned int sdcard_d0_pins[] = { PIN(CARD_1, EE_OFF) };
 static const unsigned int sdcard_d1_pins[] = { PIN(CARD_0, EE_OFF) };
 static const unsigned int sdcard_d2_pins[] = { PIN(CARD_5, EE_OFF) };
@@ -405,6 +410,10 @@
 	GROUP(pwm_a,		5,	25),
 	GROUP(pwm_e,		5,	15),
 	GROUP(pwm_f_x,		5,	14),
+	GROUP(spi_mosi,		5,	3),
+	GROUP(spi_miso,		5,	2),
+	GROUP(spi_ss0,		5,	1),
+	GROUP(spi_sclk,		5,	0),
 
 	/* Bank Z */
 	GROUP(eth_mdio,		4,	23),
@@ -560,6 +569,10 @@
 	"nor_d", "nor_q", "nor_c", "nor_cs",
 };
 
+static const char * const spi_groups[] = {
+	"spi_mosi", "spi_miso", "spi_ss0", "spi_sclk",
+};
+
 static const char * const sdcard_groups[] = {
 	"sdcard_d0", "sdcard_d1", "sdcard_d2", "sdcard_d3",
 	"sdcard_cmd", "sdcard_clk",
@@ -693,6 +706,7 @@
 	FUNCTION(gpio_periphs),
 	FUNCTION(emmc),
 	FUNCTION(nor),
+	FUNCTION(spi),
 	FUNCTION(sdcard),
 	FUNCTION(sdio),
 	FUNCTION(nand),
-- 
1.9.1

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

* [PATCH 2/2] pinctrl: meson-gxbb: Add SPI pins for SPICC controller
  2017-05-22 12:59 [PATCH 0/2] pinctrl: meson: Add SPICC pins Neil Armstrong
  2017-05-22 12:59 ` [PATCH 1/2] pinctrl: meson-gxl: Add SPI pins for the SPICC controller Neil Armstrong
@ 2017-05-22 12:59 ` Neil Armstrong
  2017-05-29  8:14   ` Linus Walleij
  1 sibling, 1 reply; 5+ messages in thread
From: Neil Armstrong @ 2017-05-22 12:59 UTC (permalink / raw)
  To: linus.walleij
  Cc: Neil Armstrong, linux-gpio, linux-arm-kernel, linux-amlogic,
	linux-kernel

The SPICC controller has dedicated SPI pins, this patchs add the pins
definition in the GXBB pinctrl driver

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
index 9b00be1..3ccb0f4f 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
@@ -161,6 +161,11 @@
 static const unsigned int nor_c_pins[]		= { PIN(BOOT_13, EE_OFF) };
 static const unsigned int nor_cs_pins[]		= { PIN(BOOT_15, EE_OFF) };
 
+static const unsigned int spi_sclk_pins[]	= { PIN(GPIOZ_6, EE_OFF) };
+static const unsigned int spi_ss0_pins[]	= { PIN(GPIOZ_7, EE_OFF) };
+static const unsigned int spi_miso_pins[]	= { PIN(GPIOZ_12, EE_OFF) };
+static const unsigned int spi_mosi_pins[]	= { PIN(GPIOZ_13, EE_OFF) };
+
 static const unsigned int sdcard_d0_pins[] = { PIN(CARD_1, EE_OFF) };
 static const unsigned int sdcard_d1_pins[] = { PIN(CARD_0, EE_OFF) };
 static const unsigned int sdcard_d2_pins[] = { PIN(CARD_5, EE_OFF) };
@@ -462,6 +467,10 @@
 	GROUP(eth_txd1,		6,	4),
 	GROUP(eth_txd2,		6,	3),
 	GROUP(eth_txd3,		6,	2),
+	GROUP(spi_ss0,		5,	26),
+	GROUP(spi_sclk,		5,	27),
+	GROUP(spi_miso,		5,	28),
+	GROUP(spi_mosi,		5,	29),
 
 	/* Bank H */
 	GROUP(hdmi_hpd,		1,	26),
@@ -598,6 +607,10 @@
 	"nor_d", "nor_q", "nor_c", "nor_cs",
 };
 
+static const char * const spi_groups[] = {
+	"spi_mosi", "spi_miso", "spi_ss0", "spi_sclk",
+};
+
 static const char * const sdcard_groups[] = {
 	"sdcard_d0", "sdcard_d1", "sdcard_d2", "sdcard_d3",
 	"sdcard_cmd", "sdcard_clk",
@@ -743,6 +756,7 @@
 	FUNCTION(gpio_periphs),
 	FUNCTION(emmc),
 	FUNCTION(nor),
+	FUNCTION(spi),
 	FUNCTION(sdcard),
 	FUNCTION(sdio),
 	FUNCTION(nand),
-- 
1.9.1

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

* Re: [PATCH 1/2] pinctrl: meson-gxl: Add SPI pins for the SPICC controller
  2017-05-22 12:59 ` [PATCH 1/2] pinctrl: meson-gxl: Add SPI pins for the SPICC controller Neil Armstrong
@ 2017-05-29  8:13   ` Linus Walleij
  0 siblings, 0 replies; 5+ messages in thread
From: Linus Walleij @ 2017-05-29  8:13 UTC (permalink / raw)
  To: Neil Armstrong
  Cc: linux-gpio, linux-arm-kernel, open list:ARM/Amlogic Meson...,
	linux-kernel

On Mon, May 22, 2017 at 2:59 PM, Neil Armstrong <narmstrong@baylibre.com> wrote:

> The SPICC controller has dedicated SPI pins, this patchs add the pins
> definition in the GXL pinctrl driver.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

Patch applied.

Yours,
Linus Walleij

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

* Re: [PATCH 2/2] pinctrl: meson-gxbb: Add SPI pins for SPICC controller
  2017-05-22 12:59 ` [PATCH 2/2] pinctrl: meson-gxbb: Add SPI pins for " Neil Armstrong
@ 2017-05-29  8:14   ` Linus Walleij
  0 siblings, 0 replies; 5+ messages in thread
From: Linus Walleij @ 2017-05-29  8:14 UTC (permalink / raw)
  To: Neil Armstrong
  Cc: linux-gpio, linux-arm-kernel, open list:ARM/Amlogic Meson...,
	linux-kernel

On Mon, May 22, 2017 at 2:59 PM, Neil Armstrong <narmstrong@baylibre.com> wrote:

> The SPICC controller has dedicated SPI pins, this patchs add the pins
> definition in the GXBB pinctrl driver
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

Patch applied.

Yours,
Linus Walleij

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

end of thread, other threads:[~2017-05-29  8:14 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-22 12:59 [PATCH 0/2] pinctrl: meson: Add SPICC pins Neil Armstrong
2017-05-22 12:59 ` [PATCH 1/2] pinctrl: meson-gxl: Add SPI pins for the SPICC controller Neil Armstrong
2017-05-29  8:13   ` Linus Walleij
2017-05-22 12:59 ` [PATCH 2/2] pinctrl: meson-gxbb: Add SPI pins for " Neil Armstrong
2017-05-29  8:14   ` Linus Walleij

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).