Skip to contentSkip to conversation

MSCC: Add Jaguar2 SOC family

PATCH Superseded Horatiu Vultur 3 participants 11 messages Jan 9, 2019

Subsystems (2)

v3 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

v3 cover MSCC: Add Jaguar2 SOC family

This patch series add support for MSCC Jaguar2 SOC family. In this family there are the following boards: Jagaur2(pcb110), Jaguar2-48(pcb111) and Serval2(pcb112).

This is based off the u-boot-mips/next repository

This version address comments from Daniel Schwierzeck <[email protected]>

v3-changes:
- remove any target specific code from mscc-common.c

v2-changes:
- create sysreset driver for Jaguar2
- update pinctrl

Horatiu Vultur (7):
pinctrl: mscc: Add gpio and pinctrl for Jaguar2 SOC family
MSCC: Add support for Jaguar2 SOC family
MSCC: Add device tree for Jaguar2 board
MSCC: Add device tree for Jaguar2-48 board
MSCC: add device tree for Serval2 board
MSCC: Add board support for Jaguar2 SOC family
MSCC: Add sysreset driver for Jaguar2 SOC family

 MAINTAINERS                                        |   4 +
 arch/mips/dts/Makefile                             |   1 +
 arch/mips/dts/jr2_pcb110.dts                       |  74 +++++
 arch/mips/dts/jr2_pcb111.dts                       |  74 +++++
 arch/mips/dts/mscc,jr2.dtsi                        | 187 ++++++++++++
 arch/mips/dts/serval2_pcb112.dts                   |  60 ++++
 arch/mips/mach-mscc/Kconfig                        |   9 +
 arch/mips/mach-mscc/Makefile                       |   5 +-
 arch/mips/mach-mscc/cpu.c                          |   7 +
 arch/mips/mach-mscc/dram.c                         |   2 +-
 arch/mips/mach-mscc/include/mach/common.h          |   5 +
 arch/mips/mach-mscc/include/mach/ddr.h             |  38 ++-
 arch/mips/mach-mscc/include/mach/jr2/jr2.h         |  24 ++
 .../mach-mscc/include/mach/jr2/jr2_devcpu_gcb.h    |  20 ++
 .../include/mach/jr2/jr2_devcpu_gcb_miim_regs.h    |  25 ++
 .../mips/mach-mscc/include/mach/jr2/jr2_icpu_cfg.h | 321 +++++++++++++++++++++
 board/mscc/common/Makefile                         |   4 +
 board/mscc/common/spi.c                            |  31 ++
 board/mscc/jr2/Kconfig                             |  15 +
 board/mscc/jr2/Makefile                            |   4 +
 board/mscc/jr2/jr2.c                               | 125 ++++++++
 board/mscc/ocelot/ocelot.c                         |  22 --
 configs/mscc_jr2_defconfig                         |  61 ++++
 drivers/pinctrl/mscc/Kconfig                       |   9 +
 drivers/pinctrl/mscc/Makefile                      |   1 +
 drivers/pinctrl/mscc/mscc-common.c                 |  90 ++++--
 drivers/pinctrl/mscc/mscc-common.h                 |  17 +-
 drivers/pinctrl/mscc/pinctrl-jr2.c                 | 315 ++++++++++++++++++++
 drivers/pinctrl/mscc/pinctrl-luton.c               |  16 +-
 drivers/pinctrl/mscc/pinctrl-ocelot.c              |  16 +-
 drivers/sysreset/Kconfig                           |   6 +
 drivers/sysreset/Makefile                          |   1 +
 drivers/sysreset/sysreset_jr2.c                    |  46 +++
 33 files changed, 1574 insertions(+), 61 deletions(-)
 create mode 100644 arch/mips/dts/jr2_pcb110.dts
 create mode 100644 arch/mips/dts/jr2_pcb111.dts
 create mode 100644 arch/mips/dts/mscc,jr2.dtsi
 create mode 100644 arch/mips/dts/serval2_pcb112.dts
 create mode 100644 arch/mips/mach-mscc/include/mach/jr2/jr2.h
 create mode 100644 arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb.h
 create mode 100644 arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb_miim_regs.h
 create mode 100644 arch/mips/mach-mscc/include/mach/jr2/jr2_icpu_cfg.h
 create mode 100644 board/mscc/common/Makefile
 create mode 100644 board/mscc/common/spi.c
 create mode 100644 board/mscc/jr2/Kconfig
 create mode 100644 board/mscc/jr2/Makefile
 create mode 100644 board/mscc/jr2/jr2.c
 create mode 100644 configs/mscc_jr2_defconfig
 create mode 100644 drivers/pinctrl/mscc/pinctrl-jr2.c
 create mode 100644 drivers/sysreset/sysreset_jr2.c
Signature · 1 line
2.7.4
#1 lore raw

PATCH v3 1/7 pinctrl: mscc: Add gpio and pinctrl for Jaguar2 SOC family

The Jaguar2 SOC family has 63 gpio pins therefore I extended mscc-common to support new numbe of pins and remove any platform dependency from mscc-common.

---
 MAINTAINERS                           |   1 +
 drivers/pinctrl/mscc/Kconfig          |   9 +
 drivers/pinctrl/mscc/Makefile         |   1 +
 drivers/pinctrl/mscc/mscc-common.c    |  90 +++++++---
 drivers/pinctrl/mscc/mscc-common.h    |  17 +-
 drivers/pinctrl/mscc/pinctrl-jr2.c    | 315 ++++++++++++++++++++++++++++++++++
 drivers/pinctrl/mscc/pinctrl-luton.c  |  16 +-
 drivers/pinctrl/mscc/pinctrl-ocelot.c |  16 +-
 8 files changed, 436 insertions(+), 29 deletions(-)
 create mode 100644 drivers/pinctrl/mscc/pinctrl-jr2.c
MAINTAINERS +1 -0
index 494962e..495d3e5 100644
@@ -525,6 +525,7 @@ F:	board/mscc/
 F:	configs/mscc*
 F:	drivers/gpio/mscc_sgpio.c
 F:	include/configs/vcoreiii.h
+F:	drivers/pinctrl/mscc/
 
 MIPS JZ4780
 M:	Ezequiel Garcia <[email protected]>
drivers/pinctrl/mscc/Kconfig +9 -0
index cfc6c06..d07ea1b 100644
@@ -20,3 +20,12 @@ config PINCTRL_MSCC_LUTON
 	help
 	   Support pin multiplexing and pin configuration control on
 	   Microsemi luton SoCs.
+
+config PINCTRL_MSCC_JR2
+	depends on SOC_JR2 && PINCTRL_FULL && OF_CONTROL
+	select PINCTRL_MSCC
+	default y
+	bool "Microsemi jr2 family pin control driver"
+	help
+	    Support pin multiplexing and pin configuration control on
+	    Microsemi jr2 SoCs.
drivers/pinctrl/mscc/Makefile +1 -0
index 6910671..8038d54 100644
@@ -3,3 +3,4 @@
 obj-y += mscc-common.o
 obj-$(CONFIG_PINCTRL_MSCC_OCELOT) += pinctrl-ocelot.o
 obj-$(CONFIG_PINCTRL_MSCC_LUTON) += pinctrl-luton.o
