March 2023 - U-Boot

[PATCH] Modify the print log when adma is not supported
by Zhipeng Chen 31 Mar '23

31 Mar '23

--- drivers/mmc/sdhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index c6b250b9a1..4e57e12732 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -882,7 +882,7 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host, #endif #if CONFIG_IS_ENABLED(MMC_SDHCI_ADMA) if (!(caps & SDHCI_CAN_DO_ADMA2)) { - printf("%s: Your controller doesn't support SDMA!!\n", + printf("%s: Your controller doesn't support ADMA!!\n", __func__); return -EINVAL; } -- 2.25.1

1 0

[PATCH] include: configs: Change dtb names in fitImage to match oe-core
by Ryan Eatmon 30 Mar '23

30 Mar '23

The oe-core class for assembling the fitImage includes the vendor sub-directory (with the / changed to _) in the config sections of the fitImage. Our env var settings for chosing which section to boot from needs to be updated to agree with the fitImage. Signed-off-by: Ryan Eatmon <reatmon(a)ti.com> --- include/configs/am64x_evm.h | 4 ++-- include/configs/am65x_evm.h | 2 +- include/configs/j721e_evm.h | 6 +++--- include/configs/j721s2_evm.h | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h index 26a7f2521e..456a44730c 100644 --- a/include/configs/am64x_evm.h +++ b/include/configs/am64x_evm.h @@ -26,9 +26,9 @@ #define EXTRA_ENV_AM642_BOARD_SETTINGS \ "findfdt=" \ "if test $board_name = am64x_gpevm; then " \ - "setenv fdtfile k3-am642-evm.dtb; fi; " \ + "setenv fdtfile ti_k3-am642-evm.dtb; fi; " \ "if test $board_name = am64x_skevm; then " \ - "setenv fdtfile k3-am642-sk.dtb; fi;" \ + "setenv fdtfile ti_k3-am642-sk.dtb; fi;" \ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" \ "name_kern=Image\0" \ diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index 33dd6cfdfa..60a7eb1453 100644 --- a/include/configs/am65x_evm.h +++ b/include/configs/am65x_evm.h @@ -24,7 +24,7 @@ /* U-Boot general configuration */ #define EXTRA_ENV_AM65X_BOARD_SETTINGS \ "findfdt=" \ - "setenv name_fdt k3-am654-base-board.dtb;" \ + "setenv name_fdt ti_k3-am654-base-board.dtb;" \ "setenv fdtfile ${name_fdt}\0" \ "name_kern=Image\0" \ "console=ttyS2,115200n8\0" \ diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index 48b1cea6e3..eac5cd5b76 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -34,11 +34,11 @@ #define EXTRA_ENV_J721E_BOARD_SETTINGS \ "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "findfdt=" \ - "setenv name_fdt ${default_device_tree};" \ + "setenv name_fdt ti_${default_device_tree};" \ "if test $board_name = j721e; then " \ - "setenv name_fdt k3-j721e-common-proc-board.dtb; fi;" \ + "setenv name_fdt ti_k3-j721e-common-proc-board.dtb; fi;" \ "if test $board_name = j721e-eaik || test $board_name = j721e-sk; then " \ - "setenv name_fdt k3-j721e-sk.dtb; fi;" \ + "setenv name_fdt ti_k3-j721e-sk.dtb; fi;" \ "setenv fdtfile ${name_fdt}\0" \ "name_kern=Image\0" \ "console=ttyS2,115200n8\0" \ diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h index bfada9eebc..b30a4a8da4 100644 --- a/include/configs/j721s2_evm.h +++ b/include/configs/j721s2_evm.h @@ -31,11 +31,11 @@ #define EXTRA_ENV_J721S2_BOARD_SETTINGS \ "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "findfdt=" \ - "setenv name_fdt ${default_device_tree};" \ + "setenv name_fdt ti_${default_device_tree};" \ "if test $board_name = j721s2; then " \ - "setenv name_fdt k3-j721s2-common-proc-board.dtb; fi;" \ + "setenv name_fdt ti_k3-j721s2-common-proc-board.dtb; fi;" \ "if test $board_name = am68-sk; then " \ - "setenv name_fdt k3-am68-sk-base-board.dtb; fi;"\ + "setenv name_fdt ti_k3-am68-sk-base-board.dtb; fi;"\ "setenv fdtfile ${name_fdt}\0" \ "name_kern=Image\0" \ "console=ttyS2,115200n8\0" \ -- 2.17.1

