summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5p6442
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'p2v' into develRussell King2011-03-161-1/+1
|\ | | | | | | | | | | Conflicts: arch/arm/kernel/module.c arch/arm/mach-s5pv210/sleep.S
| * ARM: P2V: separate PHYS_OFFSET from platform definitionsRussell King2011-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uncouple PHYS_OFFSET from the platform definitions, thereby facilitating run-time computation of the physical memory offset. Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Viresh Kumar <viresh.kumar@st.com> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: Magnus Damm <damm@opensource.se> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Wan ZongShun <mcuos.com@gmail.com> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Acked-by: Eric Miao <eric.y.miao@gmail.com> Acked-by: Jiandong Zheng <jdzheng@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | ARM: S5P6442: Cleanup map.h fileKukjin Kim2011-02-171-32/+37
|/ | | | Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* ARM: S5P6442: Enable I2S device to work on SMDK6442Jassi Brar2011-01-181-0/+1
| | | | | | | | | Add missing virtual ASoC DMA device. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> [kgene.kim@samsung.com: minor changed title] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* Merge branch 'dev/cleanup-clocks' into for-nextKukjin Kim2011-01-051-13/+3
|\
| * ARM: S5P6442: Tidy register and disable clock usageKukjin Kim2011-01-041-13/+3
| | | | | | | | | | | | | | This patch changes the clock registration code to use the s3c_register_clocks() followed by s3c_disable_clocks() instead of the loops it was using. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | Merge branch 'next-s5p' into for-next-newKukjin Kim2010-12-301-0/+3
|\ \
| * | ARM: S5P: Move SROM controller IO mapping to plat-s5p for S5P SoCsThomas Abraham2010-12-301-0/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | This patch modifies the following. 1. Moves the SROM controller mapping from S5PV210 specific code to S5P common code. The SROM controller mapping can be used for all S5P SoCs. 2. Define the SROM controller physical address for S5P64X0, S5P6442, S5PC100, S5PV210 and S5PV310. Signed-off-by: Thomas Abraham <thomas.ab@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | ARM: S5P6442: Enable I2C0 device on SMDK6442Jassi Brar2010-12-301-0/+10
| | | | | | | | | | | | | | | | | | This patch enables I2C0 device for WM8580 on SMDK6442. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> [kgene.kim@samsung.com: minor changed title and description] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | ARM: S5P6442: Implement i2c-gpio configJassi Brar2010-12-301-1/+4
| | | | | | | | | | | | Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | ARM: S5P6442: Upgrade platform device for I2SJassi Brar2010-11-191-6/+36
| | | | | | | | | | | | | | | | | | | | Add more information to I2S platform_devices in order to prepare them for new controller driver. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | ARM: SAMSUNG: Rename s3c64xx I2S platform deviceJassi Brar2010-11-191-2/+2
|/ | | | | | | | | | | Since the I2S of S3C64XX and newer SoCs are incremental versions of each other with changes managable in a single driver, rename the 's3c64xx-iis' -> 'samsung-i2s' Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* Merge branch 'for-rmk' of ↵Russell King2010-10-287-27/+43
|\ | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable Conflicts: arch/arm/mach-s3c64xx/dev-audio.c
| * ARM: S5P: 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: S5P: Reorder DMA platform device idSeungwhan Youn2010-10-251-1/+1
| | | | | | | | | | | | | | | | This patch is matched-up DMA platform device id to its clock id. Signed-off-by: Seungwhan Youn <sw.youn@samsung.com> Acked-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S5P6442: Add DMA operation clockSeungwhan Youn2010-10-252-0/+29
| | | | | | | | | | | | | | | | This patch adds DMA operation clock which is disabled as default. Signed-off-by: Seungwhan Youn <sw.youn@samsung.com> Acked-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * Merge branch 'next-gpio-update' into for-nextKukjin Kim2010-10-252-24/+12
| |\
| | * ARM: S5P6442: Change to using s3c_gpio_cfgall_range()Kukjin Kim2010-10-231-3/+2
| | | | | | | | | | | | | | | | | | | | | Change the code setting a range of GPIO pins' configuration and pull state to use the recently introduced s3c_gpio_cfgall_range(). Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| | * ARM: S5P6442: Change to using s3c_gpio_cfgpin_range()Ben Dooks2010-10-232-22/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change the code setting ranges of GPIO pins using s3c_gpio_cfgpin() to use the recently introduced s3c_gpio_cfgpin_range(). Signed-off-by: Ben Dooks <ben-linux@fluff.org> [kgene.kim@samsung.com: fixed wrong change] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S5P64XX: Remove redundant selection PLAT_S5P.Kukjin Kim2010-10-211-1/+0
| |/ | | | | | | | | | | | | This patch removes redundant selection PLAT_S5P in the CPU_S5P64XX config. Because PLAT_S5P is selected if select ARCH_S5P64XX in the plat-s5p/Kconfig. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | arm: remove machine_desc.io_pg_offst and .phys_ioNicolas Pitre2010-10-201-2/+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: S5P: Moves initial map for merging S5P64X0Kukjin Kim2010-10-182-9/+24
| | | | | | | This patch moves some initial maps from plat-s5p to machine, so that can merge mach-s5p6440 and mach-s5p6450. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* ARM: S5P: Bug fix on errors of build with CONFIG_PREEMPT_NONESeungChull Suh2010-10-081-0/+1
| | | | | | | | | | | | | | | | | | | This patch adds header <linux/sched.h> into the below files for build with CONFIG_PREEMPT_NONE. arch/arm/mach-s5p6440/cpu.c arch/arm/mach-s5p6442/cpu.c arch/arm/mach-s5pc100/cpu.c arch/arm/mach-s5pv210/cpu.c Following is error message of in case of s5pv210_defconfig with CONFIG_PREEMPT_NONE. arch/arm/mach-s5pv210/cpu.c:91: error: implicit declaration of function 'need_resched' Signed-off-by: SeungChull Suh <sc.suh@samsung.com> [kgene.kim@samsung.com: removed mach-s5p64x0/cpu.c] [kgene.kim@samsung.com: added fix mach-s5p6440/cpu.c] Signed-off-by: Kukjin Kim <kgene.kim@samsung.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>
* Merge branch 'next-samsung' into for-nextKukjin Kim2010-08-063-3/+2
|\ | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-s5p6440/Kconfig arch/arm/mach-s5p6442/Kconfig arch/arm/mach-s5pc100/Kconfig arch/arm/mach-s5pv210/Kconfig arch/arm/mach-s5pv210/cpu.c arch/arm/plat-samsung/include/plat/sdhci.h
| * ARM: SAMSUNG: Fix on inclusion mach/gpio.h for Samsung SoCsKukjin Kim2010-08-062-2/+2
| | | | | | | | | | | | | | 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: SAMSUNG: Make WDT driver dependency SoC specific instead of machine ↵Banajit Goswami2010-08-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specific This patch moves the dependency of watchdog timer driver from MACH_XXX(board) to ARCH_XXX(SoC). This will enable all machines using Samsung S3C64XX and S5P SoCs to use the WDT driver by default. Signed-off-by: Banajit Goswami <banajit.g@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Conflicts: arch/arm/Kconfig arch/arm/mach-s3c64xx/Kconfig arch/arm/mach-s5p6442/Kconfig arch/arm/mach-s5pc100/Kconfig
* | Merge branch 'next-s5p' into for-nextKukjin Kim2010-08-063-18/+15
|\ \ | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-s5pv210/mach-aquila.c arch/arm/mach-s5pv210/mach-goni.c
| * | ARM: S5P: Add Support common arch_reset() for S5PJongpill Lee2010-08-051-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support common arch_reset() for S5P6440, S5P6442, S5PC100 and S5PV210/S5PC110. Now perform reset using Watchdog reset, SWRESET support with s5p_reset_hook() will be added later. Signed-off-by: Jongpill Lee <boyko.lee@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S5P: Changes the definition name of default UART registersKukjin Kim2010-08-051-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | This patch changes the definition name of default UCON, ULCON, and UFCON UART registers from ARCH(SoC) to Machine(Board). Because it depends on machine. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S5P: Add PMU deviceJoonyoung Shim2010-08-051-1/+1
| |/ | | | | | | | | | | | | | | | | This patch adds an initcall for the s5p platforms so that they register their PMU IRQs with the PMU framework in the Kernel. Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | ARM: S5P6442: Add Watchdog support for S5P6442Banajit Goswami2010-08-053-0/+9
| | | | | | | | | | | | | | This patch adds support for Watchdog timer for Samsung S5P6442. Signed-off-by: Banajit Goswami <banajit.g@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | ARM: S5P6442: Add Watchdog Timer map for S5P6442Jongpill Lee2010-08-051-0/+3
|/ | | | | | | This patch adds definition of Watchdog Timer map. Signed-off-by: Jongpill Lee <boyko.lee@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* ARM: S5P6442: Fix PLL setting announce message.Thomas Abraham2010-07-051-1/+1
| | | | | | | | The S5P6442 PLL setting announce message incorrectly displays S5P6440 as the SoC. Change it to S5P6442. Signed-off-by: Thomas Abraham <thomas.ab@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* ARM: S5P: Fix the platform external interrupt issues.Pannaga Bhushan2010-05-261-2/+3
| | | | | | | | | | | | | | | This patch does the following: 1. Corrects the common platform code for external interrupts for using the VIC mask/unmask bits also. 2. Moves the common defines related to external interrupt for plat-s5p to common files. 3. Based on the new common defines, corresponding changes are made in the affected platforms (S5P6440, S5P6442 and S5PC100). Signed-off-by: Pannaga Bhushan <p.bhushan@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5P6442: Define SPI platform devicesJassi Brar2010-05-204-0/+143
| | | | | | | 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: SAMSUNG: Copy common I2C0 device helpers to machine directoriesMarek Szyprowski2010-05-192-0/+26
| | | | | | 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: Merge for-2635/s5p-audioBen Dooks2010-05-194-0/+209
|\ | | | | | | Merge branch 'for-2635/s5p-audio' into for-linus/samsung2
| * ARM: SMDK6442: Add audio devices on boardJassi Brar2010-05-181-0/+1
| | | | | | | | | | | | | | 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: S5P6442: Add audio platform devicesJassi Brar2010-05-183-0/+208
| | | | | | | | | | | | | | Define platform devices for all audio devices found on S5P6442 Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: Merge for-2635/s5p-dmaBen Dooks2010-05-195-1/+136
|\ \ | | | | | | | | | | | | | | | | | | Merge branch 'for-2635/s5p-dma' into for-linus/samsung2 Conflicts: arch/arm/mach-s5pv210/Makefile
| * | S5P6442: DMA: Add platform devices for PL330 DMACsJassi Brar2010-05-185-1/+136
| |/ | | | | | | | | | | | | | | | | | | | | Samsung's Soc S5P6442 has two PL330 DMACs. First is dedicated for Memory->Memory data transfer while the second is meant for data transfer with peripherals. Define and add the peripheral PL330 DMAC as platform device on the S5P6442 platform. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: Merge for-2635/s5p-generalBen Dooks2010-05-191-1/+1
|\ \ | | | | | | | | | Merge branch 'for-2635/s5p-general' into for-linus/samsung2
| * | ARM: SAMSUNG: Remove static of S5P SoCs sysclassKukjin Kim2010-05-121-1/+1
| |/ | | | | | | | | | | | | | | This patch removes static of s5p6440_sysclass, s5p6442_sysclass, and s5pv210_sysclass for defintion as extern. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: S5P6442: Bug fix on PWM TimerJongpill Lee2010-05-111-10/+11
|/ | | | | | | | | | | | | | This patch fixes return value in below functions - pwm_cfg_src_is_tclk - tcfg_to_divisor - pwm_tdiv_has_div1 - pwm_tdiv_div_bits And this patch changes Copyright ordering. Signed-off-by: Jongpill Lee <boyko.lee@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: SAMSUNG: Fixup commit 4e6d488af37980d224cbf298224db6173673f362Ben Dooks2010-03-151-1/+1
| | | | | | | | | | | | | | | Commit 4e6d488af37980d224cbf298224db6173673f362 either missed out the following machine files or somehow managed to clash between merges. Fixup the three files missing the second parameter to addruart macro to allow them to build. Fixes the following warnings in arch/arm/kernel/debug.c: arch/arm/kernel/debug.S: Assembler messages: arch/arm/kernel/debug.S:167: Error: too many positional arguments arch/arm/kernel/debug.S:183: Error: too many positional arguments Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5P6442: Add SMDK6442 board support fileKukjin Kim2010-02-242-0/+92
| | | | | | | This patch adds SMDK6442 board support file. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5P6442: Add <mach/*.h> files missing from original commitBen Dooks2010-02-243-0/+58
| | | | | | | The removal of plat-s3c has left these missing from the initial commit, so add copies from elsewhere. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5P6442: Add IRQ supportKukjin Kim2010-02-242-0/+105
| | | | | | | | | | | This patch adds IRQ support for S5P6442. This patch adds interrupt register definitions, IRQ definitions for various interrupt sources and new VIC base for VIC2 in plat-s5p common irq code. Signed-off-by: Adityapratap Sharma <aditya.ps@samsung.com> Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
OpenPOWER on IntegriCloud