diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-30 14:20:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-30 14:20:02 -0400 |
| commit | 1056c9bd2702ea1bb79abf9bd1e78c578589d247 (patch) | |
| tree | faada7d658151c059a845cdb9d9d521817d1e611 /include/dt-bindings | |
| parent | 797cee982eef9195736afc5e7f3b8f613c41d19a (diff) | |
| parent | d22527fed2f094c2e4f9a66f35b68a090c3d906a (diff) | |
Merge tag 'clk-for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk updates from Michael Turquette:
"The bulk of the changes are updates and fixes to existing clk provider
drivers, along with a pretty standard number of new drivers. The core
recieved a small number of updates as well.
Core changes of note:
- removed CLK_IS_ROOT flag
New clk provider drivers:
- Renesas r8a7796 clock pulse generator / module standby and
software reset
- Allwinner sun8i H3 clock controller unit
- AmLogic meson8b clock controller (rewritten)
- AmLogic gxbb clock controller
- support for some new ICs was added by simple changes to static
data tables for chips sharing the same family
Driver updates of note:
- the Allwinner sunxi clock driver infrastucture was rewritten to
comform to the state of the art at drivers/clk/sunxi-ng. The old
implementation is still supported for backwards compatibility with
the DT ABI"
* tag 'clk-for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (162 commits)
clk: Makefile: re-sort and clean up
Revert "clk: gxbb: expose CLKID_MMC_PCLK"
clk: samsung: Allow modular build of the Audio Subsystem CLKCON driver
clk: samsung: make clk-s5pv210-audss explicitly non-modular
clk: exynos5433: remove CLK_IGNORE_UNUSED flag from SPI clocks
clk: oxnas: Add hardware dependencies
clk: imx7d: do not set parent of ethernet time/ref clocks
ARM: dt: sun8i: switch the H3 to the new CCU driver
clk: sunxi-ng: h3: Fix Kconfig symbol typo
clk: sunxi-ng: h3: Fix audio clock divider offset
clk: sunxi-ng: Add H3 clocks
clk: sunxi-ng: Add N-K-M-P factor clock
clk: sunxi-ng: Add N-K-M Factor clock
clk: sunxi-ng: Add N-M-factor clock support
clk: sunxi-ng: Add N-K-factor clock support
clk: sunxi-ng: Add M-P factor clock support
clk: sunxi-ng: Add divider
clk: sunxi-ng: Add phase clock support
clk: sunxi-ng: Add mux clock support
clk: sunxi-ng: Add gate clock support
...
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/clock/exynos5410.h | 76 | ||||
| -rw-r--r-- | include/dt-bindings/clock/exynos5433.h | 3 | ||||
| -rw-r--r-- | include/dt-bindings/clock/gxbb-clkc.h | 12 | ||||
| -rw-r--r-- | include/dt-bindings/clock/hi6220-clock.h | 5 | ||||
| -rw-r--r-- | include/dt-bindings/clock/lpc32xx-clock.h | 1 | ||||
| -rw-r--r-- | include/dt-bindings/clock/meson8b-clkc.h | 4 | ||||
| -rw-r--r-- | include/dt-bindings/clock/r8a7796-cpg-mssr.h | 69 | ||||
| -rw-r--r-- | include/dt-bindings/clock/rk3228-cru.h | 15 | ||||
| -rw-r--r-- | include/dt-bindings/clock/sun8i-h3-ccu.h | 145 | ||||
| -rw-r--r-- | include/dt-bindings/clock/tegra210-car.h | 2 | ||||
| -rw-r--r-- | include/dt-bindings/reset/sun8i-h3-ccu.h | 103 |
11 files changed, 408 insertions, 27 deletions
diff --git a/include/dt-bindings/clock/exynos5410.h b/include/dt-bindings/clock/exynos5410.h index 9b180f032e2d..85b467b3a207 100644 --- a/include/dt-bindings/clock/exynos5410.h +++ b/include/dt-bindings/clock/exynos5410.h | |||
| @@ -1,33 +1,65 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (c) 2014 Samsung Electronics Co., Ltd. | ||
| 3 | * Copyright (c) 2016 Krzysztof Kozlowski | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify | ||
| 6 | * it under the terms of the GNU General Public License version 2 as | ||
| 7 | * published by the Free Software Foundation. | ||
| 8 | * | ||
| 9 | * Device Tree binding constants for Exynos5421 clock controller. | ||
| 10 | */ | ||
| 11 | |||
| 1 | #ifndef _DT_BINDINGS_CLOCK_EXYNOS_5410_H | 12 | #ifndef _DT_BINDINGS_CLOCK_EXYNOS_5410_H |
| 2 | #define _DT_BINDINGS_CLOCK_EXYNOS_5410_H | 13 | #define _DT_BINDINGS_CLOCK_EXYNOS_5410_H |
| 3 | 14 | ||
| 4 | /* core clocks */ | 15 | /* core clocks */ |
| 5 | #define CLK_FIN_PLL 1 | 16 | #define CLK_FIN_PLL 1 |
| 6 | #define CLK_FOUT_APLL 2 | 17 | #define CLK_FOUT_APLL 2 |
| 7 | #define CLK_FOUT_CPLL 3 | 18 | #define CLK_FOUT_CPLL 3 |
| 8 | #define CLK_FOUT_MPLL 4 | 19 | #define CLK_FOUT_MPLL 4 |
| 9 | #define CLK_FOUT_BPLL 5 | 20 | #define CLK_FOUT_BPLL 5 |
| 10 | #define CLK_FOUT_KPLL 6 | 21 | #define CLK_FOUT_KPLL 6 |
| 11 | 22 | ||
| 12 | /* gate for special clocks (sclk) */ | 23 | /* gate for special clocks (sclk) */ |
| 13 | #define CLK_SCLK_UART0 128 | 24 | #define CLK_SCLK_UART0 128 |
| 14 | #define CLK_SCLK_UART1 129 | 25 | #define CLK_SCLK_UART1 129 |
| 15 | #define CLK_SCLK_UART2 130 | 26 | #define CLK_SCLK_UART2 130 |
| 16 | #define CLK_SCLK_UART3 131 | 27 | #define CLK_SCLK_UART3 131 |
| 17 | #define CLK_SCLK_MMC0 132 | 28 | #define CLK_SCLK_MMC0 132 |
| 18 | #define CLK_SCLK_MMC1 133 | 29 | #define CLK_SCLK_MMC1 133 |
| 19 | #define CLK_SCLK_MMC2 134 | 30 | #define CLK_SCLK_MMC2 134 |
| 31 | #define CLK_SCLK_USBD300 150 | ||
| 32 | #define CLK_SCLK_USBD301 151 | ||
| 33 | #define CLK_SCLK_USBPHY300 152 | ||
| 34 | #define CLK_SCLK_USBPHY301 153 | ||
| 35 | #define CLK_SCLK_PWM 155 | ||
| 20 | 36 | ||
| 21 | /* gate clocks */ | 37 | /* gate clocks */ |
| 22 | #define CLK_UART0 257 | 38 | #define CLK_UART0 257 |
| 23 | #define CLK_UART1 258 | 39 | #define CLK_UART1 258 |
| 24 | #define CLK_UART2 259 | 40 | #define CLK_UART2 259 |
| 25 | #define CLK_UART3 260 | 41 | #define CLK_I2C0 261 |
| 26 | #define CLK_MCT 315 | 42 | #define CLK_I2C1 262 |
| 27 | #define CLK_MMC0 351 | 43 | #define CLK_I2C2 263 |
| 28 | #define CLK_MMC1 352 | 44 | #define CLK_I2C3 264 |
| 29 | #define CLK_MMC2 353 | 45 | #define CLK_USI0 265 |
| 46 | #define CLK_USI1 266 | ||
| 47 | #define CLK_USI2 267 | ||
| 48 | #define CLK_USI3 268 | ||
| 49 | #define CLK_UART3 260 | ||
| 50 | #define CLK_PWM 279 | ||
| 51 | #define CLK_MCT 315 | ||
| 52 | #define CLK_WDT 316 | ||
| 53 | #define CLK_RTC 317 | ||
| 54 | #define CLK_TMU 318 | ||
| 55 | #define CLK_MMC0 351 | ||
| 56 | #define CLK_MMC1 352 | ||
| 57 | #define CLK_MMC2 353 | ||
| 58 | #define CLK_USBH20 365 | ||
| 59 | #define CLK_USBD300 366 | ||
| 60 | #define CLK_USBD301 367 | ||
| 61 | #define CLK_SSS 471 | ||
| 30 | 62 | ||
| 31 | #define CLK_NR_CLKS 512 | 63 | #define CLK_NR_CLKS 512 |
| 32 | 64 | ||
| 33 | #endif /* _DT_BINDINGS_CLOCK_EXYNOS_5410_H */ | 65 | #endif /* _DT_BINDINGS_CLOCK_EXYNOS_5410_H */ |
diff --git a/include/dt-bindings/clock/exynos5433.h b/include/dt-bindings/clock/exynos5433.h index 8e024fea26e7..4fa6bb2136e3 100644 --- a/include/dt-bindings/clock/exynos5433.h +++ b/include/dt-bindings/clock/exynos5433.h | |||
| @@ -622,8 +622,9 @@ | |||
| 622 | #define CLK_SCLK_UFSUNIPRO 112 | 622 | #define CLK_SCLK_UFSUNIPRO 112 |
| 623 | #define CLK_SCLK_USBHOST30 113 | 623 | #define CLK_SCLK_USBHOST30 113 |
| 624 | #define CLK_SCLK_USBDRD30 114 | 624 | #define CLK_SCLK_USBDRD30 114 |
| 625 | #define CLK_PCIE 115 | ||
| 625 | 626 | ||
| 626 | #define FSYS_NR_CLK 115 | 627 | #define FSYS_NR_CLK 116 |
| 627 | 628 | ||
| 628 | /* CMU_G2D */ | 629 | /* CMU_G2D */ |
| 629 | #define CLK_MUX_ACLK_G2D_266_USER 1 | 630 | #define CLK_MUX_ACLK_G2D_266_USER 1 |
diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h new file mode 100644 index 000000000000..f889d80246cb --- /dev/null +++ b/include/dt-bindings/clock/gxbb-clkc.h | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | /* | ||
| 2 | * GXBB clock tree IDs | ||
| 3 | */ | ||
| 4 | |||
| 5 | #ifndef __GXBB_CLKC_H | ||
| 6 | #define __GXBB_CLKC_H | ||
| 7 | |||
| 8 | #define CLKID_CPUCLK 1 | ||
| 9 | #define CLKID_CLK81 12 | ||
| 10 | #define CLKID_ETH 36 | ||
| 11 | |||
| 12 | #endif /* __GXBB_CLKC_H */ | ||
diff --git a/include/dt-bindings/clock/hi6220-clock.h b/include/dt-bindings/clock/hi6220-clock.h index 70ee3833a7a0..6b03c84f4278 100644 --- a/include/dt-bindings/clock/hi6220-clock.h +++ b/include/dt-bindings/clock/hi6220-clock.h | |||
| @@ -55,8 +55,9 @@ | |||
| 55 | #define HI6220_TIMER7_PCLK 34 | 55 | #define HI6220_TIMER7_PCLK 34 |
| 56 | #define HI6220_TIMER8_PCLK 35 | 56 | #define HI6220_TIMER8_PCLK 35 |
| 57 | #define HI6220_UART0_PCLK 36 | 57 | #define HI6220_UART0_PCLK 36 |
| 58 | 58 | #define HI6220_RTC0_PCLK 37 | |
| 59 | #define HI6220_AO_NR_CLKS 37 | 59 | #define HI6220_RTC1_PCLK 38 |
| 60 | #define HI6220_AO_NR_CLKS 39 | ||
| 60 | 61 | ||
| 61 | /* clk in Hi6220 systrl */ | 62 | /* clk in Hi6220 systrl */ |
| 62 | /* gate clock */ | 63 | /* gate clock */ |
diff --git a/include/dt-bindings/clock/lpc32xx-clock.h b/include/dt-bindings/clock/lpc32xx-clock.h index d41b6fea1450..e624d3a52798 100644 --- a/include/dt-bindings/clock/lpc32xx-clock.h +++ b/include/dt-bindings/clock/lpc32xx-clock.h | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #define LPC32XX_CLK_PWM2 33 | 48 | #define LPC32XX_CLK_PWM2 33 |
| 49 | #define LPC32XX_CLK_ADC 34 | 49 | #define LPC32XX_CLK_ADC 34 |
| 50 | #define LPC32XX_CLK_HCLK_PLL 35 | 50 | #define LPC32XX_CLK_HCLK_PLL 35 |
| 51 | #define LPC32XX_CLK_PERIPH 36 | ||
| 51 | 52 | ||
| 52 | /* LPC32XX USB clocks */ | 53 | /* LPC32XX USB clocks */ |
| 53 | #define LPC32XX_USB_CLK_I2C 1 | 54 | #define LPC32XX_USB_CLK_I2C 1 |
diff --git a/include/dt-bindings/clock/meson8b-clkc.h b/include/dt-bindings/clock/meson8b-clkc.h index bd2720d58e0c..595a58d0969a 100644 --- a/include/dt-bindings/clock/meson8b-clkc.h +++ b/include/dt-bindings/clock/meson8b-clkc.h | |||
| @@ -19,7 +19,9 @@ | |||
| 19 | #define CLKID_MALI 11 | 19 | #define CLKID_MALI 11 |
| 20 | #define CLKID_CPUCLK 12 | 20 | #define CLKID_CPUCLK 12 |
| 21 | #define CLKID_ZERO 13 | 21 | #define CLKID_ZERO 13 |
| 22 | #define CLKID_MPEG_SEL 14 | ||
| 23 | #define CLKID_MPEG_DIV 15 | ||
| 22 | 24 | ||
| 23 | #define CLK_NR_CLKS (CLKID_ZERO + 1) | 25 | #define CLK_NR_CLKS (CLKID_MPEG_DIV + 1) |
| 24 | 26 | ||
| 25 | #endif /* __MESON8B_CLKC_H */ | 27 | #endif /* __MESON8B_CLKC_H */ |
diff --git a/include/dt-bindings/clock/r8a7796-cpg-mssr.h b/include/dt-bindings/clock/r8a7796-cpg-mssr.h new file mode 100644 index 000000000000..1e5942695f0d --- /dev/null +++ b/include/dt-bindings/clock/r8a7796-cpg-mssr.h | |||
| @@ -0,0 +1,69 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2016 Renesas Electronics Corp. | ||
| 3 | * | ||
| 4 | * This program is free software; you can redistribute it and/or modify | ||
| 5 | * it under the terms of the GNU General Public License as published by | ||
| 6 | * the Free Software Foundation; either version 2 of the License, or | ||
| 7 | * (at your option) any later version. | ||
| 8 | */ | ||
| 9 | #ifndef __DT_BINDINGS_CLOCK_R8A7796_CPG_MSSR_H__ | ||
| 10 | #define __DT_BINDINGS_CLOCK_R8A7796_CPG_MSSR_H__ | ||
| 11 | |||
| 12 | #include <dt-bindings/clock/renesas-cpg-mssr.h> | ||
| 13 | |||
| 14 | /* r8a7796 CPG Core Clocks */ | ||
| 15 | #define R8A7796_CLK_Z 0 | ||
| 16 | #define R8A7796_CLK_Z2 1 | ||
| 17 | #define R8A7796_CLK_ZR 2 | ||
| 18 | #define R8A7796_CLK_ZG 3 | ||
| 19 | #define R8A7796_CLK_ZTR 4 | ||
| 20 | #define R8A7796_CLK_ZTRD2 5 | ||
| 21 | #define R8A7796_CLK_ZT 6 | ||
| 22 | #define R8A7796_CLK_ZX 7 | ||
| 23 | #define R8A7796_CLK_S0D1 8 | ||
| 24 | #define R8A7796_CLK_S0D2 9 | ||
| 25 | #define R8A7796_CLK_S0D3 10 | ||
| 26 | #define R8A7796_CLK_S0D4 11 | ||
| 27 | #define R8A7796_CLK_S0D6 12 | ||
| 28 | #define R8A7796_CLK_S0D8 13 | ||
| 29 | #define R8A7796_CLK_S0D12 14 | ||
| 30 | #define R8A7796_CLK_S1D1 15 | ||
| 31 | #define R8A7796_CLK_S1D2 16 | ||
| 32 | #define R8A7796_CLK_S1D4 17 | ||
| 33 | #define R8A7796_CLK_S2D1 18 | ||
| 34 | #define R8A7796_CLK_S2D2 19 | ||
| 35 | #define R8A7796_CLK_S2D4 20 | ||
| 36 | #define R8A7796_CLK_S3D1 21 | ||
| 37 | #define R8A7796_CLK_S3D2 22 | ||
| 38 | #define R8A7796_CLK_S3D4 23 | ||
| 39 | #define R8A7796_CLK_LB 24 | ||
| 40 | #define R8A7796_CLK_CL 25 | ||
| 41 | #define R8A7796_CLK_ZB3 26 | ||
| 42 | #define R8A7796_CLK_ZB3D2 27 | ||
| 43 | #define R8A7796_CLK_ZB3D4 28 | ||
| 44 | #define R8A7796_CLK_CR 29 | ||
| 45 | #define R8A7796_CLK_CRD2 30 | ||
| 46 | #define R8A7796_CLK_SD0H 31 | ||
| 47 | #define R8A7796_CLK_SD0 32 | ||
| 48 | #define R8A7796_CLK_SD1H 33 | ||
| 49 | #define R8A7796_CLK_SD1 34 | ||
| 50 | #define R8A7796_CLK_SD2H 35 | ||
| 51 | #define R8A7796_CLK_SD2 36 | ||
| 52 | #define R8A7796_CLK_SD3H 37 | ||
| 53 | #define R8A7796_CLK_SD3 38 | ||
| 54 | #define R8A7796_CLK_SSP2 39 | ||
| 55 | #define R8A7796_CLK_SSP1 40 | ||
| 56 | #define R8A7796_CLK_SSPRS 41 | ||
| 57 | #define R8A7796_CLK_RPC 42 | ||
| 58 | #define R8A7796_CLK_RPCD2 43 | ||
| 59 | #define R8A7796_CLK_MSO 44 | ||
| 60 | #define R8A7796_CLK_CANFD 45 | ||
| 61 | #define R8A7796_CLK_HDMI 46 | ||
| 62 | #define R8A7796_CLK_CSI0 47 | ||
| 63 | #define R8A7796_CLK_CSIREF 48 | ||
| 64 | #define R8A7796_CLK_CP 49 | ||
| 65 | #define R8A7796_CLK_CPEX 50 | ||
| 66 | #define R8A7796_CLK_R 51 | ||
| 67 | #define R8A7796_CLK_OSC 52 | ||
| 68 | |||
| 69 | #endif /* __DT_BINDINGS_CLOCK_R8A7796_CPG_MSSR_H__ */ | ||
diff --git a/include/dt-bindings/clock/rk3228-cru.h b/include/dt-bindings/clock/rk3228-cru.h index 5d43ed9b05ad..b27e2b1a65e3 100644 --- a/include/dt-bindings/clock/rk3228-cru.h +++ b/include/dt-bindings/clock/rk3228-cru.h | |||
| @@ -52,6 +52,15 @@ | |||
| 52 | #define SCLK_EMMC_SAMPLE 121 | 52 | #define SCLK_EMMC_SAMPLE 121 |
| 53 | #define SCLK_VOP 122 | 53 | #define SCLK_VOP 122 |
| 54 | #define SCLK_HDMI_HDCP 123 | 54 | #define SCLK_HDMI_HDCP 123 |
| 55 | #define SCLK_MAC_SRC 124 | ||
| 56 | #define SCLK_MAC_EXTCLK 125 | ||
| 57 | #define SCLK_MAC 126 | ||
| 58 | #define SCLK_MAC_REFOUT 127 | ||
| 59 | #define SCLK_MAC_REF 128 | ||
| 60 | #define SCLK_MAC_RX 129 | ||
| 61 | #define SCLK_MAC_TX 130 | ||
| 62 | #define SCLK_MAC_PHY 131 | ||
| 63 | #define SCLK_MAC_OUT 132 | ||
| 55 | 64 | ||
| 56 | /* dclk gates */ | 65 | /* dclk gates */ |
| 57 | #define DCLK_VOP 190 | 66 | #define DCLK_VOP 190 |
| @@ -61,6 +70,7 @@ | |||
| 61 | #define ACLK_DMAC 194 | 70 | #define ACLK_DMAC 194 |
| 62 | #define ACLK_PERI 210 | 71 | #define ACLK_PERI 210 |
| 63 | #define ACLK_VOP 211 | 72 | #define ACLK_VOP 211 |
| 73 | #define ACLK_GMAC 212 | ||
| 64 | 74 | ||
| 65 | /* pclk gates */ | 75 | /* pclk gates */ |
| 66 | #define PCLK_GPIO0 320 | 76 | #define PCLK_GPIO0 320 |
| @@ -82,8 +92,13 @@ | |||
| 82 | #define PCLK_PERI 363 | 92 | #define PCLK_PERI 363 |
| 83 | #define PCLK_HDMI_CTRL 364 | 93 | #define PCLK_HDMI_CTRL 364 |
| 84 | #define PCLK_HDMI_PHY 365 | 94 | #define PCLK_HDMI_PHY 365 |
| 95 | #define PCLK_GMAC 367 | ||
| 85 | 96 | ||
| 86 | /* hclk gates */ | 97 | /* hclk gates */ |
| 98 | #define HCLK_I2S0_8CH 442 | ||
| 99 | #define HCLK_I2S1_8CH 443 | ||
| 100 | #define HCLK_I2S2_2CH 444 | ||
| 101 | #define HCLK_SPDIF_8CH 445 | ||
| 87 | #define HCLK_VOP 452 | 102 | #define HCLK_VOP 452 |
| 88 | #define HCLK_NANDC 453 | 103 | #define HCLK_NANDC 453 |
| 89 | #define HCLK_SDMMC 456 | 104 | #define HCLK_SDMMC 456 |
diff --git a/include/dt-bindings/clock/sun8i-h3-ccu.h b/include/dt-bindings/clock/sun8i-h3-ccu.h new file mode 100644 index 000000000000..efb7ba2bd515 --- /dev/null +++ b/include/dt-bindings/clock/sun8i-h3-ccu.h | |||
| @@ -0,0 +1,145 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2016 Maxime Ripard <maxime.ripard@free-electrons.com> | ||
| 3 | * | ||
| 4 | * This file is dual-licensed: you can use it either under the terms | ||
| 5 | * of the GPL or the X11 license, at your option. Note that this dual | ||
| 6 | * licensing only applies to this file, and not this project as a | ||
| 7 | * whole. | ||
| 8 | * | ||
| 9 | * a) This file is free software; you can redistribute it and/or | ||
| 10 | * modify it under the terms of the GNU General Public License as | ||
| 11 | * published by the Free Software Foundation; either version 2 of the | ||
| 12 | * License, or (at your option) any later version. | ||
| 13 | * | ||
| 14 | * This file is distributed in the hope that it will be useful, | ||
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 17 | * GNU General Public License for more details. | ||
| 18 | * | ||
| 19 | * Or, alternatively, | ||
| 20 | * | ||
| 21 | * b) Permission is hereby granted, free of charge, to any person | ||
| 22 | * obtaining a copy of this software and associated documentation | ||
| 23 | * files (the "Software"), to deal in the Software without | ||
| 24 | * restriction, including without limitation the rights to use, | ||
| 25 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
| 26 | * sell copies of the Software, and to permit persons to whom the | ||
| 27 | * Software is furnished to do so, subject to the following | ||
| 28 | * conditions: | ||
| 29 | * | ||
| 30 | * The above copyright notice and this permission notice shall be | ||
| 31 | * included in all copies or substantial portions of the Software. | ||
| 32 | * | ||
| 33 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 34 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| 35 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 36 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| 37 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| 38 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| 39 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| 40 | * OTHER DEALINGS IN THE SOFTWARE. | ||
| 41 | */ | ||
| 42 | |||
| 43 | #ifndef _DT_BINDINGS_CLK_SUN8I_H3_H_ | ||
| 44 | #define _DT_BINDINGS_CLK_SUN8I_H3_H_ | ||
| 45 | |||
| 46 | #define CLK_CPUX 14 | ||
| 47 | |||
| 48 | #define CLK_BUS_CE 20 | ||
| 49 | #define CLK_BUS_DMA 21 | ||
| 50 | #define CLK_BUS_MMC0 22 | ||
| 51 | #define CLK_BUS_MMC1 23 | ||
| 52 | #define CLK_BUS_MMC2 24 | ||
| 53 | #define CLK_BUS_NAND 25 | ||
| 54 | #define CLK_BUS_DRAM 26 | ||
| 55 | #define CLK_BUS_EMAC 27 | ||
| 56 | #define CLK_BUS_TS 28 | ||
| 57 | #define CLK_BUS_HSTIMER 29 | ||
| 58 | #define CLK_BUS_SPI0 30 | ||
| 59 | #define CLK_BUS_SPI1 31 | ||
| 60 | #define CLK_BUS_OTG 32 | ||
| 61 | #define CLK_BUS_EHCI0 33 | ||
| 62 | #define CLK_BUS_EHCI1 34 | ||
| 63 | #define CLK_BUS_EHCI2 35 | ||
| 64 | #define CLK_BUS_EHCI3 36 | ||
| 65 | #define CLK_BUS_OHCI0 37 | ||
| 66 | #define CLK_BUS_OHCI1 38 | ||
| 67 | #define CLK_BUS_OHCI2 39 | ||
| 68 | #define CLK_BUS_OHCI3 40 | ||
| 69 | #define CLK_BUS_VE 41 | ||
| 70 | #define CLK_BUS_TCON0 42 | ||
| 71 | #define CLK_BUS_TCON1 43 | ||
| 72 | #define CLK_BUS_DEINTERLACE 44 | ||
| 73 | #define CLK_BUS_CSI 45 | ||
| 74 | #define CLK_BUS_TVE 46 | ||
| 75 | #define CLK_BUS_HDMI 47 | ||
| 76 | #define CLK_BUS_DE 48 | ||
| 77 | #define CLK_BUS_GPU 49 | ||
| 78 | #define CLK_BUS_MSGBOX 50 | ||
| 79 | #define CLK_BUS_SPINLOCK 51 | ||
| 80 | #define CLK_BUS_CODEC 52 | ||
| 81 | #define CLK_BUS_SPDIF 53 | ||
| 82 | #define CLK_BUS_PIO 54 | ||
| 83 | #define CLK_BUS_THS 55 | ||
| 84 | #define CLK_BUS_I2S0 56 | ||
| 85 | #define CLK_BUS_I2S1 57 | ||
| 86 | #define CLK_BUS_I2S2 58 | ||
| 87 | #define CLK_BUS_I2C0 59 | ||
| 88 | #define CLK_BUS_I2C1 60 | ||
| 89 | #define CLK_BUS_I2C2 61 | ||
| 90 | #define CLK_BUS_UART0 62 | ||
| 91 | #define CLK_BUS_UART1 63 | ||
| 92 | #define CLK_BUS_UART2 64 | ||
| 93 | #define CLK_BUS_UART3 65 | ||
| 94 | #define CLK_BUS_SCR 66 | ||
| 95 | #define CLK_BUS_EPHY 67 | ||
| 96 | #define CLK_BUS_DBG 68 | ||
| 97 | |||
| 98 | #define CLK_THS 69 | ||
| 99 | #define CLK_NAND 70 | ||
| 100 | #define CLK_MMC0 71 | ||
| 101 | #define CLK_MMC0_SAMPLE 72 | ||
| 102 | #define CLK_MMC0_OUTPUT 73 | ||
| 103 | #define CLK_MMC1 74 | ||
| 104 | #define CLK_MMC1_SAMPLE 75 | ||
| 105 | #define CLK_MMC1_OUTPUT 76 | ||
| 106 | #define CLK_MMC2 77 | ||
| 107 | #define CLK_MMC2_SAMPLE 78 | ||
| 108 | #define CLK_MMC2_OUTPUT 79 | ||
| 109 | #define CLK_TS 80 | ||
| 110 | #define CLK_CE 81 | ||
| 111 | #define CLK_SPI0 82 | ||
| 112 | #define CLK_SPI1 83 | ||
| 113 | #define CLK_I2S0 84 | ||
| 114 | #define CLK_I2S1 85 | ||
| 115 | #define CLK_I2S2 86 | ||
| 116 | #define CLK_SPDIF 87 | ||
| 117 | #define CLK_USB_PHY0 88 | ||
| 118 | #define CLK_USB_PHY1 89 | ||
| 119 | #define CLK_USB_PHY2 90 | ||
| 120 | #define CLK_USB_PHY3 91 | ||
| 121 | #define CLK_USB_OHCI0 92 | ||
| 122 | #define CLK_USB_OHCI1 93 | ||
| 123 | #define CLK_USB_OHCI2 94 | ||
| 124 | #define CLK_USB_OHCI3 95 | ||
| 125 | |||
| 126 | #define CLK_DRAM_VE 97 | ||
| 127 | #define CLK_DRAM_CSI 98 | ||
| 128 | #define CLK_DRAM_DEINTERLACE 99 | ||
| 129 | #define CLK_DRAM_TS 100 | ||
| 130 | #define CLK_DE 101 | ||
| 131 | #define CLK_TCON0 102 | ||
| 132 | #define CLK_TVE 103 | ||
| 133 | #define CLK_DEINTERLACE 104 | ||
| 134 | #define CLK_CSI_MISC 105 | ||
| 135 | #define CLK_CSI_SCLK 106 | ||
| 136 | #define CLK_CSI_MCLK 107 | ||
| 137 | #define CLK_VE 108 | ||
| 138 | #define CLK_AC_DIG 109 | ||
| 139 | #define CLK_AVS 110 | ||
| 140 | #define CLK_HDMI 111 | ||
| 141 | #define CLK_HDMI_DDC 112 | ||
| 142 | |||
| 143 | #define CLK_GPU 114 | ||
| 144 | |||
| 145 | #endif /* _DT_BINDINGS_CLK_SUN8I_H3_H_ */ | ||
diff --git a/include/dt-bindings/clock/tegra210-car.h b/include/dt-bindings/clock/tegra210-car.h index bd3530e56d46..35288b20f2c9 100644 --- a/include/dt-bindings/clock/tegra210-car.h +++ b/include/dt-bindings/clock/tegra210-car.h | |||
| @@ -308,7 +308,7 @@ | |||
| 308 | #define TEGRA210_CLK_CLK_OUT_3 279 | 308 | #define TEGRA210_CLK_CLK_OUT_3 279 |
| 309 | #define TEGRA210_CLK_BLINK 280 | 309 | #define TEGRA210_CLK_BLINK 280 |
| 310 | /* 281 */ | 310 | /* 281 */ |
| 311 | /* 282 */ | 311 | #define TEGRA210_CLK_SOR1_SRC 282 |
| 312 | /* 283 */ | 312 | /* 283 */ |
| 313 | #define TEGRA210_CLK_XUSB_HOST_SRC 284 | 313 | #define TEGRA210_CLK_XUSB_HOST_SRC 284 |
| 314 | #define TEGRA210_CLK_XUSB_FALCON_SRC 285 | 314 | #define TEGRA210_CLK_XUSB_FALCON_SRC 285 |
diff --git a/include/dt-bindings/reset/sun8i-h3-ccu.h b/include/dt-bindings/reset/sun8i-h3-ccu.h new file mode 100644 index 000000000000..6b7af80c26ec --- /dev/null +++ b/include/dt-bindings/reset/sun8i-h3-ccu.h | |||
| @@ -0,0 +1,103 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2016 Maxime Ripard <maxime.ripard@free-electrons.com> | ||
| 3 | * | ||
| 4 | * This file is dual-licensed: you can use it either under the terms | ||
| 5 | * of the GPL or the X11 license, at your option. Note that this dual | ||
| 6 | * licensing only applies to this file, and not this project as a | ||
| 7 | * whole. | ||
| 8 | * | ||
| 9 | * a) This file is free software; you can redistribute it and/or | ||
| 10 | * modify it under the terms of the GNU General Public License as | ||
| 11 | * published by the Free Software Foundation; either version 2 of the | ||
| 12 | * License, or (at your option) any later version. | ||
| 13 | * | ||
| 14 | * This file is distributed in the hope that it will be useful, | ||
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 17 | * GNU General Public License for more details. | ||
| 18 | * | ||
| 19 | * Or, alternatively, | ||
| 20 | * | ||
| 21 | * b) Permission is hereby granted, free of charge, to any person | ||
| 22 | * obtaining a copy of this software and associated documentation | ||
| 23 | * files (the "Software"), to deal in the Software without | ||
| 24 | * restriction, including without limitation the rights to use, | ||
| 25 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
| 26 | * sell copies of the Software, and to permit persons to whom the | ||
| 27 | * Software is furnished to do so, subject to the following | ||
| 28 | * conditions: | ||
| 29 | * | ||
| 30 | * The above copyright notice and this permission notice shall be | ||
| 31 | * included in all copies or substantial portions of the Software. | ||
| 32 | * | ||
| 33 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 34 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| 35 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 36 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| 37 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| 38 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| 39 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| 40 | * OTHER DEALINGS IN THE SOFTWARE. | ||
| 41 | */ | ||
| 42 | |||
| 43 | #ifndef _DT_BINDINGS_RST_SUN8I_H3_H_ | ||
| 44 | #define _DT_BINDINGS_RST_SUN8I_H3_H_ | ||
| 45 | |||
| 46 | #define RST_USB_PHY0 0 | ||
| 47 | #define RST_USB_PHY1 1 | ||
| 48 | #define RST_USB_PHY2 2 | ||
| 49 | #define RST_USB_PHY3 3 | ||
| 50 | |||
| 51 | #define RST_MBUS 4 | ||
| 52 | |||
| 53 | #define RST_BUS_CE 5 | ||
| 54 | #define RST_BUS_DMA 6 | ||
| 55 | #define RST_BUS_MMC0 7 | ||
| 56 | #define RST_BUS_MMC1 8 | ||
| 57 | #define RST_BUS_MMC2 9 | ||
| 58 | #define RST_BUS_NAND 10 | ||
| 59 | #define RST_BUS_DRAM 11 | ||
| 60 | #define RST_BUS_EMAC 12 | ||
| 61 | #define RST_BUS_TS 13 | ||
| 62 | #define RST_BUS_HSTIMER 14 | ||
| 63 | #define RST_BUS_SPI0 15 | ||
| 64 | #define RST_BUS_SPI1 16 | ||
| 65 | #define RST_BUS_OTG 17 | ||
| 66 | #define RST_BUS_EHCI0 18 | ||
| 67 | #define RST_BUS_EHCI1 19 | ||
| 68 | #define RST_BUS_EHCI2 20 | ||
| 69 | #define RST_BUS_EHCI3 21 | ||
| 70 | #define RST_BUS_OHCI0 22 | ||
| 71 | #define RST_BUS_OHCI1 23 | ||
| 72 | #define RST_BUS_OHCI2 24 | ||
| 73 | #define RST_BUS_OHCI3 25 | ||
| 74 | #define RST_BUS_VE 26 | ||
| 75 | #define RST_BUS_TCON0 27 | ||
| 76 | #define RST_BUS_TCON1 28 | ||
| 77 | #define RST_BUS_DEINTERLACE 29 | ||
| 78 | #define RST_BUS_CSI 30 | ||
| 79 | #define RST_BUS_TVE 31 | ||
| 80 | #define RST_BUS_HDMI0 32 | ||
| 81 | #define RST_BUS_HDMI1 33 | ||
| 82 | #define RST_BUS_DE 34 | ||
| 83 | #define RST_BUS_GPU 35 | ||
| 84 | #define RST_BUS_MSGBOX 36 | ||
| 85 | #define RST_BUS_SPINLOCK 37 | ||
| 86 | #define RST_BUS_DBG 38 | ||
| 87 | #define RST_BUS_EPHY 39 | ||
| 88 | #define RST_BUS_CODEC 40 | ||
| 89 | #define RST_BUS_SPDIF 41 | ||
| 90 | #define RST_BUS_THS 42 | ||
| 91 | #define RST_BUS_I2S0 43 | ||
| 92 | #define RST_BUS_I2S1 44 | ||
| 93 | #define RST_BUS_I2S2 45 | ||
| 94 | #define RST_BUS_I2C0 46 | ||
| 95 | #define RST_BUS_I2C1 47 | ||
| 96 | #define RST_BUS_I2C2 48 | ||
| 97 | #define RST_BUS_UART0 49 | ||
| 98 | #define RST_BUS_UART1 50 | ||
| 99 | #define RST_BUS_UART2 51 | ||
| 100 | #define RST_BUS_UART3 52 | ||
| 101 | #define RST_BUS_SCR 53 | ||
| 102 | |||
| 103 | #endif /* _DT_BINDINGS_RST_SUN8I_H3_H_ */ | ||