+obj-$(CONFIG_PINCTRL_MSCC_JR2) += pinctrl-jr2.o
drivers/pinctrl/mscc/mscc-common.c +64 -26

164 lines not on this page · raw message

drivers/pinctrl/mscc/mscc-common.h +16 -1
index b0001db..3c5c1fa 100644
@@ -9,6 +9,19 @@
 
 #define MSCC_FUNC_PER_PIN	4
 
+enum mscc_regs_gpio {
+	MSCC_GPIO_OUT_SET,
+	MSCC_GPIO_OUT_CLR,
+	MSCC_GPIO_OUT,
+	MSCC_GPIO_IN,
+	MSCC_GPIO_OE,
+	MSCC_GPIO_INTR,
+	MSCC_GPIO_INTR_ENA,
+	MSCC_GPIO_INTR_IDENT,
+	MSCC_GPIO_ALT0,
+	MSCC_GPIO_ALT1,
+};
+
 struct mscc_pin_caps {
 	unsigned int pin;
 	unsigned char functions[MSCC_FUNC_PER_PIN];
@@ -41,11 +54,13 @@ struct mscc_pinctrl {
 	const struct mscc_pin_data *mscc_pins;
 	int num_pins;
 	char * const *function_names;
+	const unsigned long *mscc_gpios;
 };
 
 int mscc_pinctrl_probe(struct udevice *dev, int num_func,
 		       const struct mscc_pin_data *mscc_pins, int num_pins,
-		       char * const *function_names);
+		       char * const *function_names,
+		       const unsigned long *mscc_gpios);
 const struct pinctrl_ops mscc_pinctrl_ops;
 
 const struct dm_gpio_ops mscc_gpio_ops;
drivers/pinctrl/mscc/pinctrl-jr2.c new file +315 -0

315 lines not on this page · raw message

drivers/pinctrl/mscc/pinctrl-luton.c +15 -1
index 7166588..8c636ff 100644
@@ -123,6 +123,19 @@ static const struct mscc_pin_data luton_pins[] = {
 	LUTON_PIN(31),
 };
 
+const unsigned long luton_gpios[] = {
+	[MSCC_GPIO_OUT_SET] = 0x00,
+	[MSCC_GPIO_OUT_CLR] = 0x04,
+	[MSCC_GPIO_OUT] = 0x08,
+	[MSCC_GPIO_IN] = 0x0c,
+	[MSCC_GPIO_OE] = 0x10,
+	[MSCC_GPIO_INTR] = 0x14,
+	[MSCC_GPIO_INTR_ENA] = 0x18,
+	[MSCC_GPIO_INTR_IDENT] = 0x1c,
+	[MSCC_GPIO_ALT0] = 0x20,
+	[MSCC_GPIO_ALT1] = 0x24,
+};
+
 static int luton_gpio_probe(struct udevice *dev)
 {
 	struct gpio_dev_priv *uc_priv;
@@ -146,7 +159,8 @@ int luton_pinctrl_probe(struct udevice *dev)
 	int ret;
 
 	ret = mscc_pinctrl_probe(dev, FUNC_MAX, luton_pins,
-				 ARRAY_SIZE(luton_pins), luton_function_names);
+				 ARRAY_SIZE(luton_pins), luton_function_names,
+				 luton_gpios);
 
 	if (ret)
 		return ret;
drivers/pinctrl/mscc/pinctrl-ocelot.c +15 -1
index 10f9b90..fb02061 100644
@@ -138,6 +138,19 @@ static const struct mscc_pin_data ocelot_pins[] = {
 	OCELOT_PIN(21),
 };
 
+const unsigned long ocelot_gpios[] = {
+	[MSCC_GPIO_OUT_SET] = 0x00,
+	[MSCC_GPIO_OUT_CLR] = 0x04,
+	[MSCC_GPIO_OUT] = 0x08,
+	[MSCC_GPIO_IN] = 0x0c,
+	[MSCC_GPIO_OE] = 0x10,
+	[MSCC_GPIO_INTR] = 0x14,
+	[MSCC_GPIO_INTR_ENA] = 0x18,
+	[MSCC_GPIO_INTR_IDENT] = 0x1c,
+	[MSCC_GPIO_ALT0] = 0x20,
+	[MSCC_GPIO_ALT1] = 0x24,
+};
+
 static int ocelot_gpio_probe(struct udevice *dev)
 {
 	struct gpio_dev_priv *uc_priv;
@@ -162,7 +175,8 @@ int ocelot_pinctrl_probe(struct udevice *dev)
 
 	ret = mscc_pinctrl_probe(dev, FUNC_MAX, ocelot_pins,
 				 ARRAY_SIZE(ocelot_pins),
-				 ocelot_function_names);
+				 ocelot_function_names,
+				 ocelot_gpios);
 
 	if (ret)
 		return ret;
Signature · 1 line
2.7.4
#2 lore raw

PATCH v3 1/7 pinctrl: mscc: Add gpio and pinctrl for Jaguar2 SOC family

Am 09.01.19 um 09:25 schrieb Horatiu Vultur:

Quoted 5 lines

The Jaguar2 SOC family has 63 gpio pins therefore I extended mscc-common to support new numbe of pins and remove any platform dependency from mscc-common.

Quoted 12 lines
---
 MAINTAINERS                           |   1 +
 drivers/pinctrl/mscc/Kconfig          |   9 +
 drivers/pinctrl/mscc/Makefile         |   1 +
 drivers/pinctrl/mscc/mscc-common.c    |  90 +++++++---
 drivers/pinctrl/mscc/mscc-common.h    |  17 +-
 drivers/pinctrl/mscc/pinctrl-jr2.c    | 315 ++++++++++++++++++++++++++++++++++
 drivers/pinctrl/mscc/pinctrl-luton.c  |  16 +-
 drivers/pinctrl/mscc/pinctrl-ocelot.c |  16 +-
 8 files changed, 436 insertions(+), 29 deletions(-)
 create mode 100644 drivers/pinctrl/mscc/pinctrl-jr2.c
Signature · 1 line
- Daniel
#3 lore raw

PATCH v3 2/7 MSCC: Add support for Jaguar2 SOC family

In reply to Horatiu Vultur

As the Ocelot and Luton SoCs, this family of SoCs are found in Microsemi Switches solution.

