• Olof Johansson's avatar
    Merge tag 'tegra-for-3.9-soc-ccf' of... · bda6f8e6
    Olof Johansson authored
    Merge tag 'tegra-for-3.9-soc-ccf' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/soc
    
    From Stephen Warren:
    ARM: tegra: Common Clock Framework rework
    
    Tegra already supports the common clock framework, but had issues:
    
    1) The clock driver was located in arch/arm/mach-tegra/ rather than
       drivers/clk/.
    
    2) A single "Tegra clock" type was implemented, rather than separate
       clock types for PLL, mux, divider, ... type in HW.
    
    3) Clock lookups by device drivers were still driven by device name
       and connection ID, rather than through device tree.
    
    This pull request solves all three issues. This required some DT changes
    to add clocks properties, and driver changes to request clocks more
    "correctly". Finally, this rework allows all AUXDATA to be removed from
    Tegra board files, and various duplicate clock lookup entries to be
    removed from the driver.
    
    This pull request is based on the previous pull request, with tag
    tegra-for-3.9-cleanup.
    
    * tag 'tegra-for-3.9-soc-ccf' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (31 commits)
      clk: tegra30: remove unused TEGRA_CLK_DUPLICATE()s
      clk: tegra20: remove unused TEGRA_CLK_DUPLICATE()s
      ARM: tegra30: remove auxdata
      ARM: tegra20: remove auxdata
      ASoC: tegra: remove auxdata
      staging: nvec: remove use of clk_get_sys
      ARM: tegra: paz00: add clock information to DT
      ARM: tegra: add clock properties to Tegra30 DT
      ARM: tegra: add clock properties to Tegra20 DT
      spi: tegra: do not use clock name to get clock
      ARM: tegra: remove legacy clock code
      ARM: tegra: migrate to new clock code
      clk: tegra: add clock support for Tegra30
      clk: tegra: add clock support for Tegra20
      clk: tegra: add Tegra specific clocks
      ARM: tegra: define Tegra30 CAR binding
      ARM: tegra: define Tegra20 CAR binding
      ARM: tegra: move tegra_cpu_car.h to linux/clk/tegra.h
      ARM: tegra: add function to read chipid
      ARM: tegra: fix compile error when disable CPU_IDLE
      ...
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    
    Conflicts:
    	arch/arm/mach-tegra/board-dt-tegra20.c
    	arch/arm/mach-tegra/board-dt-tegra30.c
    	arch/arm/mach-tegra/common.c
    	arch/arm/mach-tegra/platsmp.c
    	drivers/clocksource/Makefile
    bda6f8e6
common.c 2.67 KB