summaryrefslogtreecommitdiffstats
path: root/arch/arm (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'samsung/soc' into next/soc2Arnd Bergmann2012-03-1527-72/+765
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * samsung/soc: ARM: EXYNOS: fix cycle count for periodic mode of clock event timers ARM: EXYNOS: add support JPEG ARM: EXYNOS: Add DMC1, allow PPMU access for DMC ARM: SAMSUNG: Correct MIPI-CSIS io memory resource definition ARM: SAMSUNG: fix __init attribute on regarding s3c_set_platdata() ARM: SAMSUNG: Add __init attribute to samsung_bl_set() ARM: S5PV210: Add usb otg phy control ARM: S3C64XX: Add usb otg phy control ARM: EXYNOS: Enable l2 configuration through device tree ARM: EXYNOS: remove useless code to save/restore L2 ARM: EXYNOS: save L2 settings during bootup ARM: S5P: add L2 early resume code ARM: EXYNOS: Add support AFTR mode on EXYNOS4210 ARM: SAMSUNG: use spin_lock_irqsave() in clk_{enable,disable} ARM: S3C64XX: Define some additional always off clocks ARM: S3C64XX: Reduce residency requirement for cpuidle WFI mode ARM: SAMSUNG: Add a callback 'notify_after' for PWM backlight control ARM: SAMSUNG: add G2D to plat-s5p and mach-exynos ARM: S3C64XX: Gate some more clocks by default ARM: S3C64XX: Add basic cpuidle driver Conflicts: arch/arm/mach-exynos/clock.c arch/arm/mach-exynos/common.c This merges the earlier samsung support into the next/soc2 branch to resolve conflicts between commits in the earlier work and the exynos5 branch. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * ARM: EXYNOS: fix cycle count for periodic mode of clock event timersChanghwan Youn2012-03-101-8/+13
| | | | | | | | | | | | | | | | | | | | EXYNOS SOC series use MCT for kernel timer and MCT has two types of clock event timers, which are mct-comp and mct-tick. Because the clock rate of each event timer is diffent from the other, this patch fixes cycles_per_jiffy for each timer's periodic mode. Signed-off-by: Changhwan Youn <chaos.youn@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: add support JPEGAndrzej Pietrasiewicz2012-03-105-0/+32
| | | | | | | | | | | | | | | | This patch adds platform_device, clock, map for JPEG Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: Add DMC1, allow PPMU access for DMCMyungJoo Ham2012-03-102-1/+7
| | | | | | | | | | | | | | | | | | | | - Add DMC1 - Enlarge address space for DMC from 4k to 64k so that PPMU registers may be accessed. Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: SAMSUNG: Correct MIPI-CSIS io memory resource definitionSylwester Nawrocki2012-03-101-2/+2
| | | | | | | | | | | | | | | | | | | | The resources size is increased to 16KB to also include the non-image packet data buffers (CSIS_PKTDATAn). The 4KiB region is only sufficient when the driver is not using the packet data buffers. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: SAMSUNG: fix __init attribute on regarding s3c_set_platdata()Tushar Behera2012-03-101-2/+2
| | | | | | | | | | | | | | | | s3c_set_platdata() is defined with __init attribute, hence all functions referencing this function should also be defined with __init attribute. Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: SAMSUNG: Add __init attribute to samsung_bl_set()Tushar Behera2012-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | s3c_set_platdata() is defined with __init attribute, hence all functions referencing this function should also be defined with __init attribute. samsung_bl_set() is referenced only in '__init xxx_machine_init()' functions, thus this change won't put any additional constraint on the usage of samsung_bl_set(). Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S5PV210: Add usb otg phy controlJoonyoung Shim2012-03-094-4/+97
| | | | | | | | | | | | | | | | | | | | | | This patch supports to control usb otg phy of S5PV210. Based on setup-usb-phy.c of S3C64XX. Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> [Test HW: GONI S5PC110] Tested-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S3C64XX: Add usb otg phy controlJoonyoung Shim2012-03-099-3/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch supports to control usb otg phy of S3C64XX. Currently, the driver for usb otg controls usb otg phy but it can be removed by this patch. Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> [Rebased on the newest git/kgene/linux-samsung #for-next] Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Acked-by: Mark Brown<broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: Enable l2 configuration through device treeAmit Daniel Kachhap2012-03-091-2/+11
| | | | | | | | | | | | | | This patch enables calling generic l2 setup functions if device tree is used. Signed-off-by: Amit Daniel Kachhap <amit.kachhap@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: remove useless code to save/restore L2Amit Daniel Kachhap2012-03-091-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Following the merge of CPU PM notifiers and L2 resume code, this patch removes useless code to save and restore L2 registers. This is now automatically covered by suspend calls which integrated CPU PM notifiers and new sleep code that allows to resume L2 before MMU is turned on. Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Amit Daniel Kachhap <amit.kachhap@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: save L2 settings during bootupAmit Daniel Kachhap2012-03-091-11/+31
| | | | | | | | | | | | | | | | | | | | This patch adds code to save L2 register configuration at boot, and later used to resume L2 before MMU is enabled in suspend and cpuidle resume paths. Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Amit Daniel Kachhap <amit.kachhap@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S5P: add L2 early resume codeAmit Daniel Kachhap2012-03-091-6/+38
| | | | | | | | | | | | | | | | | | | | This patch adds code to resume L2 before MMU is enabled in suspend and cpuidle resume paths. s3c_cpu_resume is moved to the data section with appropriate comments. Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Amit Daniel Kachhap <amit.kachhap@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: Add support AFTR mode on EXYNOS4210Amit Daniel Kachhap2012-03-092-4/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support AFTR(ARM OFF TOP RUNNING) mode in cpuidle driver. L2 cache keeps their data in this mode. This patch ports the code to the latest interfaces to save/restore CPU state inclusive of CPU PM notifiers, l2 resume and cpu_suspend/resume. Signed-off-by: Jaecheol Lee <jc.lee@samsung.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Amit Daniel Kachhap <amit.kachhap@linaro.org> [kgene.kim@samsung.com: fixed for non-smp as per Tushar's pointing out] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: SAMSUNG: use spin_lock_irqsave() in clk_{enable,disable}Minho Ban2012-02-111-4/+8
| | | | | | | | | | | | | | | | | | | | | | The clk_enable()and clk_disable() can be used process and ISR either. And actually it is used for real product and other platforms use it now. So spin_lock_irqsave() should be used instead. Signed-off-by: Minho Ban <mhban@samsung.com> Signed-off-by: Jaecheol Lee <jc.lee@samsung.com> Signed-off-by: Sunyoung Kang <sy0816.kang@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S3C64XX: Define some additional always off clocksMark Brown2012-02-111-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | Add entries to clocks_off for some additional clocks which are not currently used by any mainline drivers. They default on at power up but are never actually used so If these blocks are actually supported some of these bindings would need to be redone properly, for example hooking up to the muxes that use them, but that can be done incrementally. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S3C64XX: Reduce residency requirement for cpuidle WFI modeMark Brown2012-02-111-1/+1
| | | | | | | | | | | | | | | | Entering and leaving WFI is really cheap so there's no reason to have much of a residency requirement for the state. Lower it to 1ms. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: SAMSUNG: Add a callback 'notify_after' for PWM backlight controlJingoo Han2012-02-111-0/+2
| | | | | | | | | | | | | | | | | | | | The callback 'notify_after' was added to struct platform_pwm_backlight_data provided by PWM backlight driver. Therefore, this patch adds a callback 'notify_after' which can be called after pwm_enable, pwm_disable and pwm_config. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: SAMSUNG: add G2D to plat-s5p and mach-exynosKamil Debski2012-02-114-0/+37
| | | | | | | | | | | | | | | | | | | | G2D is a 2D graphics accelerator engine present in the s5p family of Samsung SoCs. It is capable of bitblt and raster operations on images having dimensions of up to 8000x8000. Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S3C64XX: Gate some more clocks by defaultMark Brown2012-02-111-10/+10
| | | | | | | | | | | | | | | | Gate the AC'97 and CF clocks by default. The drivers will enable them required. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S3C64XX: Add basic cpuidle driverMark Brown2012-01-202-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | Add a very basic cpuidle driver for S3C64xx which merely drives the CPU into IDLE mode. We could do this with pm_idle but the more modern idiom is to use cpuidle and the intention is to go further and support STOP and DEEP-STOP states in conjunction with the pm_domain framework. The actual state entry code was lifted from Tomasz Figa's work on spica. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | Merge branch 'samsung/exynos5' into next/soc2Arnd Bergmann2012-03-1591-2329/+5232
|\ \
| * | ARM: EXYNOS: Fix compilation error with mach-exynos4-dt boardTushar Behera2012-03-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 171c067 ("ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5") renames S5P_PA_UARTn to EXYNOS4_PA_UARTn. Hence we need to do similar modification in mach-exynos4-dt.c to fix compilation error. arch/arm/mach-exynos/mach-exynos4-dt.c:40:2: error: 'S5P_PA_UART0' undeclared here (not in a function) Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: dts: add initial dts file for EXYNOS5250, SMDK5250Kukjin Kim2012-03-152-0/+439
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds initial dts file for EXYNOS5250 SoC. This dts file is including the SoC specific devices and properties. And adds the dts file for SMDK5250 board which uses the EXYNOS5250 dts file. Its board specific properites will be added later. Cc: Thomas Abraham <thomas.abraham@linaro.org> Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: add support device tree enabled board file for EXYNOS5Kukjin Kim2012-03-153-1/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a new EXYNOS5 compatible device tree enabled board When using this, a corresponding device tree blob which describes the board's properties should be supplied at boot time to the kernel. Cc: Thomas Abraham <thomas.abraham@linaro.org> Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: add support ARCH_EXYNOS5 for EXYNOS5 SoCsKukjin Kim2012-03-142-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds CONFIG_ARCH_EXYNOS5 and CONFIG_SOC_EXYNOS5250 for supporting EXYNOS5250 SoC and allows supporting EXYNOS4 and EXYNOS5 together. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: add support get_core_count() for EXYNOS5250Kukjin Kim2012-03-141-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | The EXYNOS5250 has two Cortex-A15 cores and there's no need to call scu_enable() in platform_smp_prepare_cpus() because Cortex-A15 has no regarding scu register which can be used for getting number of cores. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: support EINT for EXYNOS4 and EXYNOS5Eunki Kim2012-03-142-62/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GPIOs of EXYNOS4 and EXYNOS5 are changed to use ioremap instead of static mapping. It alse causes the change of external interrupt IO mapping. This patch changes EXYNOS4 to EXYNOS for common use and changes EINT_x macros for supporting dynamic IO mapping. Signed-off-by: Eunki Kim <eunki_kim@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: add interrupt definitions for EXYNOS5250Kukjin Kim2012-03-148-208/+558
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the interrupt definitions for EXYNOS5250 at <mach/irqs.h> file and it is needed for EXYNOS5250 SoC. As a note, for single zImage of EXYNOS4 and EXYNOS5, prefix of EXYNOS4_ and EXYNOS5_ has been added. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: add support for EXYNOS5250 SoCKukjin Kim2012-03-147-16/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch add support for EXYNOS5250 SoC has two Cortex-A15 cores. Since actually, most codes in mach-exynos/ are used commonly for EXYNOS4 and EXYNOS5 the EXYNOS5/EXYNOS5250 has been implemented in mach-exynos/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5Kukjin Kim2012-03-1411-18/+135
| | | | | | | | | | | | | | | | | | | | | | | | Actually, the base address of uart is different between EXYNOS4 and EXYNOS5 and this patch enables to support uart for EXYNOS4 and EXYNOS5 SoCs at runtime. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: add initial setup-i2c0 for EXYNOS5Kukjin Kim2012-03-142-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | In all of Samsung platform, the setup-i2c0.c file for I2C channel 0 is always compiled. So when supporting new SoC,it should be updated for it. Since EXYNOS5 GPIO will be supported after this, there is no setup gpio in there now. It will be implemented with that, of course. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: add clock part for EXYNOS5250 SoCKukjin Kim2012-03-144-0/+1351
| | | | | | | | | | | | | | | | | | | | | This patch adds clock-exynos5.c for EXYNOS5250 now and that can be used for other EXYNOS5 SoCs later. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: use exynos_init_uarts() instead of exynos4_init_uarts()Kukjin Kim2012-03-141-5/+5
| | | | | | | | | | | | | | | | | | | | | Since exynos4_init_uarts() can be used for EXYNOS5 SoCs, this patch changes the name of function to exynos_init_uarts(). Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: to declare static for mach-exynos/common.cKukjin Kim2012-03-142-21/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to commit cc511b8d84d8 ("ARM: 7257/1: EXYNOS: introduce arch/arm/mach-exynos/common.[ch]"), we don't need to declare extern for exynos4_map_io(), exynos4_init_clocks(), exynos4_init_uarts(), and exynos_init(). And the exynos4210_register_clocks() and exynos4212_register_clocks depend on each SoC not ARCH_EXYNOS4. So this patch fixed above. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: Add clkdev lookup entry for lcd clockTushar Behera2012-03-141-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The framebuffer driver needs the clock named 'lcd' as its bus clock but the equivalent clock on Exynos4 is named as 'fimd'. Hence, create a clkdev lookup entry with the name 'lcd' that references the 'fimd' clock. Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Acked-by: Jingoo Han <jg1.han@samsung.com> Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com> [kgene.kim@samsung.com: rebased on top of latest samsung tree] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: add support DMA for EXYNOS4X12 SoCBoojin Kim2012-03-113-8/+98
| | | | | | | | | | | | | | | Signed-off-by: Boojin Kim <boojin.kim@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1Tushar Behera2012-03-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amba core assumes the pclk to be named as apb_pclk. During device probe, it tries to get that clock and enable that. When PM_RUNTIME is enabled, dma clock is not explicitly enabled in pl330_probe, which causes device probe to fail. Adding a clkdev entry for apb_pclk for mdma1 fixes the problem. This patch fixes following runtime error. dma-pl330 dma-pl330.2: PERIPH_ID 0x0, PCELL_ID 0x0 ! dma-pl330: probe of dma-pl330.2 failed with error -22 Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: Enable MDMA driverBoojin Kim2012-03-115-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds MDMA platform data and enables MDMA for DMA memcpy operation for EXYNOS SoCs. Signed-off-by: Boojin Kim <boojin.kim@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driverMyungJoo Ham2012-03-111-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EXYNOS4212/4412 memory bus devfreq driver requires some register addresses that were not defined with EXYNOS4210 support. This patch adds the required register addresses and shift/mask data. Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: add clock registers for exynos4x12-cpufreqJaecheol Lee2012-03-111-0/+9
| | | | | | | | | | | | | | | Signed-off-by: Jaecheol Lee <jc.lee@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clockKukjin Kim2012-03-117-762/+766
| | | | | | | | | | | | | | | | | | | | | | | | This patch changes prefix of the clk register from S5P_ to EXYNOS4_ for new EXYNOS SoCs such as EXYNOS5 and adds prefix exynos4_ on clk declarations. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: use static declaration on regarding clockKukjin Kim2012-03-112-21/+10
| | | | | | | | | | | | | | | | | | | | | | | | This patch uses static declaration struct which is not used in other file and re-arrange with group in header file. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: replace clock.c for other new EXYNOS SoCsKukjin Kim2012-03-115-91/+90
| | | | | | | | | | | | | | | | | | | | | | | | This patch changes the name of clock.c to clock-exynos4.c for other EXYNOS series such as EXYNOS5. And since the header file of clock is used only in arch/arm/mach-exynos, moves it in the local directory. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clockKukjin Kim2012-03-11156-2366/+842
| |\ \
| | * \ Merge branch 'topic/cleanup-use-static' into next/cleanup-use-staticKukjin Kim2012-03-0728-108/+83
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-exynos/dma.c arch/arm/mach-s5p64x0/dma.c arch/arm/mach-s5pc100/dma.c arch/arm/mach-s5pv210/dma.c
| | | * | ARM: SAMSUNG: use static declaration when it is not used in other filesKukjin Kim2012-01-214-15/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| | | * | ARM: S5PV210: use static declaration when it is not used in other filesKukjin Kim2012-01-213-8/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| | | * | ARM: S5PC100: use static declaration when it is not used in other filesKukjin Kim2012-01-212-20/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| | | * | ARM: S5P64X0: use static declaration when it is not used in other filesKukjin Kim2012-01-213-17/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>