---
 arch/mips/mach-mscc/Kconfig                        |   9 +
 arch/mips/mach-mscc/cpu.c                          |   7 +
 arch/mips/mach-mscc/dram.c                         |   2 +-
 arch/mips/mach-mscc/include/mach/common.h          |   5 +
 arch/mips/mach-mscc/include/mach/ddr.h             |  38 ++-
 arch/mips/mach-mscc/include/mach/jr2/jr2.h         |  24 ++
 .../mach-mscc/include/mach/jr2/jr2_devcpu_gcb.h    |  20 ++
 .../include/mach/jr2/jr2_devcpu_gcb_miim_regs.h    |  25 ++
 .../mips/mach-mscc/include/mach/jr2/jr2_icpu_cfg.h | 321 +++++++++++++++++++++
 9 files changed, 443 insertions(+), 8 deletions(-)
 create mode 100644 arch/mips/mach-mscc/include/mach/jr2/jr2.h
 create mode 100644 arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb.h
 create mode 100644 arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb_miim_regs.h
 create mode 100644 arch/mips/mach-mscc/include/mach/jr2/jr2_icpu_cfg.h
arch/mips/mach-mscc/Kconfig +9 -0
index 37ef432..fc6aa03 100644
@@ -33,6 +33,13 @@ config SOC_LUTON
 	help
 	  This supports MSCC Luton family of SOCs.
 
+config SOC_JR2
+	bool "Jaguar2 SOC Family"
+	select SOC_VCOREIII
+	select DESIGNWARE_SPI
+	help
+	  This supports MSCC Jaguar2 family of SOCs.
+
 endchoice
 
 config SYS_CONFIG_NAME
@@ -65,4 +72,6 @@ source "board/mscc/ocelot/Kconfig"
 
 source "board/mscc/luton/Kconfig"
 
+source "board/mscc/jr2/Kconfig"
+
 endmenu
arch/mips/mach-mscc/cpu.c +7 -0
index 5be8ff6..4729b7a 100644
@@ -87,8 +87,15 @@ int mach_cpu_init(void)
 	       ICPU_SPI_MST_CFG_CS_DESELECT_TIME(0x19) +
 	       ICPU_SPI_MST_CFG_CLK_DIV(9), BASE_CFG + ICPU_SPI_MST_CFG);
 #else
+#ifdef CONFIG_SOC_OCELOT
 	writel(ICPU_SPI_MST_CFG_CS_DESELECT_TIME(0x19) +
 	       ICPU_SPI_MST_CFG_CLK_DIV(9), BASE_CFG + ICPU_SPI_MST_CFG);
+#endif
+#ifdef CONFIG_SOC_JR2
+	writel(ICPU_SPI_MST_CFG_FAST_READ_ENA +
+	       ICPU_SPI_MST_CFG_CS_DESELECT_TIME(0x19) +
+	       ICPU_SPI_MST_CFG_CLK_DIV(14), BASE_CFG + ICPU_SPI_MST_CFG);
+#endif
 	/*
 	 * Legacy and mainline linux kernel expect that the
 	 * interruption map was set as it was done by redboot.
arch/mips/mach-mscc/dram.c +1 -1
index 309007c..8002e07 100644
@@ -19,7 +19,7 @@ static inline int vcoreiii_train_bytelane(void)
 
 	ret = hal_vcoreiii_train_bytelane(0);
 
-#ifdef CONFIG_SOC_OCELOT
+#if defined(CONFIG_SOC_OCELOT) || defined(CONFIG_SOC_JR2)
 	if (ret)
 		return ret;
 	ret = hal_vcoreiii_train_bytelane(1);
arch/mips/mach-mscc/include/mach/common.h +5 -0
index d18ae78..9cb2fbb 100644
@@ -16,6 +16,11 @@
 #include <mach/luton/luton_devcpu_gcb.h>
 #include <mach/luton/luton_devcpu_gcb_miim_regs.h>
 #include <mach/luton/luton_icpu_cfg.h>
+#elif defined(CONFIG_SOC_JR2)
+#include <mach/jr2/jr2.h>
+#include <mach/jr2/jr2_devcpu_gcb.h>
+#include <mach/jr2/jr2_devcpu_gcb_miim_regs.h>
+#include <mach/jr2/jr2_icpu_cfg.h>
 #else
 #error Unsupported platform
 #endif
arch/mips/mach-mscc/include/mach/ddr.h +31 -7
index f445e63..7552acb 100644
@@ -161,7 +161,7 @@
 
 #endif
 
-#ifdef CONFIG_SOC_OCELOT
+#if defined(CONFIG_SOC_OCELOT) || defined(CONFIG_SOC_JR2)
 #define MIPS_VCOREIII_MEMORY_16BIT 1
 #endif
 
@@ -239,7 +239,7 @@
 	ICPU_MEMCTRL_CFG_MSB_ROW_ADDR(VC3_MPAR_row_addr_cnt - 1) |	\
 	ICPU_MEMCTRL_CFG_MSB_COL_ADDR(VC3_MPAR_col_addr_cnt - 1)
 
-#ifdef CONFIG_SOC_OCELOT
+#if defined(CONFIG_SOC_OCELOT) || defined(CONFIG_SOC_JR2)
 #define MSCC_MEMPARM_PERIOD					\
 	ICPU_MEMCTRL_REF_PERIOD_MAX_PEND_REF(8) |		\
 	ICPU_MEMCTRL_REF_PERIOD_REF_PERIOD(VC3_MPAR_tREFI)
@@ -378,7 +378,7 @@ static inline void memphy_soft_reset(void)
 	PAUSE();
 }
 
-#ifdef CONFIG_SOC_OCELOT
+#if defined(CONFIG_SOC_OCELOT) || defined(CONFIG_SOC_JR2)
 static u8 training_data[] = { 0xfe, 0x11, 0x33, 0x55, 0x77, 0x99, 0xbb, 0xdd };
 
 static inline void sleep_100ns(u32 val)
@@ -398,6 +398,7 @@ static inline void sleep_100ns(u32 val)
 		;
 }
 
+#if defined(CONFIG_SOC_OCELOT)
 static inline void hal_vcoreiii_ddr_reset_assert(void)
 {
 	/* DDR has reset pin on GPIO 19 toggle Low-High to release */
@@ -448,6 +449,26 @@ static inline void hal_vcoreiii_ddr_failed(void)
 
 	panic("DDR init failed\n");
 }
+#else				/* JR2 */
+static inline void hal_vcoreiii_ddr_reset_assert(void)
+{
+	/* Ensure the memory controller physical iface is forced reset */
+	writel(readl(BASE_CFG + ICPU_MEMPHY_CFG) |
+	       ICPU_MEMPHY_CFG_PHY_RST, BASE_CFG + ICPU_MEMPHY_CFG);
+
+	/* Ensure the memory controller is forced reset */
+	writel(readl(BASE_CFG + ICPU_RESET) |
+	       ICPU_RESET_MEM_RST_FORCE, BASE_CFG + ICPU_RESET);
+}
+
+static inline void hal_vcoreiii_ddr_failed(void)
+{
+	writel(0, BASE_CFG + ICPU_RESET);
+	writel(PERF_SOFT_RST_SOFT_CHIP_RST, BASE_CFG + PERF_SOFT_RST);
+
+	panic("DDR init failed\n");
+}
+#endif
 
 /*
  * DDR memory sanity checking done, possibly enable ECC.
@@ -738,7 +759,7 @@ static inline void hal_vcoreiii_init_memctl(void)
 	/* Wait for ZCAL to clear */
 	while (readl(BASE_CFG + ICPU_MEMPHY_ZCAL) & ICPU_MEMPHY_ZCAL_ZCAL_ENA)
 		;
