diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-02 15:10:12 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-02 15:10:12 -0500 |
| commit | e05f9ac42c1b87a1a266e3e83191ed00211576bc (patch) | |
| tree | b1c28ec3b64d5f752c97fd4ac93483cb2be19ed7 /arch/arm/mach-imx/common.h | |
| parent | c655479ab89cfad17a773cb55b57199c19f65e9b (diff) | |
| parent | 48c95841110036a95840c6782f27d841ead9a583 (diff) | |
Merge tag 'imx-soc-3.14' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc
From Shawn Guo:
i.MX SoC changes for 3.14:
- Add the initial i.MX50 SoC support
- Support device tree boot for i.MX35
- Move imx5 clock driver to use macros for clock ID
- Some random updates and non-critical fixes on clock drivers
- A few defconfig updates and minor cleanups
* tag 'imx-soc-3.14' of git://git.linaro.org/people/shawnguo/linux-2.6: (37 commits)
ARM: imx: improve the comment of CCM lpm SW workaround
ARM: imx: improve status check of clock gate
ARM: imx: add necessary interface for pfd
ARM: imx_v6_v7_defconfig: Select CONFIG_REGULATOR_PFUZE100
ARM: imx_v6_v7_defconfig: Select MX35 and MX50 device tree support
ARM: imx: Add cpu frequency scaling support
ARM i.MX35: Add devicetree support.
ARM: imx: update imx_v6_v7_defconfig
ARM: imx6sl: Add missing spba clock to clock tree
ARM: imx6sl: Add missing pll4_audio_div to the clock tree
ARM: imx6: Derive spdif clock from pll3_pfd3_454m
ARM: imx: use __initconst for const init definition
ARM i.MX5: fix obvious typo in ldb_di0_gate clk definition
ARM i.MX5: set CAN peripheral clock to 24 MHz parent
ARM: imx: pllv1: Fix PLL calculation for i.MX27
ARM i.MX5: fix "shift" value for lp_apm_sel on i.MX50 and i.MX53
ARM: imx: imx53: Add SATA PHY clock
ARM: imx_v6_v7_defconfig: Enable STMPE touchscreen
ARM: imx: rename IMX6SL_CLK_CLK_END to IMX6SL_CLK_END
ARM: imx: select PINCTRL at sub-architecure level
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-imx/common.h')
| -rw-r--r-- | arch/arm/mach-imx/common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index 24a7899e36a8..59c3b9b26bb4 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h | |||
| @@ -108,6 +108,7 @@ void tzic_handle_irq(struct pt_regs *); | |||
| 108 | #define imx27_handle_irq avic_handle_irq | 108 | #define imx27_handle_irq avic_handle_irq |
| 109 | #define imx31_handle_irq avic_handle_irq | 109 | #define imx31_handle_irq avic_handle_irq |
| 110 | #define imx35_handle_irq avic_handle_irq | 110 | #define imx35_handle_irq avic_handle_irq |
| 111 | #define imx50_handle_irq tzic_handle_irq | ||
| 111 | #define imx51_handle_irq tzic_handle_irq | 112 | #define imx51_handle_irq tzic_handle_irq |
| 112 | #define imx53_handle_irq tzic_handle_irq | 113 | #define imx53_handle_irq tzic_handle_irq |
| 113 | 114 | ||