February 2020 - U-Boot

[PATCH v3 00/12] riscv: Add Sipeed Maix support
by Sean Anderson 06 Feb '20

06 Feb '20

This patch series adds support for Sipeed Maix boards and the Kendryte K210 CPU. Currently, only the Maix Bit V2.0 is supported, however other models are similar. This series depends on <https://patchwork.ozlabs.org/patch/1215327/> (clk: Include missing headers for linux/clk-provider.h). In addition, there are optional dependencies on <https://patchwork.ozlabs.org/project/uboot/list/?series=156377> <https://patchwork.ozlabs.org/project/uboot/list/?series=156381> and <https://patchwork.ozlabs.org/patch/1232422/> (wdt: Add DM support for Designware WDT) (riscv: Try to get cpu frequency from device tree) (serial: Set baudrate on boot) To flash u-boot to a maix bit, run kflash -tp /dev/<your tty here> -B bit_mic u-boot-dtb.bin Boot output should look like the following: U-Boot 2020.01-00455-gad03fd83e1 (Jan 15 2020 - 17:10:24 -0500) DRAM: 8 MiB MMC: spi@52000000:slot@0: 0 In: serial@38000000 Out: serial@38000000 Err: serial@38000000 => Note that spi does not work! I am trying to figure out what the problem is, but for the moment the only way to boot something is to transfer it over serial. Changes for v3: Remove patch to set RV64I as default. Remove patch for a separate sysctl driver. Split off cpu frequency patch into its own series. Reorder support/devicetree patches to come last. Add patch for reset driver. Add simple-pm-bus for busses with their own clocks. Add additional documentation. Reword mcounteren patch to refer to the RISC-V priv spec 1.9.1. Many devicetree changes Switch to "make savedefconfig" to generate the config Changes for v2: Many bugfixes for the device tree. Modify the config to build without errors. Add support for keeping internal PLL frequencies in-range. Fix several rebase-induced artifacts. Sean Anderson (12): clk: Always use the supplied struct clk clk: Check that ops of composite clock components exist before calling clk: Unconditionally recursively en-/dis-able clocks reset: Add generic reset driver dm: Add support for simple-pm-bus riscv: Add headers for asm/global_data.h riscv: Add option to support RISC-V privileged spec 1.9.1 riscv: Allow use of reset drivers riscv: Add K210 pll support riscv: Add K210 clock support riscv: Add device tree for K210 riscv: Add initial Sipeed Maix support arch/riscv/Kconfig | 14 + arch/riscv/cpu/cpu.c | 6 + arch/riscv/dts/Makefile | 1 + arch/riscv/dts/k210-maix-bit.dts | 42 ++ arch/riscv/dts/k210.dtsi | 496 ++++++++++++++ arch/riscv/include/asm/csr.h | 6 + arch/riscv/include/asm/global_data.h | 2 + arch/riscv/lib/reset.c | 2 + board/sipeed/maix/Kconfig | 51 ++ board/sipeed/maix/MAINTAINERS | 10 + board/sipeed/maix/Makefile | 5 + board/sipeed/maix/maix.c | 9 + configs/sipeed_maix_bitm_defconfig | 10 + doc/board/index.rst | 1 + doc/board/kendryte/index.rst | 9 + doc/board/kendryte/k210.rst | 46 ++ .../bus/simple-pm-bus.txt | 44 ++ .../reset/syscon-reset.txt | 36 ++ doc/imx/clk/ccf.txt | 63 +- drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 1 + drivers/clk/clk-composite.c | 65 +- drivers/clk/clk-divider.c | 6 +- drivers/clk/clk-fixed-factor.c | 3 +- drivers/clk/clk-gate.c | 6 +- drivers/clk/clk-mux.c | 12 +- drivers/clk/clk-uclass.c | 58 +- drivers/clk/imx/clk-gate2.c | 4 +- drivers/clk/kendryte/Kconfig | 12 + drivers/clk/kendryte/Makefile | 1 + drivers/clk/kendryte/clk.c | 390 +++++++++++ drivers/clk/kendryte/clk.h | 27 + drivers/clk/kendryte/pll.c | 607 ++++++++++++++++++ drivers/clk/kendryte/pll.h | 38 ++ drivers/core/simple-bus.c | 57 +- drivers/reset/Kconfig | 6 +- drivers/reset/Makefile | 1 + drivers/reset/reset-syscon.c | 79 +++ include/configs/sipeed-maix.h | 19 + include/dt-bindings/clock/k210-sysctl.h | 53 ++ include/dt-bindings/mfd/k210-sysctl.h | 38 ++ include/dt-bindings/reset/k210-sysctl.h | 38 ++ 42 files changed, 2266 insertions(+), 109 deletions(-) create mode 100644 arch/riscv/dts/k210-maix-bit.dts create mode 100644 arch/riscv/dts/k210.dtsi create mode 100644 board/sipeed/maix/Kconfig create mode 100644 board/sipeed/maix/MAINTAINERS create mode 100644 board/sipeed/maix/Makefile create mode 100644 board/sipeed/maix/maix.c create mode 100644 configs/sipeed_maix_bitm_defconfig create mode 100644 doc/board/kendryte/index.rst create mode 100644 doc/board/kendryte/k210.rst create mode 100644 doc/device-tree-bindings/bus/simple-pm-bus.txt create mode 100644 doc/device-tree-bindings/reset/syscon-reset.txt create mode 100644 drivers/clk/kendryte/Kconfig create mode 100644 drivers/clk/kendryte/Makefile create mode 100644 drivers/clk/kendryte/clk.c create mode 100644 drivers/clk/kendryte/clk.h create mode 100644 drivers/clk/kendryte/pll.c create mode 100644 drivers/clk/kendryte/pll.h create mode 100644 drivers/reset/reset-syscon.c create mode 100644 include/configs/sipeed-maix.h create mode 100644 include/dt-bindings/clock/k210-sysctl.h create mode 100644 include/dt-bindings/mfd/k210-sysctl.h create mode 100644 include/dt-bindings/reset/k210-sysctl.h -- 2.25.0

