diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-17 17:52:21 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-17 17:52:21 +0300 |
| commit | d5dbc661c3041e910e161a95fca9e615d85730ac (patch) | |
| tree | aff587483c785b8384de496d6670e9824eb3e703 /arch/arm/include | |
| parent | c39946a2e2d062025c9fc8b34587dfdd45fd8703 (diff) | |
| parent | edf95bdeddeab8f0fd7b88d4865fbc6e99071c73 (diff) | |
| download | u-boot-d5dbc661c3041e910e161a95fca9e615d85730ac.tar.xz | |
Merge tag 'u-boot-imx-20210717' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
i.MX
----
- mx7ulp : fix WDOG
- imx8 : Phytec
- USB3 support for i.MX8
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/8277
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-imx8m/clock.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/sys_proto.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-imx8m/clock.h b/arch/arm/include/asm/arch-imx8m/clock.h index 77d9428a18..c705dfdf46 100644 --- a/arch/arm/include/asm/arch-imx8m/clock.h +++ b/arch/arm/include/asm/arch-imx8m/clock.h @@ -257,6 +257,7 @@ u32 imx_get_uartclk(void); int clock_init(void); void init_clk_usdhc(u32 index); void init_uart_clk(u32 index); +void init_usb_clk(void); void init_wdog_clk(void); unsigned int mxc_get_clock(enum mxc_clock clk); int clock_enable(enum clk_ccgr_index index, bool enable); diff --git a/arch/arm/include/asm/arch-mx6/sys_proto.h b/arch/arm/include/asm/arch-mx6/sys_proto.h index 1e5fa1a75e..c49759af92 100644 --- a/arch/arm/include/asm/arch-mx6/sys_proto.h +++ b/arch/arm/include/asm/arch-mx6/sys_proto.h @@ -7,6 +7,7 @@ #ifndef __SYS_PROTO_IMX6_ #define __SYS_PROTO_IMX6_ +#include <asm/gpio.h> #include <asm/mach-imx/sys_proto.h> #include <asm/arch/iomux.h> @@ -18,7 +19,7 @@ USBPHY_PWD_RXPWDRX)) int imx6_pcie_toggle_power(void); -int imx6_pcie_toggle_reset(void); +int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high); enum ldo_reg { LDO_ARM, |