clk: imx: add i.MX6UL clk driver
Subsystems (5)
PATCH v4 1/4 clk: imx: add i.MX6UL clk driver
Add i.MX6UL clk driver for i.MX6UL CLK driver model usage
---
Changes in v4:
- Fix Kconfig typo
- Fix IPG clock duplication
- Add space for consistency in block
- and other minor
Changes in v3:
- Add all uarts definition
- Move OSC on top suggested
- Drop an invalid clock definition
- Move some pll before they are referenced
Changes in v2:
- None
drivers/clk/imx/Kconfig | 8 + drivers/clk/imx/Makefile | 1 + drivers/clk/imx/clk-imx6ul.c | 289 +++++++++++++++++++++++++++++++++++ 3 files changed, 298 insertions(+) create mode 100644 drivers/clk/imx/clk-imx6ul.c
drivers/clk/imx/Kconfig +8 -0
@@ -14,6 +14,14 @@ config CLK_IMX6Q help This enables DM/DTS support for clock driver in i.MX6Q platforms. +config CLK_IMX6UL + bool "Clock support for i.MX6UL" + depends on ARCH_MX6 + select CLK + select CLK_CCF + help + This enables DM/DTS support for clock driver in i.MX6UL platforms. + config CLK_IMX8 bool "Clock support for i.MX8" depends on ARCH_IMX8
drivers/clk/imx/Makefile +1 -0
@@ -4,6 +4,7 @@ obj-$(CONFIG_$(PHASE_)CLK_CCF) += clk-gate2.o clk-pllv3.o clk-pfd.o obj-$(CONFIG_$(PHASE_)CLK_IMX6Q) += clk-imx6q.o +obj-$(CONFIG_$(PHASE_)CLK_IMX6UL) += clk-imx6ul.o obj-$(CONFIG_CLK_IMX8) += clk-imx8.o ifdef CONFIG_CLK_IMX8
drivers/clk/imx/clk-imx6ul.c new file +289 -0
289 lines not on this page · raw message
Signature · 3 lines
2.43.0 base-commit: df2ed552f0b05591090369a7fe7ddc92439dea5c
PATCH v4 2/4 mtd: mxs_nand_dt: Move from clk_get/clk_enable to clk_bulk api
Make simple the clock registration and enable and allow later to add support for other platforms
---
Changes in v4:
- None
Changes in v3:
- None
Changes in v2:
- no changes
drivers/mtd/nand/raw/mxs_nand_dt.c | 48 ++++-------------------------- 1 file changed, 5 insertions(+), 43 deletions(-)
drivers/mtd/nand/raw/mxs_nand_dt.c +5 -43
@@ -100,9 +100,7 @@ static int mxs_nand_dt_probe(struct udevice *dev)if (IS_ENABLED (CONFIG_CLK ) && (IS_ENABLED (CONFIG_IMX8 ) ||IS_ENABLED (CONFIG_IMX8M ))) { -/* Assigned clock already set clock */ -struct clk gpmi_clk; - +struct clk_bulk clk_bulk; info->gpmi_clk =devm_clk_get (dev,"gpmi_io" );if (IS_ERR (info->gpmi_clk)) {
@@ -111,47 +109,11 @@ static int mxs_nand_dt_probe(struct udevice *dev)return ret; } - ret =clk_enable (info->gpmi_clk); -if (ret <0 ) { -debug ("Can't enable gpmi io clk: %d\n" , ret); -return ret; - } - -if (IS_ENABLED (CONFIG_IMX8 )) { - ret =clk_get_by_name (dev,"gpmi_apb" , &gpmi_clk); -if (ret <0 ) { -debug ("Can't get gpmi_apb clk: %d\n" , ret); -return ret; - } - - ret =clk_enable (&gpmi_clk); -if (ret <0 ) { -debug ("Can't enable gpmi_apb clk: %d\n" , ret); -return ret; - } - - ret =clk_get_by_name (dev,"gpmi_bch" , &gpmi_clk); -if (ret <0 ) { -debug ("Can't get gpmi_bch clk: %d\n" , ret); -return ret; - } - - ret =clk_enable (&gpmi_clk); -if (ret <0 ) { -debug ("Can't enable gpmi_bch clk: %d\n" , ret); -return ret; - } - } - - ret =clk_get_by_name (dev,"gpmi_bch_apb" , &gpmi_clk); -if (ret <0 ) { -debug ("Can't get gpmi_bch_apb clk: %d\n" , ret); -return ret; - } - - ret =clk_enable (&gpmi_clk); + ret =clk_get_bulk (dev, &clk_bulk); +if (!ret) + ret =clk_enable_bulk (&clk_bulk);if (ret <0 ) { -debug ("Can't enable gpmi_bch_apb clk: %d\n" , ret); +debug ("Can't enable gpmi clks: %d\n" , ret);return ret; } }
Signature · 3 lines
2.43.0 base-commit: df2ed552f0b05591090369a7fe7ddc92439dea5c
PATCH v4 3/4 mtd: nand: Add support for EDO mode 1-5 to IMX6ULL platform
In reply to Michael TrimarchiThe clock driver allows to boost the NAND performance controller. Make changes to let it use the new clock driver
=> time nand read ${loadaddr} kernel
NAND read: device 0 offset 0x500000, size 0x800000
8388608 bytes read: OK
time: 0.488 seconds
---
Changes in v4:
- None
Changes in v3:
- None
Changes in v2:
- Adjust commit message and include speed test result
- remove not needed { }
drivers/mtd/nand/raw/mxs_nand.c | 10 ++++++++++ drivers/mtd/nand/raw/mxs_nand_dt.c | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/mtd/nand/raw/mxs_nand.c +10 -0
@@ -1507,8 +1507,18 @@ static void mxs_compute_timings(struct nand_chip *chip,writel (GPMI_CTRL1_CLEAR_MASK , &nand_info->gpmi_regs->hw_gpmi_ctrl1_clr);writel (ctrl1n, &nand_info->gpmi_regs->hw_gpmi_ctrl1_set); +/* Clock dividers do NOT guarantee a clean clock signal on its output +* during the change of the divide factor on i.MX6Q/UL/SX. On i.MX7/8, +* all clock dividers provide these guarantee. +*/ +if (IS_ENABLED (CONFIG_MX6ULL )) +clk_disable (nand_info->gpmi_clk); +clk_set_rate (nand_info->gpmi_clk, clk_rate); +if (IS_ENABLED (CONFIG_MX6ULL )) +clk_enable (nand_info->gpmi_clk); +/* Wait 64 clock cycles before using the GPMI after enabling the DLL */ dll_wait_time_us =USEC_PER_SEC / clk_rate *64 ;if (!dll_wait_time_us)
drivers/mtd/nand/raw/mxs_nand_dt.c +1 -1
@@ -99,7 +99,7 @@ static int mxs_nand_dt_probe(struct udevice *dev) info->use_minimum_ecc =dev_read_bool (dev,"fsl,use-minimum-ecc" );if (IS_ENABLED (CONFIG_CLK ) && - (IS_ENABLED (CONFIG_IMX8 ) ||IS_ENABLED (CONFIG_IMX8M ))) { + (IS_ENABLED (CONFIG_IMX8 ) ||IS_ENABLED (CONFIG_IMX8M ) ||IS_ENABLED (CONFIG_MX6ULL ))) {struct clk_bulk clk_bulk; info->gpmi_clk =devm_clk_get (dev,"gpmi_io" );
Signature · 3 lines
2.43.0 base-commit: df2ed552f0b05591090369a7fe7ddc92439dea5c
PATCH v4 4/4 configs/imx6ulz_smm_m2_defconfig: Enable clock framework
In reply to Michael TrimarchiEnable the clock framework on the m2 platform. This helps to increase the NAND controller performance.
---
Changes in v4:
- None
Changes in v3:
- None
Changes in v2:
- Ajust commit message
- drop CONFIG_DM_MTD selected already by MXS_NAND_DT
configs/imx6ulz_smm_m2_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/imx6ulz_smm_m2_defconfig +2 -0
@@ -43,6 +43,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NO_NET=y CONFIG_BOUNCE_BUFFER=y +CONFIG_CLK_COMPOSITE_CCF=y +CONFIG_CLK_IMX6UL=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_FASTBOOT_FLASH=y
Signature · 3 lines
2.43.0 base-commit: df2ed552f0b05591090369a7fe7ddc92439dea5c
Fabio Estevam
reviewerQuoted 8 lines · Michael Trimarchi
Add i.MX6UL clk driver for i.MX6UL CLK driver model usage
Reviewed-by Peng Fan <[email protected]>Reviewed-by Christoph Niedermaier <[email protected]>Signed-off-by Michael Trimarchi <[email protected]>
Quoted 7 lines
---
Changes in v4:
- FixKconfigtypo
- Fix IPG clock duplication
- Add space for consistency in block
- and other minor
Applied the series to u-boot-imx/next, thanks.