-#ifdef CONFIG_SOC_OCELOT
+#if defined(CONFIG_SOC_OCELOT) || defined(CONFIG_SOC_JR2)
 	/* Check no ZCAL_ERR */
 	if (readl(BASE_CFG + ICPU_MEMPHY_ZCAL_STAT)
 	    & ICPU_MEMPHY_ZCAL_STAT_ZCAL_ERR)
@@ -752,7 +773,7 @@ static inline void hal_vcoreiii_init_memctl(void)
 	writel(MSCC_MEMPARM_MEMCFG, BASE_CFG + ICPU_MEMCTRL_CFG);
 	writel(MSCC_MEMPARM_PERIOD, BASE_CFG + ICPU_MEMCTRL_REF_PERIOD);
 
-#ifdef CONFIG_SOC_OCELOT
+#if defined(CONFIG_SOC_OCELOT) || defined(CONFIG_SOC_JR2)
 	writel(MSCC_MEMPARM_TIMING0, BASE_CFG + ICPU_MEMCTRL_TIMING0);
 #else /* Luton */
 	clrbits_le32(BASE_CFG + ICPU_MEMCTRL_TIMING0, ((1 << 20) - 1));
@@ -767,7 +788,7 @@ static inline void hal_vcoreiii_init_memctl(void)
 	writel(MSCC_MEMPARM_MR2, BASE_CFG + ICPU_MEMCTRL_MR2_VAL);
 	writel(MSCC_MEMPARM_MR3, BASE_CFG + ICPU_MEMCTRL_MR3_VAL);
 
