• Arnd Bergmann's avatar
    Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup · 397d77a5
    Arnd Bergmann authored
    Merge "First batch of AT91 cleanup for 3.15" from Nicolas Ferre:
    
    - some updates on the defconfig front
    - two SoCs converted to Device Tree: sam9261 and sam9rl
      (with use of CCF!)
    - a little PWM clock update that goes on top of this
    
    * tag 'at91-cleanup' of git://github.com/at91linux/linux-at91:
      ARM: at91: add PWM clock
      ARM: at91: move sam9261 SoC to common clk
      ARM: at91: prepare common clk transition for sam9261 SoC
      ARM: at91: updated the at91_dt_defconfig with support for the ADS7846
      ARM: at91: dt: sam9261: Device Tree support for the at91sam9261ek
      ARM: at91: dt: defconfig: Added the sam9261 to the list of DT-enabled SOCs
      ARM: at91: dt: Add at91sam9261 dt SoC support
      ARM: at91: switch sam9rl to common clock framework
      ARM: at91/dt: define main clk frequency of at91sam9rlek
      ARM: at91/dt: define at91sam9rl clocks
      ARM: at91: prepare common clk transition for sam9rl SoCs
      ARM: at91: prepare sam9 dt boards transition to common clk
      ARM: at91: dt: sam9rl: Device Tree for the at91sam9rlek
      ARM: at91/defconfig: Add the sam9rl to the list of DT-enabled SOCs
      ARM: at91: Add at91sam9rl DT SoC support
      ARM: at91: prepare at91sam9rl DT transition
      ARM: at91/defconfig: refresh at91sam9260_9g20_defconfig
      ARM: at91/defconfig: remove useless configuration in at91sam9260_9g20_defconfig
      ARM: at91/defconfig: refresh at91sam9rl_defconfig
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    397d77a5
at91sam9261.c 10 KB