4 39

[PATCH] tools: env: enable PIC for static library
by Martin Hundebøll 06 Feb '20

06 Feb '20

External projects wanting to embed the static library needs it to be position independent. Signed-off-by: Martin Hundebøll <martin(a)geanix.com> --- tools/env/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/env/Makefile b/tools/env/Makefile index b627796e94..2444269de7 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -13,6 +13,7 @@ HOST_EXTRACFLAGS = -I$(srctree)/tools \ $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ -idirafter $(srctree)/tools/env \ -DUSE_HOSTCC \ + -fPIC \ -DTEXT_BASE=$(TEXT_BASE) ifeq ($(MTD_VERSION),old) -- 2.25.0

1 0

[PATCH] tools: env: remove include of env.h
by Martin Hundebøll 06 Feb '20

06 Feb '20

The header isn't used. Including it breaks compilation for external users of the static library. Signed-off-by: Martin Hundebøll <martin(a)geanix.com> --- tools/env/fw_env.h | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h index b60fbfc8f8..78c803c944 100644 --- a/tools/env/fw_env.h +++ b/tools/env/fw_env.h @@ -4,7 +4,6 @@ * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. */ -#include <env.h> #include <stdint.h> /* -- 2.25.0

1 0

[Patch v2] configs: lx2160a: Enable FSPI support
by Kuldeep Singh 06 Feb '20

06 Feb '20

Enable FSPI controller support. So, flash environment can now be used. Signed-off-by: Kuldeep Singh <kuldeep.singh(a)nxp.com> --- Please let me know if rebase required while applying. v2: -Drop other patches from series as already accepted. -Add ENV_SECT_SIZE value as 0x20000 configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160aqds_tfa_defconfig | 5 ++++- configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160ardb_tfa_defconfig | 5 ++++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig b/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig index 6989543..4c54eb4 100644 --- a/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig @@ -65,6 +65,7 @@ CONFIG_DM_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y +CONFIG_NXP_FSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/lx2160aqds_tfa_defconfig b/configs/lx2160aqds_tfa_defconfig index c9a6ffb..e472c12 100644 --- a/configs/lx2160aqds_tfa_defconfig +++ b/configs/lx2160aqds_tfa_defconfig @@ -4,6 +4,7 @@ CONFIG_TFABOOT=y CONFIG_SYS_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_F_LEN=0x6000 CONFIG_ENV_SIZE=0x2000 +CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_ENV_OFFSET=0x500000 CONFIG_DM_GPIO=y CONFIG_FSPI_AHB_EN_4BYTE=y @@ -32,6 +33,7 @@ CONFIG_OF_CONTROL=y CONFIG_OF_BOARD_FIXUP=y CONFIG_DEFAULT_DEVICE_TREE="fsl-lx2160a-qds" CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y @@ -57,14 +59,15 @@ CONFIG_E1000=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y -CONFIG_PCIE_LAYERSCAPE_GEN4=y CONFIG_PCIE_LAYERSCAPE=y +CONFIG_PCIE_LAYERSCAPE_GEN4=y CONFIG_DM_RTC=y CONFIG_RTC_PCF2127=y CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y +CONFIG_NXP_FSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig index 5517a7d..887ca4a 100644 --- a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig @@ -60,6 +60,7 @@ CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y +CONFIG_NXP_FSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/lx2160ardb_tfa_defconfig b/configs/lx2160ardb_tfa_defconfig index b998cb6..5d4580e 100644 --- a/configs/lx2160ardb_tfa_defconfig +++ b/configs/lx2160ardb_tfa_defconfig @@ -4,6 +4,7 @@ CONFIG_TFABOOT=y CONFIG_SYS_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_F_LEN=0x6000 CONFIG_ENV_SIZE=0x2000 +CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_ENV_OFFSET=0x500000 CONFIG_DM_GPIO=y CONFIG_EMC2305=y @@ -33,6 +34,7 @@ CONFIG_OF_CONTROL=y CONFIG_OF_BOARD_FIXUP=y CONFIG_DEFAULT_DEVICE_TREE="fsl-lx2160a-rdb" CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y @@ -56,14 +58,15 @@ CONFIG_E1000=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y -CONFIG_PCIE_LAYERSCAPE_GEN4=y CONFIG_PCIE_LAYERSCAPE=y +CONFIG_PCIE_LAYERSCAPE_GEN4=y CONFIG_DM_RTC=y CONFIG_RTC_PCF2127=y CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y +CONFIG_NXP_FSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y -- 2.7.4