-#ifdef CONFIG_SOC_OCELOT
+#if defined(CONFIG_SOC_OCELOT)
 	/* Termination setup - enable ODT */
 	writel(ICPU_MEMCTRL_TERMRES_CTRL_LOCAL_ODT_RD_ENA |
 	       /* Assert ODT0 for any write */
@@ -778,6 +799,9 @@ static inline void hal_vcoreiii_init_memctl(void)
 	hal_vcoreiii_ddr_reset_release();
 
 	writel(readl(BASE_CFG + ICPU_GPR(7)) + 1, BASE_CFG + ICPU_GPR(7));
+#elif defined(CONFIG_SOC_JR2)
+	writel(ICPU_MEMCTRL_TERMRES_CTRL_ODT_WR_ENA(3),
+	       BASE_CFG + ICPU_MEMCTRL_TERMRES_CTRL);
 #else				/* Luton */
 	/* Termination setup - disable ODT */
 	writel(0, BASE_CFG + ICPU_MEMCTRL_TERMRES_CTRL);
@@ -796,7 +820,7 @@ static inline void hal_vcoreiii_wait_memctl(void)
 
 	/* Settle...? */
 	sleep_100ns(10000);
-#ifdef CONFIG_SOC_OCELOT
+#if defined(CONFIG_SOC_OCELOT) || defined(CONFIG_SOC_JR2)
 	/* Establish data contents in DDR RAM for training */
 
 	__raw_writel(0xcacafefe, ((void __iomem *)MSCC_DDR_TO));
arch/mips/mach-mscc/include/mach/jr2/jr2.h new file +24 -0
new file mode 100644
index 0000000..67244f6
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Microsemi Jaguar2 Switch driver
+ *
+ * Copyright (c) 2018 Microsemi Corporation
+ */
+
+#ifndef _MSCC_JR2_H_
+#define _MSCC_JR2_H_
+
+#include <linux/bitops.h>
+#include <dm.h>
+
+/*
+ * Target offset base(s)
+ */
+#define MSCC_IO_ORIGIN1_OFFSET 0x70000000
+#define MSCC_IO_ORIGIN1_SIZE   0x00200000
+#define MSCC_IO_ORIGIN2_OFFSET 0x71000000
+#define MSCC_IO_ORIGIN2_SIZE   0x01000000
+#define BASE_CFG        ((void __iomem *)0x70000000)
+#define BASE_DEVCPU_GCB ((void __iomem *)0x71010000)
+
+#endif
arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb.h new file +20 -0
new file mode 100644
index 0000000..4a1228d
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2018 Microsemi Corporation
+ */
+
+#ifndef _MSCC_JR2_DEVCPU_GCB_H_
+#define _MSCC_JR2_DEVCPU_GCB_H_
+
+#define PERF_GPR                                          0x4
+
+#define PERF_SOFT_RST                                     0x8
+
+#define PERF_SOFT_RST_SOFT_NON_CFG_RST                    BIT(2)
+#define PERF_SOFT_RST_SOFT_SWC_RST                        BIT(1)
+#define PERF_SOFT_RST_SOFT_CHIP_RST                       BIT(0)
+
+#define GPIO_GPIO_ALT(x)                                  (0x78 + 4 * (x))
+#define GPIO_GPIO_ALT1(x)                                 (0x80 + 4 * (x))
+
+#endif
arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb_miim_regs.h new file +25 -0
new file mode 100644
index 0000000..3c84edc
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2018 Microsemi Corporation
+ */
+
+#ifndef _MSCC_JR2_DEVCPU_GCB_MIIM_REGS_H_
+#define _MSCC_JR2_DEVCPU_GCB_MIIM_REGS_H_
+
+#define MIIM_MII_STATUS(gi)  (0xc8 + (gi * 36))
+#define MIIM_MII_CMD(gi)     (0xd0 + (gi * 36))
+#define MIIM_MII_DATA(gi)    (0xd4 + (gi * 36))
+
+#define  MSCC_F_MII_STATUS_MIIM_STAT_BUSY(x)  ((x) ? BIT(3) : 0)
+
+#define MSCC_F_MII_CMD_MIIM_CMD_VLD(x)        ((x) ? BIT(31) : 0)
+#define MSCC_F_MII_CMD_MIIM_CMD_PHYAD(x)      (GENMASK(29, 25) & ((x) << 25))
+#define MSCC_F_MII_CMD_MIIM_CMD_REGAD(x)      (GENMASK(24, 20) & ((x) << 20))
+#define MSCC_F_MII_CMD_MIIM_CMD_WRDATA(x)     (GENMASK(19, 4) & ((x) << 4))
+#define MSCC_F_MII_CMD_MIIM_CMD_OPR_FIELD(x)  (GENMASK(2, 1) & ((x) << 1))
+#define MSCC_F_MII_CMD_MIIM_CMD_SCAN(x)       ((x) ? BIT(0) : 0)
+
+#define MSCC_M_MII_DATA_MIIM_DATA_SUCCESS     GENMASK(17, 16)
+#define MSCC_X_MII_DATA_MIIM_DATA_RDDATA(x)   (((x) >> 0) & GENMASK(15, 0))
+
+#endif
arch/mips/mach-mscc/include/mach/jr2/jr2_icpu_cfg.h new file +321 -0

321 lines not on this page · raw message

Signature · 1 line
2.7.4
#4 lore raw

PATCH v3 3/7 MSCC: Add device tree for Jaguar2 board

In reply to Horatiu Vultur

Add device tree based on evaluation board pcb110.

---
 MAINTAINERS                  |   1 +
 arch/mips/dts/jr2_pcb110.dts |  74 +++++++++++++++++
 arch/mips/dts/mscc,jr2.dtsi  | 187 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 262 insertions(+)
 create mode 100644 arch/mips/dts/jr2_pcb110.dts
 create mode 100644 arch/mips/dts/mscc,jr2.dtsi
MAINTAINERS +1 -0
index 495d3e5..f05c36b 100644
@@ -521,6 +521,7 @@ F:	arch/mips/mach-mscc/
 F:	arch/mips/dts/luton*
 F:	arch/mips/dts/mscc*
 F:	arch/mips/dts/ocelot*
+F:	arch/mips/dts/jr2*
 F:	board/mscc/
 F:	configs/mscc*
 F:	drivers/gpio/mscc_sgpio.c
arch/mips/dts/jr2_pcb110.dts new file +74 -0

74 lines not on this page · raw message

arch/mips/dts/mscc,jr2.dtsi new file +187 -0

187 lines not on this page · raw message

Signature · 1 line
2.7.4
#5 lore raw

PATCH v3 3/7 MSCC: Add device tree for Jaguar2 board

Hi Horatiu,

Quoted 214 lines · Horatiu Vultur

Add device tree based on evaluation board pcb110.

---
 MAINTAINERS                  |   1 +
 arch/mips/dts/jr2_pcb110.dts |  74 +++++++++++++++++
 arch/mips/dts/mscc,jr2.dtsi  | 187 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 262 insertions(+)
 create mode 100644 arch/mips/dts/jr2_pcb110.dts
 create mode 100644 arch/mips/dts/mscc,jr2.dtsi
MAINTAINERS +1 -0
index 495d3e5..f05c36b 100644
@@ -521,6 +521,7 @@ F:	arch/mips/mach-mscc/
 F:	arch/mips/dts/luton*
 F:	arch/mips/dts/mscc*
 F:	arch/mips/dts/ocelot*
+F:	arch/mips/dts/jr2*
 F:	board/mscc/
 F:	configs/mscc*
 F:	drivers/gpio/mscc_sgpio.c
arch/mips/dts/jr2_pcb110.dts new file +74 -0
new file mode 100644
index 0000000..54b8988
@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2018 Microsemi Corporation
+ */
+
+/dts-v1/;
+#include "mscc,jr2.dtsi"
+
+/ {
+	model = "Jaguar2 Cu8-Sfp16 PCB110 Reference Board";
+	compatible = "mscc,jr2-pcb110", "mscc,jr2";
+
+	aliases {
+		spi0 = &spi0;
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		status_green {
+			label = "pcb110:green:status";
+			gpios = <&gpio 12 0>;
+			default-state = "on";
+		};
+
+		status_red {
+			label = "pcb110:red:status";
+			gpios = <&gpio 13 0>;
+			default-state = "off";
+		};
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
+
+&spi0 {
+	status = "okay";
+	spi-flash at 0 {
+		compatible = "spi-flash";
+		spi-max-frequency = <18000000>; /* input clock */
+		reg = <0>; /* CS0 */
+	};
+};
+
+&gpio {
+	/* SPIO only use DO, CLK, no inputs */
+	sgpio1_pins: sgpio1-pins {
+		pins = "GPIO_4", "GPIO_5";
+		function = "sio1";
+	};
+};
+
+&sgpio {
+	status = "okay";
+	sgpio-ports = <0x00ffffff>;
+};
+
+&sgpio1 {
+	status = "okay";
+	sgpio-ports = <0x00ff0000>;
+};
+
+&sgpio2 {
+	status = "okay";
+	sgpio-ports = <0x3f00ffff>;
+	gpio-ranges = <&sgpio2 0 0 96>;
+};
arch/mips/dts/mscc,jr2.dtsi new file +105 -0
new file mode 100644
index 0000000..1ae7873
@@ -0,0 +1,187 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2018 Microsemi Corporation
+ */
+
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+	compatible = "mscc,jr2";
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu at 0 {
+			compatible = "mips,mips24KEc";
+			device_type = "cpu";
+			clocks = <&cpu_clk>;
+			reg = <0>;
+		};
+	};
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	cpuintc: interrupt-controller at 0 {
+		#address-cells = <0>;
+		#interrupt-cells = <1>;
+		interrupt-controller;
+		compatible = "mti,cpu-interrupt-controller";
+	};
+
+	cpu_clk: cpu-clock {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <500000000>;
+	};
+
+	ahb_clk: ahb-clk {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <250000000>;
+	};
+
+	ahb {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges = <0 0x70000000 0x2000000>;
+
+		interrupt-parent = <&intc>;
+
+		cpu_ctrl: syscon at 0 {
+			compatible = "mscc,jr2-cpu-syscon", "syscon";
+			reg = <0x0 0x2c>;
+		};
+
+		intc: interrupt-controller at 70 {
+			compatible = "mscc,jr2-icpu-intr";
+			reg = <0x70 0x94>;
+			#interrupt-cells = <1>;
+			interrupt-controller;
+			interrupt-parent = <&cpuintc>;
+			interrupts = <2>;
+		};
+
+		uart0: serial at 100000 {
+			pinctrl-0 = <&uart_pins>;
+			pinctrl-names = "default";
+			compatible = "ns16550a";
+			reg = <0x100000 0x20>;
+			interrupts = <6>;
+			clocks = <&ahb_clk>;
+			reg-io-width = <4>;
+			reg-shift = <2>;
+
+			status = "disabled";
+		};
+
+		uart2: serial at 100800 {
+			pinctrl-0 = <&uart2_pins>;
+			pinctrl-names = "default";
+			compatible = "ns16550a";
+			reg = <0x100800 0x20>;
+			interrupts = <7>;
+			clocks = <&ahb_clk>;
+			reg-io-width = <4>;
+			reg-shift = <2>;
+
+			status = "disabled";
+		};
+
+		spi0: spi-master at 101000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "snps,dw-apb-ssi";
+			reg = <0x101000 0x40>;
+			num-chipselect = <4>;
+			bus-num = <0>;
+			reg-io-width = <4>;
+			reg-shift = <2>;
+			spi-max-frequency = <18000000>; /* input clock */
+			clocks = <&ahb_clk>;
+

arch/mips/dts/mscc,jr2.dtsi line 115

Quoted 10 lines
arch/mips/dts/mscc,jr2.dtsi new file +10 -0
+			status = "disabled";
+		};
+
+		reset at 1010008 {
+			compatible = "mscc,jr2-chip-reset";
+			reg = <0x1010008 0x4>;
+		};
+
+		gpio: pinctrl at 1070034 {
+			compatible = "mscc,jr2-pinctrl";

Actually the binding for the pin controller of the Jaguar 2 had already been posted for the Linux kernel. So in order to be able to use the same dts between Linux and U-Boot and should be good to use the same binding:

https://elixir.bootlin.com/linux/v5.0-rc1/source/Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.txt#L6

Gregory

Quoted 75 lines
arch/mips/dts/mscc,jr2.dtsi new file +72 -0
+			reg = <0x1010038 0x90>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			gpio-ranges = <&gpio 0 0 64>;
+
+			sgpio_pins: sgpio-pins {
+				pins = "GPIO_0", "GPIO_1", "GPIO_2", "GPIO_3";
+				function = "sio";
+			};
+
+			sgpio1_pins: sgpio1-pins {
+				pins = "GPIO_4", "GPIO_5", "GPIO_12", "GPIO_13";
+				function = "sio1";
+			};
+
+			sgpio2_pins: sgpio2-pins {
+				pins = "GPIO_30", "GPIO_31",
+				       "GPIO_32", "GPIO_33";
+				function = "sio2";
+			};
+
+			uart_pins: uart-pins {
+				pins = "GPIO_10", "GPIO_11";
+				function = "uart";
+			};
+
+			uart2_pins: uart2-pins {
+				pins = "GPIO_24", "GPIO_25";
+				function = "uart2";
+			};
+		};
+
+		sgpio: gpio at 1010150 {
+			compatible = "mscc,ocelot-sgpio";
+			status = "disabled";
+			pinctrl-0 = <&sgpio_pins>;
+			pinctrl-names = "default";
+			reg = <0x1010150 0x100>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			gpio-ranges = <&sgpio 0 0 64>;
+			gpio-bank-name = "sgpio0_";
+			sgpio-clock = <0x14>;
+		};
+
+		sgpio1: gpio at 101025c {
+			compatible = "mscc,ocelot-sgpio";
+			status = "disabled";
+			pinctrl-0 = <&sgpio1_pins>;
+			pinctrl-names = "default";
+			reg = <0x101025c 0x100>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			gpio-ranges = <&sgpio1 0 0 64>;
+			gpio-bank-name = "sgpio1_";
+			sgpio-clock = <0x14>;
+		};
+
+		sgpio2: gpio at 1010368 {
+			compatible = "mscc,ocelot-sgpio";
+			status = "disabled";
+			pinctrl-0 = <&sgpio2_pins>;
+			pinctrl-names = "default";
+			reg = <0x1010368 0x100>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			gpio-ranges = <&sgpio2 0 0 64>;
+			gpio-bank-name = "sgpio2_";
+			sgpio-clock = <0x14>;
+		};
+	};
+};
Signature · 1 line
2.7.4
Signature · 3 lines
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com
#6 lore raw