1 0

Missed rename of CONFIG_RAM_RK3399_LPDDR4
by David Sebek 30 Mar '23

30 Mar '23

Hi, I think this line: https://source.denx.de/u-boot/u-boot/-/blob/master/drivers/ram/rockchip/sdr… should be #if defined(CONFIG_RAM_ROCKCHIP_DEBUG) instead of #if defined(CONFIG_RAM_RK3399_LPDDR4) The condition now evaluates to false on the RockPro64 board in the latest U-Boot version, which I believe is incorrect. Thanks, David Sebek

3 3

Re: Re: How to add eth1 to test device tree?
by Simon Glass 30 Mar '23

30 Mar '23

+Tom Rini +Heinrich Schuchardt too Hi Ehsan, On Wed, 29 Mar 2023 at 04:15, Ehsan Mohandesi <emohandesi(a)microsoft.com> wrote: > > Hi Simon, > > > -----Original Message----- > > From: Simon Glass <sjg(a)chromium.org> > > Sent: Monday, March 27, 2023 3:15 PM > > To: Ehsan Mohandesi <emohandesi(a)linux.microsoft.com> > > Cc: u-boot(a)lists.denx.de; swarren(a)nvidia.com; michal.simek(a)xilinx.com; > > guillaume.gardet(a)free.fr > > Subject: [EXTERNAL] Re: How to add eth1 to test device tree? > > > > Hi Ehsan, > > > > On Tue, 28 Mar 2023 at 08:58, Ehsan Mohandesi > > <emohandesi(a)linux.microsoft.com> wrote: > > > > > > Hi All, > > > > > > When running the sandbox tests, I want to know how to enable eth1 in > > > order to be able to test network features. > > > > > > The following command is used to run sandbox tests. > > > > > > ./test/py/test.py -k testname.py > > > > > > I am specifically interested in running the network tests. > > > > > > ./test/py/test.py -k test_net.py > > > > > > These Python tests use test.dts device tree which does not have eth1 > > > in it. I can replace the test.dts file with sandbox.dts to enable eth1 > > > and run the network tests; however, I think there should be a better > > > way to do it. > > > > > > Can anyone help me with this issue? > > > > > > When running U-Boot, the -T option could be used to tell it to use the > > > test.dts or -D to use sandbox.dts; however, there is no such option > > > when running test.py. > > > > > > Eth1 is needed in order to enable the network. Enabling the sandbox > > > network is explained after line 250 in doc/arch/sandbox.rst. > > > > > > For more information, the following is the list of network interfaces > > > when each device tree is used. > > > > > > ** > > > > > > *arch/sandbox/dts/sandbox.dts** > > > *Net: eth0: host_lo, *eth1: host_eth0*, eth2: host_br1, eth3: eth@10002000 > > > > > > *arch/sandbox/dts/test.dts* > > > > > > Net: eth0: eth@10002000, eth5: eth@10003000, eth3: sbe5, eth6: > > > eth@10004000, eth4: dsa-test-eth, eth2: lan0, eth7: lan1 > > > > > > > You should write tests in C where possible. See [1]. > > > > If you are just trying to try something out locally, then you can run a sandbox > > test without Python. See [2]. You can use the -D flag as usual. Of course you > > can't > > > > Network tests should generate their own traffic and check it internally, rather > > than relying on the real network features of the host machine. You can see > > test/dm/eth.c for that > > > > For local hacking you can change u_boot_console_sandbox.py.get_spawn() > > to pass -D instead of the -d xxx it currently does. > > > > So it depends on what you are trying to do. > > > > Regards, > > Simon > > > > [1] https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fu- > > boot.readthedocs.io%2Fen%2Flatest%2Fdevelop%2Ftests_writing.html&data=0 > > 5%7C01%7Cemohandesi%40microsoft.com%7Ccb2205b7fa56490d6b0008db2ef > > ff21e%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C63815544908078 > > 1196%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzI > > iLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=qi8G4i64eXd > > S4VpzMz9F5LL3BcEh0C87%2BvsTBg4IRic%3D&reserved=0 > > [2] https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fu- > > boot.readthedocs.io%2Fen%2Flatest%2Fdevelop%2Ftests_sandbox.html%23run > > ning-sandbox-tests- > > directly&data=05%7C01%7Cemohandesi%40microsoft.com%7Ccb2205b7fa564 > > 90d6b0008db2efff21e%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C > > 638155449080781196%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMD > > AiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&s > > data=YiBTpwZ4sjvKAu9H%2B4%2BBGFJUjoe3zT5pERDtBA5oDms%3D&reserved > > =0 > > Let me add a little bit of information on my change and how I want to test it. > I have implemented the IPv6 network discovery and have sent it upstream. Now I am working on writing the sandbox tests. I have implemented some tests in C and one in Python when using C was not possible. > Tests written in C are in test/dm/eth.c and they use fake networks as you have instructed. > Test written in Python is in test/py/tests/test_net.py. The Python test is similar to the DHCP and TFTP tests where they deal with real network traffic. My question is how those tests succeed. Do they use eth1? For them to succeed, they need to be connected to a DHCP server or other servers. How do the users run such tests? OK I understand now. There is a u-boot-test-hooks repo [1] which provides these details, as they are specific to the environment you are using. For example, in 'travis-ci/u_boot_boardenv_qemu_x86_64_na.py' you will see: import os import travis_tftp env__net_uses_pci = True env__net_dhcp_server = True env__net_tftp_readable_file = travis_tftp.file2env('u-boot') env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi') env__efi_loader_check_smbios = True env__efi_loader_grub_file = travis_tftp.file2env('grub_x64.efi') env__efi_fit_tftp_file = { "dn" : os.environ['UBOOT_TRAVIS_BUILD_DIR'], } This sets up some environment vars which are read by the test in conftest.py You can see an example that uses USB ethernet in the swarren-lx1 directory. Note that these tests use 'real' boards, not sandbox. That's because we don't have emulation of a TFTP server, etc. in sandbox, at least so far. They do run in CI, e.g. see qemu-x86_64, and you can run them locally, either by setting up the test hooks, or by manually running qemu with suitable args taken from conf.qemu-x86_64_na for example. Regards, Simon [1] https://source.denx.de/u-boot/u-boot-test-hooks