1 0

[PATCH] x86: Move P2SB from Apollo Lake to a more generic location
by Wolfgang Wallner 06 Feb '20

06 Feb '20

The Primary to Sideband Bridge (P2SB) is not specific to Apollo Lake, so move its driver to a common location within arch/x86. Signed-off-by: Wolfgang Wallner <wolfgang.wallner(a)br-automation.com> --- This commit follows a similar rational as the recent moving of the ITSS driver from Apollo Lake to the intel_common directory, and it also depends on those patches (which are currently in u-boot-x86). arch/x86/Kconfig | 7 +++++++ arch/x86/cpu/apollolake/Kconfig | 1 + arch/x86/cpu/apollolake/Makefile | 1 - arch/x86/cpu/intel_common/Makefile | 1 + arch/x86/cpu/{apollolake => intel_common}/p2sb.c | 0 5 files changed, 9 insertions(+), 1 deletion(-) rename arch/x86/cpu/{apollolake => intel_common}/p2sb.c (100%) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b733d2264e..b3fbf306f7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -715,6 +715,13 @@ config HAVE_ITSS Select this to include the driver for the Interrupt Timer Subsystem (ITSS) which is found on several Intel devices. +config HAVE_P2SB + bool "Enable P2SB" + help + Select this to include the driver for the Primary to + Sideband Bridge (P2SB) which is found on several Intel + devices. + menu "System tables" depends on !EFI && !SYS_COREBOOT diff --git a/arch/x86/cpu/apollolake/Kconfig b/arch/x86/cpu/apollolake/Kconfig index a760e0ac68..145b8cbdf5 100644 --- a/arch/x86/cpu/apollolake/Kconfig +++ b/arch/x86/cpu/apollolake/Kconfig @@ -40,6 +40,7 @@ config INTEL_APOLLOLAKE imply INTEL_GPIO imply SMP imply HAVE_ITSS + imply HAVE_P2SB if INTEL_APOLLOLAKE diff --git a/arch/x86/cpu/apollolake/Makefile b/arch/x86/cpu/apollolake/Makefile index f99f2c6473..578e15c4bf 100644 --- a/arch/x86/cpu/apollolake/Makefile +++ b/arch/x86/cpu/apollolake/Makefile @@ -20,7 +20,6 @@ endif obj-y += hostbridge.o obj-y += lpc.o -obj-y += p2sb.o obj-y += pch.o obj-y += pmc.o obj-y += uart.o diff --git a/arch/x86/cpu/intel_common/Makefile b/arch/x86/cpu/intel_common/Makefile index e22c70781d..1736bd2b53 100644 --- a/arch/x86/cpu/intel_common/Makefile +++ b/arch/x86/cpu/intel_common/Makefile @@ -28,6 +28,7 @@ endif endif obj-y += pch.o obj-$(CONFIG_HAVE_ITSS) += itss.o +obj-$(CONFIG_HAVE_P2SB) += p2sb.o ifdef CONFIG_SPL ifndef CONFIG_SPL_BUILD diff --git a/arch/x86/cpu/apollolake/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c similarity index 100% rename from arch/x86/cpu/apollolake/p2sb.c rename to arch/x86/cpu/intel_common/p2sb.c -- 2.25.0

2 2