PATCH v3 4/7 MSCC: Add device tree for Jaguar2-48 board

In reply to Horatiu Vultur

Add device tree based on evaluation board pcb111.

---
 arch/mips/dts/jr2_pcb111.dts | 74 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 arch/mips/dts/jr2_pcb111.dts
arch/mips/dts/jr2_pcb111.dts new file +74 -0
new file mode 100644
index 0000000..f1af66f
@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2018 Microsemi Corporation
+ */
+
+/dts-v1/;
+#include "mscc,jr2.dtsi"
+
+/ {
+	model = "Jaguar2 Cu48 PCB111 Reference Board";
+	compatible = "mscc,jr2-pcb111", "mscc,jr2";
+
+	aliases {
+		spi0 = &spi0;
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		status_green {
+			label = "pcb111:green:status";
+			gpios = <&gpio 12 0>;
+			default-state = "on";
+		};
+
+		status_red {
+			label = "pcb111:red:status";
+			gpios = <&gpio 13 0>;
+			default-state = "off";
+		};
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
+
+&spi0 {
+	status = "okay";
+	spi-flash at 0 {
+		compatible = "spi-flash";
+		spi-max-frequency = <18000000>; /* input clock */
+		reg = <0>; /* CS0 */
+	};
+};
+
+&gpio {
+	/* SPIO only use DO, CLK, no inputs */
+	sgpio1_pins: sgpio1-pins {
+		pins = "GPIO_4", "GPIO_5";
+		function = "sio1";
+	};
+};
+
+&sgpio {
+	status = "okay";
+	sgpio-ports = <0xffffffff>;
+};
+
+&sgpio1 {
+	status = "okay";
+	sgpio-ports = <0x001effff>;
+};
+
+&sgpio2 {
+	status = "okay";
+	sgpio-ports = <0xff000000>;
+	gpio-ranges = <&sgpio2 0 0 96>;
+};
Signature · 1 line
2.7.4
#7 lore raw

PATCH v3 5/7 MSCC: add device tree for Serval2 board

In reply to Horatiu Vultur

Add device tree based on evaluation board pcb112.

---
 MAINTAINERS                      |  1 +
 arch/mips/dts/serval2_pcb112.dts | 60 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 arch/mips/dts/serval2_pcb112.dts
MAINTAINERS +1 -0
index f05c36b..d42736b 100644
@@ -522,6 +522,7 @@ F:	arch/mips/dts/luton*
 F:	arch/mips/dts/mscc*
 F:	arch/mips/dts/ocelot*
 F:	arch/mips/dts/jr2*
+F:	arch/mips/dts/serval*
 F:	board/mscc/
 F:	configs/mscc*
 F:	drivers/gpio/mscc_sgpio.c
arch/mips/dts/serval2_pcb112.dts new file +60 -0

60 lines not on this page · raw message

Signature · 1 line
2.7.4
#8 lore raw

PATCH v3 6/7 MSCC: Add board support for Jaguar2 SOC family

In reply to Horatiu Vultur

Add board support and configuration for Jaguar2 SOC family. The detection of the board type in this family is based on the phy ids.

---
 arch/mips/dts/Makefile       |   1 +
 arch/mips/mach-mscc/Makefile |   5 +-
 board/mscc/common/Makefile   |   4 ++
 board/mscc/common/spi.c      |  31 ++++++++++++
 board/mscc/jr2/Kconfig       |  15 ++++++
 board/mscc/jr2/Makefile      |   4 ++
 board/mscc/jr2/jr2.c         | 117 +++++++++++++++++++++++++++++++++++++++++++
 board/mscc/ocelot/ocelot.c   |  22 --------
 configs/mscc_jr2_defconfig   |  59 ++++++++++++++++++++++
 9 files changed, 234 insertions(+), 24 deletions(-)
 create mode 100644 board/mscc/common/Makefile
 create mode 100644 board/mscc/common/spi.c
 create mode 100644 board/mscc/jr2/Kconfig
 create mode 100644 board/mscc/jr2/Makefile
 create mode 100644 board/mscc/jr2/jr2.c
 create mode 100644 configs/mscc_jr2_defconfig
arch/mips/dts/Makefile +1 -0
index b61afe6..1484db9 100644
@@ -19,6 +19,7 @@ dtb-$(CONFIG_BOARD_TPLINK_WDR4300) += tplink_wdr4300.dtb
 dtb-$(CONFIG_TARGET_JZ4780_CI20) += ci20.dtb
 dtb-$(CONFIG_SOC_LUTON) += luton_pcb090.dtb luton_pcb091.dtb
 dtb-$(CONFIG_SOC_OCELOT) += ocelot_pcb120.dtb ocelot_pcb123.dtb
+dtb-$(CONFIG_SOC_JR2) += jr2_pcb110.dtb jr2_pcb111.dtb serval2_pcb112.dtb
 
 targets += $(dtb-y)
 
arch/mips/mach-mscc/Makefile +3 -2
index 44538b7..f5b6968 100644
@@ -2,5 +2,6 @@
 
 CFLAGS_cpu.o += -finline-limit=64000
 
-obj-y += cpu.o dram.o reset.o phy.o gpio.o lowlevel_init.o
-obj-$(CONFIG_SOC_LUTON) += lowlevel_init_luton.o
+obj-y += cpu.o dram.o reset.o phy.o lowlevel_init.o
+obj-$(CONFIG_SOC_LUTON) += lowlevel_init_luton.o gpio.o
+obj-$(CONFIG_SOC_OCELOT) += gpio.o
board/mscc/common/Makefile new file +4 -0
new file mode 100644
index 0000000..4f0eded
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+obj-$(CONFIG_SOC_JR2)	:= spi.o
+obj-$(CONFIG_SOC_OCELOT)	:= spi.o
board/mscc/common/spi.c new file +31 -0
new file mode 100644
index 0000000..0566fcb
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2018 Microsemi Coprporation
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <spi.h>
+
+void external_cs_manage(struct udevice *dev, bool enable)
+{
+	u32 cs = spi_chip_select(dev);
+	/* IF_SI0_OWNER, select the owner of the SI interface
+	 * Encoding: 0: SI Slave
+	 *	     1: SI Boot Master
+	 *	     2: SI Master Controller
+	 */
+	if (!enable) {
+		writel(ICPU_SW_MODE_SW_PIN_CTRL_MODE |
+		       ICPU_SW_MODE_SW_SPI_CS(BIT(cs)),
+		       BASE_CFG + ICPU_SW_MODE);
+		clrsetbits_le32(BASE_CFG + ICPU_GENERAL_CTRL,
+				ICPU_GENERAL_CTRL_IF_SI_OWNER_M,
+				ICPU_GENERAL_CTRL_IF_SI_OWNER(2));
+	} else {
+		writel(0, BASE_CFG + ICPU_SW_MODE);
+		clrsetbits_le32(BASE_CFG + ICPU_GENERAL_CTRL,
+				ICPU_GENERAL_CTRL_IF_SI_OWNER_M,
+				ICPU_GENERAL_CTRL_IF_SI_OWNER(1));
+	}
+}
board/mscc/jr2/Kconfig new file +15 -0
new file mode 100644
index 0000000..68a2de8
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+config SYS_VENDOR
+	default "mscc"
+
+if SOC_JR2
+
+config SYS_BOARD
+	default "jr2"
+
+config SYS_CONFIG_NAME
+	default "jr2"
+
+endif
+
board/mscc/jr2/Makefile new file +4 -0
new file mode 100644
index 0000000..c1db2a9
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+obj-$(CONFIG_SOC_JR2)	:= jr2.o
+
board/mscc/jr2/jr2.c new file +117 -0

117 lines not on this page · raw message

board/mscc/ocelot/ocelot.c +0 -22
index a05c308..0f7a532 100644
@@ -18,28 +18,6 @@ enum {
 	BOARD_TYPE_PCB123,
 };
 
-void external_cs_manage(struct udevice *dev, bool enable)
-{
-	u32 cs = spi_chip_select(dev);
-	/* IF_SI0_OWNER, select the owner of the SI interface
-	 * Encoding: 0: SI Slave
-	 *	     1: SI Boot Master
-	 *	     2: SI Master Controller
-	 */
-	if (!enable) {
-		writel(ICPU_SW_MODE_SW_PIN_CTRL_MODE |
-		       ICPU_SW_MODE_SW_SPI_CS(BIT(cs)), BASE_CFG + ICPU_SW_MODE);
-		clrsetbits_le32(BASE_CFG + ICPU_GENERAL_CTRL,
-				ICPU_GENERAL_CTRL_IF_SI_OWNER_M,
-				ICPU_GENERAL_CTRL_IF_SI_OWNER(2));
-	} else {
-		writel(0, BASE_CFG + ICPU_SW_MODE);
-		clrsetbits_le32(BASE_CFG + ICPU_GENERAL_CTRL,
-				ICPU_GENERAL_CTRL_IF_SI_OWNER_M,
-				ICPU_GENERAL_CTRL_IF_SI_OWNER(1));
-	}
-}
-
 void board_debug_uart_init(void)
 {
 	/* too early for the pinctrl driver, so configure the UART pins here */
configs/mscc_jr2_defconfig new file +59 -0

59 lines not on this page · raw message

Signature · 1 line
2.7.4
#9 lore raw

PATCH v3 7/7 MSCC: Add sysreset driver for Jaguar2 SOC family

In reply to Horatiu Vultur

Create sysreset driver for Jaguar2 SOC family and update defconfig to use it.

---
 MAINTAINERS                     |  1 +
 board/mscc/jr2/jr2.c            |  8 +++++++
 configs/mscc_jr2_defconfig      |  2 ++
 drivers/sysreset/Kconfig        |  6 ++++++
 drivers/sysreset/Makefile       |  1 +
 drivers/sysreset/sysreset_jr2.c | 46 +++++++++++++++++++++++++++++++++++++++++
 6 files changed, 64 insertions(+)
 create mode 100644 drivers/sysreset/sysreset_jr2.c
MAINTAINERS +1 -0
index d42736b..8b8cc9d 100644
@@ -526,6 +526,7 @@ F:	arch/mips/dts/serval*
 F:	board/mscc/
 F:	configs/mscc*
 F:	drivers/gpio/mscc_sgpio.c
+F:	drivers/sysreset/sysreset_jr2.c
 F:	include/configs/vcoreiii.h
 F:	drivers/pinctrl/mscc/
 
board/mscc/jr2/jr2.c +8 -0
index 36f9896..2935ad0 100644
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <led.h>
+#include <dm/lists.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -17,6 +18,8 @@ enum {
 
 int board_early_init_r(void)
 {
+	int ret;
+
 	/* Prepare SPI controller to be used in master mode */
 	writel(0, BASE_CFG + ICPU_SW_MODE);
 	clrsetbits_le32(BASE_CFG + ICPU_GENERAL_CTRL,
@@ -30,6 +33,11 @@ int board_early_init_r(void)
 	if (IS_ENABLED(CONFIG_LED))
 		led_default_state();
 
+	ret = device_bind_driver(gd->dm_root, "jr2_soft_reset",
+				 "reset_soft", NULL);
+	if (ret)
+		printf("Warning: No reset driver: ret=%d\n", ret);
+
 	return 0;
 }
 
configs/mscc_jr2_defconfig +2 -0
index b215754..e80dde6 100644
@@ -57,3 +57,5 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_LZMA=y
 CONFIG_XZ=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_JR2=y
drivers/sysreset/Kconfig +6 -0
index 8ce3e2e..7c6db0f 100644
@@ -43,6 +43,12 @@ config SYSRESET_TI_SCI
 	  This enables the system reset driver support over TI System Control
 	  Interface available on some new TI's SoCs.
 
+config SYSRESET_JR2
+	bool "Enable support for Jaguar2 soft reset"
+	depends on SOC_JR2
+	help
+	  This is soft reset on Jaguar2.
+
 endif
 
 config SYSRESET_SYSCON
drivers/sysreset/Makefile +1 -0
index b3728ac..24c488b 100644
@@ -16,3 +16,4 @@ obj-$(CONFIG_SYSRESET_SYSCON) += sysreset_syscon.o
 obj-$(CONFIG_SYSRESET_WATCHDOG) += sysreset_watchdog.o
 obj-$(CONFIG_SYSRESET_X86) += sysreset_x86.o
 obj-$(CONFIG_TARGET_XTFPGA) += sysreset_xtfpga.o
+obj-$(CONFIG_SYSRESET_JR2) += sysreset_jr2.o
drivers/sysreset/sysreset_jr2.c new file +46 -0

46 lines not on this page · raw message

Signature · 1 line
2.7.4
#10 lore raw

PATCH v3 7/7 MSCC: Add sysreset driver for Jaguar2 SOC family

Am 09.01.19 um 09:25 schrieb Horatiu Vultur:

Quoted 48 lines

Create sysreset driver for Jaguar2 SOC family and update defconfig to use it.

---
 MAINTAINERS                     |  1 +
 board/mscc/jr2/jr2.c            |  8 +++++++
 configs/mscc_jr2_defconfig      |  2 ++
 drivers/sysreset/Kconfig        |  6 ++++++
 drivers/sysreset/Makefile       |  1 +
 drivers/sysreset/sysreset_jr2.c | 46 +++++++++++++++++++++++++++++++++++++++++
 6 files changed, 64 insertions(+)
 create mode 100644 drivers/sysreset/sysreset_jr2.c
MAINTAINERS +1 -0
index d42736b..8b8cc9d 100644
@@ -526,6 +526,7 @@ F:	arch/mips/dts/serval*
 F:	board/mscc/
 F:	configs/mscc*
 F:	drivers/gpio/mscc_sgpio.c
+F:	drivers/sysreset/sysreset_jr2.c
 F:	include/configs/vcoreiii.h
 F:	drivers/pinctrl/mscc/
 
board/mscc/jr2/jr2.c +3 -0
index 36f9896..2935ad0 100644
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <led.h>
+#include <dm/lists.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -17,6 +18,8 @@ enum {
 
 int board_early_init_r(void)
 {
+	int ret;
+
 	/* Prepare SPI controller to be used in master mode */
 	writel(0, BASE_CFG + ICPU_SW_MODE);
 	clrsetbits_le32(BASE_CFG + ICPU_GENERAL_CTRL,

board/mscc/jr2/jr2.c int board_early_init_r(void) · line 40

Quoted 8 lines
board/mscc/jr2/jr2.c +5 -0
@@ -30,6 +33,11 @@ int board_early_init_r(void)
 	if (IS_ENABLED(CONFIG_LED))
 		led_default_state();
 
+	ret = device_bind_driver(gd->dm_root, "jr2_soft_reset",
+				 "reset_soft", NULL);
+	if (ret)
+		printf("Warning: No reset driver: ret=%d\n", ret);
+

hm, that's still the same as v2. You don't need this code if you add a sysreset node to device-tree.
But as already said, you don't need to add a sysreset driver with this series. I'm fine with the v1 variant of initially extending _machine_restart(). But you should consider adding a sysreset driver later which supports all Microsemi SoC's.

Quoted 92 lines
board/mscc/jr2/jr2.c +0 -0
 	return 0;
 }
 
configs/mscc_jr2_defconfig +2 -0
index b215754..e80dde6 100644
@@ -57,3 +57,5 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_LZMA=y
 CONFIG_XZ=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_JR2=y
drivers/sysreset/Kconfig +6 -0
index 8ce3e2e..7c6db0f 100644
@@ -43,6 +43,12 @@ config SYSRESET_TI_SCI
 	  This enables the system reset driver support over TI System Control
 	  Interface available on some new TI's SoCs.
 
+config SYSRESET_JR2
+	bool "Enable support for Jaguar2 soft reset"
+	depends on SOC_JR2
+	help
+	  This is soft reset on Jaguar2.
+
 endif
 
 config SYSRESET_SYSCON
drivers/sysreset/Makefile +1 -0
index b3728ac..24c488b 100644
@@ -16,3 +16,4 @@ obj-$(CONFIG_SYSRESET_SYSCON) += sysreset_syscon.o
 obj-$(CONFIG_SYSRESET_WATCHDOG) += sysreset_watchdog.o
 obj-$(CONFIG_SYSRESET_X86) += sysreset_x86.o
 obj-$(CONFIG_TARGET_XTFPGA) += sysreset_xtfpga.o
+obj-$(CONFIG_SYSRESET_JR2) += sysreset_jr2.o
drivers/sysreset/sysreset_jr2.c new file +46 -0
new file mode 100644
index 0000000..76a5bac
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Microsemi SoCs pinctrl driver
+ *
+ * Author: <[email protected]>
+ * License: Dual MIT/GPL
+ * Copyright (c) 2018 Microsemi Corporation
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <sysreset.h>
+#include <linux/err.h>
+#include <asm/io.h>
+
+static int jr2_sysreset_request(struct udevice *dev,
+				enum sysreset_t type)
+{
+	register u32 reg = readl(BASE_CFG + ICPU_GENERAL_CTRL);
+	/* Set owner */
+	reg &= ~ICPU_GENERAL_CTRL_IF_SI_OWNER_M;
+	reg |= ICPU_GENERAL_CTRL_IF_SI_OWNER(1);
+	/* Set boot mode */
+	reg |= ICPU_GENERAL_CTRL_BOOT_MODE_ENA;
+	writel(reg, BASE_CFG + ICPU_GENERAL_CTRL);
+	/* Read back in order to make BOOT mode setting active */
+	reg = readl(BASE_CFG + ICPU_GENERAL_CTRL);
+	/* Reset CPU only - still executing _here_. but from cache */
+	writel(readl(BASE_CFG + ICPU_RESET) |
+	       ICPU_RESET_CORE_RST_CPU_ONLY |
+	       ICPU_RESET_CORE_RST_FORCE,
+	       BASE_CFG + ICPU_RESET);
+
+	return -EINPROGRESS;
+}
+
+static struct sysreset_ops jr2_sysreset = {
+	.request = jr2_sysreset_request,
+};
+
+U_BOOT_DRIVER(sysreset_jr2) = {
+	.id	= UCLASS_SYSRESET,
+	.name	= "jr2_soft_reset",
+	.ops	= &jr2_sysreset,
+};
Signature · 1 line
- Daniel