summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-01-154-15/+16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (161 commits) ARM: pxa: fix building issue of missing physmap.h ARM: mmp: PXA910 drive strength FAST using wrong value ARM: mmp: MMP2 drive strength FAST using wrong value ARM: pxa: fix recursive calls in pxa_low_gpio_chip AT91: Support for gsia18s board AT91: Acme Systems FOX Board G20 board files AT91: board-sam9m10g45ek.c: Remove duplicate inclusion of mach/hardware.h ARM: pxa: fix suspend/resume array index miscalculation ARM: pxa: use cpu_has_ipr() consistently in irq.c ARM: pxa: remove unused variable in clock-pxa3xx.c ARM: pxa: fix warning in zeus.c ARM: sa1111: fix typo in sa1111_retrigger_lowirq() ARM mxs: clkdev related compile fixes ARM i.MX mx31_3ds: Fix MC13783 regulator names ARM: plat-stmp3xxx: irq_data conversion. ARM: plat-spear: irq_data conversion. ARM: plat-orion: irq_data conversion. ARM: plat-omap: irq_data conversion. ARM: plat-nomadik: irq_data conversion. ARM: plat-mxc: irq_data conversion. ... Fix up trivial conflict in arch/arm/plat-omap/gpio.c (Lennert Buytenhek's irq_data conversion clashing with some omap irq updates)
| * Merge branch 'next-s3c24xx' into for-nextKukjin Kim2011-01-063-4/+5
| |\
| | * ARM: S3C24XX: Add address map and clock definitions for HSMMC0Yauhen Kharuzhy2011-01-063-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define maps for HSMMC devices. S3C2443 has one HSMMC device with base address 0x4A800000. S3C2416 has HSMMC0 at 0x4AC00000 and HSMMC1 at 0x4A800000. So suppose that S3C2443 has only HSMMC1. Define clock for hsmmc0 device and register it. Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C24XX: irq_data conversionLennert Buytenhek2011-01-031-11/+11
| |/ | | | | | | | | | | Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca> [kgene.kim@samsung.com: coding-style fixes] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | Merge branch 'topic/workq-update' into topic/asocTakashi Iwai2010-12-131-4/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: sound/soc/codecs/wm8350.c sound/soc/codecs/wm8753.c sound/soc/sh/fsi.c sound/soc/soc-core.c
| * ARM: S3C2410: Adapt h1940-bluetooth to gpiolib changesVasily Khoruzhick2010-11-251-4/+4
| | | | | | | | | | | | | | Replace in s3c_gpio_cfgpull with s3c_gpio_setpull. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | ARM: Samsung: Define common audio-dma deviceJassi Brar2010-11-231-1/+1
|/ | | | | | | | | | The ASoC uses common DMA driver for Audio devices. So it makes sense to a common audio-dma device shared across all platforms. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-10-303-4/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (215 commits) ARM: memblock: setup lowmem mappings using memblock ARM: memblock: move meminfo into find_limits directly ARM: memblock: convert free_highpages() to use memblock ARM: move freeing of highmem pages out of mem_init() ARM: memblock: convert memory detail printing to use memblock ARM: memblock: use memblock to free memory into arm_bootmem_init() ARM: memblock: use memblock when initializing memory allocators ARM: ensure membank array is always sorted ARM: 6466/1: implement flush_icache_all for the rest of the CPUs ARM: 6464/2: fix spinlock recursion in adjust_pte() ARM: fix memblock breakage ARM: 6465/1: Fix data abort accessing proc_info from __lookup_processor_type ARM: 6460/1: ixp2000: fix type of ixp2000_timer_interrupt ARM: 6449/1: Fix for compiler warning of uninitialized variable. ARM: 6445/1: fixup TCM memory types ARM: imx: Add wake functionality to GPIO ARM: mx5: Add gpio-keys to mx51 babbage board ARM: imx: Add gpio-keys to plat-mxc mx31_3ds: Fix spi registration mx31_3ds: Fix the logic for detecting the debug board ...
| * Merge branch 'for-rmk' of ↵Russell King2010-10-283-4/+10
| |\ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable Conflicts: arch/arm/mach-s3c64xx/dev-audio.c
| | * ARM: S3C: Change VMALLOC_END to use more vmalloc()/ioremap() areaKukjin Kim2010-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes VMALLOC_END from 0xE0000000 to 0xF6000000, because some systems want to use more vmalloc()/ioremap() area and now don't use from at 0xE0000000 to 0xF6000000 (the start of Samsung SoCs' VA space) Cc: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| | * ARM: S3C2416: Add Power Management support for SMDK2416Abhilash Kesavan2010-10-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Adds suspend-to-ram support for SMDK2416 based on existing 2412 PM code Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com> Signed-off-by: Sangbeom Kim <sbkim73@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| | * ARM: S3C24XX: Fix gpiolib support for ports K..MYauhen Kharuzhy2010-10-201-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S3C2443 and S3C2416 has 12 GPIO banks (from A to M), increase ARCH_NR_GPIOS for this architectures. Also typo from previous commit has been fixed: CONFIG_CPU_S3C24XX instead CONFIG_CPU_244X. Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com> Tested-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | | ARM: Merge for-2637/s3c24xx/h1940Ben Dooks2010-10-303-57/+182
|\ \ \ | |/ / |/| |
| * | ARM: h1940: add UDA1380 to i2c devices listVasily Khoruzhick2010-10-301-0/+20
| | | | | | | | | | | | | | | | | | | | | Register UDA1380 codec during H1940 machine init Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: h1940: Fix backlight and LCD power functionsVasily Khoruzhick2010-10-302-16/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current implementation of LCD and backlight power control functions is not complete, as result PDA consumes power in suspend. Fix this issue by managing state of some latch bits, just like WinMobile does. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: h1940: Implement mmc_power functionVasily Khoruzhick2010-09-272-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch implements h1940-specific set_power callback for s3cmci driver, so card power can be disabled when card is not inserted or before suspend. Without this patch PDA consumes power in suspend when card is inserted. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: h1940: Use gpiolib for latch accessVasily Khoruzhick2010-09-263-48/+86
| |/ | | | | | | | | | | | | | | | | | | This patch adds gpiolib support for h1940 latch. With this patch it's possible to use leds-gpio and uda1380 drivers (they require gpiolib support for appropriate pins). And now it's possible to drop leds-h1940 driver. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | arm: remove machine_desc.io_pg_offst and .phys_ioNicolas Pitre2010-10-209-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're now using addruart to establish the debug mapping, we can remove the io_pg_offst and phys_io members of struct machine_desc. The various declarations were removed using the following script: grep -rl MACHINE_START arch/arm | xargs \ sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }' [ Initial patch was from Jeremy Kerr, example script from Russell King ] Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Eric Miao <eric.miao at canonical.com>
* | arm: return both physical and virtual addresses from addruartJeremy Kerr2010-10-201-6/+5
|/ | | | | | | | | | | | | | | | | | | | Rather than checking the MMU status in every instance of addruart, do it once in kernel/debug.S, and change the existing addruart macros to return both physical and virtual addresses. The main debug code can then select the appropriate address to use. This will also allow us to retreive the address of a uart for the MMU state that we're not current in. Updated with fixes for OMAP from Jason Wang <jason77.wang@gmail.com> and Tony Lindgren <tony@atomide.com>, and fix for versatile express from Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>. Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Jason Wang <jason77.wang@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Tested-by: Kevin Hilman <khilman@deeprootsystems.com>
* 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>
* ARM: Convert platform reservations to use LMB rather than bootmemRussell King2010-07-271-3/+3
| | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: Move platform memory reservations out of generic codeRussell King2010-07-161-0/+9
| | | | | | | Move the platform specific bootmem memory reservations out of arch/arm/mm/mmu.c into their respective platform files. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: SAMSUNG: Move WDT device definitions in plat-samsungBanajit Goswami2010-05-201-0/+1
| | | | | | | | | | | 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: SAMSUNG: Implements cfg_gpio function for Samsung touchscreenNaveen Krishna2010-05-192-0/+2
| | | | | | | | | This patch implements cfg_gpio function for Samsung touchscreen. And also modifies the H1940 machine respectively. 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: SAMSUNG: Move mach/ts.h to plat/ts.hMaurus Cuelenaere2010-05-192-22/+1
| | | | | | | | This moves mach-s3c2410/include/mach/ts.h to plat-samsung/include/plat/ts.h in order to prepare for s3c64xx support in the touchscreen driver. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: Merge for-2635/fb-updates1Ben Dooks2010-05-1911-7/+168
|\ | | | | | | Merge branch 'for-2635/fb-updates1' into for-linus/samsung2
| * ARM: S3C2443: Fix definition of LCD clock bitBen Dooks2010-05-181-2/+1
| | | | | | | | | | | | | | Fix the definition of the LCD clock bit, it is the TFT display controller on bit 9, not the older STN on bit 10. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S3C2443: Add initial defines for framebuffer supportBen Dooks2010-05-182-0/+6
| | | | | | | | | | | | | | Add the necessary defines to get the s3c-fb device to compile for s3c2443. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S3C2416: Add support for second HSMMC channelBen Dooks2010-05-102-2/+6
| | | | | | | | | | | | Add support for the second HSMMC channel on the S3C2416. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S3C2416: Add basic clock supportBen Dooks2010-05-101-0/+2
| | | | | | | | | | | | | | | | Add basic clock support for the PLLs, HSMMC channels and PWM clocks. This is enough to get a basic system up and running. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S3C2416: Add S3C2416-specific registers definitionsYauhen Kharuzhy2010-05-107-2/+150
| | | | | | | | | | | | | | | | | | Add macros for S3C2416 SoC support. Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com> [ben-linux@fluff.org: removed files that need changing] [ben-linux@fluff.org: Fix S3C2416_GPH0_TXD0 definition] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S3C: Add S3C2416 detection to uncompress codeYauhen Kharuzhy2010-05-061-1/+3
| | | | | | | | | | | | | | Add S3C2416 serial port setup to uncompress code. Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: Merge for-2635/gpio2Ben Dooks2010-05-1915-120/+144
|\ \ | | | | | | | | | Merge branch 'for-2635/gpio2' into for-linus/samsung2
| * | ARM: S3C24XX: Add note on GPIO bank sizesBen Dooks2010-05-181-0/+19
| | | | | | | | | | | | | | | | | | Add a table for the GPIO bank sizes for each SoC Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S3C24XX: Remove macros mapping GPIO number to baseBen Dooks2010-05-183-22/+3
| | | | | | | | | | | | | | | | | | | | | | | | As part of the cleanup, remove the old macros mapping GPIO numbers to the base of the register now we have gpiolib to manage the GPIO mappings for us. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S3C24XX: Start cleanup of GPIO numberingBen Dooks2010-05-181-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | Start cleaning up the numbering of GPIO banks by removing the old bank start definitions currently being used by some of the header files. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S3C244X: fix gpiolib port J supportVasily Khoruzhick2010-05-182-1/+9
| |/ | | | | | | | | | | | | | | | | | | Increase GPIOs number for S3C244X, and make S3C_GPIO_END point to BANKJ end, otherwise gpiolib refuses to register BANKJ Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> [ben-linux@fluff.org: Move pm fix to new patch] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S3C24XX: Remove _INP macros in <mach/regs-gpioj.h>Ben Dooks2010-05-061-13/+0
| | | | | | | | | | | | Remove the _INP definitions, they are all zero and also unused Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S3C24XX: Remove S3C2410_GPJ numberingBen Dooks2010-05-061-19/+0
| | | | | | | | | | | | | | Remove the old S3C2410_GPJ as we will be moving to the new gpiolib based driver code and these numbers will become invalid. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S3C2410: Remove the users of s3c2410_gpio_pullup()Ben Dooks2010-05-062-2/+2
| | | | | | | | | | | | | | | | | | Remove the last s3c2410_gpio_pullup() users in arch/arm/mach-s3c2410 Note, since mach-h1940.c is setting output and a pull-up, the call has vbeen chanerd to S3C_GPIO_PULL_NONE instead of S3C_GPIO_PULL_UP. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S3C24XX: Remove s3c2410_gpio_getpull()Ben Dooks2010-05-061-12/+0
| | | | | | | | | | | | Remove the unused s3c2410_gpio_getpull() Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S3C24XX: Remove s3c2410_gpio_setcfg()Ben Dooks2010-05-061-11/+24
| | | | | | | | | | | | | | | | Remove the implementation of s3c2410_gpio_setcfg() as it should now be functionally equivalent to s3c_gpio_cfgpin(), and add a wrapper for those drivers that are still using this call. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S3C24XX: Drop s3c2410 specific s3c2410_gpio_cfgpin()Ben Dooks2010-05-065-8/+12
| | | | | | | | | | | | | | | | The s3c_gpio_cfgpin() call should be functionally equivalent, so replace the s3c2410_gpio_cfgpin() calls in the s3c24xx code with s3c_gpio_cfgpin to allow moving away from a fixed GPIO number to register address mapping Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S3C2410: Change s3c2410_gpio_pullupl(x, 1) to use s3c_gpio_cfgpull()Ben Dooks2010-05-061-4/+4
| | | | | | | | | | | | | | | | | | | | Start moving code that is using the old s3c2410_gpio API to using the newer s3c_gpio variants by finding all the usages of s3c2410_gpio_pullup() which disable the pin's pull up and replacing them. sed 's/s3c2410_gpio_pullup\(.*\), 1/s3c_gpio_cfgpull\1, S3C_GPIO_PULL_NONE/g' Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: VR1000: Update mach-vr1000.c to use gpiolib APIBen Dooks2010-05-061-2/+3
| | | | | | | | | | | | Change mach-vr1000.c to use gpiolib for gpio control. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: BAST: Update mach-bast to use gpiolib APIBen Dooks2010-05-061-3/+3
| | | | | | | | | | | | | | Change mach-bast .c to use gpiolib for the GPIO lines that are directly manipulated by it. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: n30: Update mach-n30 to use gpiolib APIBen Dooks2010-05-061-2/+5
| | | | | | | | | | | | | | Change mach-n30.c to use gpiolib for the GPIO lines that are directly manipulated by it. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: QT2410: Update mach-qt2410 to use gpiolib APIBen Dooks2010-05-061-3/+4
| | | | | | | | | | | | | | Change mach-qt2410.c to use gpiolib for the GPIO lines that are directly manipulated by it. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: H1940: Change mach-h1940 to use gpiolib APIBen Dooks2010-05-061-7/+8
| | | | | | | | | | | | | | Change mach-h1940 to use the gpiolib calls instead of s3c2410_gpio directly. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: H1940: Change h1940-bluetooth to use gpiolib APIBen Dooks2010-05-061-4/+12
| | | | | | | | | | | | | | Change the h1940-bluetooth driver to use gpiolib to set the output state of GPH1. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
OpenPOWER on IntegriCloud