summaryrefslogtreecommitdiffstats
path: root/arch/arm
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into ↵Russell King2010-05-24116-3664/+4784
|\ | | | | | | | | | | | | devel-stable Conflicts: arch/arm/Kconfig
| * ARM: s3c6400_defconfig: Add NAND driverBen Dooks2010-05-231-1/+83
| | | | | | | | | | | | Add the NAND driver to the list of inbuilt devices. Signed-of-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: s3c6400_defconfig: enable sound as modulesBen Dooks2010-05-231-2/+41
| | | | | | | | | | | | Add the ASoC/ALSA configuration for s3c6400_defconfig as modules Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: s3c6400_defconfig: enable power managementBen Dooks2010-05-231-2/+12
| | | | | | | | | | | | Enable power management in the default build Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34Ben Dooks2010-05-231-6/+18
| | | | | | | | | | | | Update the s5pv210_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34Ben Dooks2010-05-231-6/+18
| | | | | | | | | | | | Update the s5pc110_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34Ben Dooks2010-05-231-16/+28
| | | | | | | | | | | | Update the s5p6442_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34Ben Dooks2010-05-231-17/+43
| | | | | | | | | | | | Update the s5p6440_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: s3c6400_defconfig: Update s3c6400_defconfig to v2.6.34Ben Dooks2010-05-231-34/+47
| | | | | | | | | | | | Update the s3c6400_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: s3c2410_defconfig: Update s3c2410_defconfig to v2.6.34Ben Dooks2010-05-231-317/+321
| | | | | | | | | | | | Update the s3c2410_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: s5pc100_defconfig: change ARCH_S5PC1XX to ARCH_S5PC100Ben Dooks2010-05-231-1/+1
| | | | | | | | | | | | | | Fixup the defconfig post the latest moves, so ARCH_S5PC1XX becomes ARCH_S5PC100 which is sufficient to get the system building. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S5PC100: Fixup merge problemsBen Dooks2010-05-234-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | Between problems with Kconfig and merging commits from several different sources, it seems the s5pc100 build's move from plat-s5pc11 has had a few problems. Since I do not have the trees to rebuild this quickly, the easiest thing is to simply fix the errors found once the s5pc100_defconfig actually builds. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S5PC100: DMA: Add platform devices for PL330 DMACsJassi Brar2010-05-234-0/+195
| | | | | | | | | | | | | | | | | | | | | | Samsung's Soc S5PC100 has three PL330 DMACs. First is dedicated for Memory->Memory data transfer while the other two meant for data transfer with peripherals. Define and add latter two PL330 DMACs as platform devices on the S5PC100 platform. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S5PC100: Fix definition of IRQ_EINT()Ben Dooks2010-05-231-0/+3
| | | | | | | | | | | | | | Somewhere during the latest platform cleanups the IRQ_EINT definition got broken, so fix it by replacing it in <mach/irqs.h> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: SAMSUNG: fix suspend/resume on if some GPIO banks not presentPinkava J2010-05-231-2/+6
| | | | | | | | | | | | | | | | | | When saving GPIOs during suspend/resume we need skip missing GPIO banks, not trying get corresponding chip again and again in infinite loop. Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz> [ben-linux@fluff.org: shorten subject] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S3C64XX: PM: Synchronise wakeup mask on suspendBen Dooks2010-05-202-0/+21
| | | | | | | | | | | | | | Use the new wakeup mask synchronisation code to set the relevant wakeup mask bits. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: SAMSUNG: Add support for interrupt wakeup-sourcesBen Dooks2010-05-204-0/+101
| | | | | | | | | | | | | | | | | | Add support for wakeup-mask style interrupts that share a single mask register for various different interrupts. This registers a set of interrupt->bit mappings and the register they belong to. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: SAMSUNG: Make ADC client SMP safeBen Dooks2010-05-201-6/+20
| | | | | | | | | | | | | | | | | | | | Change local_irq disable calls to use spinlocks to ensure that the ADC driver data is protected against multiple access.. Note, this does not protect the client's data, and the client should ensure it does not make multiple calls to the ADC driver. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S5P6440: Add locking to GPIO callsBen Dooks2010-05-201-0/+15
| | | | | | | | | | | | | | | | | | Add the new locking calls to ensure that these are always exclusively accessing the GPIO registers. Fixes a possible race between two threads modifying the same GPIO bank, Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S5PV210: Add temporary <mach/regs-fb.h>Ben Dooks2010-05-201-0/+21
| | | | | | | | | | | | | | Add temporary <mach/regs-fb.h> until the new framebuffer driver can be merged. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S5PV210: Fixup ADC device changeBen Dooks2010-05-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | Ensure the ADC device is touched only if S3C_DEV_ADC is selected. Fixes: arch/arm/mach-s5pv210/built-in.o: In function `s5pv210_map_io': /home/kgene/bjdooks/arch/arm/mach-s5pv210/cpu.c:92: undefined reference to `s3c_device_adc' Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: SAMSUNG: Fixup merge problemBen Dooks2010-05-201-1/+1
| | | | | | | | | | | | Fixup merge which re-introduced the setup-i2c0 helper Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: SAMSUNG: Fixup convert arm to arch_gettimeoffset()Ben Dooks2010-05-201-0/+4
| | | | | | | | | | | | | | | | Fixup commit 5cfc8ee0bb5134e1204e1ec5843e164f24315021 which introduced ARCH_USES_GETTIMEOFFSET but missed out several S5P architectures. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: Merge for-2635-4/onenandBen Dooks2010-05-2019-12/+368
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'for-2635-4/onenand' into for-2635-4/partial2 Conflicts: arch/arm/mach-s5pc100/cpu.c arch/arm/mach-s5pc100/include/mach/map.h arch/arm/mach-s5pv210/Makefile
| | * ARM: SAMSUNG: Add platform support code for OneNAND controllerMarek Szyprowski2010-05-2019-0/+320
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds setup code for Samsung OneNAND controller driver. The driver needs to be aware on which SoC it is running, so the actual device id is being changed in cpu init code. S3C64xx SoCs have 2 OneNAND controllers while S5PC100 and S5PC110 has only one. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> [ben-linux@fluff.org: sort map.h entries] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: Merge for-2635-4/watchdogBen Dooks2010-05-2015-26/+66
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'for-2635-4/watchdog' into for-2635-4/partial2 Conflicts: arch/arm/mach-s3c64xx/mach-smdk6410.c arch/arm/mach-s5p6440/Kconfig arch/arm/mach-s5p6440/include/mach/map.h arch/arm/mach-s5p6440/mach-smdk6440.c arch/arm/mach-s5pv210/Kconfig arch/arm/mach-s5pv210/include/mach/map.h arch/arm/mach-s5pv210/mach-smdkv210.c
| | * | ARM: S5PV210: Add Watchdog support for S5PV210Banajit Goswami2010-05-204-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for Watchdog timer for Samsung S5PV210. Signed-off-by: Banajit Goswami <banajit.g@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: S5P6440: Add Watchdog support for S5P6440Banajit Goswami2010-05-203-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for Watchdog timer for Samsung S5P6440. Signed-off-by: Banajit Goswami <banajit.g@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: SMDK6410: Add Watchdog support for SMDK6410Banajit Goswami2010-05-203-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for Watchdog timer for Samsung S3C6410 Signed-off-by: Banajit Goswami <banajit.g@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: SAMSUNG: Move WDT device definitions in plat-samsungBanajit Goswami2010-05-205-26/+48
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves the definitions of watchdog timer device from plat-s3c24xx to plat-samsung. This will enable all Samsung S3C and S5P series SoC's to use common WDT device definition. Signed-off-by: Banajit Goswami <banajit.g@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Acked-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S3C6410: Add basic support for SmartQ machinesMaurus Cuelenaere2010-05-206-0/+803
| | | | | | | | | | | | | | | | | | | | | This adds new machine definitions for the SmartQ 5 and 7. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: Merge for-2635-4/spi-devsBen Dooks2010-05-2018-1/+818
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'for-2635-4/spi-devs' into for-2635-4/partial2 Conflicts: arch/arm/mach-s5pc100/include/mach/map.h arch/arm/mach-s5pv210/Makefile
| | * | ARM: S5P6440: Define SPI platform devicesJassi Brar2010-05-206-0/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Define SPI platform devices for the SoC. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: S5P6442: Define SPI platform devicesJassi Brar2010-05-206-0/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Define SPI platform devices for the SoC. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: S5PV210: Define SPI platform devicesJassi Brar2010-05-206-0/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Define SPI platform devices for the SoC. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: S5PC100: Define SPI platform devicesJassi Brar2010-05-206-0/+265
| | |/ | | | | | | | | | | | | | | | | | | Define SPI platform devices for the SoC. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: Merge for-2635-4/s5p-devsBen Dooks2010-05-205-0/+309
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'for-2635-4/s5p-devs' into for-2635-4/partial2 Conflicts: arch/arm/mach-s5pc100/include/mach/map.h
| | * | ARM: SMDKC100: Add audio devices on boardJassi Brar2010-05-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add audio platform devices on the smdk by default. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: S5PC100: Add audio platform devicesJassi Brar2010-05-204-0/+304
| | |/ | | | | | | | | | | | | | | | | | | Define platform devices for all audio devices found on S5PC100 Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: Merge for-2635-4/s5pv210-boardsBen Dooks2010-05-2022-8/+773
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'for-2635-4/s5pv210-boards' into for-2635-4/partial1 Conflicts: arch/arm/mach-s5pv210/include/mach/map.h
| | * | ARM: S5PV210: Fixup machine Kconfig orderBen Dooks2010-05-201-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the Kconfig order and add a spacer between device setup support and the machine definitions. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: S5PV210: Add GONI board supportJoonyoung Shim2010-05-203-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for samsung GONI board using s5pc110. Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Reviewed-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: S5PV210: add common HSMMC device helpersMarek Szyprowski2010-05-207-0/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds sdhci platform helpers required by sdhci-s3c driver. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: S5PV210: add common I2C device helpersMarek Szyprowski2010-05-2012-2/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds I2C platform helpers required by s3c2440-i2c driver. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: S5PV210: add framebuffer platform helpers for s5pv210 based machinesMarek Szyprowski2010-05-207-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds common framebuffer device helpers and register defines for S5PV210 based machines. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: S5PV210: add support for s3c-fb driver on Aquila machineMarek Szyprowski2010-05-202-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds required platform definitions to enable s3c-fb driver. Two framebuffer windows in 480x800x16bpp mode are defined. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: S5PV210: add Aquila boardMarek Szyprowski2010-05-203-0/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add basic support for Samsung Aquila board. This board is based on S5PC110 SoC. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: S5PV210: Remove limiting choice of machine to buildBen Dooks2010-05-201-7/+0
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The arch/arm/mach-s5pv210/Kconfig had a choice entry to choose which of the two machines to build, which is silly since you can easily build more than one machine at a time. Remove the choice entry so that both machines and any future additions can all build in harmony. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: Merge for-2635-4/ts-machinesBen Dooks2010-05-2010-0/+49
| |\ \ | | | | | | | | | | | | Merge branch 'for-2635-4/ts-machines' into for-2635-4/partial1
| | * | ARM: S5PV210: Add Touchscreen support for S5PV210Naveen Krishna Ch2010-05-204-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds touchscreen support for S5PV210. Note: TSADC in S5PV210 support 2 touchscreen interfaces, Only 1 is implemented as of now. Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> [ben-linux@fluff.org: minor title fix] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
OpenPOWER on IntegriCloud