1 0

[PATCH v3 1/2] regulator: implement basic reference counter
by Eugen Hristev 30 Mar '23

30 Mar '23

Some devices share a regulator supply, when the first one will request regulator disable, the second device will have it's supply cut off before graciously shutting down. Hence there will be timeouts and other failed operations. Implement a reference counter mechanism similar with what is done in Linux, to keep track of enable and disable requests, and only disable the regulator when the last of the consumers has requested shutdown. Signed-off-by: Eugen Hristev <eugen.hristev(a)collabora.com> --- Changes in v3: - add error return codes Changes in v2: - add info in header regarding the function drivers/power/regulator/regulator_common.c | 22 ++++++++++++++++++++++ drivers/power/regulator/regulator_common.h | 14 ++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c index 93d8196b381e..484a4fc31ef7 100644 --- a/drivers/power/regulator/regulator_common.c +++ b/drivers/power/regulator/regulator_common.c @@ -73,6 +73,23 @@ int regulator_common_set_enable(const struct udevice *dev, return 0; } + /* If previously enabled, increase count */ + if (enable && dev_pdata->enable_count > 0) { + dev_pdata->enable_count++; + return -EALREADY; + } + + if (!enable) { + if (dev_pdata->enable_count > 1) { + /* If enabled multiple times, decrease count */ + dev_pdata->enable_count--; + return -EBUSY; + } else if (!dev_pdata->enable_count) { + /* If already disabled, do nothing */ + return -EALREADY; + } + } + ret = dm_gpio_set_value(&dev_pdata->gpio, enable); if (ret) { pr_err("Can't set regulator : %s gpio to: %d\n", dev->name, @@ -87,5 +104,10 @@ int regulator_common_set_enable(const struct udevice *dev, if (!enable && dev_pdata->off_on_delay_us) udelay(dev_pdata->off_on_delay_us); + if (enable) + dev_pdata->enable_count++; + else + dev_pdata->enable_count--; + return 0; } diff --git a/drivers/power/regulator/regulator_common.h b/drivers/power/regulator/regulator_common.h index c10492f01675..7a4df703ea1a 100644 --- a/drivers/power/regulator/regulator_common.h +++ b/drivers/power/regulator/regulator_common.h @@ -13,6 +13,7 @@ struct regulator_common_plat { struct gpio_desc gpio; /* GPIO for regulator enable control */ unsigned int startup_delay_us; unsigned int off_on_delay_us; + unsigned int enable_count; }; int regulator_common_of_to_plat(struct udevice *dev, @@ -20,6 +21,19 @@ int regulator_common_of_to_plat(struct udevice *dev, char *enable_gpio_name); int regulator_common_get_enable(const struct udevice *dev, struct regulator_common_plat *dev_pdata); +/* + * Enable or Disable a regulator + * + * This is a reentrant function and subsequent calls that enable will + * increase an internal counter, and disable calls will decrease the counter. + * The actual resource will be enabled when the counter gets to 1 coming from 0, + * and disabled when it reaches 0 coming from 1. + * + * @dev: regulator device + * @dev_pdata: Platform data + * @enable: bool indicating whether to enable or disable the regulator + * @return 0 if OK, -ve on error + */ int regulator_common_set_enable(const struct udevice *dev, struct regulator_common_plat *dev_pdata, bool enable); -- 2.34.1