[U-Boot] [PATCH] board: ax25-ae350: Print board information.
by Andes 06 Feb '20

06 Feb '20

From: Rick Chen <rick(a)andestech.com> Add to print board and bit information message. Signed-off-by: Rick Chen <rick(a)andestech.com> Cc: Greentime Hu <greentime(a)andestech.com> --- board/AndesTech/ax25-ae350/ax25-ae350.c | 1 + 1 file changed, 1 insertion(+) diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c index 5f4ca0f..61ca10b 100644 --- a/board/AndesTech/ax25-ae350/ax25-ae350.c +++ b/board/AndesTech/ax25-ae350/ax25-ae350.c @@ -20,6 +20,7 @@ DECLARE_GLOBAL_DATA_PTR; int board_init(void) { + printf("Board: %s (%d)\n" , CONFIG_SYS_BOARD, __riscv_xlen); gd->bd->bi_boot_params = PHYS_SDRAM_0 + 0x400; return 0; -- 2.7.4

3 3

[PATCH v2 00/32] sandbox: Move to SDL2
by Simon Glass 06 Feb '20

06 Feb '20

2 40

[PATCH v3 07/32] gpio: Rename free() to rfree()
by Simon Glass 06 Feb '20

06 Feb '20

This function name conflicts with our desire to #define free() to something else on sandbox. Since it deals with resources, rename it to rfree(). Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v3: - Update microblaze manual relocation Changes in v2: None drivers/gpio/gpio-rcar.c | 2 +- drivers/gpio/gpio-uclass.c | 8 ++++---- include/asm-generic/gpio.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c index 594e0a470a..a8c5b7f879 100644 --- a/drivers/gpio/gpio-rcar.c +++ b/drivers/gpio/gpio-rcar.c @@ -128,7 +128,7 @@ static int rcar_gpio_free(struct udevice *dev, unsigned offset) static const struct dm_gpio_ops rcar_gpio_ops = { .request = rcar_gpio_request, - .free = rcar_gpio_free, + .rfree = rcar_gpio_free, .direction_input = rcar_gpio_direction_input, .direction_output = rcar_gpio_direction_output, .get_value = rcar_gpio_get_value, diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c index 90fbed455b..0a22441d38 100644 --- a/drivers/gpio/gpio-uclass.c +++ b/drivers/gpio/gpio-uclass.c @@ -364,8 +364,8 @@ int _dm_gpio_free(struct udevice *dev, uint offset) uc_priv = dev_get_uclass_priv(dev); if (!uc_priv->name[offset]) return -ENXIO; - if (gpio_get_ops(dev)->free) { - ret = gpio_get_ops(dev)->free(dev, offset); + if (gpio_get_ops(dev)->rfree) { + ret = gpio_get_ops(dev)->rfree(dev, offset); if (ret) return ret; } @@ -1043,8 +1043,8 @@ static int gpio_post_bind(struct udevice *dev) if (!reloc_done) { if (ops->request) ops->request += gd->reloc_off; - if (ops->free) - ops->free += gd->reloc_off; + if (ops->rfree) + ops->rfree += gd->reloc_off; if (ops->direction_input) ops->direction_input += gd->reloc_off; if (ops->direction_output) diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index d6cf18744f..05777e6afe 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -248,7 +248,7 @@ int gpio_xlate_offs_flags(struct udevice *dev, struct gpio_desc *desc, */ struct dm_gpio_ops { int (*request)(struct udevice *dev, unsigned offset, const char *label); - int (*free)(struct udevice *dev, unsigned offset); + int (*rfree)(struct udevice *dev, unsigned int offset); int (*direction_input)(struct udevice *dev, unsigned offset); int (*direction_output)(struct udevice *dev, unsigned offset, int value); -- 2.25.0.341.g760bfbb309-goog

2 1

qnap nas uboot emmc flash
by tonyp 06 Feb '20

06 Feb '20

I have borked my TS-228 QNAP nas from booting by messing with some files on the emmc while it was mounted rw. Support is non-existent for this nas, so I'm attempting to recover it myself but am a little lost. I've got a serial hooked up and have tried loading the firmware from a usb stick but am getting a "Error: unrecognized/unsupported machine ID (r1 = 0x0000138a)." when attempting to boot the kernel. My steps so far - download and unzip the firmware. There are 3 folders - META-INF, NASROOT (contains a few tar files) and system, as well as 9 files - android.emmc.dtb, android.root.emmc.cpio.gz_pad.img, bluecore.audio, config.txt, emmc.uImage, file_contexts, rescue.emmc.dtb, rescue.root.emmc.cpio.gz_pad.img, rsa_key_2048.pem. The file config.txt contains the following - # Package Configuration secure_boot=0 fw = rescueDT rescue.emmc.dtb 0x01ff2000 fw = kernelDT android.emmc.dtb 0x01ff2000 fw = rescueRootFS rescue.root.emmc.cpio.gz_pad.img 0x02200000 fw = kernelRootFS android.root.emmc.cpio.gz_pad.img 0x02200000 fw = linuxKernel emmc.uImage 0x03000000 fw = audioKernel bluecore.audio 0x01b00000 So I tried running - usb start; usb dev 0 secure_boot=0; console=ttyS0,115200; fatload usb 0:1 0x01ff2000 rescue.emmc.dtb; fatload usb 0:1 0x03000000 emmc.uImage; bootm 0x03000000 and get the "Error: unrecognized/unsupported machine ID (r1 = 0x0000138a)." when running it. I also tried adding "fatload usb 0:1 0x02200000 rescue.root.emmc.cpio.gz_pad.img" to the command with the same result. (It's a very old Uboot on this box by the way - U-Boot 2012.07 (Jan 27 2016 - 17:16:49)). The env is - Realtek> env print baudrate=115200 bootargs=console=ttyS0,115200 earlyprintk loglevel=4 bootcmd=bootr bootdelay=0 ethact=r8168#0 ethaddr=00:10:20:30:40:50 fdt_loadaddr=0x01FF2000 gatewayip=192.168.100.254 ipaddr=192.168.1.20 kernel_loadaddr=0x03000000 mtd_part=mtdparts=rtk_nand: netmask=255.255.255.0 rescue_audio=bluecore.audio rescue_dtb=rescue.emmc.dtb rescue_rootfs=rescue.root.emmc.cpio.gz_pad.img rescue_vmlinux=emmc.uImage rootfs_loadaddr=0x02200000 serverip=192.168.1.9 I did take a copy of the emmc before I played with it, and have the file, mmcblk0 (3.64 GB) on my desktop. Can anyone advise the best way to proceed? Keep trying to boot a kernel in order to manually restore the mounted emmc partition, or just flash the mmcblk0 file onto the emmc? I didn't want to flash it without advice because I'm very new to this sort of thing and didn't want to flash the wrong offset and flash over uboot. Then the device would be done for. Thank you for any assistance anyone can offer me. Regards, Tony P -- Sent from: http://u-boot.10912.n7.nabble.com/

1 0

[PATCH v2 1/4] clock_imx8mq: Delete not used init_usb_clk()
by Pedro Jardim 06 Feb '20

06 Feb '20

Function init_usb_clk() is not used anywhere, so it can simply be deleted. This was detected by the following sparse warning: arch/arm/mach-imx/imx8m/clock_imx8mq.c:377:6: warning: no previous prototype for ‘init_usb_clk’ [-Wmissing-prototypes] void init_usb_clk(void) ^~~~~~~~~~~~ Signed-off-by: Pedro Jardim <jardim.c.pedro(a)gmail.com> --- Chages since v1: - Fixed patch corruption arch/arm/mach-imx/imx8m/clock_imx8mq.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mq.c b/arch/arm/mach-imx/imx8m/clock_imx8mq.c index 878f2be166..663fe4d3ca 100644 --- a/arch/arm/mach-imx/imx8m/clock_imx8mq.c +++ b/arch/arm/mach-imx/imx8m/clock_imx8mq.c @@ -374,28 +374,6 @@ void init_wdog_clk(void) clock_enable(CCGR_WDOG3, 1); } -void init_usb_clk(void) -{ - if (!is_usb_boot()) { - clock_enable(CCGR_USB_CTRL1, 0); - clock_enable(CCGR_USB_CTRL2, 0); - clock_enable(CCGR_USB_PHY1, 0); - clock_enable(CCGR_USB_PHY2, 0); - /* 500MHz */ - clock_set_target_val(USB_BUS_CLK_ROOT, CLK_ROOT_ON | - CLK_ROOT_SOURCE_SEL(1)); - /* 100MHz */ - clock_set_target_val(USB_CORE_REF_CLK_ROOT, CLK_ROOT_ON | - CLK_ROOT_SOURCE_SEL(1)); - /* 100MHz */ - clock_set_target_val(USB_PHY_REF_CLK_ROOT, CLK_ROOT_ON | - CLK_ROOT_SOURCE_SEL(1)); - clock_enable(CCGR_USB_CTRL1, 1); - clock_enable(CCGR_USB_CTRL2, 1); - clock_enable(CCGR_USB_PHY1, 1); - clock_enable(CCGR_USB_PHY2, 1); - } -} void init_nand_clk(void) { -- 2.17.1

6 8