diff options
| author | Tom Rini <[email protected]> | 2021-10-12 08:58:58 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-10-12 11:45:00 -0400 |
| commit | 2aab77f7263bb6e27120cfea82fc5efa4f625014 (patch) | |
| tree | e9148490ad695bc33b087a7dcfee45fbdc661085 /drivers/reset | |
| parent | 4c1996ce374924a226c872e26a42cfcc7bf74da2 (diff) | |
| parent | f9437b00c06382d3edc623c10c69901786ad6317 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-sunxi
The bulk of it is Samuel's DM_I2C rework, which removes the nasty I2C
deprecation warnings for most 32-bit boards. It also includes some
smaller refactorings that pave the way for more changes, mostly driven
by needing to support the Allwinner RISC-V SoC later on.
Board wise we gain support for the FriendlyARM NanoPi R1S H5 router
board and official Pinetab support.
Build-tested for all 160 sunxi boards, and boot tested on a A64, A20,
H3, H6, and H616 board. USB, SD card, eMMC, and Ethernet all work there
(where applicable).
Diffstat (limited to 'drivers/reset')
| -rw-r--r-- | drivers/reset/reset-sunxi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c index 264337ed803..8b95938dfe3 100644 --- a/drivers/reset/reset-sunxi.c +++ b/drivers/reset/reset-sunxi.c @@ -11,11 +11,11 @@ #include <malloc.h> #include <reset-uclass.h> #include <asm/io.h> +#include <clk/sunxi.h> #include <dm/device-internal.h> #include <dm/lists.h> #include <linux/bitops.h> #include <linux/log2.h> -#include <asm/arch/ccu.h> struct sunxi_reset_priv { void *base; |