2 3

[PATCH u-boot] mmc: Use EXT_CSD_EXTRACT_BOOT_PART() macro for extracting boot part
by Pali Rohár 30 Mar '23

30 Mar '23

Mask macro PART_ACCESS_MASK filter out access bits of emmc register and macro EXT_CSD_EXTRACT_BOOT_PART() extracts boot part bits of emmc register. So use EXT_CSD_EXTRACT_BOOT_PART() when extracting boot partition. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- board/purism/librem5/librem5.c | 2 +- cmd/mvebu/bubt.c | 3 +-- common/spl/spl_mmc.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/board/purism/librem5/librem5.c b/board/purism/librem5/librem5.c index caa02655fc49..386ed1b4fb22 100644 --- a/board/purism/librem5/librem5.c +++ b/board/purism/librem5/librem5.c @@ -41,7 +41,7 @@ int board_early_init_f(void) #if IS_ENABLED(CONFIG_LOAD_ENV_FROM_MMC_BOOT_PARTITION) uint board_mmc_get_env_part(struct mmc *mmc) { - uint part = (mmc->part_config >> 3) & PART_ACCESS_MASK; + uint part = EXT_CSD_EXTRACT_BOOT_PART(mmc->part_config); if (part == 7) part = 0; diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index 49797b23144b..37ff9c455228 100644 --- a/cmd/mvebu/bubt.c +++ b/cmd/mvebu/bubt.c @@ -223,8 +223,7 @@ static int mmc_burn_image(size_t image_size) orig_part = mmc->block_dev.hwpart; #endif - part = (mmc->part_config >> 3) & PART_ACCESS_MASK; - + part = EXT_CSD_EXTRACT_BOOT_PART(mmc->part_config); if (part == 7) part = 0; diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index bd5e6adf1ea6..a0722167044f 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -378,7 +378,7 @@ int default_spl_mmc_emmc_boot_partition(struct mmc *mmc) * 1 and 2 match up to boot0 / boot1 and 7 is user data * which is the first physical partition (0). */ - part = (mmc->part_config >> 3) & PART_ACCESS_MASK; + part = EXT_CSD_EXTRACT_BOOT_PART(mmc->part_config); if (part == 7) part = 0; #endif -- 2.20.1

2 2

[PATCH 0/3] remoteproc: uclass cleanup
by Samuel Holland 30 Mar '23

30 Mar '23

This series cleans up some misplaced and dead code that I ran in to while writing a new remoteproc driver for the Bouffalo Lab BL808. Samuel Holland (3): remoteproc: Move rproc_cfg_arr out of the uclass header remoteproc: Remove unused mem_type platform data remoteproc: Remove legacy probing method cmd/remoteproc.c | 12 +------- .../driver-model/remoteproc-framework.rst | 30 ------------------- drivers/remoteproc/ipu_rproc.c | 4 ++- drivers/remoteproc/rproc-uclass.c | 25 +--------------- drivers/remoteproc/sandbox_testproc.c | 11 ------- include/remoteproc.h | 18 ----------- 6 files changed, 5 insertions(+), 95 deletions(-) -- 2.39.2

3 8

[PATCH 0/2] arm: dts: J721E Hyperbus Fixes
by Vaishnav Achath 30 Mar '23

30 Mar '23

