1. 08 Mar, 2012 1 commit
    • Olof Johansson's avatar
      Merge branch 'next/cleanup-s3c24xx' of... · d60d506e
      Olof Johansson authored
      Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
      
      * 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (24 commits)
        ARM: S3C24XX: remove call to s3c24xx_setup_clocks
        ARM: S3C24XX: add get_rate for clk_p on S3C2416/2443
        ARM: S3C24XX: add get_rate for clk_h on S3C2416/2443
        ARM: S3C24XX: remove XXX_setup_clocks method from S3C2443
        ARM: S3C24XX: remove obsolete S3C2416_DMA option
        ARM: S3C24XX: Reuse S3C2443 dma for S3C2416
        ARM: S3C24XX: Fix indentation of dma-s3c2443
        ARM: S3C24XX: Move device setup files to mach directory
        ARM: S3C24XX: Consolidate Simtec extensions
        ARM: S3C24XX: move simtec-specific code to mach directory
        ARM: S3C24XX: Move common-smdk code to mach directory
        ARM: S3C24XX: Move s3c2443-clock.c to mach-s3c24xx
        ARM: s3c2410_defconfig: update s3c2410_defconfig
        ARM: S3C2443: move mach-s3c2443/* into mach-s3c24xx/
        ARM: S3C2440: move mach-s3c2440/* into mach-s3c24xx/
        ARM: S3C2416: move mach-s3c2416/* into mach-s3c24xx/
        ARM: S3C2412: move mach-s3c2412/* into mach-s3c24xx/
        ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/
        ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XX
        ARM: S3C2410: move s3c2410_baseclk_add to clock.h
        ...
      d60d506e
  2. 07 Mar, 2012 16 commits
  3. 04 Mar, 2012 6 commits
  4. 02 Mar, 2012 9 commits
  5. 29 Feb, 2012 2 commits
  6. 28 Feb, 2012 4 commits
  7. 27 Feb, 2012 2 commits
    • Arnd Bergmann's avatar
      Merge branch 'davinci/cleanups' into next/cleanup · a3a3c466
      Arnd Bergmann authored
      * davinci/cleanups:
        ARM: davinci: add back dummy header files
        ARM: davinci: dm644x: don't force vpfe registeration on all boards
        ARM: davinci: dm644x: fix inconsistent variable naming
        ARM: davinci: dm644x: improve readability using macro
        ARM: davinci: streamline sysmod access
        ARM: davinci: create new common platform header for davinci
        ARM: davinci: dm646x: move private definitions to C file
        ARM: davinci: dm365: move private definitions to C file
        ARM: davinci: dm644x: move private definitions to C file
      
      Conflicts:
      	arch/arm/mach-davinci/board-dm644x-evm.c
      	arch/arm/mach-davinci/board-neuros-osd2.c
      	arch/arm/mach-davinci/board-sffsdr.c
      a3a3c466
    • Arnd Bergmann's avatar
      ARM: davinci: add back dummy header files · 6ea96e11
      Arnd Bergmann authored
      The mach/dm365.h and mach/dm646xh headers are currently being included
      in some device drivers. The removal of those includes is already merged
      in some subsystem trees, but adding the dummy files ensures that this
      branch can be built standalone.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      6ea96e11