1. 23 11月, 2014 38 次提交
  2. 04 11月, 2014 2 次提交
    • F
      ARM: imx: Fix the removal of CONFIG_SPI option · 89fbec5b
      Fabio Estevam 提交于
      Since 64546e9f ("ARM: imx_v6_v7_defconfig updates") and commit
      0650f855 ("ARM: imx_v4_v5_defconfig: Select CONFIG_IMX_WEIM") CONFIG_SPI
      selection was dropped by savedefconfig for imx_v4_v5_defconfig and
      imx_v6_v7_defconfig.
      
      In order to keep the same behaviour as previous kernel versions and avoid
      regressions, let's add CONFIG_SPI option back.
      Signed-off-by: NFabio Estevam <fabio.estevam@freescale.com>
      Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
      89fbec5b
    • S
      ARM: imx: clk-vf610: define PLL's clock tree · c72c5532
      Stefan Agner 提交于
      So far, the required PLL's (PLL1/PLL2/PLL5) have been initialized
      by boot loader and the kernel code defined fixed rates according
      to those default configurations. Beginning with the USB PLL7 the
      code started to initialize the PLL's itself (using imx_clk_pllv3).
      
      However, since commit dc4805c2
      (ARM: imx: remove ENABLE and BYPASS bits from clk-pllv3 driver)
      imx_clk_pllv3 no longer takes care of the ENABLE and BYPASS bits,
      hence the USB PLL were not configured correctly anymore.
      
      This patch not only fixes those USB PLL's, but also makes use of
      the imx_clk_pllv3 for all PLL's and alignes the code with the PLL
      support of the i.MX6 series.
      Signed-off-by: NStefan Agner <stefan@agner.ch>
      Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
      c72c5532