Skip to content
Snippets Groups Projects
  • Arnd Bergmann's avatar
    0a01216c
    Merge tag 'imx-fixes-3.9-5' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes · 0a01216c
    Arnd Bergmann authored
    From Shawn Guo <shawn.guo@linaro.org>:
    
    The imx fixes for 3.9, take 5:
    
    * A couple imx35 clock fixes for regressions caused by common clock
      framework conversion.  The admux and iomux get disabled by common
      clock framework late initcall, and hence causes problems.
    * Add missing twd clock lookup in device tree.  This becomes required
      since commit bd603455 (ARM: use device tree to get smp_twd clock)
      forces all DT boot to find lookup from device tree.
    * Fix imx6q ldb_di clock parents mismatch per reference manual.
    
    * tag 'imx-fixes-3.9-5' of git://git.linaro.org/people/shawnguo/linux-2.6
    
    : (217 commits)
      ARM i.MX6: Fix ldb_di clock selection
      ARM: imx: provide twd clock lookup from device tree
      ARM: imx35 Bugfix admux clock
      ARM: clk-imx35: Bugfix iomux clock
    
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    0a01216c
    History
    Merge tag 'imx-fixes-3.9-5' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
    Arnd Bergmann authored
    From Shawn Guo <shawn.guo@linaro.org>:
    
    The imx fixes for 3.9, take 5:
    
    * A couple imx35 clock fixes for regressions caused by common clock
      framework conversion.  The admux and iomux get disabled by common
      clock framework late initcall, and hence causes problems.
    * Add missing twd clock lookup in device tree.  This becomes required
      since commit bd603455 (ARM: use device tree to get smp_twd clock)
      forces all DT boot to find lookup from device tree.
    * Fix imx6q ldb_di clock parents mismatch per reference manual.
    
    * tag 'imx-fixes-3.9-5' of git://git.linaro.org/people/shawnguo/linux-2.6
    
    : (217 commits)
      ARM i.MX6: Fix ldb_di clock selection
      ARM: imx: provide twd clock lookup from device tree
      ARM: imx35 Bugfix admux clock
      ARM: clk-imx35: Bugfix iomux clock
    
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>