summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5p64x0
Commit message (Collapse)AuthorAgeFilesLines
* ARM: zImage: remove the static qualifier from global data variablesNicolas Pitre2011-05-071-3/+3
| | | | | | | | | | | | | | | To be able to relocate the .bss section at run time independently from the rest of the code, we must make sure that no GOTOFF relocations are used with .bss symbols. This usually means that no global variables can be marked static unless they're also const. Let's remove the static qualifier from current offenders, or turn them into const variables when possible. Next commit will ensure the build fails if one of those is reintroduced due to otherwise enforced coding standards for the kernel. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Tested-by: Tony Lindgren <tony@atomide.com>
* ARM: S5P64X0: Fix iodesc array size for S5P6450Banajit Goswami2011-03-281-1/+1
| | | | | | | | The array size parameter of iotable_init for S5P6450 is incorrect. Fix this by passing the correct length of s5p6450_iodesc table. Signed-off-by: Banajit Goswami <banajit.g@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-03-173-2/+96
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits) davinci: DM644x EVM: register MUSB device earlier davinci: add spi devices on tnetv107x evm davinci: add ssp config for tnetv107x evm board davinci: add tnetv107x ssp platform device spi: add ti-ssp spi master driver mfd: add driver for sequencer serial port ARM: EXYNOS4: Implement Clock gating for System MMU ARM: EXYNOS4: Enhancement of System MMU driver ARM: EXYNOS4: Add support for gpio interrupts ARM: S5P: Add function to register gpio interrupt bank data ARM: S5P: Cleanup S5P gpio interrupt code ARM: EXYNOS4: Add missing GPYx banks ARM: S3C64XX: Fix section mismatch from cpufreq init ARM: EXYNOS4: Add keypad device to the SMDKV310 ARM: EXYNOS4: Update clocks for keypad ARM: EXYNOS4: Update keypad base address ARM: EXYNOS4: Add keypad device helpers ARM: EXYNOS4: Add support for SATA on ARMLEX4210 plat-nomadik: make GPIO interrupts work with cpuidle ApSleep mach-u300: define a dummy filter function for coh901318 ... Fix up various conflicts in - arch/arm/mach-exynos4/cpufreq.c - arch/arm/mach-mxs/gpio.c - drivers/net/Kconfig - drivers/tty/serial/Kconfig - drivers/tty/serial/Makefile - drivers/usb/gadget/fsl_mxc_udc.c - drivers/video/Kconfig
| * ARM: S5P: Update defconfig for HRT supportSangbeom Kim2011-03-121-0/+2
| | | | | | | | | | | | | | | | This patch updates s5pv210_defconfig and s5p64x0_defconfig for HRT support and CONFIG_S5P_HRT is used for its configuration. Signed-off-by: Sangbeom Kim <sbkim73@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S5P: Update machine of S5P64X0 and S5PV210 for HRTSangbeom Kim2011-03-122-2/+6
| | | | | | | | | | | | | | | | | | | | This patch adds support HRT for machines of S5P64X0 and S5PV210. Basically, PWM Timer3 is used for clockevent and PWM Timer4 is used for clocksource. Since PWM Timer3 is used for other purpose, PWM Timer2 is used on SMDKV210. Signed-off-by: Sangbeom Kim <sbkim73@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * Merge branch 'dev/pwm-backlight' into for-nextKukjin Kim2011-03-113-0/+88
| |\ | | | | | | | | | | | | Conflicts: arch/arm/mach-s3c64xx/mach-smdk6410.c
| | * ARM: SAMSUNG: Add PWM backlight support on Samsung S5P6450Banajit Goswami2011-03-032-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for LCD backlight control using PWM timer for Samsung SMDK6450 board. Signed-off-by: Banajit Goswami <banajit.g@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| | * ARM: SAMSUNG: Add PWM backlight support on Samsung S5P6440Banajit Goswami2011-03-032-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for LCD backlight control using PWM timer for Samsung SMDK6440 board. Signed-off-by: Banajit Goswami <banajit.g@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | | 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: S5P64X0: Fix number of GPIO lines in Bank FBanajit Goswami2011-03-041-2/+2
| |/ |/| | | | | | | | | | | | | | | | | | | | | This patch modifies the number of total GPIO lines for Bank F for Samsung S5P6440 and S5P6450 SoCs from 2 to 16. This is necessary as the GPIO lines from 0 to 13 are reserved and only lines 14 and 15 are used. As during initialization, the line number starts at 0, putting 2 does not solve the intended purpose. Signed-off-by: Banajit Goswami <banajit.g@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | ARM: S5P64X0: Cleanup map.h fileKukjin Kim2011-02-171-41/+42
|/ | | | Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* ARM: S5P6450: Add missing virtual ASoC DMA deviceJassi Brar2011-01-181-0/+1
| | | | | Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* ARM: S5P6440: Add missing virtual ASoC DMA deviceJassi Brar2011-01-181-0/+1
| | | | | Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* Merge branch 'dev/cleanup-clocks' into for-nextKukjin Kim2011-01-052-26/+6
|\
| * ARM: S5P6450: 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>
| * ARM: S5P6440: 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-s5p64x0' into for-next-newKukjin Kim2010-12-305-72/+222
|\ \
| * | ARM: S5P6440: Change the name for MMC Special ClockAbhilash Kesavan2010-12-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the name of mmc spcial clock from mmc_bus to sclk_mmc to be in line with the naming across the S5P SoCs Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com> Signed-off-by: Sangbeom Kim <sbkim73@samsung.com> [kgene.kim@samsung.com: minor edit of title] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S5P64X0: Change GPIOlib initialization to core_initcallAbhilash Kesavan2010-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the gpiolib initialization from arch_initcall to core_initcall will allow us to make use of gpio functions in smdk64x0_machine_init function. 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: S5P64X0: Add clock support for RTCAtul Dahiya2010-12-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds RTC clock for S5P6450. 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>
| * | ARM: S5P64X0: Rename GPIOlib file to gpiolib.cKukjin Kim2010-12-302-2/+2
| | | | | | | | | | | | | | | | | | This patch renames S5P64X0 GPIOlib file according to other S5P SoCs. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S5P64X0: Cleanup S5P64X0 GPIOlib adding 2bit chipsKukjin Kim2010-12-301-11/+6
| | | | | | | | | | | | | | | | | | This patch changes S5P6440 and S5P6450 GPIOlib adding 2bit chips. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S5P64X0: Add GPIOlib support for S5P6450Kukjin Kim2010-12-303-68/+217
| |/ | | | | | | | | | | | | | | | | Already can support S5P6440 GPIOlib but S5P6450. This patch changes regarding S5P6440 GPIO definitions so that can be used it from S5P6450 and adds S5P6450 GPIO chips. Tested-by: Atul Dahiya <atul.dahiya@samsung.com> 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: S5P6450: Enable I2S device to work on SMDK6450Jassi Brar2010-12-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Add missing virtual ASoC DMA device and WM8580 as I2C slave, so that the I2S can work on SMDK6450. [kgene.kim@samsung.com: removed virtual ASoC DMA device to avoid build error and it will be added next time] 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>
* | ARM: S5P6440: Enable I2S device to work on SMDK6440Jassi Brar2010-12-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Add missing virtual ASoC DMA device and WM8580 as I2C slave, so that the I2S can work on SMDK6440. [kgene.kim@samsung.com: removed virtual ASoC DMA device to avoid build error and it will be added next time] 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>
* | ARM: S5P64X0: Segregate audio devicesRajeshwari Shinde2010-12-301-13/+110
| | | | | | | | | | | | | | | | | | Segregate I2S devices for S5P6440 and S5P6450. Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> 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: S5P6450: Define base addresses for I2SJassi Brar2010-12-301-0/+2
| | | | | | | | | | | | | | | | | | Define the base address of I2S-1 and 2 for S5P6450. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> [kgene.kim@samsung.com: Added description] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | ARM: S5P6450: Define clocks for I2SJassi Brar2010-12-301-0/+12
| | | | | | | | | | | | | | | | Define missing controller clocks for the I2S-0,1 blocks. 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: S5P64X0: Upgrade platform device for I2SJassi Brar2010-11-193-36/+23
| | | | | | | | | | | | | | | | | | | | | | Add more information to I2S platform_devices in order to prepare them for new controller driver. Also, discard duplicated gpio-cfg. 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-2811-97/+55
|\ | | | | | | | | | | | | 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: S5P64X0: Set DMA clock disable as defaultSeungwhan Youn2010-10-252-12/+12
| | | | | | | | | | | | | | | | | | This patch modify to DMA operation clock into disable list for default clock setting. 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: S5P: Add EPLL rate change warningSeungwhan Youn2010-10-252-0/+6
| | | | | | | | | | | | | | | | | | | | This patch adds warning about changing EPLL rate to notice that other driver that controls H/W, which is using EPLL, will has unknown effects by this EPLL rate change. 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: S5P: Reduce duplicated EPLL control codesSeungwhan Youn2010-10-254-22/+6
| | | | | | | | | | | | | | | | | | | | | | | | S5P Samsung SoCs has a EPLL to support various PLL clock sources for other H/W blocks. Until now, to control EPLL, each of SoCs make their own functions in 'mach-s5pxxx/clock.c'. But some of functions, 'xxx_epll_get_rate()' and 'xxx_epll_enable()', are exactly same in all S5P SoCs, so this patch move these duplicated codes to common EPLL functions that use platform wide. 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-254-59/+29
| |\
| | * ARM: S5P64X0: 2nd Change to using s3c_gpio_cfgall_range()Kukjin Kim2010-10-231-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | This patch changes the code setting range of GPIO pins' configuration and pull state to use the recently introduced s3c_gpio_cfgpin_range(). NOTE: This is for missed things from the previous patch. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| | * ARM: S5P64X0: Change to using s3c_gpio_cfgall_range()Kukjin Kim2010-10-232-20/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change the code setting a range of GPIO pins' configuration and pull state to use the recently introduced s3c_gpio_cfgall_range(). Mop up a few missed s3c_gpio_cfgpin_range() changes. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| | * ARM: S5P64X0: 2nd Change to using s3c_gpio_cfgpin_range()Kukjin Kim2010-10-233-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | This patch changes the code setting ranges of GPIO pins in mach-s5p64x0 using s3c_gpio_cfgpin() to use the recently introduced s3c_gpio_cfgpin_range(). NOTE: This is for missed things from the previous patch. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| | * ARM: S5P64X0: Change to using s3c_gpio_cfgpin_range()Ben Dooks2010-10-231-19/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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: modified to s5p64x0 from s5p6440] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S5P64XX: Remove redundant selection PLAT_S5P.Kukjin Kim2010-10-211-2/+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-202-4/+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: S5P64X0: Bug fix on errors of build with CONFIG_PREEMPT_NONESeungChull Suh2010-10-181-0/+1
| | | | | | | | | | | This patch adds header <linux/sched.h> into the below files for build with CONFIG_PREEMPT_NONE. arch/arm/mach-s5p64x0/cpu.c Signed-off-by: Seung-Chull Suh <sc.suh@samsung.com> [kgene.kim@samsung.com: edited title and message] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* ARM: S5P64X0: Fix GPIO rbank supportAtul Dahiya2010-10-181-5/+0
| | | | | | | | | | The patch removes s3c_gpio_lock/unlock to avoid acquiring the lock recursively as lock is already acquired by calling function. Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com> Signed-off-by: Sangbeom Kim <sbkim73@samsung.com> [kgene.kim@samsung.com: removed useless variable due to this] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* ARM: S5P64X0: FIX typo in the ADC device nameNaveen Krishna Ch2010-10-181-2/+2
| | | | | | | Fix the touch screen device name from s3c64x0-adc to s3c64xx-adc. Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* ARM: S5P64X0: Move SMDK6440 board file and Add SMDK6450 board fileKukjin Kim2010-10-182-0/+345
| | | | | | | This patch moves smdk6440 board file from mach-s5p6440 into the new mach-s5p64x0 directory and adds smdk6450 board file. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
OpenPOWER on IntegriCloud