diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2014-11-23 15:07:02 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2014-11-23 15:07:02 +0800 |
| commit | 2ce34b105c79ee0404b3a8f68c9ab2ce197dd06f (patch) | |
| tree | 2111f40b612ccf19b0acb480f82c1e7a80d2e24a /include/dt-bindings/clock/imx5-clock.h | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
| parent | 3db47dc0ae4d370ec3c86fc357608132ca695c27 (diff) | |
Merge tag 'imx-soc-3.19' into imx/dt
The i.MX SoC update for 3.19:
- Update i.MX6 suspend code to check DDR instead of CPU type, as the
difference we need to handle is between LPDDR2 and DDR3, not SoCs.
- Set anatop properly for LPDDR2 in DSM mode
- Add support for new SoC LS1021A which integrates dual Cortex-A7
- Add ENET initialization for i.MX6SX platform
- Add cpufreq support for i.MX53 platform
- Add a SNVS based poweroff driver for i.MX6 platforms
- Use ARM Global Timer as clocksource on VF610
Note: the change set is built on top of tag imx-fixes-3.18-2 to resolve
a conflict on file arch/arm/mach-imx/clk-vf610.c.
Diffstat (limited to 'include/dt-bindings/clock/imx5-clock.h')
| -rw-r--r-- | include/dt-bindings/clock/imx5-clock.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/dt-bindings/clock/imx5-clock.h b/include/dt-bindings/clock/imx5-clock.h index 5f2667ecd98..f4b7478e23c 100644 --- a/include/dt-bindings/clock/imx5-clock.h +++ b/include/dt-bindings/clock/imx5-clock.h @@ -198,6 +198,9 @@ #define IMX5_CLK_OCRAM 186 #define IMX5_CLK_SAHARA_IPG_GATE 187 #define IMX5_CLK_SATA_REF 188 -#define IMX5_CLK_END 189 +#define IMX5_CLK_STEP_SEL 189 +#define IMX5_CLK_CPU_PODF_SEL 190 +#define IMX5_CLK_ARM 191 +#define IMX5_CLK_END 192 #endif /* __DT_BINDINGS_CLOCK_IMX5_H */ |