summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx
Commit message (Collapse)AuthorAgeFilesLines
* ARM: SAMSUNG: Fix on build warning regarding VMALLOC_END typeKukjin Kim2010-08-271-1/+1
| | | | | | | | | | | | | | Fix this warning: arch/arm/mm/init.c: In function 'mem_init': arch/arm/mm/init.c:644: warning: format '%08lx' expects type 'long unsigned int', but argument 12 has type 'unsigned int' And removes the useless parens and white space. Reported-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Cc: Ben Dooks <ben-linux@fluff.org>
* Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linuxLinus Torvalds2010-08-149-63/+209
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux: DMAENGINE: correct PL080 register header file ARM: SAMSUNG: Fix on build warning about dependency in Kconfig ARM: SMDK6410: Make virtual screen twice depth of real ARM: S3C64XX: Update consistent DMA size to 8MiB ARM: S3C64XX: Add audio support to SmartQ ARM: S3C64XX: Framebuffer fix for SmartQ5 ARM: S3C64XX: Set wifi and iNAND as permanently connected SD devices on SmartQ boards ARM: S3C64XX: Move SmartQ LCD control platform definition to shared file ARM: mach-real6410: add sdhc device support ARM: mach-real6410: add dm9000 ethernet support for mach-real6410 ARM: S3C64XX: Support for Real6410 Fix up trivial conflicts in arch/arm/mach-s3c64xx/mach-smartq5.c ("remove pixclock" vs "Framebuffer fix for SmartQ5")
| * Merge branch 'for-2636/s3c64xx' into for-linus/samsung-2635Ben Dooks2010-08-148-62/+208
| |\
| | * ARM: SMDK6410: Make virtual screen twice depth of realBen Dooks2010-08-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | For situations where double buffering is needed (such as the current Android) make the screen virtual y size twice the LCD size so that there is space for a second screen that can be switched to. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C64XX: Update consistent DMA size to 8MiBBen Dooks2010-08-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change the area available for consitent DMA allocations from the default to 8MiB to allow drivers such as the framebuffer to get more memory (for situations where larger virtual screen resolutions are needed). Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C64XX: Add audio support to SmartQMaurus Cuelenaere2010-08-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | This adds the I²C board information for the WM8987 used in the SmartQ as audio codec and adds the I²C/I²S platform drivers. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C64XX: Framebuffer fix for SmartQ5Patrick Georgi2010-08-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following change makes the framebuffer work on SmartQ5. There are still some problems with ADC, so this patch alone won't make the device run (or even give a working fb), but it's one issue less to think about. Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C64XX: Set wifi and iNAND as permanently connected SD devices on ↵Maurus Cuelenaere2010-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SmartQ boards This patch changes the platform data definitions of the wifi and iNAND chip on the SmartQ 5 and 7 to indicate that they don't have a CD line available and are thus hard-wired to the SDHCI data lines. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C64XX: Move SmartQ LCD control platform definition to shared fileMaurus Cuelenaere2010-08-143-58/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | This shares the common LCD control platform definition used in the SmartQ 5 and 7. This also corrects it as a GPIO bitbanged SPI device instead of an I²C one, which was wrong. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: mach-real6410: add sdhc device supportDarius Augulis2010-08-142-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Register SHDCI devices Signed-off-by: Darius Augulis <augulis.darius@gmail.com> [ben-linux@fluff.org: rewrite header[ Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: mach-real6410: add dm9000 ethernet support for mach-real6410Darius Augulis2010-08-141-0/+63
| | | | | | | | | | | | | | | | | | | | | This patch is based on "[PATCH v2] Support for Real6410" Signed-off-by: Darius Augulis <augulis.darius@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C64XX: Support for Real6410Darius Augulis2010-08-143-0/+93
| | | | | | | | | | | | | | | | | | | | | Add support for CoreWind Real6410 board, based on Samsung s3c6410 processor. Signed-off-by: Darius Augulis <augulis.darius@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | DMAENGINE: correct PL080 register header fileLinus Walleij2010-08-141-1/+1
| |/ | | | | | | | | | | | | | | | | | | This PL008 among all other variables named PL080 doesn't seem right. Fix it. Also add some missing defined that I use in the new PL08x driver. Acked-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-08-1116-19/+181
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (226 commits) ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions} ARM: 6324/1: cam60: move cam60_spi_devices to .init.data ARM: 6322/1: imx/pca100: Fix name of spi platform data ARM: 6321/1: fix syntax error in main Kconfig file ARM: 6297/1: move U300 timer to dynamic clock lookup ARM: 6296/1: clock U300 intcon and timer properly ARM: 6295/1: fix U300 apb_pclk split ARM: 6306/1: fix inverted MMC card detect in U300 ARM: 6299/1: errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID ARM: 6294/1: etm: do a dummy read from OSSRR during initialization ARM: 6292/1: coresight: add ETM management registers ARM: 6288/1: ftrace: document mcount formats ARM: 6287/1: ftrace: clean up mcount assembly indentation ARM: 6286/1: fix Thumb-2 decompressor broken by "Auto calculate ZRELADDR" ARM: 6281/1: video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE ARM: 6280/1: imx: Fix build failure when including <mach/gpio.h> without <linux/spinlock.h> ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3 ARM: S5P: Fix on missing S5P_DEV_FIMC in plat-s5p/Kconfig ARM: S5PV210: Override FIMC driver name on Aquila board ARM: S5PC100: enable FIMC on SMDKC100 ... Fix up conflicts in arch/arm/mach-{s5pc100,s5pv210}/cpu.c due to different subsystem 'setname' calls, and trivial port types in include/linux/serial_core.h
| * | ARM: SAMSUNG: Fix on inclusion mach/gpio.h for Samsung SoCsKukjin Kim2010-08-067-7/+7
| | | | | | | | | | | | | | | | | | | | | This patch fixes on inclusion <mach/gpio.h> to <linux/gpio.h> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Cc: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S3C64XX: Add keypad device to the SMDK6410 boardNaveen Krishna Ch2010-08-066-0/+74
| | | | | | | | | | | | | | | | | | | | | This patch is to support keypad device to the SMDK6410 board. Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C64XX: Add RTC support for S3C64XXAtul Dahiya2010-08-052-0/+2
| | | | | | | | | | | | | | | | | | | | | This patch adds support for RTC for SMDK6410. Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C64XX: Move RTC clock from init_clocks to init_clocks_disableAtul Dahiya2010-08-051-6/+6
| | | | | | | | | | | | | | | | | | | | | RTC clock does not require to be enabled at boot time. Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: SAMSUNG: Add new s3c-sdhci card detection methods for Samsung SoCsMarek Szyprowski2010-08-051-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some Samsung SoCs not all SDHCI controllers have card detect (CD) line. For some embedded designs it is not even needed, because ususally the device (like SDIO flash memory or wifi controller) is permanently wired to the controller. There are also systems which have a card detect line connected to some of the external interrupt lines or the presence of the card depends on some other actions (like enabling a power regulator). This patch adds all required changes to platform support code, so another patch, which extends the driver with support for the new card detection methods can be applied. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> [kgene.kim@samsung.com: minor title and coding-style fixes] [kgene.kim@samsung.com: fix build errors] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: SAMSUNG: Implement set_name function for ADC devicesNaveen Krishna Ch2010-08-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This patch implements s3c_adc_setname() for Samsung SoCs. Also updates its usage in S3C64XX, S5P6440, and S5PV210. Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C64XX: Add support for Compact Flash driver on SMDK6410Abhilash Kesavan2010-08-058-0/+79
| |/ | | | | | | | | | | | | | | | | | | | | | | Following is added for the CF-ATA driver: - Platform data strucure instantiation - Platform device enabling code - Addition of cfcon clock - Platform-specific gpio setup code Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | arm: samsung: remove pixclock from several boardsMaurus Cuelenaere2010-08-115-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since "s3c-fb: Automatically calculate pixel clock when none is given", there's no need for manually calculating the pixel clock anymore so remove these lines and add the correct refresh rate where appropriately. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Cc: Pawel Osciak <p.osciak@samsung.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: InKi Dae <inki.dae@samsung.com> Cc: Ben Dooks <ben-linux@fluff.org> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | s3c-fb: initial move to unifying the header filesBen Dooks2010-08-111-20/+0
|/ | | | | | | | | | | | | | | | Remove the various header files that configure this driver and use the platform device name to select the correct configuration at probe time. Currently this does not remove the header files, only updates the driver and the relevant platform files. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Pawel Osciak <p.osciak@samsung.com> Cc: InKi Dae <inki.dae@samsung.com> Cc: KyungMin Park <kyungmin.park.samsung.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* ARM: S3C64XX: Add USB OTG HCLK to the list of clocksThomas Abraham2010-05-281-0/+6
| | | | | | | | | Add the USB OTG HCLK clock to the list of clocks to be registered during initialization. Signed-off-by: Thomas Abraham <thomas.ab@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> 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: Merge for-2635-4/onenandBen Dooks2010-05-207-0/+85
|\ | | | | | | | | | | | | | | | | 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-207-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | 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-203-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: 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: 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: S3C64XX: Add Touchscreen support for S3C64XXNaveen Krishna Ch2010-05-202-0/+13
|/ | | | | | | | | This patch adds touchscreen support for S3C64XX. 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>
* ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configurationBen Dooks2010-05-191-61/+0
| | | | | | | Move the arch/arm/mach-s3c64xx/dev-ts.c file to arch/arm/plat-samsung and rename the Kconfig entry appropriately. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S3C64XX: Add touchscreen platform device definitionMaurus Cuelenaere2010-05-192-0/+62
| | | | | | | This patch adds the touchscreen platform device definition for S3C64XX boards. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: Merge for-2635/samsung-rtcBen Dooks2010-05-193-44/+2
|\ | | | | | | | | | | | | | | | | Merge branch 'for-2635/samsung-rtc' into for-linus/samsung2 Conflicts: arch/arm/mach-s3c64xx/include/mach/map.h arch/arm/plat-samsung/Kconfig arch/arm/plat-samsung/Makefile
| * ARM: SAMSUNG: Move RTC device definitions in plat-samsungAtul Dahiya2010-05-183-44/+1
| | | | | | | | | | | | | | | | | | | | | | This patch moves RTC device definitions from mach-s3c64xx to plat-samsung, to enable the other SoCs to use same device definition. Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com> Signed-off-by: Sangbeom Kim <sbkim73@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: Merge for-2635/samsung-tsBen Dooks2010-05-195-47/+4
|\ \ | | | | | | | | | Merge branch 'for-2635/samsung-ts' into for-linus/samsung2
| * | ARM: SAMSUNG: Moving ADC device definition to plat-samsung.Naveen Krishna2010-05-185-47/+4
| |/ | | | | | | | | | | | | | | | | This patch moves ADC device definition to plat-samsung. Because that is generic to the S3C64XX and S5P Series SoCs. Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: Merge for-2635/fb-updates1Ben Dooks2010-05-191-32/+3
|\ \ | | | | | | | | | Merge branch 'for-2635/fb-updates1' into for-linus/samsung2
| * | ARM: SAMSUNG: Move S3C6400 PLL code to <plat/pll.h> for re-useBen Dooks2010-05-101-32/+3
| | | | | | | | | | | | | | | | | | | | | The S3C6400 EPLL code matches the S3C2416 and compatible SoCs, so move it from mach-s3c64xx into <plat/pll.h> for easy reuse. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | | ARM: Merge for-2635/s3c6410-clockBen Dooks2010-05-192-0/+37
|\ \ \ | | | | | | | | | | | | Merge branch 'for-2635/s3c6410-clock' into for-linus/samsung2
| * | | ARM: S3C64XX: Add USB external clock definitionMaurus Cuelenaere2010-05-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the xusbxti clock to S3C64XX platform. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | ARM: S3C6410: Declare IISv4 audio-bus clockJassi Brar2010-05-141-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Declare 'audio-bus' clock for IISv4 controller of S3C6410. Even though the name is same as that for IISv3, the id is set to -1(just one instance of the controller is available) which helps always fetch the correct clock. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | ARM: S3C6410: Declare possible sources of audio-bus2Jassi Brar2010-05-141-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Declare possible sources of CLKAUDIO[2]/audio-bus for IISv4 controller. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | ARM: S3C6410: Declare IISCDCLK_V4 ClockJassi Brar2010-05-141-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Declare the source of clock provided at Xi2sCDCLK2 pin for IISv4 controller. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | ARM: S3C6410: Define clk_src2 registerJassi Brar2010-05-141-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | Define S3C6410 specific register - CLK_SRC2 Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | | ARM: Merge for-2635/gpio2Ben Dooks2010-05-191-0/+6
|\ \ \ | | |/ | |/| | | | Merge branch 'for-2635/gpio2' into for-linus/samsung2
| * | ARM: SAMSUNG: Add GPIO configuration read callsBen Dooks2010-05-061-0/+6
| |/ | | | | | | | | | | | | Add the necessary 1,2 and 4 bit configuration read calls for the new gpio code to allow removal of the old s3c24xx gpio code. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: Merge for-2635/samsung-dmaBen Dooks2010-05-191-1/+1
|\ \ | | | | | | | | | Merge branch 'for-2635/samsung-dma' into for-linus/samsung2
| * | S3C: DMA: Change argument of s3c2410_dma_devconfigJassi Brar2010-05-171-1/+1
| |/ | | | | | | | | | | | | | | | | All other functions have the channel argument of type 'unsigned int' the s3c2410_dma_devconfig also accept the same value as argument but treat it as type 'int'. Remove this anomaly by make it 'unsigned int'. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: SAMSUNG: Remove old email address for ben-linux@fluff.orgBen Dooks2010-05-122-2/+2
|/ | | | | | | | The address ben@fluff.org is old, ben-linux@fluff.org has been in use for a long time, and we should fixup all the occasions of the older address to avoid confusion. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
OpenPOWER on IntegriCloud