diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-17 09:19:45 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-17 09:19:45 -0400 |
| commit | 4b37f36d68ebb79cdc7d68a539de71e28e954d11 (patch) | |
| tree | c982cc1d42e8eeb28dc1dc31d027e1fe145f113d /drivers/clk | |
| parent | 14b8c420b88a90e7ca0c979a2ee413bf459941e8 (diff) | |
| parent | f8c8669760610b2949d8d9ccaeef8231a44d4205 (diff) | |
| download | u-boot-4b37f36d68ebb79cdc7d68a539de71e28e954d11.zip u-boot-4b37f36d68ebb79cdc7d68a539de71e28e954d11.tar.gz u-boot-4b37f36d68ebb79cdc7d68a539de71e28e954d11.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
- Convert DM_MMC and DM_SCSI
- A20, R40, H6 Linux dts(i) sync
- CLK, RESET support for sunxi, sun8_emac net drivers
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/sunxi/clk_r40.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/sunxi/clk_r40.c b/drivers/clk/sunxi/clk_r40.c index 30beac9..44abc4f 100644 --- a/drivers/clk/sunxi/clk_r40.c +++ b/drivers/clk/sunxi/clk_r40.c @@ -62,7 +62,6 @@ static struct ccu_reset r40_resets[] = { [RST_BUS_MMC1] = RESET(0x2c0, BIT(9)), [RST_BUS_MMC2] = RESET(0x2c0, BIT(10)), [RST_BUS_MMC3] = RESET(0x2c0, BIT(11)), - [RST_BUS_GMAC] = RESET(0x2c0, BIT(17)), [RST_BUS_SPI0] = RESET(0x2c0, BIT(20)), [RST_BUS_SPI1] = RESET(0x2c0, BIT(21)), [RST_BUS_SPI2] = RESET(0x2c0, BIT(22)), @@ -75,6 +74,8 @@ static struct ccu_reset r40_resets[] = { [RST_BUS_OHCI1] = RESET(0x2c0, BIT(30)), [RST_BUS_OHCI2] = RESET(0x2c0, BIT(31)), + [RST_BUS_GMAC] = RESET(0x2c4, BIT(17)), + [RST_BUS_UART0] = RESET(0x2d8, BIT(16)), [RST_BUS_UART1] = RESET(0x2d8, BIT(17)), [RST_BUS_UART2] = RESET(0x2d8, BIT(18)), |