linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] ARM: davinci: da850: Add SPI1 pinmux definitions
@ 2020-09-01 13:15 Esben Haabendal
  2020-09-01 13:15 ` [PATCH 2/2] ARM: davinci: mityomapl138: Ensure pinmux setup of SPI1 pins Esben Haabendal
  2020-09-24 13:47 ` [PATCH 1/2] ARM: davinci: da850: Add SPI1 pinmux definitions Sekhar Nori
  0 siblings, 2 replies; 3+ messages in thread
From: Esben Haabendal @ 2020-09-01 13:15 UTC (permalink / raw)
  To: linux-arm-kernel, Sekhar Nori, Bartosz Golaszewski; +Cc: Russell King

Extend the MUX configuration to allow enabling SPI1 pin functions.

Signed-off-by: Esben Haabendal <esben@geanix.com>
---
 arch/arm/mach-davinci/da850.c            | 13 +++++++++++++
 arch/arm/mach-davinci/include/mach/mux.h | 14 ++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 68156e7239a6..d07ea5dbab65 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -157,6 +157,19 @@ static const struct mux_config da850_pins[] = {
 	MUX_CFG(DA850, MMCSD1_DAT_3,	19,	8,	15,	2,	false)
 	MUX_CFG(DA850, MMCSD1_CLK,	18,	12,	15,	2,	false)
 	MUX_CFG(DA850, MMCSD1_CMD,	18,	16,	15,	2,	false)
+	/* SPI1 function */
+	MUX_CFG(DA850, SPI1_SIMO,	5,	20,	15,	1,	false)
+	MUX_CFG(DA850, SPI1_SOMI,	5,	16,	15,	1,	false)
+	MUX_CFG(DA850, SPI1_ENA,	5,	12,	15,	1,	false)
+	MUX_CFG(DA850, SPI1_CLK,	5,	8,	15,	1,	false)
+	MUX_CFG(DA850, SPI1_SCS0,	5,	4,	15,	1,	false)
+	MUX_CFG(DA850, SPI1_SCS1,	5,	0,	15,	1,	false)
+	MUX_CFG(DA850, SPI1_SCS2,	4,	28,	15,	1,	false)
+	MUX_CFG(DA850, SPI1_SCS3,	4,	24,	15,	1,	false)
+	MUX_CFG(DA850, SPI1_SCS4,	4,	20,	15,	1,	false)
+	MUX_CFG(DA850, SPI1_SCS5,	4,	16,	15,	1,	false)
+	MUX_CFG(DA850, SPI1_SCS6,	4,	12,	15,	1,	false)
+	MUX_CFG(DA850, SPI1_SCS7,	4,	8,	15,	1,	false)
 	/* EMIF2.5/EMIFA function */
 	MUX_CFG(DA850, EMA_D_7,		9,	0,	15,	1,	false)
 	MUX_CFG(DA850, EMA_D_6,		9,	4,	15,	1,	false)
diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
index 631655e68ae0..2340ca92110d 100644
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -865,6 +865,20 @@ enum davinci_da850_index {
 	DA850_MMCSD1_CLK,
 	DA850_MMCSD1_CMD,
 
+	/* SPI1 function */
+	DA850_SPI1_SIMO,
+	DA850_SPI1_SOMI,
+	DA850_SPI1_ENA,
+	DA850_SPI1_CLK,
+	DA850_SPI1_SCS0,
+	DA850_SPI1_SCS1,
+	DA850_SPI1_SCS2,
+	DA850_SPI1_SCS3,
+	DA850_SPI1_SCS4,
+	DA850_SPI1_SCS5,
+	DA850_SPI1_SCS6,
+	DA850_SPI1_SCS7,
+
 	/* EMIF2.5/EMIFA function */
 	DA850_EMA_D_7,
 	DA850_EMA_D_6,
-- 
2.28.0


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

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH 2/2] ARM: davinci: mityomapl138: Ensure pinmux setup of SPI1 pins
  2020-09-01 13:15 [PATCH 1/2] ARM: davinci: da850: Add SPI1 pinmux definitions Esben Haabendal
@ 2020-09-01 13:15 ` Esben Haabendal
  2020-09-24 13:47 ` [PATCH 1/2] ARM: davinci: da850: Add SPI1 pinmux definitions Sekhar Nori
  1 sibling, 0 replies; 3+ messages in thread
From: Esben Haabendal @ 2020-09-01 13:15 UTC (permalink / raw)
  To: linux-arm-kernel, Sekhar Nori, Bartosz Golaszewski; +Cc: Russell King

Let Linux manage pinmux setup of SPI1 pins instead of relying on
bootloader to do this.

This is especially convenient for boards where bootloader update is not
feasible.

Signed-off-by: Esben Haabendal <esben@geanix.com>
---
 arch/arm/mach-davinci/board-mityomapl138.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
index 3382b93d9a2a..44468a804fe8 100644
--- a/arch/arm/mach-davinci/board-mityomapl138.c
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -517,6 +517,12 @@ static const short mityomap_rmii_pins[] = {
 	-1
 };
 
+static const short mityomap_spi1_pins[]  = {
+	DA850_SPI1_SIMO, DA850_SPI1_SOMI, DA850_SPI1_CLK,
+	DA850_SPI1_SCS0,
+	-1,
+};
+
 static void __init mityomapl138_config_emac(void)
 {
 	void __iomem *cfg_chip3_base;
@@ -585,6 +591,10 @@ static void __init mityomapl138_init(void)
 
 	mityomapl138_setup_nand();
 
+	ret = davinci_cfg_reg_list(mityomap_spi1_pins);
+	if (ret)
+		pr_warn("SPI1 pinmux setup failed: %d\n", ret);
+
 	ret = spi_register_board_info(mityomapl138_spi_flash_info,
 				      ARRAY_SIZE(mityomapl138_spi_flash_info));
 	if (ret)
-- 
2.28.0


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

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] ARM: davinci: da850: Add SPI1 pinmux definitions
  2020-09-01 13:15 [PATCH 1/2] ARM: davinci: da850: Add SPI1 pinmux definitions Esben Haabendal
  2020-09-01 13:15 ` [PATCH 2/2] ARM: davinci: mityomapl138: Ensure pinmux setup of SPI1 pins Esben Haabendal
@ 2020-09-24 13:47 ` Sekhar Nori
  1 sibling, 0 replies; 3+ messages in thread
From: Sekhar Nori @ 2020-09-24 13:47 UTC (permalink / raw)
  To: Esben Haabendal, linux-arm-kernel, Bartosz Golaszewski; +Cc: Russell King

On 01/09/20 6:45 PM, Esben Haabendal wrote:
> Extend the MUX configuration to allow enabling SPI1 pin functions.
> 
> Signed-off-by: Esben Haabendal <esben@geanix.com>

These patches also should no be required if we convert over to DT.

Thanks,
Sekhar


_______________________________________________
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] 3+ messages in thread
end of thread, other threads:[~2020-09-24 13:49 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-01 13:15 [PATCH 1/2] ARM: davinci: da850: Add SPI1 pinmux definitions Esben Haabendal
2020-09-01 13:15 ` [PATCH 2/2] ARM: davinci: mityomapl138: Ensure pinmux setup of SPI1 pins Esben Haabendal
2020-09-24 13:47 ` [PATCH 1/2] ARM: davinci: da850: Add SPI1 pinmux definitions Sekhar Nori

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).