From: Olof Johansson Date: Sat, 19 Jul 2014 18:56:39 +0000 (-0700) Subject: Merge tag 'imx-soc-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b40abaf07fa19c5aa3e649369ed8e0f9df1d2eda;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'imx-soc-3.17' of git://git./linux/kernel/git/shawnguo/linux into next/soc Merge "ARM: imx: SoC changes for 3.17" from Shawn Guo: The i.MX SoC changes for 3.17: - Add devicetree support for i.MX1 and i.MX21 clock driver - Use CLOCKSOURCE_OF_DECLARE() to initialize timer for DT targets - Use of_clk_init() to initialize i.MX25 and i.MX27 clock driver in device tree boot - Remove i.MX1 camera support - Remove i.MX27 IP Camera and Lite-Kit board support - Add suspend and cpuidle support for i.mx6sx - Clean up unused clk_register_clkdev() lookups - Update imx-weim bus driver to support populating devices on a simple bus - Switch i.MX27 and i.MX6QDL clock driver to use macro for clock IDs - Make i.MX51 a DT only platform and clean up the non-DT support code - Support disabling supervisor protect via DT - Random defconfig updates * tag 'imx-soc-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (69 commits) ARM: imx: clk-vf610: fix FlexCAN clock gating ARM: i.MX: Use CLOCKSOURCE_OF_DECLARE() for DT targets ARM: i.MX53: globally disable supervisor protect ARM: i.MX: allow disabling supervisor protect via DT ARM: i.MX27 clk: Add 26 MHz oscillator circuit clock gate ARM: i.MX27 clk: Remove unused definitions ARM: i.MX27 clk: Introduce DT include for clock provider ARM: i.MX: Remove Freescale Logic Product Development i.MX27 Lite-Kit board support ARM: i.MX: Remove excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27 ARM: i.MX: Remove i.MX1 camera support ARM: imx: use PTR_ERR_OR_ZERO bus: imx-weim: populate devices on a simple bus ARM: imx: build cpu_is_imx6sl function conditionally ARM: imx: imx6sx uses imx6q cpuidle code ARM: imx: drop PL310 errata 588369 and 727915 ARM: imx_v6_v7_defconfig: add FSL_EDMA and PRINTK_TIME ARM: imx: clk-imx6sx: register SSI/SSI_IPG as shared gate clocks ARM: imx_v6_v7_defconfig: Enable flexcan driver for can support ARM: imx_v6_v7_defconfig: Enable STMPE gpio support ARM: imx: mark .dt_compat as const ... Signed-off-by: Olof Johansson --- b40abaf07fa19c5aa3e649369ed8e0f9df1d2eda