summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx/clock.c
Commit message (Collapse)AuthorAgeFilesLines
* ARM: S3C6410: Use device names for both I2C clocksMark Brown2012-01-271-0/+5
| | | | | | | | | | | | | | | When the S3C64xx CPUs were converted to clkdev mappings were added for the I2C controllers on them. On S3C6410 a device name is specified for I2C controller 1 but not for controller 0 which makes the code less robust as we'll falsely return the clock for controller 0 if there's an error in the request for controller 1. Improve things by registering a device name for controller 0 as well. Due to the fact that we change the numbering for controller 0 depending on if we've registered controller 1 this requires an ifdef to choose the name. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* Merge branch 'samsung/dt' into samsung/cleanupArnd Bergmann2012-01-091-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-s3c64xx/Makefile arch/arm/mach-s5pc100/Makefile arch/arm/mach-s5pv210/Makefile Pull in previously resolved conflicts: The Makefiles were reorganized in the "rmk/restart" series and modified in the "samsung/cleanup series". This also pulls in the other conflict resolutions from the restart series against the samsung/dt series. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * Merge branch 'depends/rmk/for-linus' into samsung/dtArnd Bergmann2012-01-071-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-exynos/Makefile arch/arm/mach-exynos/cpu.c -> common.c arch/arm/mach-exynos/include/mach/entry-macro.S arch/arm/mach-exynos/init.c -> common.c arch/arm/mach-s5p64x0/init.c -> common.c arch/arm/mach-s5pv210/init.c -> common.c Multiple files were moved into common.c files in the rmk/for-linus branch, so this moves over the samsung/dt changes to the new files. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * ARM: 7245/1: S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch]Kukjin Kim2011-12-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces common.[ch] which are used only in the arch/arm/mach-s3c64xx/ directory. The common.c file merges the cpu.c, irq.c and irq-eint.c which are used commonly on S3C64XX SoCs and the common.h file replaces with plat/s3c6400.h and plat/s3c6410.h files. Cc: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | ARM: S3C64XX: Add SPI clkdev supportPadmavathi Venna2011-12-231-31/+49
| | | | | | | | | | | | | | | | | | | | | | | | Registered the SPI bus clocks with clkdev using generic connection id. Signed-off-by: Padmavathi Venna <padma.v@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | | ARM: SAMSUNG: Add lookup of sdhci-s3c clocks using generic namesRajeshwari Shinde2011-12-231-48/+78
|/ / | | | | | | | | | | | | | | | | Add support for lookup of sdhci-s3c controller clocks using generic names for s3c2416, s3c64xx, s5pc100, s5pv210 and exynos4 SoC's. Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> [kgene.kim@samsung.com: fixed trailing whitespace] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | ARM: SAMSUNG: register uart clocks to clock lookup listThomas Abraham2011-12-231-10/+27
|/ | | | | | | | | | Samsung uart driver lookups the clock using the connection id 'clk_uart_baud'. The uart clocks for all Samsung platforms are reorganized to register them with the lookup name as required by the uart driver. Cc: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2Kukjin Kim2011-10-041-2/+3
|\ | | | | | | | | Conflicts: arch/arm/plat-s5p/include/plat/pll.h
| * ARM: SAMSUNG: Consolidate plat/pll.hKukjin Kim2011-10-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed - arch/arm/plat-s3c24xx/include/plat/pll.h - arch/arm/mach-s3c64xx/include/mach/pll.h - arch/arm/plat-s5p/include/plat/pll.h - arch/arm/plat-samsung/include/plat/pll6553x.h And created - arch/arm/plat-samsung/include/plat/pll.h Cc: Ben Dooks <ben-linux@fluff.org> [kgene.kim@samsung.com: changed title] [kgene.kim@samsung.com: fixed conflicts in plat-s5p/include/pll.h] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | ARM: S3C64XX: Add support for synchronous clock operationTomasz Figa2011-09-191-1/+7
|/ | | | | | | | | | | Some boards based on S3C6410 use synchronous clocking, which means that HCLKx2 and other system clocks are generated from APLL instead of MPLL. This patch adds support for such boards, by calculating hclk2 depending on the status of S3C_OTHERS_SYNCMUXSEL bit in S3C64XX_OTHERS regist Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* ARM: S3C64XX: Add clkdev supportThomas Abraham2011-07-201-61/+25
| | | | | Signed-off-by: Thomas Abraham <thomas.ab@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* ARM: S3C64XX: Add clock for i2c1Ben Dooks2011-03-041-0/+6
| | | | | | | | | The clock for i2c1 has been missing for a while, add it to the list of clocks for the system and ensure it is initialised at startup. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* Merge branch 'dev/cleanup-clocks' into for-nextKukjin Kim2011-01-051-16/+3
|\
| * ARM: S3C64XX: Tidy register and disable clock usageKukjin Kim2011-01-041-16/+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. Cc: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | ARM: S3C64XX: Upgrade platform device for I2SJassi Brar2010-11-191-1/+1
|/ | | | | | | | | | 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: S3C64XX: Add keypad device to the SMDK6410 boardNaveen Krishna Ch2010-08-061-0/+6
| | | | | | | 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>
* ARM: S3C64XX: Move RTC clock from init_clocks to init_clocks_disableAtul Dahiya2010-08-051-6/+6
| | | | | | | 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>
* ARM: S3C64XX: Add support for Compact Flash driver on SMDK6410Abhilash Kesavan2010-08-051-0/+6
| | | | | | | | | | | | 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>
* ARM: S3C64XX: Add USB OTG HCLK to the list of clocksThomas Abraham2010-05-281-0/+6
| | | | | | | | | Add the USB OTG HCLK clock to the list of clocks to be registered during initialization. Signed-off-by: Thomas Abraham <thomas.ab@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S3C64XX: Add USB external clock definitionMaurus Cuelenaere2010-05-181-0/+7
| | | | | | | This adds the xusbxti clock to S3C64XX platform. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S3C6410: Declare IISv4 audio-bus clockJassi Brar2010-05-141-0/+10
| | | | | | | | | | Declare 'audio-bus' clock for IISv4 controller of S3C6410. Even though the name is same as that for IISv3, the id is set to -1(just one instance of the controller is available) which helps always fetch the correct clock. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S3C6410: Declare possible sources of audio-bus2Jassi Brar2010-05-141-0/+13
| | | | | | | Declare possible sources of CLKAUDIO[2]/audio-bus for IISv4 controller. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S3C6410: Declare IISCDCLK_V4 ClockJassi Brar2010-05-141-0/+6
| | | | | | | Declare the source of clock provided at Xi2sCDCLK2 pin for IISv4 controller. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S3C64XX: Declare IISv4 PCLK for S3C6410Jassi Brar2010-02-241-0/+8
| | | | | | | | | | | [Updated the device ID to -1 since there's only one IISv4 device but the S3C clock API tries to match based on the ID of the requesting device (and not the name) -- broonie.] Signed-Off-by: Jassi Brar <jassi.brar@samsung.com> [ben-linux@fluff.org: Fixed Jassi's lastname] Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S3C64XX: Combine the clock init codeBen Dooks2010-02-201-31/+19
| | | | | | | | | | | Turn the init sequence of s3c24xx_register_baseclocks(xtal); s3c64xx_register_clocks(); s3c6400_register_clocks(S3C6410_CLKDIV0_ARM_MASK); into a single call as this is now contained within one file. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S3C64XX: Merge s3c6400-clock.c and clock.c into mach-s3c64xxBen Dooks2010-02-201-0/+507
| | | | | | | | | | Merge plat-s3c64xx/s3c6400-clock.c mach-s3c64xx/clock.c placing all the clock code into one place. Note, no effort is made in this patch to squash the init functions together. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S3C64XX: Move core support to mach-s3c64xxBen Dooks2010-02-201-0/+306
Move the core S3C64XX support to mach-s3c64xx as it is unlikely to be used outside of this directory. Also move the SoC header files in with it. This includes the clock, cpu, cpufreq, dma, gpiolib and pll support. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
OpenPOWER on IntegriCloud