summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/include/mach
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* 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-301-39/+18
|\ \ \ | |/ / |/| |
| * | ARM: h1940: Fix backlight and LCD power functionsVasily Khoruzhick2010-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-39/+18
| |/ | | | | | | | | | | | | | | | | | | 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: 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: 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: Move mach/ts.h to plat/ts.hMaurus Cuelenaere2010-05-191-21/+0
| | | | | | | | 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: 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: 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: Add extended GPIO used on S3C2443 and beyondBen Dooks2010-05-063-4/+29
| | | | | | | | | | | Add the GPIO banks that are used on the S3C2443 and above to the list of available GPIOS. Currently we do not have any limit on the SoC GPIO, so these are being registered whether the SoC has them or not. It is currently up to the user not to try and use them. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* Merge branch 'for-linus' of ↵Linus Torvalds2010-03-121-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits) doc: fix typo in comment explaining rb_tree usage Remove fs/ntfs/ChangeLog doc: fix console doc typo doc: cpuset: Update the cpuset flag file Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed Remove drivers/parport/ChangeLog Remove drivers/char/ChangeLog doc: typo - Table 1-2 should refer to "status", not "statm" tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h devres/irq: Fix devm_irq_match comment Remove reference to kthread_create_on_cpu tree-wide: Assorted spelling fixes tree-wide: fix 'lenght' typo in comments and code drm/kms: fix spelling in error message doc: capitalization and other minor fixes in pnp doc devres: typo fix s/dev/devm/ Remove redundant trailing semicolons from macros fix typo "definetly" -> "definitely" in comment tree-wide: s/widht/width/g typo in comments ... Fix trivial conflict in Documentation/laptops/00-INDEX
| * Merge branch 'for-next' into for-linusJiri Kosina2010-03-081-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c
| | * Fix spelling of 'platform' in comments and docStefan Weil2010-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace platfrom -> platform. This is a frequent spelling bug. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | | Merge branch 'origin' into devel-stableRussell King2010-03-081-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c
| * | ARM: 5910/1: ARM: Add tmp register for addruart and loadspTony Lindgren2010-02-121-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise more complicated uart configuration won't be possible. We can use r1 for tmp register for both head.S and debug.S. NOTE: This patch depends on another patch to add the the tmp register into all debug-macro.S files. That can be done with: $ sed -i -e "s/addruart,rx|addruart, rx/addruart, rx, tmp/" arch/arm/*/include/*/debug-macro.S Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | ARM: Merge next-samsung-s3c2443-clockBen Dooks2010-03-071-31/+1
|\ \ | | | | | | | | | Merge branch 'next-samsung-s3c2443-clock' into next-samsung
| * | ARM: S3C2443: Further clksrc-clk conversionsBen Dooks2010-03-071-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | Move more of the core clocks that where left over from the last commit as they are much more core to the system operation. This should allow for easier tracking of any problems. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S3C2443: Change to using plat-samsung clksrc-clk implementationBen Dooks2010-03-071-28/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The S3C2443 clock code could easily make use of the clksrc implementation in plat-samsung for many of the clocks. Make the clocks that easily move to clksrc-clk over, update any initialisation and remove the old register definitions from the header file (it is only being used once). Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | | ARM: S3C2443: GPIO: Correct AC97 pin definesJassi Brar2010-02-241-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | GPIO_E-[5,9] pin functionality was defined incorrectly. The patch corrects and adds missing pins. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | | ARM: SAMSUNG: Move include/mach files out of plat-s3cBen Dooks2010-02-242-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | Move the include/mach files out of plat-s3c and into the relevant machine files. This does mean copying the files, but there is nowhere else to put them. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | | ARM: SAMSUNG: Move pm-core.h to machine directoryBen Dooks2010-02-201-0/+64
|/ / | | | | | | | | | | | | Move the pm-core.h to the machine include directory in the process of eliminating the plat-s3c64xx. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: SAMSUNG: Remove empty gpio-core.h and use central plat/gpio-core.hBen Dooks2010-01-191-1/+0
|/ | | | | | | | | | Rename mach-s3c2410/include/mach/gpio-core.h to mach/gpio-track.h so that it can be included by <plat/gpio-core.h> when needed. Eliminate all other empty gpio-core.h files and just include the <plat/gpio-core.h> as necessary. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S3C24XX: touchscreen device definitionArnaud Patard2009-12-231-0/+21
| | | | | | | | | Add definition for the touchscreen driver platform data and initial support for the H1940 machine. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2009-12-171-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: spi: spi_txx9.c: use resource_size() spi: spi_sh_sci.c: use resource_size() spi: spi_mpc8xxx.c: use resource_size() spi: spi_bfin5xx.c: use resource_size() spi: atmel_spi.c: use resource_size() spi: Add s3c64xx SPI Controller driver atmel_spi: fix dma addr calculation for len > BUFFER_SIZE spi_s3c24xx: add FIQ pseudo-DMA support spi: controller driver for Designware SPI core spidev: add proper section markers spidev: use DECLARE_BITMAP instead of declaring the array
| * spi_s3c24xx: add FIQ pseudo-DMA supportBen Dooks2009-12-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pseudo-DMA by FIQ to the S3C24XX SPI driver. This allows the driver to get DMA-like performance where there are either no free DMA channels or when doing transfers that required both TX and RX data paths. Since this patch requires the addition of an assembly file to hold the FIQ code, we rename the module (instead of adding a rename of the .c file to this patch). We expect most users are loading this via udev and thus there should be no change to the userland configuration. Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Simtec Linux Team <linux@simtec.co.uk> Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
* | ARM: S3C: Update Simtec copyright statements from , to - [2]Ben Dooks2009-12-013-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | There are a number of statements of the form A, B or A, B, C where the numbers A,B,C are not consecutive. However, referencing [1] it is the correct thing to replace these with A-B or A-C as apropriate. [1] http://www.copyrightservice.co.uk/copyright/p03_copyright_notices section 4iii 'Year of publication' Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Simtec Linux Team <linux@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: S3C: Update Simtec copyright statements from , to -Ben Dooks2009-12-018-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | There are a number of statements of the form A, B or A, B, C where the numbers A,B,C are consecutive. Tidy these up to be A-B or A-C as appropriate and to comply better with copyright standards [1] [1] http://www.copyrightservice.co.uk/copyright/p03_copyright_notices section 4iii 'Year of publication' Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Simtec Linux Team <linux@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: S3C: Fix Simtec copyright statements in Documentation/S3C24XXBen Dooks2009-12-011-1/+1
|/ | | | | | | | | | | | | The (c) alone is not a sufficient copyright statement, nor is it a good replacement for the proper encircled &copy; symbol [1]. Add the word copyright to the apropriate places and remove the (c) symbol. [1] http://www.copyrightservice.co.uk/copyright/p03_copyright_notices section 4 'What does a notice consist of?' Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Simtec Linux Team <linux@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S3C: Add info for supporting circular DMA buffersBen Dooks2009-10-281-0/+7
| | | | | | | | | | | | | | | The S3C64XX DMA implementation will work a lot better with the ability to enqueue circular buffers as the hardware can do it's own linked-list management. Add a function s3c_dma_has_circular() to show that the system can do this and a flag for the channel. Update the s3c24xx/s3c64xx I2S DMA code to deal with this. Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org> Acked-by: Mark Brown <broonie@@opensource.wolfsonmicro.com>
* Merge branch 'next-s3c64xx-moves' into next-s3cBen Dooks2009-08-141-0/+1
|\
OpenPOWER on IntegriCloud