summaryrefslogtreecommitdiffstats
path: root/arch
AgeCommit message (Collapse)Author
2010-08-06Merge branch 'next-samsung' into for-nextKukjin Kim
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
2010-08-06Merge branch 'next-s5p' into for-nextKukjin Kim
Conflicts: arch/arm/mach-s5pv210/mach-aquila.c arch/arm/mach-s5pv210/mach-goni.c
2010-08-06Merge branch 'next-s5pv310' into for-nextKukjin Kim
2010-08-06Merge branch 'next-s5pv210' into for-nextKukjin Kim
2010-08-06Merge branch 'next-s5pc100' into for-nextKukjin Kim
2010-08-06Merge branch 'next-s5p6442' into for-nextKukjin Kim
2010-08-06ARM: SAMSUNG: Fix on inclusion mach/gpio.h for Samsung SoCsKukjin Kim
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>
2010-08-06ARM: SAMSUNG: Fix on inclusion mach/gpio.h on gpiolib.cKyungmin Park
Fix on inclusion mach/gpio.h on plat-samsung/gpiolib.c since new C preprocessor directives. Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Ben Dooks <ben-linux@fluff.org> [kgene.kim@samsung.com: minor title and message fix] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-06ARM: SAMSUNG: Add platform definitions and helpers for FIMC driverSylwester Nawrocki
FIMC (CAMIF) device is a camera interface embedded in S3C/S5P Samsung SOC series. It supports ITU-R BT.601/656 and MIPI-CSI2 standards, memory to memory operations, color conversion, resizing and rotation. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-06ARM: S3C64XX: Add keypad device to the SMDK6410 boardNaveen Krishna Ch
This patch is to support keypad device to the SMDK6410 board. Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-06ARM: SAMSUNG: Add keypad device supportJoonyoung Shim
This patch adds Samsung keypad device definition for Samsung SoCs. 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>
2010-08-06Merge commit 'd01d0756f75e7a5b4b43764ad45b83c4340f11d6' into next-samsungKukjin Kim
2010-08-06ARM: SAMSUNG: Make WDT driver dependency SoC specific instead of machine ↵Banajit Goswami
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
2010-08-06ARM: S5PV310: Add Samsung UNIVERSAL_C210 supportKyungmin Park
This patch adds Samsung Mobile S5PC210 Reference Board, UNIVERSAL_C210 board support. Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> [kgene.kim@samsung.com: changed machine name] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-06ARM: S5P6440: Add support for I2C channel 0 and 1 on SMDK6440Naveen Krishna Ch
This patch adds helper functions for I2C channel 0 and 1, GPIO configurations for I2C on S5P6440 and support I2C-0/1 devices on SMDK6440. Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Conflicts: arch/arm/mach-s5p6440/Kconfig arch/arm/mach-s5p6440/include/mach/map.h arch/arm/mach-s5p6440/mach-smdk6440.c
2010-08-05ARM: S5PC110: Add OneNAND interrupt numberKyungmin Park
To use OneNAND interrupt at drivers, also extend DMA address to cover fully. Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5PV210: cleanup hsmmc clock definitionsMarek Szyprowski
This patch performs minor clocks cleanup for S5PV210 SoC. The duplicate HCLK clock entry for sdhci-s3c has been disabled and the index of a reserved entry has been fixed. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5PV210: Add SDHCI devices for GONI boardMarek Szyprowski
This patch add support for SDHCI blocks on Samsung Goni board. The following host controllers are defined: 1. Internal MoviNAND device (permanently wired to the controller) 2. Internal WiFI SDIO device (card is activated by power regualor) 3. External MMC/SD socket (card detection is provided by external gpio interrupt) Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5PV210: Add SDHCI devices for Aquila boardMarek Szyprowski
This patch add support for SDHCI blocks on Samsung Aquila board. The following host controllers are defined: 1. Internal MoviNAND device (permanently wired to the controller) 2. Internal WiFI SDIO device (card is activated by power regualor) 3. External MMC/SD socket (card detection is provided by external gpio interrupt) Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5PV210: Add support for I2C devices on SMDKV210 and SMDKC110Naveen Krishna Ch
This patch adds support I2C-0/1/2 devices to the SMDKV210/SMDKC110. Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com> [kgene.kim@samsung.com: Fixes wrong name] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: SAMSUNG: updates sdhci.h for Samsung SoCsKukjin Kim
This patch updates sdhci.h as Maurus suggestion like following: From: #ifdef ... function() { blahblah; } #else function() { } #endif To: function() { #ifdef ... blahblah; #endif } And fixes a couple of typos. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Conflicts: arch/arm/plat-samsung/include/plat/sdhci.h
2010-08-05ARM: SAMSUNG: i2c/busses: Add HAVE_S3C2410_I2C option to include I2C for ↵Naveen Krishna Ch
Samsung SoCs This patch adds HAVE_S3C2410_I2C to control inclusion of I2C bus driver on Samsung SoCs and makes I2C bus driver dependency SoC specific instead of machine specific. This will enalbe all machines using Samsung ARCH_S3C2410, _S3C64XX, _S5P6440, _S5PC100, and _S5PV210 to select the I2C driver by default Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Cc: Ben Dooks <ben-linux@fluff.org>
2010-08-05ARM: SAMSUNG: Make RTC driver dependency SoC specific instead of machine ↵Atul Dahiya
specific This patch moves the dependency of RTC driver from MACH_XXX(board) to ARCH_XXX(SoC). This will enable all machines using Samsung S5P6440, S5PC100 and S5PV210 SoCs to use RTC driver by default. Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S3C64XX: Add RTC support for S3C64XXAtul Dahiya
This patch adds support for RTC for SMDK6410. Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: SAMSUNG: Updates RTC register for support Alarm IRQ and Time Tick.Atul Dahiya
This patch updates RTC registers for support Alarm IRQ and Time Tick. Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com> Signed-off-by: Taekgyun Ko <taeggyun.ko@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S3C64XX: Move RTC clock from init_clocks to init_clocks_disableAtul Dahiya
RTC clock does not require to be enabled at boot time. Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: SAMSUNG: Add new s3c-sdhci card detection methods for Samsung SoCsMarek Szyprowski
On some Samsung SoCs not all SDHCI controllers have card detect (CD) line. For some embedded designs it is not even needed, because ususally the device (like SDIO flash memory or wifi controller) is permanently wired to the controller. There are also systems which have a card detect line connected to some of the external interrupt lines or the presence of the card depends on some other actions (like enabling a power regulator). This patch adds all required changes to platform support code, so another patch, which extends the driver with support for the new card detection methods can be applied. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> [kgene.kim@samsung.com: minor title and coding-style fixes] [kgene.kim@samsung.com: fix build errors] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: SAMSUNG: Add device definition for HSMMC3Hyuk Lee
This patch adds hsmmc3 device definition in plat-samsung. Because now S5PV210 can support 4 hsmmc such as hsmmc0, hsmmc1, hsmmc2 and hsmmc3 and that can be used in further Samsung SoCs. Signed-off-by: Hyuk Lee <hyuk1.lee@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: SAMSUNG: Implement set_name function for ADC devicesNaveen Krishna Ch
This patch implements s3c_adc_setname() for Samsung SoCs. Also updates its usage in S3C64XX, S5P6440, and S5PV210. Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S3C64XX: Add support for Compact Flash driver on SMDK6410Abhilash Kesavan
Following is added for the CF-ATA driver: - Platform data strucure instantiation - Platform device enabling code - Addition of cfcon clock - Platform-specific gpio setup code Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCsAbhilash Kesavan
Following has been added: - Common CF Platform device definition - Platform data strucure definition - CF controller register definitions Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: SAMSUNG: Add helper to clone and set platform dataBen Dooks
This is intended to replace a number of sites in the Samsung kernel where the same thing is being repeated in specific platform setting code. See next patches for replacements. Signed-off-by: Ben Dooks <ben-linux@fluff.org> [kgene.kim@samsung.com: This is for building test] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: SAMSUNG: Reduce virtual memory size for WDT deviceBanajit Goswami
This patch reduces the virtual memory allocated for WDT device from 1M to 1K. 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>
2010-08-05ARM: S5PV310: Add I2C channel 0, 1 and 2 supportKyungmin Park
This patch adds configuration of proper mux pins for support I2C channel 0, 1, and 2 on S5PV310/S5PC210. Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> [kgene.kim@samsung.com: coding-style and minor comment fixes] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5PV310: Add Board support fileChanghwan Youn
This patch adds Samsung SMDKV310 board support file. Signed-off-by: Changhwan Youn <chaos.youn@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5PV310: Add new Kconfig and MakefilesChanghwan Youn
This patch adds the Kconfig and Makefile for the new S5PV310 SoC. It also updates arch/arm Kconfig, Makefile and arch/arm/mm/Kconfig to include support for the new S5PV310. Signed-off-by: Changhwan Youn <chaos.youn@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5PV310: Add Timer supportChanghwan Youn
This patch adds timer support for S5PV310. Until now, all S5P SoCs use CONFIG_ARCH_USES_GETTIMEOFFSET macro as a default configuration. Instead,S5PV310 implements clocksource and clock_event_device to support the high resolution timer and tickless system. Signed-off-by: Changhwan Youn <chaos.youn@samsung.com> Signed-off-by: Hyuk Lee <hyuk1.lee@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5PV310: Add IRQ supportChanghwan Youn
This patch adds IRQ support for S5PV310. ARM GIC is installed in S5PV310 instead of VIC which is in every other CPUs in S5P series. Several irq combiners are used to resolve the lack of irq lines in current implementation. Signed-off-by: Changhwan Youn <chaos.youn@samsung.com> Signed-off-by: Hyuk Lee <hyuk1.lee@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5PV310: Add Clock and PLL supportChanghwan Youn
This patch adds clock and pll support for S5PV310. Signed-off-by: Changhwan Youn <chaos.youn@samsung.com> Signed-off-by: Jongpill Lee <boyko.lee@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5PV310: Add new CPU initialization supportChanghwan Youn
This patch adds Samsung S5PV310/S5PC210 CPU support. The S5PV310/S5PC210 integrates a ARM Cortex A9 multi-core. Signed-off-by: Changhwan Youn <chaos.youn@samsung.com> Signed-off-by: Jongpill Lee <boyko.lee@samsung.com> Signed-off-by: Jiseong Oh <jiseong.oh@samsung.com> [kgene.kim@samsung.com: fix build errors] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5P: Remove fixed uart offset dependent codeChanghwan Youn
The uart offset between channels has been 0x400 for all S5P series and to present virtual and physical offsets, both number 0x400 and S3C_UART_OFFSET have been used together. This patch removes the use of the number 0x400 and expands the virtual mapping size of S3C_VA_UART from 4KB to 512KB to support the CPU with S3C_UART_OFFSET being 0x10000. Signed-off-by: Changhwan Youn <chaos.youn@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: SAMSUNG: serial: Add FRACVAL support for newer UARTJongpill Lee
Add support for the FRACVAL register on the newer UART blocks which provides the same function as UDIVSLOT register but the FRACVAL is easier to implement. To support UDIVSLOT register, UDIVSLOT table search is necessary though supporting FRACVAL only needs the index value of UDIVSLOT table. Signed-off-by: Jongpill Lee <boyko.lee@samsung.com> Acked-by: Changhwan Youn <chaos.youn@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5PV210: Add s5pv210_sw_reset for SWRESETJongpill Lee
This patch adds s5pv210_sw_reset() which includes SWRESET for S5PV210/S5PC110. Signed-off-by: Jongpill Lee <boyko.lee@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5PV210: Add RTC support for S5PV210 and S5PC110Atul Dahiya
This patch adds support RTC driver for Samsung S5PV210/S5PC110. Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5PV210: Add support HSMMC on SMDKV210Hyuk Lee
This patch adds support HSMMC on SMDKV210, and gpio configuration for S5PV210 hsmmc3. Signed-off-by: Hyuk Lee <hyuk1.lee@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5PV210: Add keypad device to the SMDKV210 boardNaveen Krishna Ch
This patch is to support keypad device to the SMDKV210 board. Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5PV210: Add keypad device helpersJoonyoung Shim
This patch adds the keypad device platform helpers for S5PV210 cpu. 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>
2010-08-05ARM: s5pv210_defconfig: Update for removing s5pc110_defconfigKukjin Kim
Now that S5PC110 machines and S5PV210 machines can be built into one kernel, update mach-s5pv210/Kconfig and s5pv210_defconfig. Tested on Aquila(S5PC110), GONI(S5PC110), SMDKC110(S5PC110) and SMDKV210(S5PV210). Created and tested against linux-2.6.35-rc5. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
2010-08-05ARM: S5PV210: Add support for Compact Flash driver on SMDKV210/C110Abhilash Kesavan
Following is added for the CF-ATA driver: - Platform data strucure instantiation - Platform device enabling code - Platform-specific gpio setup code - Fixed IRQ naming to match across 64xx and v210 Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5PV210: Add MAX8998 PMIC support for GONIMarek Szyprowski
This patch adds required platform definitions for MAX8998 PMIC driver. Power regulators for LDO and BUCK outputs has been defined as well as a simple gpio-keys button for power key (to enable wakeup functionality with external interrupt). Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> [broonie@opensource.wolfsonmicro.com: For the regulator API usage] Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> [kgene.kim@samsung.com: minor title fix] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>