imx8mn-smm-s2/pro: Add iMX8MN BSH SMM S2 boards
Subsystems (9)
v5 cover imx8mn-smm-s2/pro: Add iMX8MN BSH SMM S2 boards
Introduce BSH SystemMaster (SMM) S2 board family, which consists of:
iMX8MN SMM S2 and iMX8MN SMM S2 PRO boards.
This patchset also adds support for NXP TJA11xx Ethernet PHYs.
Changes in v5:
* Export init_nand_clk() function.
* Drop __ASSEMBLY__ in ddr config.
* Init nand clk in spl, required when usb boot is forced.
* Migrate symbols to defconfig.
Changes in v4:
* Add new Reviewed-by tags to patches.
* Set atf-bl31 blob type in device tree binman configuration.
Changes in v3:
* Added nxp-c45-tja11xx driver.
* Added ethernet support to iMX8MN BSH SMM S2 boards.
Changes in v2:
* Properly added MAINTAINERS entry.
* Fixed binman configuration.
* Picked device tree from kernel.
* Removed CONFIG_SPL_BUILD anti-pattern in board config.
* Removed downstream stuff in bootargs.
* Added board documentation.
Ariel D'Alessandro (4):
phy: nxp-c45-tja11xx: Rename functions to be c45 tja11xx specific
iopoll: Extend read_poll_timeout macro to support variable parameters
net: phy: Add phy_modify() accessor
bsh: imx8mn-smm-s2/pro: Add iMX8MN BSH SMM S2 boards
Michael Trimarchi (3):
imx8m: add regs used by GPMI
imx8m: add init_nand_clk
net: phy: nxp-tja11xx: Add NXP TJA11xx PHY driver
arch/arm/dts/Makefile | 2 + arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi | 423 ++++++++ .../dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi | 225 +++++ arch/arm/dts/imx8mn-bsh-smm-s2-u-boot.dtsi | 15 + arch/arm/dts/imx8mn-bsh-smm-s2.dts | 48 + arch/arm/dts/imx8mn-bsh-smm-s2pro-u-boot.dtsi | 15 + arch/arm/dts/imx8mn-bsh-smm-s2pro.dts | 80 ++ arch/arm/include/asm/arch-imx8m/clock.h | 1 + arch/arm/include/asm/arch-imx8m/imx-regs.h | 7 + arch/arm/mach-imx/imx8m/Kconfig | 15 + arch/arm/mach-socfpga/reset_manager_s10.c | 20 +- board/bsh/imx8mn_smm_s2/Kconfig | 49 + board/bsh/imx8mn_smm_s2/MAINTAINERS | 8 + board/bsh/imx8mn_smm_s2/Makefile | 13 + board/bsh/imx8mn_smm_s2/ddr3l_timing_256m.c | 941 ++++++++++++++++++ board/bsh/imx8mn_smm_s2/ddr3l_timing_512m.c | 941 ++++++++++++++++++ board/bsh/imx8mn_smm_s2/imx8mn_smm_s2.c | 23 + board/bsh/imx8mn_smm_s2/imximage-8mn-ddr3.cfg | 8 + board/bsh/imx8mn_smm_s2/spl.c | 97 ++ configs/imx8mn_bsh_smm_s2_defconfig | 96 ++ configs/imx8mn_bsh_smm_s2pro_defconfig | 93 ++ doc/board/bsh/imx8mn_bsh_smm_s2.rst | 62 ++ doc/board/bsh/index.rst | 9 + doc/board/index.rst | 1 + drivers/mmc/rockchip_sdhci.c | 9 +- drivers/net/phy/Kconfig | 5 + drivers/net/phy/Makefile | 1 + drivers/net/phy/nxp-c45-tja11xx.c | 6 +- drivers/net/phy/nxp-tja11xx.c | 277 ++++++ drivers/net/phy/phy.c | 23 + include/configs/imx8mn_bsh_smm_s2.h | 51 + include/configs/imx8mn_bsh_smm_s2_common.h | 59 ++ include/configs/imx8mn_bsh_smm_s2pro.h | 35 + include/linux/iopoll.h | 12 +- include/phy.h | 3 + 35 files changed, 3651 insertions(+), 22 deletions(-) create mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi create mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi create mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2-u-boot.dtsi create mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2.dts create mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2pro-u-boot.dtsi create mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2pro.dts create mode 100644 board/bsh/imx8mn_smm_s2/Kconfig create mode 100644 board/bsh/imx8mn_smm_s2/MAINTAINERS create mode 100644 board/bsh/imx8mn_smm_s2/Makefile create mode 100644 board/bsh/imx8mn_smm_s2/ddr3l_timing_256m.c create mode 100644 board/bsh/imx8mn_smm_s2/ddr3l_timing_512m.c create mode 100644 board/bsh/imx8mn_smm_s2/imx8mn_smm_s2.c create mode 100644 board/bsh/imx8mn_smm_s2/imximage-8mn-ddr3.cfg create mode 100644 board/bsh/imx8mn_smm_s2/spl.c create mode 100644 configs/imx8mn_bsh_smm_s2_defconfig create mode 100644 configs/imx8mn_bsh_smm_s2pro_defconfig create mode 100644 doc/board/bsh/imx8mn_bsh_smm_s2.rst create mode 100644 doc/board/bsh/index.rst create mode 100644 drivers/net/phy/nxp-tja11xx.c create mode 100644 include/configs/imx8mn_bsh_smm_s2.h create mode 100644 include/configs/imx8mn_bsh_smm_s2_common.h create mode 100644 include/configs/imx8mn_bsh_smm_s2pro.h
Signature · 1 line
2.34.1
PATCH v5 1/7 imx8m: add regs used by GPMI
From: Michael Trimarchi <[email protected]>
Add regs used by GPMI
--- arch/arm/include/asm/arch-imx8m/imx-regs.h | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/include/asm/arch-imx8m/imx-regs.h +7 -0
@@ -58,6 +58,13 @@#define SRC_DDRC_RCR_ADDR 0x30391000#define SRC_DDRC2_RCR_ADDR 0x30391004 +#define APBH_DMA_ARB_BASE_ADDR 0x33000000 +#define APBH_DMA_ARB_END_ADDR 0x33007FFF +#define MXS_APBH_BASE APBH_DMA_ARB_BASE_ADDR + +#define MXS_GPMI_BASE (APBH_DMA_ARB_BASE_ADDR + 0x02000) +#define MXS_BCH_BASE (APBH_DMA_ARB_BASE_ADDR + 0x04000) +#define DDRC_DDR_SS_GPR0 0x3d000000#define DDRC_IPS_BASE_ADDR (X ) (0x3d400000 + ((X) * 0x2000000))#define DDR_CSD1_BASE_ADDR 0x40000000
Signature · 1 line
2.34.1
PATCH v5 1/7 imx8m: add regs used by GPMI
Quoted 5 lines
From: Michael Trimarchi <[email protected]> Add regs used by GPMI
Signed-off-by Michael Trimarchi <[email protected]>Signed-off-by Ariel D'Alessandro <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v5 2/7 imx8m: add init_nand_clk
In reply to Ariel D'AlessandroFrom: Michael Trimarchi <[email protected]>
Add init_nand_clk to enable gpmi nand clock. Since i.MX8M not use CCF, so we still use legacy mode to configure the clock.
--- arch/arm/include/asm/arch-imx8m/clock.h | 1 + 1 file changed, 1 insertion(+)
arch/arm/include/asm/arch-imx8m/clock.h +1 -0
@@ -256,6 +256,7 @@ u32 imx_get_fecclk(void);u32 imx_get_uartclk (void );int clock_init (void );void init_clk_usdhc (u32 index); +void init_nand_clk (void );void init_uart_clk (u32 index);void init_usb_clk (void );void init_wdog_clk (void );
Signature · 1 line
2.34.1
PATCH v5 2/7 imx8m: add init_nand_clk
Quoted 4 lines
From: Michael Trimarchi <[email protected]>
Addinit_nand_clkto enable gpmi nand clock. Since i.MX8M not use CCF, so we still use legacy mode to configure the clock.Signed-off-by Michael Trimarchi <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v5 3/7 phy: nxp-c45-tja11xx: Rename functions to be c45 tja11xx specific
In reply to Ariel D'AlessandroThis driver supports NXP C45 TJA11XX PHYs, but there're also other NXP TJA11XX PHYs. Let's rename functions in this driver to be c45 variant specific, so further drivers can be introduced adding support for NXP TJA11XX PHYs.
--- drivers/net/phy/nxp-c45-tja11xx.c | 6 +++--- drivers/net/phy/phy.c | 2 +- include/phy.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/phy/nxp-c45-tja11xx.c +3 -3
@@ -330,7 +330,7 @@ static int nxp_c45_probe(struct phy_device *phydev)return 0 ; } -static struct phy_driver nxp_tja11xx = { +static struct phy_driver nxp_c45_tja11xx = { .name ="NXP C45 TJA1103" , .uid =PHY_ID_TJA_1103 , .mask =0xfffff0 ,
@@ -341,8 +341,8 @@ static struct phy_driver nxp_tja11xx = { .shutdown = &genphy_shutdown, }; -int phy_nxp_tja11xx_init (void ) +int phy_nxp_c45_tja11xx_init (void ) { -phy_register (&nxp_tja11xx); +phy_register (&nxp_c45_tja11xx);return 0 ; }
drivers/net/phy/phy.c +1 -1
@@ -530,7 +530,7 @@ int phy_init(void)phy_natsemi_init ();#endif #ifdef CONFIG_NXP_C45_TJA11XX_PHY -phy_nxp_tja11xx_init (); +phy_nxp_c45_tja11xx_init ();#endif #ifdef CONFIG_PHY_REALTEK phy_realtek_init ();
include/phy.h +1 -1
@@ -553,7 +553,7 @@ int phy_micrel_ksz8xxx_init(void);int phy_micrel_ksz90x1_init (void );int phy_meson_gxl_init (void );int phy_natsemi_init (void ); -int phy_nxp_tja11xx_init (void ); +int phy_nxp_c45_tja11xx_init (void );int phy_realtek_init (void );int phy_smsc_init (void );int phy_teranetics_init (void );
Signature · 1 line
2.34.1
PATCH v5 3/7 phy: nxp-c45-tja11xx: Rename functions to be c45 tja11xx specific
Quoted 5 lines
This driver supports NXP C45 TJA11XX PHYs, but there're also other NXP TJA11XX PHYs. Let's rename functions in this driver to be c45 variant specific, so further drivers can be introduced adding support for NXP TJA11XX PHYs.
Signed-off-by Ariel D'Alessandro <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v5 4/7 iopoll: Extend read_poll_timeout macro to support variable parameters
In reply to Ariel D'AlessandroThis macro currently supports only one parameter. Based on Linux iopoll, let's extend read_poll_timeout common API to allow multiple variable parameters.
--- arch/arm/mach-socfpga/reset_manager_s10.c | 20 +++++++++++--------- drivers/mmc/rockchip_sdhci.c | 9 +++++---- include/linux/iopoll.h | 12 ++++++------ 3 files changed, 22 insertions(+), 19 deletions(-)
arch/arm/mach-socfpga/reset_manager_s10.c +11 -9
@@ -80,9 +80,9 @@ void socfpga_bridges_reset(int enable) ~0);/* Poll until all idleack to 0 */ -read_poll_timeout (readl,socfpga_get_sysmgr_addr () + -SYSMGR_SOC64_NOC_IDLEACK , reg, !reg,1000 , -300000 ); +read_poll_timeout (readl, reg, !reg,1000 ,300000 , +socfpga_get_sysmgr_addr () + +SYSMGR_SOC64_NOC_IDLEACK ); }else {/* set idle request to all bridges */ writel(~0,
@@ -93,18 +93,20 @@ void socfpga_bridges_reset(int enable)writel (1 ,socfpga_get_sysmgr_addr () +SYSMGR_SOC64_NOC_TIMEOUT );/* Poll until all idleack to 1 */ -read_poll_timeout (readl,socfpga_get_sysmgr_addr () + -SYSMGR_SOC64_NOC_IDLEACK , reg, +read_poll_timeout (readl, reg, reg == (SYSMGR_NOC_H2F_MSK |SYSMGR_NOC_LWH2F_MSK ), -1000 ,300000 ); +1000 ,300000 , +socfpga_get_sysmgr_addr () + +SYSMGR_SOC64_NOC_IDLEACK );/* Poll until all idlestatus to 1 */ -read_poll_timeout (readl,socfpga_get_sysmgr_addr () + -SYSMGR_SOC64_NOC_IDLESTATUS , reg, +read_poll_timeout (readl, reg, reg == (SYSMGR_NOC_H2F_MSK |SYSMGR_NOC_LWH2F_MSK ), -1000 ,300000 ); +1000 ,300000 , +socfpga_get_sysmgr_addr () + +SYSMGR_SOC64_NOC_IDLESTATUS );/* Reset all bridges (except NOR DDR scheduler & F2S) */ setbits_le32(socfpga_get_rstmgr_addr() + RSTMGR_SOC64_BRGMODRST,
drivers/mmc/rockchip_sdhci.c +5 -4
@@ -202,8 +202,8 @@ static void rk3399_emmc_phy_power_on(struct rockchip_emmc_phy *phy, u32 clock)/* REN Enable on STRB Line for HS400 */ writel (RK_CLRSETBITS (0 ,1 <<9 ), &phy->emmcphy_con[2 ]); -read_poll_timeout (readl, &phy->emmcphy_status, dllrdy, -PHYCTRL_DLL_LOCK_WO_TMOUT (dllrdy),1 ,5000 ); +read_poll_timeout (readl, dllrdy,PHYCTRL_DLL_LOCK_WO_TMOUT (dllrdy),1 , +5000 , &phy->emmcphy_status); }static void rk3399_emmc_phy_power_off (struct rockchip_emmc_phy *phy)
@@ -328,8 +328,9 @@ static int rk3568_sdhci_emmc_set_clock(struct sdhci_host *host, unsigned int cloDWCMSHC_EMMC_DLL_START ;sdhci_writel (host, extra,DWCMSHC_EMMC_DLL_CTRL ); - ret =read_poll_timeout (readl, host->ioaddr +DWCMSHC_EMMC_DLL_STATUS0 , - val,DLL_LOCK_WO_TMOUT (val),1 ,500 ); + ret =read_poll_timeout (readl, val,DLL_LOCK_WO_TMOUT (val),1 , +500 , + host->ioaddr +DWCMSHC_EMMC_DLL_STATUS0 );if (ret)return ret;
include/linux/iopoll.h +6 -6
@@ -14,11 +14,11 @@/** * read_poll_timeout - Periodically poll an address until a condition is met or a timeout occurs * @op: accessor function (takes @addr as its only argument) -* @addr: Address to poll * @val: Variable to read the value into * @cond: Break condition (usually involving @val) * @sleep_us: Maximum time to sleep in us * @timeout_us: Timeout in us, 0 means never timeout +* @args: arguments for @op poll * * Returns 0 on success and -ETIMEDOUT upon a timeout. In either * case, the last read value at @addr is stored in @val.
@@ -26,15 +26,15 @@* When available, you'll probably want to use one of the specialized * macros defined below rather than this macro directly. */ -#define read_poll_timeout (op, addr, val, cond, sleep_us, timeout_us) \ +#define read_poll_timeout(op, val, cond, sleep_us, timeout_us, args...) \ ({ \ unsigned long timeout = timer_get_us() + timeout_us; \ for (;;) { \ - (val) = op(addr); \ + (val) = op(args); \ if (cond) \ break; \ if (timeout_us && time_after(timer_get_us(), timeout)) { \ - (val) = op(addr); \ + (val) = op(args); \ break; \ } \ if (sleep_us) \
@@ -44,13 +44,13 @@ })#define readx_poll_sleep_timeout (op, addr, val, cond, sleep_us, timeout_us) \ - read_poll_timeout(op, addr, val, cond, sleep_us, timeout_us) + read_poll_timeout(op, val, cond, sleep_us, timeout_us, addr)#define readl_poll_sleep_timeout (addr, val, cond, sleep_us, timeout_us) \ readx_poll_sleep_timeout(readl, addr, val, cond, sleep_us, timeout_us)#define readx_poll_timeout (op, addr, val, cond, timeout_us) \ - read_poll_timeout(op, addr, val, cond, false, timeout_us) + read_poll_timeout(op, val, cond, false, timeout_us, addr)#define readb_poll_timeout (addr, val, cond, timeout_us) \ readx_poll_timeout(readb, addr, val, cond, timeout_us)
Signature · 1 line
2.34.1
PATCH v5 4/7 iopoll: Extend read_poll_timeout macro to support variable parameters
Quoted 4 lines
This macro currently supports only one parameter. Based on Linux iopoll, let's extend
read_poll_timeoutcommon API to allow multiple variable parameters.Signed-off-by Ariel D'Alessandro <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v5 5/7 net: phy: Add phy_modify() accessor
In reply to Ariel D'AlessandroAdd read-modify-write unlocked accessor for accessing a PHY register.
--- drivers/net/phy/phy.c | 20 ++++++++++++++++++++ include/phy.h | 2 ++ 2 files changed, 22 insertions(+)
drivers/net/phy/phy.c +20 -0
@@ -1110,3 +1110,23 @@ int phy_get_interface_by_name(const char *str)return -1 ; } + +/** +* phy_modify - Convenience function for modifying a given PHY register +* @phydev: the phy_device struct +* @devad: The MMD to read from +* @regnum: register number to write +* @mask: bit mask of bits to clear +* @set: new value of bits set in mask to write to @regnum +*/ +int phy_modify (struct phy_device *phydev,int devad,int regnum,u16 mask, +u16 set) +{ +int ret; + + ret =phy_read (phydev, devad, regnum); +if (ret <0 ) +return ret; + +return phy_write (phydev, devad, regnum, (ret & ~mask) | set); +}
include/phy.h +2 -0
@@ -526,6 +526,8 @@ int phy_config(struct phy_device *phydev);int phy_shutdown (struct phy_device *phydev);int phy_register (struct phy_driver *drv);int phy_set_supported (struct phy_device *phydev,u32 max_speed); +int phy_modify (struct phy_device *phydev,int devad,int regnum,u16 mask, +u16 set);int genphy_config_aneg (struct phy_device *phydev);int genphy_restart_aneg (struct phy_device *phydev);int genphy_update_link (struct phy_device *phydev);
Signature · 1 line
2.34.1
PATCH v5 5/7 net: phy: Add phy_modify() accessor
Quoted 3 lines
Add read-modify-write unlocked accessor for accessing a PHY register.
Signed-off-by Ariel D'Alessandro <[email protected]>Reviewed-by Ramon Fried <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v5 6/7 net: phy: nxp-tja11xx: Add NXP TJA11xx PHY driver
In reply to Ariel D'AlessandroFrom: Michael Trimarchi <[email protected]>
Add driver for the NXP TJA1100 and TJA1101 PHYs. These PHYs are special BroadRReach 100BaseT1 PHYs used in automotive.
--- drivers/net/phy/Kconfig | 5 + drivers/net/phy/Makefile | 1 + drivers/net/phy/nxp-tja11xx.c | 277 ++++++++++++++++++++++++++++++++++ drivers/net/phy/phy.c | 3 + include/phy.h | 1 + 5 files changed, 287 insertions(+) create mode 100644 drivers/net/phy/nxp-tja11xx.c
drivers/net/phy/Kconfig +5 -0
@@ -215,6 +215,11 @@ config PHY_NXP_C45_TJA11XX Enable support for NXP C45 TJA11XX PHYs. Currently supports only the TJA1103 PHY. +config PHY_NXP_TJA11XX + bool "NXP TJA11XX Ethernet PHYs support" + help + Currently supports the NXP TJA1100 and TJA1101 PHY. + config PHY_REALTEK bool "Realtek Ethernet PHYs support"
drivers/net/phy/Makefile +1 -0
@@ -24,6 +24,7 @@ obj-$(CONFIG_PHY_MICREL_KSZ90X1) += micrel_ksz90x1.o obj-$(CONFIG_PHY_MESON_GXL) += meson-gxl.o obj-$(CONFIG_PHY_NATSEMI) += natsemi.o obj-$(CONFIG_PHY_NXP_C45_TJA11XX) += nxp-c45-tja11xx.o +obj-$(CONFIG_PHY_NXP_TJA11XX) += nxp-tja11xx.o obj-$(CONFIG_PHY_REALTEK) += realtek.o obj-$(CONFIG_PHY_SMSC) += smsc.o obj-$(CONFIG_PHY_TERANETICS) += teranetics.o
drivers/net/phy/nxp-tja11xx.c new file +277 -0
277 lines not on this page · raw message
drivers/net/phy/phy.c +3 -0
@@ -532,6 +532,9 @@ int phy_init(void)#ifdef CONFIG_NXP_C45_TJA11XX_PHY phy_nxp_c45_tja11xx_init ();#endif +#ifdef CONFIG_PHY_NXP_TJA11XX +phy_nxp_tja11xx_init (); +#endif #ifdef CONFIG_PHY_REALTEK phy_realtek_init ();#endif
include/phy.h +1 -0
@@ -556,6 +556,7 @@ int phy_micrel_ksz90x1_init(void);int phy_meson_gxl_init (void );int phy_natsemi_init (void );int phy_nxp_c45_tja11xx_init (void ); +int phy_nxp_tja11xx_init (void );int phy_realtek_init (void );int phy_smsc_init (void );int phy_teranetics_init (void );
Signature · 1 line
2.34.1
PATCH v5 6/7 net: phy: nxp-tja11xx: Add NXP TJA11xx PHY driver
Quoted 6 lines
From: Michael Trimarchi <[email protected]>
Add driver for the NXP TJA1100 and TJA1101 PHYs. These PHYs are special BroadRReach 100BaseT1 PHYs used in automotive.Signed-off-by Michael Trimarchi <[email protected]>Signed-off-by Ariel D'Alessandro <[email protected]>Reviewed-by Ramon Fried <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v5 7/7 bsh: imx8mn-smm-s2/pro: Add iMX8MN BSH SMM S2 boards
In reply to Ariel D'AlessandroIntroduce BSH SystemMaster (SMM) S2 board family, which consists of:
iMX8MN SMM S2 and iMX8MN SMM S2 PRO boards.
Add support for iMX8MN BSH SMM S2 board:
- 256 MiB DDR3 RAM
- 512MiB Nand
- USBOTG1 peripheral - fastboot.
- 100Mbit Ethernet
Add support for iMX8MN BSH SMM S2 PRO board:
- 512 MiB DDR3 RAM
- 8 GiB eMMC
- USBOTG1 peripheral - fastboot.
- 100Mbit Ethernet
--- arch/arm/dts/Makefile | 2 + arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi | 423 ++++++++ .../dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi | 225 +++++ arch/arm/dts/imx8mn-bsh-smm-s2-u-boot.dtsi | 15 + arch/arm/dts/imx8mn-bsh-smm-s2.dts | 48 + arch/arm/dts/imx8mn-bsh-smm-s2pro-u-boot.dtsi | 15 + arch/arm/dts/imx8mn-bsh-smm-s2pro.dts | 80 ++ arch/arm/mach-imx/imx8m/Kconfig | 15 + board/bsh/imx8mn_smm_s2/Kconfig | 49 + board/bsh/imx8mn_smm_s2/MAINTAINERS | 8 + board/bsh/imx8mn_smm_s2/Makefile | 13 + board/bsh/imx8mn_smm_s2/ddr3l_timing_256m.c | 941 ++++++++++++++++++ board/bsh/imx8mn_smm_s2/ddr3l_timing_512m.c | 941 ++++++++++++++++++ board/bsh/imx8mn_smm_s2/imx8mn_smm_s2.c | 23 + board/bsh/imx8mn_smm_s2/imximage-8mn-ddr3.cfg | 8 + board/bsh/imx8mn_smm_s2/spl.c | 97 ++ configs/imx8mn_bsh_smm_s2_defconfig | 96 ++ configs/imx8mn_bsh_smm_s2pro_defconfig | 93 ++ doc/board/bsh/imx8mn_bsh_smm_s2.rst | 62 ++ doc/board/bsh/index.rst | 9 + doc/board/index.rst | 1 + include/configs/imx8mn_bsh_smm_s2.h | 51 + include/configs/imx8mn_bsh_smm_s2_common.h | 59 ++ include/configs/imx8mn_bsh_smm_s2pro.h | 35 + 24 files changed, 3309 insertions(+) create mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi create mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi create mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2-u-boot.dtsi create mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2.dts create mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2pro-u-boot.dtsi create mode 100644 arch/arm/dts/imx8mn-bsh-smm-s2pro.dts create mode 100644 board/bsh/imx8mn_smm_s2/Kconfig create mode 100644 board/bsh/imx8mn_smm_s2/MAINTAINERS create mode 100644 board/bsh/imx8mn_smm_s2/Makefile create mode 100644 board/bsh/imx8mn_smm_s2/ddr3l_timing_256m.c create mode 100644 board/bsh/imx8mn_smm_s2/ddr3l_timing_512m.c create mode 100644 board/bsh/imx8mn_smm_s2/imx8mn_smm_s2.c create mode 100644 board/bsh/imx8mn_smm_s2/imximage-8mn-ddr3.cfg create mode 100644 board/bsh/imx8mn_smm_s2/spl.c create mode 100644 configs/imx8mn_bsh_smm_s2_defconfig create mode 100644 configs/imx8mn_bsh_smm_s2pro_defconfig create mode 100644 doc/board/bsh/imx8mn_bsh_smm_s2.rst create mode 100644 doc/board/bsh/index.rst create mode 100644 include/configs/imx8mn_bsh_smm_s2.h create mode 100644 include/configs/imx8mn_bsh_smm_s2_common.h create mode 100644 include/configs/imx8mn_bsh_smm_s2pro.h
arch/arm/dts/Makefile +2 -0
@@ -913,6 +913,8 @@ dtb-$(CONFIG_ARCH_IMX8M) += \ imx8mm-venice-gw7902.dtb \ imx8mm-verdin.dtb \ phycore-imx8mm.dtb \ + imx8mn-bsh-smm-s2.dtb \ + imx8mn-bsh-smm-s2pro.dtb \ imx8mn-ddr4-evk.dtb \ imx8mq-cm.dtb \ imx8mn-evk.dtb \
arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi new file +423 -0
423 lines not on this page · raw message
arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi new file +225 -0
225 lines not on this page · raw message
arch/arm/dts/imx8mn-bsh-smm-s2-u-boot.dtsi new file +15 -0
@@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2021 Collabora Ltd. + * Copyright 2021 BSH Hausgeraete GmbH + */ + +#include "imx8mn-bsh-smm-s2-u-boot-common.dtsi" + +&pinctrl_gpmi_nand { + u-boot,dm-spl; +}; + +&gpmi { + u-boot,dm-spl; +};
arch/arm/dts/imx8mn-bsh-smm-s2.dts new file +48 -0
48 lines not on this page · raw message
arch/arm/dts/imx8mn-bsh-smm-s2pro-u-boot.dtsi new file +15 -0
@@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2021 Collabora Ltd. + * Copyright 2021 BSH Hausgeraete GmbH + */ + +#include "imx8mn-bsh-smm-s2-u-boot-common.dtsi" + +&pinctrl_usdhc1 { + u-boot,dm-spl; +}; + +&usdhc1 { + u-boot,dm-spl; +};
arch/arm/dts/imx8mn-bsh-smm-s2pro.dts new file +80 -0
80 lines not on this page · raw message
arch/arm/mach-imx/imx8m/Kconfig +15 -0
@@ -85,6 +85,20 @@ config TARGET_KONTRON_MX8MM select SUPPORT_SPL select IMX8M_LPDDR4 +config TARGET_IMX8MN_BSH_SMM_S2 + bool "imx8mn-bsh-smm-s2" + select BINMAN + select IMX8MN + select SUPPORT_SPL + select IMX8M_DDR3L + +config TARGET_IMX8MN_BSH_SMM_S2PRO + bool "imx8mn-bsh-smm-s2pro" + select BINMAN + select IMX8MN + select SUPPORT_SPL + select IMX8M_DDR3L + config TARGET_IMX8MN_EVK bool "imx8mn LPDDR4 EVK board" select BINMAN
@@ -208,6 +222,7 @@ endchoice source "board/advantech/imx8mp_rsb3720a1/Kconfig" source "board/beacon/imx8mm/Kconfig" source "board/beacon/imx8mn/Kconfig" +source "board/bsh/imx8mn_smm_s2/Kconfig" source "board/compulab/imx8mm-cl-iot-gate/Kconfig" source "board/engicam/imx8mm/Kconfig" source "board/freescale/imx8mq_evk/Kconfig"
board/bsh/imx8mn_smm_s2/Kconfig new file +49 -0
49 lines not on this page · raw message
board/bsh/imx8mn_smm_s2/MAINTAINERS new file +8 -0
@@ -0,0 +1,8 @@ +ARM i.MX8MN BSH SMM S2 BOARDS +M: Ariel D'Alessandro <[email protected]> +M: Michael Trimarchi <[email protected]> +S: Maintained +F: arch/arm/dts/imx8mn-bsh-smm-s2* +F: board/bsh/imx8mn_smm_s2/ +F: configs/imx8mn_bsh_smm_s2* +F: include/configs/imx8mn_bsh_smm_s2*
board/bsh/imx8mn_smm_s2/Makefile new file +13 -0
@@ -0,0 +1,13 @@ +# +# Copyright 2021 Collabora Ltd. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += imx8mn_smm_s2.o + +ifdef CONFIG_SPL_BUILD +obj-y += spl.o +obj-$(CONFIG_BSH_SMM_S2_DDR3L_256) += ddr3l_timing_256m.o +obj-$(CONFIG_BSH_SMM_S2_DDR3L_512) += ddr3l_timing_512m.o +endif
board/bsh/imx8mn_smm_s2/ddr3l_timing_256m.c new file +941 -0
941 lines not on this page · raw message
board/bsh/imx8mn_smm_s2/ddr3l_timing_512m.c new file +941 -0
941 lines not on this page · raw message
board/bsh/imx8mn_smm_s2/imx8mn_smm_s2.c new file +23 -0
@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright 2021 Collabora Ltd. +*/ + +#include <common.h> +#include <asm/arch/sys_proto.h> +#include <env.h> + +int board_init (void ) +{ +return 0 ; +} + +int board_late_init (void ) +{ +if (is_usb_boot ()) { +env_set ("bootcmd" ,"run bootcmd_mfg" ); +env_set ("bootdelay" ,"0" ); + } + +return 0 ; +}
board/bsh/imx8mn_smm_s2/imximage-8mn-ddr3.cfg new file +8 -0
@@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2021 Collabora Ltd. + */ + +ROM_VERSION v2 +BOOT_FROM sd +LOADER u-boot-spl-ddr.bin 0x912000
board/bsh/imx8mn_smm_s2/spl.c new file +97 -0
97 lines not on this page · raw message
configs/imx8mn_bsh_smm_s2_defconfig new file +96 -0
79 lines not on this page · raw message
configs/imx8mn_bsh_smm_s2pro_defconfig new file +93 -0
93 lines not on this page · raw message
doc/board/bsh/imx8mn_bsh_smm_s2.rst new file +62 -0
62 lines not on this page · raw message
include/configs/imx8mn_bsh_smm_s2.h new file +51 -0
51 lines not on this page · raw message
include/configs/imx8mn_bsh_smm_s2_common.h new file +59 -0
59 lines not on this page · raw message
include/configs/imx8mn_bsh_smm_s2pro.h new file +35 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.34.1
Part of the diff is not shown here. View the raw message.
PATCH v5 7/7 bsh: imx8mn-smm-s2/pro: Add iMX8MN BSH SMM S2 boards
Quoted 12 lines
Introduce BSH SystemMaster (SMM) S2 board family, which consists of:
iMX8MN SMM S2 and iMX8MN SMM S2 PRO boards.
Add support for iMX8MN BSH SMM S2 board:
- 256 MiB DDR3 RAM
- 512MiB Nand
- USBOTG1 peripheral - fastboot.
- 100Mbit Ethernet
Add support for iMX8MN BSH SMM S2 PRO board:
- 512 MiB DDR3 RAM
- 8 GiB eMMC
- USBOTG1 peripheral - fastboot.
- 100Mbit Ethernet
Quoted 2 lines
Signed-off-by Ariel D'Alessandro <[email protected]>Signed-off-by Michael Trimarchi <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================