diff options
| author | Tom Rini <trini@konsulko.com> | 2017-09-20 12:32:34 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-20 12:32:34 -0400 |
| commit | e884656c2c0b2406b9bf99ea76f5a8c75128a331 (patch) | |
| tree | 520d14bd1fdaed0adefc4209f53dc0d0d1467b67 /arch/arm/include | |
| parent | 975f97b43181694041f77ecd8118364afe588144 (diff) | |
| parent | 031426a7af63d3c939fc963311e6dc8e904a0440 (diff) | |
Merge git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/sys_proto.h | 7 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-mx7/clock.h | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/include/asm/arch-mx6/sys_proto.h b/arch/arm/include/asm/arch-mx6/sys_proto.h index 14f5d948c9..ba73943260 100644 --- a/arch/arm/include/asm/arch-mx6/sys_proto.h +++ b/arch/arm/include/asm/arch-mx6/sys_proto.h @@ -6,3 +6,10 @@ */ #include <asm/mach-imx/sys_proto.h> + +#define USBPHY_PWD 0x00000000 + +#define USBPHY_PWD_RXPWDRX (1 << 20) /* receiver block power down */ + +#define is_usbotg_phy_active(void) (!(readl(USB_PHY0_BASE_ADDR + USBPHY_PWD) & \ + USBPHY_PWD_RXPWDRX)) diff --git a/arch/arm/include/asm/arch-mx7/clock.h b/arch/arm/include/asm/arch-mx7/clock.h index 688d2361df..3b115ad57c 100644 --- a/arch/arm/include/asm/arch-mx7/clock.h +++ b/arch/arm/include/asm/arch-mx7/clock.h @@ -318,9 +318,9 @@ struct clk_root_map { }; enum enet_freq { - ENET_25MHz, - ENET_50MHz, - ENET_125MHz, + ENET_25MHZ, + ENET_50MHZ, + ENET_125MHZ, }; u32 get_root_clk(enum clk_root_index clock_id); |