MSCC: Add Servalt SoC family
Subsystems (2)
v2 cover MSCC: Add Servalt SoC family
This patch series adds support for MSCC Servalt SoC family. In this family there is only one board: Servalt(pcb116).
This is based off the u-boot-mips/next repository
v2-changes:
- rename label for gpio in dts.
Horatiu Vultur (3):
pinctrl: mscc: Add gpio and pinctrl for Servalt SoC family.
MSCC: Add support for Servalt SoC family.
MSCC: Add board support for Servalt SoC family
arch/mips/dts/Makefile | 1 + arch/mips/dts/mscc,servalt.dtsi | 149 ++++++++++ arch/mips/dts/servalt_pcb116.dts | 56 ++++ arch/mips/mach-mscc/Kconfig | 8 + arch/mips/mach-mscc/cpu.c | 2 +- arch/mips/mach-mscc/dram.c | 3 +- arch/mips/mach-mscc/include/mach/common.h | 5 + arch/mips/mach-mscc/include/mach/ddr.h | 22 +- arch/mips/mach-mscc/include/mach/servalt/servalt.h | 24 ++ .../include/mach/servalt/servalt_devcpu_gcb.h | 20 ++ .../mach/servalt/servalt_devcpu_gcb_miim_regs.h | 25 ++ .../include/mach/servalt/servalt_icpu_cfg.h | 319 +++++++++++++++++++++ arch/mips/mach-mscc/reset.c | 2 +- board/mscc/servalt/Kconfig | 14 + board/mscc/servalt/Makefile | 3 + board/mscc/servalt/servalt.c | 52 ++++ configs/mscc_servalt_defconfig | 60 ++++ drivers/pinctrl/mscc/Kconfig | 9 + drivers/pinctrl/mscc/Makefile | 1 + drivers/pinctrl/mscc/pinctrl-servalt.c | 269 +++++++++++++++++ 20 files changed, 1033 insertions(+), 11 deletions(-) create mode 100644 arch/mips/dts/mscc,servalt.dtsi create mode 100644 arch/mips/dts/servalt_pcb116.dts create mode 100644 arch/mips/mach-mscc/include/mach/servalt/servalt.h create mode 100644 arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb.h create mode 100644 arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb_miim_regs.h create mode 100644 arch/mips/mach-mscc/include/mach/servalt/servalt_icpu_cfg.h create mode 100644 board/mscc/servalt/Kconfig create mode 100644 board/mscc/servalt/Makefile create mode 100644 board/mscc/servalt/servalt.c create mode 100644 configs/mscc_servalt_defconfig create mode 100644 drivers/pinctrl/mscc/pinctrl-servalt.c
Signature · 1 line
2.7.4
PATCH v2 1/3 pinctrl: mscc: Add gpio and pinctrl for Servalt SoC family.
The Servalt SoC family has 36 pins. Currently there is not support for Servalt pinctrl in Linux kernel.
--- drivers/pinctrl/mscc/Kconfig | 9 ++ drivers/pinctrl/mscc/Makefile | 1 + drivers/pinctrl/mscc/pinctrl-servalt.c | 269 +++++++++++++++++++++++++++++++++ 3 files changed, 279 insertions(+) create mode 100644 drivers/pinctrl/mscc/pinctrl-servalt.c
drivers/pinctrl/mscc/Kconfig +9 -0
@@ -29,3 +29,12 @@ config PINCTRL_MSCC_JR2 help Support pin multiplexing and pin configuration control on Microsemi jr2 SoCs. + +config PINCTRL_MSCC_SERVALT + depends on SOC_SERVALT && PINCTRL_FULL && OF_CONTROL + select PINCTRL_MSCC + default y + bool "Microsemi servalt family pin control driver" + help + Support pin multiplexing and pin configuration control on + Microsemi servalt SoCs.
drivers/pinctrl/mscc/Makefile +1 -0
@@ -4,3 +4,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 +obj-$(CONFIG_PINCTRL_MSCC_SERVALT) += pinctrl-servalt.o
drivers/pinctrl/mscc/pinctrl-servalt.c new file +269 -0
269 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v2 2/3 MSCC: Add support for Servalt SoC family.
In reply to Horatiu VulturAs Ocelot, Luton and Jaguar2, this family of SoCs are found in Microsemi Switches solution.
--- arch/mips/mach-mscc/Kconfig | 8 + arch/mips/mach-mscc/cpu.c | 2 +- arch/mips/mach-mscc/dram.c | 3 +- arch/mips/mach-mscc/include/mach/common.h | 5 + arch/mips/mach-mscc/include/mach/ddr.h | 22 +- arch/mips/mach-mscc/include/mach/servalt/servalt.h | 24 ++ .../include/mach/servalt/servalt_devcpu_gcb.h | 20 ++ .../mach/servalt/servalt_devcpu_gcb_miim_regs.h | 25 ++ .../include/mach/servalt/servalt_icpu_cfg.h | 319 +++++++++++++++++++++ arch/mips/mach-mscc/reset.c | 2 +- 10 files changed, 419 insertions(+), 11 deletions(-) create mode 100644 arch/mips/mach-mscc/include/mach/servalt/servalt.h create mode 100644 arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb.h create mode 100644 arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb_miim_regs.h create mode 100644 arch/mips/mach-mscc/include/mach/servalt/servalt_icpu_cfg.h
arch/mips/mach-mscc/Kconfig +8 -0
@@ -40,6 +40,13 @@ config SOC_JR2 help This supports MSCC Jaguar2 family of SOCs. +config SOC_SERVALT + bool "Servalt SOC Family" + select SOC_VCOREIII + select MSCC_BB_SPI + help + This supports MSCC Servalt family of SOCs. + endchoice config SYS_CONFIG_NAME
@@ -74,4 +81,5 @@ source "board/mscc/luton/Kconfig" source "board/mscc/jr2/Kconfig" +source "board/mscc/servalt/Kconfig" endmenu
arch/mips/mach-mscc/cpu.c +1 -1
@@ -91,7 +91,7 @@ int mach_cpu_init(void)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 +#if defined(CONFIG_SOC_JR2 ) || defined(CONFIG_SOC_SERVALT )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 );
arch/mips/mach-mscc/dram.c +2 -1
@@ -19,7 +19,8 @@ static inline int vcoreiii_train_bytelane(void) ret =hal_vcoreiii_train_bytelane (0 ); -#if defined(CONFIG_SOC_OCELOT ) || defined(CONFIG_SOC_JR2 ) +#if defined(CONFIG_SOC_OCELOT ) || defined(CONFIG_SOC_JR2 ) || \ + defined(CONFIG_SOC_SERVALT )if (ret)return ret; ret =hal_vcoreiii_train_bytelane (1 );
arch/mips/mach-mscc/include/mach/common.h +5 -0
@@ -21,6 +21,11 @@#include <mach/jr2/jr2_devcpu_gcb.h> #include <mach/jr2/jr2_devcpu_gcb_miim_regs.h> #include <mach/jr2/jr2_icpu_cfg.h> +#elif defined(CONFIG_SOC_SERVALT ) +#include <mach/servalt/servalt.h> +#include <mach/servalt/servalt_devcpu_gcb.h> +#include <mach/servalt/servalt_devcpu_gcb_miim_regs.h> +#include <mach/servalt/servalt_icpu_cfg.h> #else #error Unsupported platform#endif
arch/mips/mach-mscc/include/mach/ddr.h +14 -8
@@ -161,7 +161,8 @@#endif -#if defined(CONFIG_SOC_OCELOT ) || defined(CONFIG_SOC_JR2 ) +#if defined(CONFIG_SOC_OCELOT ) || defined(CONFIG_SOC_JR2 ) || \ + defined(CONFIG_SOC_SERVALT )#define MIPS_VCOREIII_MEMORY_16BIT 1#endif
@@ -239,7 +240,8 @@ICPU_MEMCTRL_CFG_MSB_ROW_ADDR (VC3_MPAR_row_addr_cnt -1 ) | \ ICPU_MEMCTRL_CFG_MSB_COL_ADDR(VC3_MPAR_col_addr_cnt - 1) -#if defined(CONFIG_SOC_OCELOT ) || defined(CONFIG_SOC_JR2 ) +#if defined(CONFIG_SOC_OCELOT ) || defined(CONFIG_SOC_JR2 ) || \ + defined(CONFIG_SOC_SERVALT )#define MSCC_MEMPARM_PERIOD \ ICPU_MEMCTRL_REF_PERIOD_MAX_PEND_REF(8) | \ ICPU_MEMCTRL_REF_PERIOD_REF_PERIOD(VC3_MPAR_tREFI)
@@ -378,7 +380,8 @@ static inline void memphy_soft_reset(void)PAUSE (); } -#if defined(CONFIG_SOC_OCELOT ) || defined(CONFIG_SOC_JR2 ) +#if defined(CONFIG_SOC_OCELOT ) || defined(CONFIG_SOC_JR2 ) || \ + defined(CONFIG_SOC_SERVALT )static u8 training_data[] = {0xfe ,0x11 ,0x33 ,0x55 ,0x77 ,0x99 ,0xbb ,0xdd };static inline void sleep_100ns (u32 val)
@@ -449,7 +452,7 @@ static inline void hal_vcoreiii_ddr_failed(void) panic("DDR init failed\n"); } -#else /* JR2 */ +#else /* JR2 || ServalT */ static inline void hal_vcoreiii_ddr_reset_assert (void ) {/* Ensure the memory controller physical iface is forced reset */
@@ -759,7 +762,8 @@ 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 ) ; -#if defined(CONFIG_SOC_OCELOT ) || defined(CONFIG_SOC_JR2 ) +#if defined(CONFIG_SOC_OCELOT ) || defined(CONFIG_SOC_JR2 ) || \ + defined(CONFIG_SOC_SERVALT )/* Check no ZCAL_ERR */ if (readl (BASE_CFG +ICPU_MEMPHY_ZCAL_STAT ) &ICPU_MEMPHY_ZCAL_STAT_ZCAL_ERR )
@@ -773,7 +777,8 @@ 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 ); -#if defined(CONFIG_SOC_OCELOT ) || defined(CONFIG_SOC_JR2 ) +#if defined(CONFIG_SOC_OCELOT ) || defined(CONFIG_SOC_JR2 ) || \ + defined(CONFIG_SOC_SERVALT )writel (MSCC_MEMPARM_TIMING0 ,BASE_CFG +ICPU_MEMCTRL_TIMING0 );#else /* Luton */ clrbits_le32 (BASE_CFG +ICPU_MEMCTRL_TIMING0 , ((1 <<20 ) -1 ));
@@ -799,7 +804,7 @@ 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 ) +#elif defined(CONFIG_SOC_JR2 ) || defined(CONFIG_SOC_SERVALT )writel (ICPU_MEMCTRL_TERMRES_CTRL_ODT_WR_ENA (3 ),BASE_CFG +ICPU_MEMCTRL_TERMRES_CTRL );#else /* Luton */
@@ -820,7 +825,8 @@ static inline void hal_vcoreiii_wait_memctl(void)/* Settle...? */ sleep_100ns (10000 ); -#if defined(CONFIG_SOC_OCELOT ) || defined(CONFIG_SOC_JR2 ) +#if defined(CONFIG_SOC_OCELOT ) || defined(CONFIG_SOC_JR2 ) || \ + defined(CONFIG_SOC_SERVALT )/* Establish data contents in DDR RAM for training */ __raw_writel (0xcacafefe , ((void __iomem *)MSCC_DDR_TO ));
arch/mips/mach-mscc/include/mach/servalt/servalt.h new file +24 -0
@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* +* Microsemi Servalt Switch driver +* +* Copyright (c) 2018 Microsemi Corporation +*/ + +#ifndef _MSCC_SERVALT_H_ +#define _MSCC_SERVALT_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/servalt/servalt_devcpu_gcb.h new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* +* Copyright (c) 2018 Microsemi Corporation +*/ + +#ifndef _MSCC_SERVALT_DEVCPU_GCB_H_ +#define _MSCC_SERVALT_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) (0x74 + 4 * (x)) +#define GPIO_GPIO_ALT1 (x) (0x7c + 4 * (x)) + +#endif
arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb_miim_regs.h new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* +* Copyright (c) 2018 Microsemi Corporation +*/ + +#ifndef _MSCC_SERVALT_DEVCPU_GCB_MIIM_REGS_H_ +#define _MSCC_SERVALT_DEVCPU_GCB_MIIM_REGS_H_ + +#define MIIM_MII_STATUS (gi) (0xc4 + (gi * 36)) +#define MIIM_MII_CMD (gi) (0xcc + (gi * 36)) +#define MIIM_MII_DATA (gi) (0xd0 + (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/servalt/servalt_icpu_cfg.h new file +319 -0
319 lines not on this page · raw message
arch/mips/mach-mscc/reset.c +1 -1
@@ -12,7 +12,7 @@void _machine_restart (void ) { -#if defined(CONFIG_SOC_JR2 ) +#if defined(CONFIG_SOC_JR2 ) || defined(CONFIG_SOC_SERVALT ) registeru32 reg =readl (BASE_CFG +ICPU_GENERAL_CTRL );/* Set owner */ reg &= ~ICPU_GENERAL_CTRL_IF_SI_OWNER_M ;
Signature · 1 line
2.7.4
PATCH v2 3/3 MSCC: Add board support for Servalt SoC family
In reply to Horatiu VulturAdd board support, configuration and DTS for Servalt SoC family. Currently there is one board in this family.
--- arch/mips/dts/Makefile | 1 + arch/mips/dts/mscc,servalt.dtsi | 149 +++++++++++++++++++++++++++++++++++++++ arch/mips/dts/servalt_pcb116.dts | 56 +++++++++++++++ board/mscc/servalt/Kconfig | 14 ++++ board/mscc/servalt/Makefile | 3 + board/mscc/servalt/servalt.c | 52 ++++++++++++++ configs/mscc_servalt_defconfig | 60 ++++++++++++++++ 7 files changed, 335 insertions(+) create mode 100644 arch/mips/dts/mscc,servalt.dtsi create mode 100644 arch/mips/dts/servalt_pcb116.dts create mode 100644 board/mscc/servalt/Kconfig create mode 100644 board/mscc/servalt/Makefile create mode 100644 board/mscc/servalt/servalt.c create mode 100644 configs/mscc_servalt_defconfig
arch/mips/dts/Makefile +1 -0
@@ -20,6 +20,7 @@ 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 +dtb-$(CONFIG_SOC_SERVALT) += servalt_pcb116.dtb targets += $(dtb-y)
arch/mips/dts/mscc,servalt.dtsi new file +149 -0
149 lines not on this page · raw message
arch/mips/dts/servalt_pcb116.dts new file +56 -0
56 lines not on this page · raw message
board/mscc/servalt/Kconfig new file +14 -0
@@ -0,0 +1,14 @@ +# SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +config SYS_VENDOR + default "mscc" + +if SOC_SERVALT + +config SYS_BOARD + default "servalt" + +config SYS_CONFIG_NAME + default "servalt" + +endif
board/mscc/servalt/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +obj-$(CONFIG_SOC_SERVALT) := servalt.o
board/mscc/servalt/servalt.c new file +52 -0
52 lines not on this page · raw message
configs/mscc_servalt_defconfig new file +60 -0
60 lines not on this page · raw message
Signature · 1 line
2.7.4
v2 cover MSCC: Add Servalt SoC family
In reply to Horatiu VulturAm 17.01.19 um 15:33 schrieb Horatiu Vultur:
Quoted 37 lines
This patch series adds support for MSCC Servalt SoC family. In this family there is only one board: Servalt(pcb116).
This is based off the u-boot-mips/next repository
v2-changes:
- rename label for gpio in dts.Horatiu Vultur (3):
pinctrl: mscc: Add gpio and pinctrl for Servalt SoC family.
MSCC: Add support for Servalt SoC family.
MSCC: Add board support for Servalt SoC familyarch/mips/dts/Makefile | 1 + arch/mips/dts/mscc,servalt.dtsi | 149 ++++++++++ arch/mips/dts/servalt_pcb116.dts | 56 ++++ arch/mips/mach-mscc/Kconfig | 8 + arch/mips/mach-mscc/cpu.c | 2 +- arch/mips/mach-mscc/dram.c | 3 +- arch/mips/mach-mscc/include/mach/common.h | 5 + arch/mips/mach-mscc/include/mach/ddr.h | 22 +- arch/mips/mach-mscc/include/mach/servalt/servalt.h | 24 ++ .../include/mach/servalt/servalt_devcpu_gcb.h | 20 ++ .../mach/servalt/servalt_devcpu_gcb_miim_regs.h | 25 ++ .../include/mach/servalt/servalt_icpu_cfg.h | 319 +++++++++++++++++++++ arch/mips/mach-mscc/reset.c | 2 +- board/mscc/servalt/Kconfig | 14 + board/mscc/servalt/Makefile | 3 + board/mscc/servalt/servalt.c | 52 ++++ configs/mscc_servalt_defconfig | 60 ++++ drivers/pinctrl/mscc/Kconfig | 9 + drivers/pinctrl/mscc/Makefile | 1 + drivers/pinctrl/mscc/pinctrl-servalt.c | 269 +++++++++++++++++ 20 files changed, 1033 insertions(+), 11 deletions(-) create mode 100644 arch/mips/dts/mscc,servalt.dtsi create mode 100644 arch/mips/dts/servalt_pcb116.dts create mode 100644 arch/mips/mach-mscc/include/mach/servalt/servalt.h
Quoted 9 lines
create mode 100644 arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb.h create mode 100644 arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb_miim_regs.h create mode 100644 arch/mips/mach-mscc/include/mach/servalt/servalt_icpu_cfg.h create mode 100644 board/mscc/servalt/Kconfig create mode 100644 board/mscc/servalt/Makefile create mode 100644 board/mscc/servalt/servalt.c create mode 100644 configs/mscc_servalt_defconfig create mode 100644 drivers/pinctrl/mscc/pinctrl-servalt.c
series applied to u-boot-mips, thanks.
Signature · 1 line
- Daniel