diff options
author | Olof Johansson <olof@lixom.net> | 2013-07-24 17:06:47 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-07-24 17:06:58 -0700 |
commit | 51378066fcb49c2cdee368ee1272fa8d963c7917 (patch) | |
tree | 1bc725545177d567d9ded18eec0e609325e08d04 /arch/arm/plat-samsung/include/plat/clock.h | |
parent | f82a3133c0c5625d54f3dd1621815b1cf77c8463 (diff) | |
parent | 53302bf60d2c95ee42118008499a5f5de544fcc1 (diff) | |
download | op-kernel-dev-51378066fcb49c2cdee368ee1272fa8d963c7917.zip op-kernel-dev-51378066fcb49c2cdee368ee1272fa8d963c7917.tar.gz |
Merge tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
From Kukjin Kim:
Samsung fixes for v3.11
- fix kernel booting on exynos5440
skip pm which is not supported
update regarding LPAE features
- fix s3c2440 uart with adding clkdev entries
- fix compilatioin for Samsung SoCs with selecting pm
- update ARCH_NR_GPIO to support exynos4412 has more gpios
* tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Update CONFIG_ARCH_NR_GPIO for Exynos
ARM: EXYNOS: Fix low level debug support
ARM: SAMSUNG: Save/restore only selected uart's registers
ARM: SAMSUNG: Add SAMSUNG_PM config option to select pm
ARM: S3C24XX: Add missing clkdev entries for s3c2440 UART
ARM: EXYNOS: Enable 64-bit DMA for EXYNOS5440 if LPAE is enabled
ARM: EXYNOS: change the PHYSMEM_BITS and SECTION_SIZE
ARM: EXYNOS: skip pm support on exynos5440
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/clock.h')
-rw-r--r-- | arch/arm/plat-samsung/include/plat/clock.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/clock.h b/arch/arm/plat-samsung/include/plat/clock.h index a62753d..df45d6e 100644 --- a/arch/arm/plat-samsung/include/plat/clock.h +++ b/arch/arm/plat-samsung/include/plat/clock.h @@ -83,6 +83,11 @@ extern struct clk clk_ext; extern struct clksrc_clk clk_epllref; extern struct clksrc_clk clk_esysclk; +/* S3C24XX UART clocks */ +extern struct clk s3c24xx_clk_uart0; +extern struct clk s3c24xx_clk_uart1; +extern struct clk s3c24xx_clk_uart2; + /* S3C64XX specific clocks */ extern struct clk clk_h2; extern struct clk clk_27m; |