diff options
author | Tom Rini <trini@konsulko.com> | 2019-03-11 15:48:57 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-03-11 15:48:57 -0400 |
commit | 2e8092d94f40a5692baf3ec768ce3216a7bf032a (patch) | |
tree | 457de4ce00ca8263c115e70bd3e7540e34a7bed8 /drivers/clk/sunxi/clk_a31.c | |
parent | 6a08213d52f036dbfbdd92f1416bc4b08fd4d3f6 (diff) | |
parent | aefc0b7a60b9147b79b7a735c045e28daba712f1 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
- axp818 fix
- fix warnings for ethernet clock code
Diffstat (limited to 'drivers/clk/sunxi/clk_a31.c')
-rw-r--r-- | drivers/clk/sunxi/clk_a31.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/sunxi/clk_a31.c b/drivers/clk/sunxi/clk_a31.c index fa6e3eeef0..4ec3c2ae89 100644 --- a/drivers/clk/sunxi/clk_a31.c +++ b/drivers/clk/sunxi/clk_a31.c @@ -17,6 +17,7 @@ static struct ccu_clk_gate a31_gates[] = { [CLK_AHB1_MMC1] = GATE(0x060, BIT(9)), [CLK_AHB1_MMC2] = GATE(0x060, BIT(10)), [CLK_AHB1_MMC3] = GATE(0x060, BIT(11)), + [CLK_AHB1_EMAC] = GATE(0x060, BIT(17)), [CLK_AHB1_SPI0] = GATE(0x060, BIT(20)), [CLK_AHB1_SPI1] = GATE(0x060, BIT(21)), [CLK_AHB1_SPI2] = GATE(0x060, BIT(22)), @@ -57,6 +58,7 @@ static struct ccu_reset a31_resets[] = { [RST_AHB1_MMC1] = RESET(0x2c0, BIT(9)), [RST_AHB1_MMC2] = RESET(0x2c0, BIT(10)), [RST_AHB1_MMC3] = RESET(0x2c0, BIT(11)), + [RST_AHB1_EMAC] = RESET(0x2c0, BIT(17)), [RST_AHB1_SPI0] = RESET(0x2c0, BIT(20)), [RST_AHB1_SPI1] = RESET(0x2c0, BIT(21)), [RST_AHB1_SPI2] = RESET(0x2c0, BIT(22)), |