• Arnd Bergmann's avatar
    Merge branch 'spear/clock' into next/clock · eae0185a
    Arnd Bergmann authored
    Viresh Kumar <viresh.kumar@st.com> writes:
    
     This is rebased over a (merge of Mike's/clk-next & SPEAr's DT) + Russell's
     patch: CLKDEV: provide helpers for common clock framework rebased over them.
    
    * spear/clock:
      SPEAr: Switch to common clock framework
      SPEAr: Call clk_prepare() before calling clk_enable
      SPEAr: clk: Add General Purpose Timer Synthesizer clock
      SPEAr: clk: Add Fractional Synthesizer clock
      SPEAr: clk: Add Auxiliary Synthesizer clock
      SPEAr: clk: Add VCO-PLL Synthesizer clock
    
    Conflicts:
    	drivers/clk/Makefile
    
    [Arnd: rebased again without the spear/dt branch]
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    eae0185a
MAINTAINERS 205 KB