J721E SoC has a hyperbus controller and OSPI controller muxed and only one of the controllers should be active at a time While enabling support for hyperflash in J721E, the hyperbus controller was enabled by default in SoC DTS and was kept disabled in board DTS. For J721E SK, the board level DTS does not disable the hyperbus node which causes OSPI and Hyperbus controllers to be active at the same time thus causing boot failure on J721E SK, to avoid situations like this keep the hyperbus controller disabled by default in SoC DTS. Also the fixups for hyperflash enable according to DIP switch settings on EVM is relevant only to J721E EVM and J7200 EVM, thus disable those fixups for other platforms. Since the hyperbus node is not present in kernel DTS, manual update is needed to fix the issue( J721E SK Boot failure). J721E SK boot failure needs additional fixes on the board DTS which will be sent separately, but hyperbus and OSPI controller being active was also one of the issues causing boot failure. Changes were tested on J721E EVM and J721E SK for basic boot and hyperflash functionality(EVM). Vaishnav Achath (2): arm: dts: k3-j721e-mcu-wakeup: Disable hyperbus controller node board: ti: j721e: Disable hyperflash fixup for J721E SK arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 1 + board/ti/j721e/evm.c | 6 ++++++ 2 files changed, 7 insertions(+) -- 2.17.1

3 4

[PATCH] ARM: dts: trimslice: sync SPI node with Linux dts
by Tomasz Maciej Nowak 30 Mar '23

30 Mar '23

From: Tomasz Maciej Nowak <tmn505(a)gmail.com> After "spi: spi_flash_probe_bus_cs() rely on DT for spi speed and mode" series flash speed and mode wasn't passed to driver anymore, which resulted in: Loading Environment from SPIFlash... tegra20_sflash spi@7000c380: Invalid chip select 0:0 (err=-19) *** Warning - spi_flash_probe_bus_cs() failed, using default environment Fix it by syncing SPI node of affected device dts with Linux kernel dts. The changed SPI bus frequency doesn't influence stability of read/write operations. Ref: https://patchwork.ozlabs.org/project/uboot/cover/20220518064648.1843664-1-p… Signed-off-by: Tomasz Maciej Nowak <tmn505(a)gmail.com> --- arch/arm/dts/tegra20-trimslice.dts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/tegra20-trimslice.dts b/arch/arm/dts/tegra20-trimslice.dts index e19001ee2bdf..fa942d260788 100644 --- a/arch/arm/dts/tegra20-trimslice.dts +++ b/arch/arm/dts/tegra20-trimslice.dts @@ -27,7 +27,13 @@ spi@7000c380 { status = "okay"; - spi-max-frequency = <25000000>; + spi-max-frequency = <48000000>; + + flash@0 { + compatible = "winbond,w25q80bl", "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <48000000>; + }; }; pcie@80003000 { -- 2.40.0

1 0

[PATCH v4 01/14] clk: imx8mp: Add EQoS MAC clock
by Marek Vasut 30 Mar '23

30 Mar '23

