diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-15 18:01:18 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-16 00:03:06 +0300 |
| commit | fed925ea70f6a8bb1a60baad1146f251770cc777 (patch) | |
| tree | 177c24bf11a0e6017c6e3f159ce170f779fedbb7 /include/dt-bindings | |
| parent | f3ccc2b445ce1d800ef9776a0a3fcc85762d380a (diff) | |
| parent | 303aa1bf077711248bd5a75cab3f7355cad8c264 (diff) | |
| download | linux-fed925ea70f6a8bb1a60baad1146f251770cc777.tar.xz | |
Merge tag 'imx-dt-newclk-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
Pull "i.MX device tree update with new clock for 4.17" from Shawn Guo:
- Add CAAM and Keypad device node for i.MX7S/D SoC device tree.
- Add clock support for i.MX7 SNVS RTC device.
* tag 'imx-dt-newclk-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: imx7s: add Keypad Port module
ARM: dts: imx7s: add CAAM device node
ARM: dts: imx7s: add snvs rtc clock
clk: imx: imx7d: add the Keypad Port module clock
clk: imx7d: add CAAM clock
clk: imx: imx7d: add the snvs clock
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/clock/imx7d-clock.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/dt-bindings/clock/imx7d-clock.h b/include/dt-bindings/clock/imx7d-clock.h index e2f99ae72d5c..b2325d3e236a 100644 --- a/include/dt-bindings/clock/imx7d-clock.h +++ b/include/dt-bindings/clock/imx7d-clock.h @@ -452,5 +452,8 @@ #define IMX7D_OCOTP_CLK 439 #define IMX7D_NAND_RAWNAND_CLK 440 #define IMX7D_NAND_USDHC_BUS_RAWNAND_CLK 441 -#define IMX7D_CLK_END 442 +#define IMX7D_SNVS_CLK 442 +#define IMX7D_CAAM_CLK 443 +#define IMX7D_KPP_ROOT_CLK 444 +#define IMX7D_CLK_END 445 #endif /* __DT_BINDINGS_CLOCK_IMX7D_H */ |