diff options
author | Tom Rini <trini@konsulko.com> | 2020-01-26 12:05:11 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-01-26 12:05:11 -0500 |
commit | 0b23b0d9f969c4a587cb9ee75905d6f6f9d1d2ea (patch) | |
tree | af37dbf79ad534f70291e5e3e8046227533da156 /include | |
parent | 40521a6c90d4adfb7f3041033c8cbbeff087a5ca (diff) | |
parent | 2936eb2d550a642275113464fc9dcbb03357c049 (diff) | |
download | u-boot-0b23b0d9f969c4a587cb9ee75905d6f6f9d1d2ea.zip u-boot-0b23b0d9f969c4a587cb9ee75905d6f6f9d1d2ea.tar.gz u-boot-0b23b0d9f969c4a587cb9ee75905d6f6f9d1d2ea.tar.bz2 |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi
- Libre Computer ALL-H3-IT/ALL-H5-CC board (Chen-Yu Tsai)
- Allwinner R40 Ethernet, usb phy enablement (Andre Przywara)
- Sunxi auto load from 128KB MMC offset (Andre Przywara)
- Orange Pi Win Ethernet phy enablement (Jernej Skrabec)
Diffstat (limited to 'include')
-rw-r--r-- | include/dt-bindings/clock/sun8i-h3-ccu.h | 11 | ||||
-rw-r--r-- | include/dt-bindings/reset/sun8i-h3-ccu.h | 5 |
2 files changed, 13 insertions, 3 deletions
diff --git a/include/dt-bindings/clock/sun8i-h3-ccu.h b/include/dt-bindings/clock/sun8i-h3-ccu.h index efb7ba2..30d2d15 100644 --- a/include/dt-bindings/clock/sun8i-h3-ccu.h +++ b/include/dt-bindings/clock/sun8i-h3-ccu.h @@ -43,6 +43,10 @@ #ifndef _DT_BINDINGS_CLK_SUN8I_H3_H_ #define _DT_BINDINGS_CLK_SUN8I_H3_H_ +#define CLK_PLL_VIDEO 6 + +#define CLK_PLL_PERIPH0 9 + #define CLK_CPUX 14 #define CLK_BUS_CE 20 @@ -91,7 +95,7 @@ #define CLK_BUS_UART1 63 #define CLK_BUS_UART2 64 #define CLK_BUS_UART3 65 -#define CLK_BUS_SCR 66 +#define CLK_BUS_SCR0 66 #define CLK_BUS_EPHY 67 #define CLK_BUS_DBG 68 @@ -139,7 +143,10 @@ #define CLK_AVS 110 #define CLK_HDMI 111 #define CLK_HDMI_DDC 112 - +#define CLK_MBUS 113 #define CLK_GPU 114 +/* New clocks imported in H5 */ +#define CLK_BUS_SCR1 115 + #endif /* _DT_BINDINGS_CLK_SUN8I_H3_H_ */ diff --git a/include/dt-bindings/reset/sun8i-h3-ccu.h b/include/dt-bindings/reset/sun8i-h3-ccu.h index 6b7af80..484c2a2 100644 --- a/include/dt-bindings/reset/sun8i-h3-ccu.h +++ b/include/dt-bindings/reset/sun8i-h3-ccu.h @@ -98,6 +98,9 @@ #define RST_BUS_UART1 50 #define RST_BUS_UART2 51 #define RST_BUS_UART3 52 -#define RST_BUS_SCR 53 +#define RST_BUS_SCR0 53 + +/* New resets imported in H5 */ +#define RST_BUS_SCR1 54 #endif /* _DT_BINDINGS_RST_SUN8I_H3_H_ */ |