Add clock for the DWMAC EQoS block. This is used among other things to configure the MII clock via DM CLK. Acked-by: Sean Anderson <seanga2(a)gmail.com> Reviewed-by: Peng Fan <peng.fan(a)nxp.com> Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: "Ariel D'Alessandro" <ariel.dalessandro(a)collabora.com> Cc: "NXP i.MX U-Boot Team" <uboot-imx(a)nxp.com> Cc: Andrey Zhizhikin <andrey.zhizhikin(a)leica-geosystems.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Lukasz Majewski <lukma(a)denx.de> Cc: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> Cc: Marek Vasut <marex(a)denx.de> Cc: Michael Trimarchi <michael(a)amarulasolutions.com> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Ramon Fried <rfried.dev(a)gmail.com> Cc: Sean Anderson <seanga2(a)gmail.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Tim Harvey <tharvey(a)gateworks.com> Cc: Tommaso Merciai <tommaso.merciai(a)amarulasolutions.com> Cc: u-boot(a)lists.denx.de --- V2: Add AB from Sean V3: No change V4: No change --- drivers/clk/imx/clk-imx8mp.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c index ffbc1d1ba9f..6dda0403e35 100644 --- a/drivers/clk/imx/clk-imx8mp.c +++ b/drivers/clk/imx/clk-imx8mp.c @@ -70,6 +70,14 @@ static const char *imx8mp_i2c6_sels[] = {"clock-osc-24m", "sys_pll1_160m", "sys_ "sys_pll3_out", "audio_pll1_out", "video_pll1_out", "audio_pll2_out", "sys_pll1_133m", }; +static const char *imx8mp_enet_qos_sels[] = {"clock-osc-24m", "sys_pll2_125m", "sys_pll2_50m", + "sys_pll2_100m", "sys_pll1_160m", "audio_pll1_out", + "video_pll1_out", "clk_ext4", }; + +static const char *imx8mp_enet_qos_timer_sels[] = {"clock-osc-24m", "sys_pll2_100m", "audio_pll1_out", + "clk_ext1", "clk_ext2", "clk_ext3", + "clk_ext4", "video_pll1_out", }; + static const char *imx8mp_usdhc1_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sys_pll1_800m", "sys_pll2_500m", "sys_pll3_out", "sys_pll1_266m", "audio_pll2_out", "sys_pll1_100m", }; @@ -250,6 +258,8 @@ static int imx8mp_clk_probe(struct udevice *dev) clk_dm(IMX8MP_CLK_DRAM_APB, imx8m_clk_composite_critical("dram_apb", imx8mp_dram_apb_sels, base + 0xa080)); clk_dm(IMX8MP_CLK_I2C5, imx8m_clk_composite("i2c5", imx8mp_i2c5_sels, base + 0xa480)); clk_dm(IMX8MP_CLK_I2C6, imx8m_clk_composite("i2c6", imx8mp_i2c6_sels, base + 0xa500)); + clk_dm(IMX8MP_CLK_ENET_QOS, imx8m_clk_composite("enet_qos", imx8mp_enet_qos_sels, base + 0xa880)); + clk_dm(IMX8MP_CLK_ENET_QOS_TIMER, imx8m_clk_composite("enet_qos_timer", imx8mp_enet_qos_timer_sels, base + 0xa900)); clk_dm(IMX8MP_CLK_ENET_REF, imx8m_clk_composite("enet_ref", imx8mp_enet_ref_sels, base + 0xa980)); clk_dm(IMX8MP_CLK_ENET_TIMER, imx8m_clk_composite("enet_timer", imx8mp_enet_timer_sels, base + 0xaa00)); clk_dm(IMX8MP_CLK_ENET_PHY_REF, imx8m_clk_composite("enet_phy_ref", imx8mp_enet_phy_ref_sels, base + 0xaa80)); @@ -292,10 +302,13 @@ static int imx8mp_clk_probe(struct udevice *dev) clk_dm(IMX8MP_CLK_I2C2_ROOT, imx_clk_gate4("i2c2_root_clk", "i2c2", base + 0x4180, 0)); clk_dm(IMX8MP_CLK_I2C3_ROOT, imx_clk_gate4("i2c3_root_clk", "i2c3", base + 0x4190, 0)); clk_dm(IMX8MP_CLK_I2C4_ROOT, imx_clk_gate4("i2c4_root_clk", "i2c4", base + 0x41a0, 0)); + clk_dm(IMX8MP_CLK_QOS_ROOT, imx_clk_gate4("qos_root_clk", "ipg_root", base + 0x42c0, 0)); + clk_dm(IMX8MP_CLK_QOS_ENET_ROOT, imx_clk_gate4("qos_enet_root_clk", "ipg_root", base + 0x42e0, 0)); clk_dm(IMX8MP_CLK_QSPI_ROOT, imx_clk_gate4("qspi_root_clk", "qspi", base + 0x42f0, 0)); clk_dm(IMX8MP_CLK_I2C5_ROOT, imx_clk_gate2("i2c5_root_clk", "i2c5", base + 0x4330, 0)); clk_dm(IMX8MP_CLK_I2C6_ROOT, imx_clk_gate2("i2c6_root_clk", "i2c6", base + 0x4340, 0)); clk_dm(IMX8MP_CLK_SIM_ENET_ROOT, imx_clk_gate4("sim_enet_root_clk", "enet_axi", base + 0x4400, 0)); + clk_dm(IMX8MP_CLK_ENET_QOS_ROOT, imx_clk_gate4("enet_qos_root_clk", "sim_enet_root_clk", base + 0x43b0, 0)); clk_dm(IMX8MP_CLK_UART1_ROOT, imx_clk_gate4("uart1_root_clk", "uart1", base + 0x4490, 0)); clk_dm(IMX8MP_CLK_UART2_ROOT, imx_clk_gate4("uart2_root_clk", "uart2", base + 0x44a0, 0)); clk_dm(IMX8MP_CLK_UART3_ROOT, imx_clk_gate4("uart3_root_clk", "uart3", base + 0x44b0, 0)); -- 2.39.2

2 27