• Olof Johansson's avatar
    Merge branch 'samsung/board' into next/boards · 8df97495
    Olof Johansson authored
    * samsung/board:
      ARM: S3C64XX: Hook up VDDINT on Cragganmore
      ARM: S3C2440: Add new LCD (W35i) support for Mini2440 board
      ARM: S3C64XX: Power gate unused domains
      ARM: S3C64XX: Hook up Littlemill audio card on Cragganmore
      ARM: S3C64XX: Hook up platform data for Kilchomin module on Cragganmore
      ARM: S3C64XX: Run Tobermory interrupts in the default mode
      ARM: S3C64XX: Improve logging of unknown Cragganmore module types
      ARM: S3C64XX: Configure WM1250 EV1 GPIOs on Cragganmore
      ARM: S3C64XX: Use software initiated powerdown for Cragganmore
      ARM: S3C64XX: Raise the frequency of the second I2C bus on Cragganmore
      ARM: S3C64XX: Correct reservation of GPIOs for CPU module on Cragganmore
      ARM: SAMSUNG: Fix GPIO space reservation for S3C64xx platforms
      ARM: S3C64XX: Update for conversion to SAMSUNG_GPIO_EXTRA
    
    Conflicts:
    	arch/arm/mach-s3c64xx/mach-crag6410.c
    8df97495
mach-crag6410-module.c 5.75 KB