imx8m: USDHC3 base address definition for i.MX8MP
Subsystems (3)
PATCH v5 1/5 imx8m: USDHC3 base address definition for i.MX8MP
The i.MX8MP also has USDHC3, allow access to the relvant base address definition.
---
Changes in v2:
- None
Changes in v3:
- None
Changes in v4:
- None
Changes in v5:
- None
arch/arm/include/asm/arch-imx8m/imx-regs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/arch-imx8m/imx-regs.h +1 -1
@@ -47,7 +47,7 @@#define USDHC1_BASE_ADDR 0x30B40000#define USDHC2_BASE_ADDR 0x30B50000#define QSPI0_AMBA_BASE 0x08000000 -#ifdef CONFIG_IMX8MM +#if defined(CONFIG_IMX8MM ) || defined(CONFIG_IMX8MP )#define USDHC3_BASE_ADDR 0x30B60000#endif #define UART_BASE_ADDR (n) ( \
Signature · 1 line
2.35.1
PATCH v5 2/5 ARM: imx: imx8mp: Enable support for i2c5 and i2c6 on i.MX8MP
The i.MX8MP SoC contains 2 more i2c buses. Add support for the configuration of these buses.
---
Changes in v2:
- None
Changes in v3:
- None
Changes in v4:
- None
Changes in v5:
- None
arch/arm/include/asm/arch-imx8m/imx-regs.h | 4 ++++ arch/arm/mach-imx/i2c-mxv7.c | 6 ++++++ arch/arm/mach-imx/imx8m/clock_imx8mm.c | 12 +++++++++--- 3 files changed, 19 insertions(+), 3 deletions(-)
arch/arm/include/asm/arch-imx8m/imx-regs.h +4 -0
@@ -44,6 +44,10 @@#define I2C3_BASE_ADDR 0x30A40000#define I2C4_BASE_ADDR 0x30A50000#define UART4_BASE_ADDR 0x30A60000 +#ifdef CONFIG_IMX8MP +#define I2C5_BASE_ADDR 0x30AD0000 +#define I2C6_BASE_ADDR 0x30AE0000 +#endif #define USDHC1_BASE_ADDR 0x30B40000#define USDHC2_BASE_ADDR 0x30B50000#define QSPI0_AMBA_BASE 0x08000000
arch/arm/mach-imx/i2c-mxv7.c +6 -0
@@ -70,6 +70,12 @@ static void * const i2c_bases[] = {#ifdef I2C4_BASE_ADDR (void *)I2C4_BASE_ADDR,#endif +#ifdef I2C5_BASE_ADDR + (void *)I2C5_BASE_ADDR, +#endif +#ifdef I2C6_BASE_ADDR + (void *)I2C6_BASE_ADDR, +#endif };/* i2c_index can be from 0 - 3 */
arch/arm/mach-imx/imx8m/clock_imx8mm.c +9 -3
@@ -36,11 +36,17 @@ void enable_ocotp_clk(unsigned char enable)int enable_i2c_clk (unsigned char enable,unsigned i2c_num) { -/* 0 - 3 is valid i2c num */ -if (i2c_num >3 ) +u8 i2c_ccgr[6 ] = { +CCGR_I2C1 ,CCGR_I2C2 ,CCGR_I2C3 ,CCGR_I2C4 , +#if (IS_ENABLED(CONFIG_IMX8MP)) +CCGR_I2C5_8MP ,CCGR_I2C6_8MP +#endif + }; + +if (i2c_num >ARRAY_SIZE (i2c_ccgr))return -EINVAL ; -clock_enable (CCGR_I2C1 + i2c_num, !!enable); +clock_enable (i2c_ccgr[i2c_num], !!enable);return 0 ; }
Signature · 1 line
2.35.1
Re: [PATCH v5 2/5] ARM: imx: imx8mp: Enable support for i2c5 and i2c6 on i.MX8MP
Quoted 70 lines · Martyn Welch
The i.MX8MP SoC contains 2 more i2c buses. Add support for the configuration of these buses.
Signed-off-by Martyn Welch <[email protected]>---
Changes in v2:
- NoneChanges in v3:
- NoneChanges in v4:
- NoneChanges in v5:
- Nonearch/arm/include/asm/arch-imx8m/imx-regs.h | 4 ++++ arch/arm/mach-imx/i2c-mxv7.c | 6 ++++++ arch/arm/mach-imx/imx8m/clock_imx8mm.c | 12 +++++++++--- 3 files changed, 19 insertions(+), 3 deletions(-)arch/arm/include/asm/arch-imx8m/imx-regs.h +4
-0@@ -44,6 +44,10 @@#define I2C3_BASE_ADDR 0x30A40000#define I2C4_BASE_ADDR 0x30A50000#define UART4_BASE_ADDR 0x30A60000 +#ifdef CONFIG_IMX8MP +#define I2C5_BASE_ADDR 0x30AD0000 +#define I2C6_BASE_ADDR 0x30AE0000 +#endif #define USDHC1_BASE_ADDR 0x30B40000#define USDHC2_BASE_ADDR 0x30B50000#define QSPI0_AMBA_BASE 0x08000000arch/arm/mach-imx/i2c-mxv7.c +6
-0@@ -70,6 +70,12 @@ static void * const i2c_bases[] = {#ifdef I2C4_BASE_ADDR (void *)I2C4_BASE_ADDR,#endif +#ifdef I2C5_BASE_ADDR + (void *)I2C5_BASE_ADDR, +#endif +#ifdef I2C6_BASE_ADDR + (void *)I2C6_BASE_ADDR, +#endif };/* i2c_index can be from 0 - 3 */ arch/arm/mach-imx/imx8m/clock_imx8mm.c +5
-2@@ -36,11 +36,17 @@ void enable_ocotp_clk(unsigned char enable)int enable_i2c_clk (unsigned char enable,unsigned i2c_num) { -/* 0 - 3 is valid i2c num */ -if (i2c_num >3 ) +u8 i2c_ccgr[6 ] = { +CCGR_I2C1 ,CCGR_I2C2 ,CCGR_I2C3 ,CCGR_I2C4 , +#if (IS_ENABLED(CONFIG_IMX8MP)) +CCGR_I2C5_8MP ,CCGR_I2C6_8MP +#endif
arch/arm/mach-imx/imx8m/clock_imx8mm.c void enable_ocotp_clk(unsigned char enable) · line 52
Quoted 10 lines
arch/arm/mach-imx/imx8m/clock_imx8mm.c +4
-1+ }; + +if (i2c_num >ARRAY_SIZE (i2c_ccgr))return -EINVAL ; -clock_enable (CCGR_I2C1 + i2c_num, !!enable); +clock_enable (i2c_ccgr[i2c_num], !!enable);return 0 ; }
With DM_CLK or SPL_DM_CLK enabled, this function is not needed anymore. Do you have DM_CLK and SPL_DM_CLK enabled?
Regards,
Peng.
PATCH v5 2/5 ARM: imx: imx8mp: Enable support for i2c5 and i2c6 on i.MX8MP
In reply to Martyn WelchQuoted 3 lines
The i.MX8MP SoC contains 2 more i2c buses. Add support for the configuration of these buses.
Signed-off-by Martyn Welch <[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/5 drivers: power: pmic: Add support for rn5t568 PMIC
In reply to Martyn WelchAdd support for the rn5t568 PMIC to the rn5t567 driver.
---
Changes in v2:
- None
Changes in v3:
- None
Changes in v4:
- None
Changes in v5:
- None
drivers/power/pmic/rn5t567.c | 1 + 1 file changed, 1 insertion(+)
drivers/power/pmic/rn5t567.c +1 -0
@@ -53,6 +53,7 @@ static struct dm_pmic_ops rn5t567_ops = {static const struct udevice_id rn5t567_ids[] = { { .compatible ="ricoh,rn5t567" }, + { .compatible ="ricoh,rn5t568" }, { } };
Signature · 1 line
2.35.1
RE: [PATCH v5 3/5] drivers: power: pmic: Add support for rn5t568 PMIC
Quoted 9 lines
-----Original Message-----
From: Martyn Welch [mailto:[email protected]]
Sent: Tuesday, October 25, 2022 6:55 PM
To: [email protected]; [email protected]; Jaehoon Chung <[email protected]>
Cc: Martyn Welch <[email protected]>; [email protected]
Subject: [PATCH v5 3/5] drivers: power: pmic: Add support for rn5t568 PMIC
Quoted 3 lines
Add support for the rn5t568 PMIC to the rn5t567 driver.
Signed-off-by Martyn Welch <[email protected]>
Best Regards,
Jaehoon Chung
Quoted 31 lines
---
Changes in v2:
- NoneChanges in v3:
- NoneChanges in v4:
- NoneChanges in v5:
- Nonedrivers/power/pmic/rn5t567.c | 1 + 1 file changed, 1 insertion(+)drivers/power/pmic/rn5t567.c +1
-1@@ -53,6 +53,7 @@ static struct dm_pmic_ops rn5t567_ops = {static const struct udevice_id rn5t567_ids[] = { { .compatible ="ricoh,rn5t567" }, + { .compatible ="ricoh,rn5t568" }, { } }; --2.35.1
PATCH v5 3/5 drivers: power: pmic: Add support for rn5t568 PMIC
In reply to Martyn WelchQuoted 3 lines
Add support for the rn5t568 PMIC to the rn5t567 driver.
Signed-off-by Martyn Welch <[email protected]>Reviewed-by Jaehoon Chung <[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/5 drivers: power: pmic: Enable use of rn5t567 PMIC in SPL
In reply to Martyn WelchFrom: Martyn Welch <[email protected]>
The support added later in this series tweaks the PMIC voltages in the SPL. Enable support for the rn5t567 in SPL builds to allow this to be done cleanly.
---
Changes in v3:
- New patch (replaces addition of legacy support for rn5t567)
Changes in v4:
- None
Changes in v5:
- Rebase to current master branch
drivers/power/pmic/Kconfig | 8 ++++++++ drivers/power/pmic/Makefile | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)
drivers/power/pmic/Kconfig +8 -0
@@ -300,6 +300,14 @@ config PMIC_RN5T567 regulators Real-Time Clock and 4 GPIOs. This driver provides register access only. +config SPL_PMIC_RN5T567 + bool "Enable driver for Ricoh RN5T567 PMIC in SPL" + depends on SPL_DM_PMIC + ---help--- + The RN5T567 is a PMIC with 4 step-down DC/DC converters, 5 LDO + regulators Real-Time Clock and 4 GPIOs. This driver provides + register access only. + config PMIC_TPS65090 bool "Enable driver for Texas Instruments TPS65090 PMIC" ---help---
drivers/power/pmic/Makefile +1 -1
@@ -22,7 +22,7 @@ obj-$(CONFIG_$(SPL_)PMIC_AXP) += axp.o obj-$(CONFIG_PMIC_MAX8997) += max8997.o obj-$(CONFIG_PMIC_QCOM) += pmic_qcom.o obj-$(CONFIG_$(SPL_TPL_)PMIC_RK8XX) += rk8xx.o -obj-$(CONFIG_PMIC_RN5T567) += rn5t567.o +obj-$(CONFIG_$(SPL_)PMIC_RN5T567) += rn5t567.o obj-$(CONFIG_PMIC_TPS65090) += tps65090.o obj-$(CONFIG_PMIC_S5M8767) += s5m8767.o obj-$(CONFIG_DM_PMIC_TPS65910) += pmic_tps65910_dm.o
Signature · 1 line
2.35.1
RE: [PATCH v5 4/5] drivers: power: pmic: Enable use of rn5t567 PMIC in SPL
Quoted 10 lines
-----Original Message-----
From: Martyn Welch [mailto:[email protected]]
Sent: Tuesday, October 25, 2022 6:55 PM
To: [email protected]; [email protected]; Jaehoon Chung <[email protected]>
Cc: Martyn Welch <[email protected]>; Simon Glass <[email protected]>; u- [email protected]
Subject: [PATCH v5 4/5] drivers: power: pmic: Enable use of rn5t567 PMIC in SPL
Quoted 8 lines
From: Martyn Welch <[email protected]>
The support added later in this series tweaks the PMIC voltages in the SPL. Enable support for the rn5t567 in SPL builds to allow this to be done cleanly.
Signed-off-by Martyn Welch <[email protected]>Reviewed-by Simon Glass <[email protected]>
Best Regards,
Jaehoon Chung
Quoted 49 lines
---
Changes in v3:
- New patch (replaces addition of legacy support for rn5t567)Changes in v4:
- NoneChanges in v5:
- Rebase to current master branchdrivers/power/pmic/Kconfig | 8 ++++++++ drivers/power/pmic/Makefile | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)drivers/power/pmic/Kconfig +8
-0@@ -300,6 +300,14 @@ config PMIC_RN5T567 regulators Real-Time Clock and 4 GPIOs. This driver provides register access only. +config SPL_PMIC_RN5T567 + bool "Enable driver for Ricoh RN5T567 PMIC in SPL" + depends on SPL_DM_PMIC + ---help--- + The RN5T567 is a PMIC with 4 step-down DC/DC converters, 5 LDO + regulators Real-Time Clock and 4 GPIOs. This driver provides + register access only. + config PMIC_TPS65090 bool "Enable driver for Texas Instruments TPS65090 PMIC" ---help---drivers/power/pmic/Makefile +1
-2@@ -22,7 +22,7 @@ obj-$(CONFIG_$(SPL_)PMIC_AXP) += axp.o obj-$(CONFIG_PMIC_MAX8997) += max8997.o obj-$(CONFIG_PMIC_QCOM) += pmic_qcom.o obj-$(CONFIG_$(SPL_TPL_)PMIC_RK8XX) += rk8xx.o -obj-$(CONFIG_PMIC_RN5T567) += rn5t567.o +obj-$(CONFIG_$(SPL_)PMIC_RN5T567) += rn5t567.o obj-$(CONFIG_PMIC_TPS65090) += tps65090.o obj-$(CONFIG_PMIC_S5M8767) += s5m8767.o obj-$(CONFIG_DM_PMIC_TPS65910) += pmic_tps65910_dm.o --2.35.1
PATCH v5 4/5 drivers: power: pmic: Enable use of rn5t567 PMIC in SPL
In reply to Martyn WelchQuoted 7 lines
From: Martyn Welch <[email protected]>
The support added later in this series tweaks the PMIC voltages in the SPL. Enable support for the rn5t567 in SPL builds to allow this to be done cleanly.Signed-off-by Martyn Welch <[email protected]>Reviewed-by Simon Glass <[email protected]>Reviewed-by Jaehoon Chung <[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/5 arm: imx8mp: Initial MSC SM2S iMX8MP support
In reply to Martyn WelchAdd support for the MSC SM2S-IMX8PLUS SMARC Module. Tested in conjunction with the MSC SM2-MB-EP1 Mini-ITX Carrier Board.
---
Changes in v2:
- Renamed FDT to closer match kernel
- Sync with kernel FDT
- Update for changes made in U-Boot
Changes in v3:
- Use imx8mp-u-boot.dtsi
- Switch to use of DM PMIC support in SPL
Changes in v4:
- Rebased to latest imx master branch
Changes in v5:
- Rebased on latest master branch
- Add MAINTAINERS entry
- Migrate symbols to Kbuild config
- Simplify header file
MAINTAINERS | 9 + arch/arm/dts/Makefile | 1 + arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi | 65 + arch/arm/dts/imx8mp-msc-sm2s.dts | 820 ++++++++ arch/arm/mach-imx/imx8m/Kconfig | 8 + board/msc/sm2s_imx8mp/Kconfig | 15 + board/msc/sm2s_imx8mp/Makefile | 12 + board/msc/sm2s_imx8mp/imximage-8mp-lpddr4.cfg | 8 + board/msc/sm2s_imx8mp/lpddr4_timing.c | 1842 +++++++++++++++++ board/msc/sm2s_imx8mp/sm2s_imx8mp.c | 60 + board/msc/sm2s_imx8mp/spl.c | 273 +++ configs/msc_sm2s_imx8mp_defconfig | 105 + include/configs/msc_sm2s_imx8mp.h | 64 + 13 files changed, 3282 insertions(+) create mode 100644 arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi create mode 100644 arch/arm/dts/imx8mp-msc-sm2s.dts create mode 100644 board/msc/sm2s_imx8mp/Kconfig create mode 100644 board/msc/sm2s_imx8mp/Makefile create mode 100644 board/msc/sm2s_imx8mp/imximage-8mp-lpddr4.cfg create mode 100644 board/msc/sm2s_imx8mp/lpddr4_timing.c create mode 100644 board/msc/sm2s_imx8mp/sm2s_imx8mp.c create mode 100644 board/msc/sm2s_imx8mp/spl.c create mode 100644 configs/msc_sm2s_imx8mp_defconfig create mode 100644 include/configs/msc_sm2s_imx8mp.h
MAINTAINERS +9 -0
@@ -398,6 +398,15 @@ F: drivers/timer/atmel_tcb_timer.c F: include/dt-bindings/mfd/atmel-flexcom.h F: drivers/timer/mchp-pit64b-timer.c +ARM MSC SM2S IMX8MP SOM +M: Martyn Welch <[email protected]> +M: Ian Ray <[email protected]> +S: Maintained +F: arch/arm/dts/imx8mp-msc-sm2s* +F: board/msc/sm2s_imx8mp/ +F: configs/msc_sm2s_imx8mp_defconfig +F: include/configs/msc_sm2s_imx8mp.h + ARM NEXELL S5P4418 M: Stefan Bosch <[email protected]> S: Maintained
arch/arm/dts/Makefile +1 -0
@@ -976,6 +976,7 @@ dtb-$(CONFIG_ARCH_IMX8M) += \ imx8mp-dhcom-pdk2.dtb \ imx8mp-evk.dtb \ imx8mp-icore-mx8mp-edimm2.2.dtb \ + imx8mp-msc-sm2s.dtb \ imx8mp-phyboard-pollux-rdk.dtb \ imx8mp-venice.dtb \ imx8mp-venice-gw74xx.dtb \
arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi new file +65 -0
65 lines not on this page · raw message
arch/arm/dts/imx8mp-msc-sm2s.dts new file +820 -0
820 lines not on this page · raw message
arch/arm/mach-imx/imx8m/Kconfig +8 -0
@@ -284,6 +284,13 @@ config TARGET_IMX8MP_RSB3720A1_6G select SUPPORT_SPL select IMX8M_LPDDR4 +config TARGET_MSC_SM2S_IMX8MP + bool "MSC SMARC2 i.MX8MPLUS" + select BINMAN + select IMX8MP + select SUPPORT_SPL + select IMX8M_LPDDR4 + config TARGET_LIBREM5 bool "Purism Librem5 Phone" select BINMAN
@@ -311,6 +318,7 @@ source "board/google/imx8mq_phanbell/Kconfig" source "board/kontron/pitx_imx8m/Kconfig" source "board/kontron/sl-mx8mm/Kconfig" source "board/menlo/mx8menlo/Kconfig" +source "board/msc/sm2s_imx8mp/Kconfig" source "board/phytec/phycore_imx8mm/Kconfig" source "board/phytec/phycore_imx8mp/Kconfig" source "board/purism/librem5/Kconfig"
board/msc/sm2s_imx8mp/Kconfig new file +15 -0
@@ -0,0 +1,15 @@ +if TARGET_MSC_SM2S_IMX8MP + +config SYS_BOARD + default "sm2s_imx8mp" + +config SYS_VENDOR + default "msc" + +config SYS_CONFIG_NAME + default "msc_sm2s_imx8mp" + +config IMX_CONFIG + default "board/msc/sm2s_imx8mp/imximage-8mp-lpddr4.cfg" + +endif
board/msc/sm2s_imx8mp/Makefile new file +12 -0
@@ -0,0 +1,12 @@ +# +# Copyright (C) 2021 AVNET Embedded, MSC Technologies GmbH +# +# SPDX-License-Identifier: GPL-2.0 +# + +ifdef CONFIG_SPL_BUILD +obj-y += spl.o lpddr4_timing.o +else +obj-y += sm2s_imx8mp.o +endif +
board/msc/sm2s_imx8mp/imximage-8mp-lpddr4.cfg new file +8 -0
@@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2021 NXP + */ + +ROM_VERSION v2 +BOOT_FROM sd +LOADER u-boot-spl-ddr.bin 0x920000
board/msc/sm2s_imx8mp/lpddr4_timing.c new file +1842 -0
1,842 lines not on this page · raw message
board/msc/sm2s_imx8mp/sm2s_imx8mp.c new file +60 -0
60 lines not on this page · raw message
board/msc/sm2s_imx8mp/spl.c new file +273 -0
136 lines not on this page · raw message
configs/msc_sm2s_imx8mp_defconfig new file +105 -0
105 lines not on this page · raw message
include/configs/msc_sm2s_imx8mp.h new file +64 -0
64 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.35.1
Part of the diff is not shown here. View the raw message.
PATCH v5 5/5 arm: imx8mp: Initial MSC SM2S iMX8MP support
Quoted 3 lines
Add support for the MSC SM2S-IMX8PLUS SMARC Module. Tested in conjunction with the MSC SM2-MB-EP1 Mini-ITX Carrier Board.
Signed-off-by Martyn Welch <[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 1/5 imx8m: USDHC3 base address definition for i.MX8MP
In reply to Martyn WelchQuoted 3 lines
The i.MX8MP also has USDHC3, allow access to the relvant base address definition.
Signed-off-by Martyn Welch <[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] =====================================================================