diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2017-06-15 02:48:21 +0300 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-06-15 02:48:21 +0300 |
commit | 9c861f33284cd77be3077cacc4c04303b3a60ebe (patch) | |
tree | 7abdfba89c5856888b6c72e83b73e91ed37c5069 /include/dt-bindings | |
parent | 7f274d54bb664519e62001a4782f5d5f2c95b06e (diff) | |
parent | 949bdfed4b0f74215da60992e9f5e14c9ecbb064 (diff) | |
download | linux-9c861f33284cd77be3077cacc4c04303b3a60ebe.tar.xz |
Merge branch 'clk-fixes' into clk-next
* clk-fixes:
clk: sunxi-ng: a64: Export PLL_PERIPH0 clock for the PRCM
clk: sunxi-ng: h3: Export PLL_PERIPH0 clock for the PRCM
dt-bindings: clock: sunxi-ccu: Add pll-periph to PRCM's needed clocks
clk: sunxi-ng: enable SUNXI_CCU_MP for PRCM
clk: sunxi-ng: v3s: Fix usb otg device reset bit
clk: sunxi-ng: a31: Correct lcd1-ch1 clock register offset
Diffstat (limited to 'include/dt-bindings')
-rw-r--r-- | include/dt-bindings/clock/sun50i-a64-ccu.h | 2 | ||||
-rw-r--r-- | include/dt-bindings/clock/sun8i-h3-ccu.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/sun50i-a64-ccu.h b/include/dt-bindings/clock/sun50i-a64-ccu.h index 370c0a0473fc..d66432c6e675 100644 --- a/include/dt-bindings/clock/sun50i-a64-ccu.h +++ b/include/dt-bindings/clock/sun50i-a64-ccu.h @@ -43,6 +43,8 @@ #ifndef _DT_BINDINGS_CLK_SUN50I_A64_H_ #define _DT_BINDINGS_CLK_SUN50I_A64_H_ +#define CLK_PLL_PERIPH0 11 + #define CLK_BUS_MIPI_DSI 28 #define CLK_BUS_CE 29 #define CLK_BUS_DMA 30 diff --git a/include/dt-bindings/clock/sun8i-h3-ccu.h b/include/dt-bindings/clock/sun8i-h3-ccu.h index c2afc41d6964..e139fe5c62ec 100644 --- a/include/dt-bindings/clock/sun8i-h3-ccu.h +++ b/include/dt-bindings/clock/sun8i-h3-ccu.h @@ -43,6 +43,8 @@ #ifndef _DT_BINDINGS_CLK_SUN8I_H3_H_ #define _DT_BINDINGS_CLK_SUN8I_H3_H_ +#define CLK_PLL_PERIPH0 9 + #define CLK_CPUX 14 #define CLK_BUS_CE 20 |