diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 20:41:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 20:41:04 -0400 |
commit | 69f1d1a6acbaa7d83ef3f4ee26209c58cd000204 (patch) | |
tree | 12be981f8a123b8361edd64b84fd72f339a9655d /arch/arm/mach-s5pv210 | |
parent | 2d86a3f04e345b03d5e429bfe14985ce26bff4dc (diff) | |
parent | 1e09939bad24df95ddeeeca4fbec64fa94b66def (diff) |
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits)
ARM: S5P64X0: External Interrupt Support
ARM: EXYNOS4: Enable MFC on Samsung NURI
ARM: EXYNOS4: Enable MFC on universal_c210
ARM: S5PV210: Enable MFC on Goni
ARM: S5P: Add support for MFC device
ARM: EXYNOS4: Add support FIMD on SMDKC210
ARM: EXYNOS4: Add platform device and helper functions for FIMD
ARM: EXYNOS4: Add resource definition for FIMD
ARM: EXYNOS4: Change devname for FIMD clkdev
ARM: SAMSUNG: Add IRQ_I2S0 definition
ARM: SAMSUNG: Add platform device for idma
ARM: EXYNOS4: Add more registers to be saved and restored for PM
ARM: EXYNOS4: Add more register addresses of CMU
ARM: EXYNOS4: Add platform device for dwmci driver
ARM: EXYNOS4: configure rtc-s3c on NURI
ARM: EXYNOS4: configure MAX8903 secondary charger on NURI
ARM: EXYNOS4: configure ADC on NURI
ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI
ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI
ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs
...
Fix up tons of silly conflicts:
- arch/arm/mach-davinci/include/mach/psc.h
- arch/arm/mach-exynos4/Kconfig
- arch/arm/mach-exynos4/mach-smdkc210.c
- arch/arm/mach-exynos4/pm.c
- arch/arm/mach-imx/mm-imx1.c
- arch/arm/mach-imx/mm-imx21.c
- arch/arm/mach-imx/mm-imx25.c
- arch/arm/mach-imx/mm-imx27.c
- arch/arm/mach-imx/mm-imx31.c
- arch/arm/mach-imx/mm-imx35.c
- arch/arm/mach-mx5/mm.c
- arch/arm/mach-s5pv210/mach-goni.c
- arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-s5pv210')
-rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/clock.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/cpu.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/dev-audio.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/include/mach/map.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/include/mach/pm-core.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/include/mach/regs-audss.h | 18 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/mach-goni.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkv210.c | 1 |
9 files changed, 46 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index 79bb3a0314ef..69dd87cd8e22 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig | |||
@@ -90,6 +90,7 @@ config MACH_GONI | |||
90 | select S3C_DEV_HSMMC2 | 90 | select S3C_DEV_HSMMC2 |
91 | select S3C_DEV_I2C1 | 91 | select S3C_DEV_I2C1 |
92 | select S3C_DEV_I2C2 | 92 | select S3C_DEV_I2C2 |
93 | select S5P_DEV_MFC | ||
93 | select S3C_DEV_USB_HSOTG | 94 | select S3C_DEV_USB_HSOTG |
94 | select S5P_DEV_ONENAND | 95 | select S5P_DEV_ONENAND |
95 | select SAMSUNG_DEV_KEYPAD | 96 | select SAMSUNG_DEV_KEYPAD |
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c index ae72f87eab15..52a8e607bcc2 100644 --- a/arch/arm/mach-s5pv210/clock.c +++ b/arch/arm/mach-s5pv210/clock.c | |||
@@ -324,6 +324,12 @@ static struct clk init_clocks_off[] = { | |||
324 | .enable = s5pv210_clk_ip0_ctrl, | 324 | .enable = s5pv210_clk_ip0_ctrl, |
325 | .ctrlbit = (1 << 26), | 325 | .ctrlbit = (1 << 26), |
326 | }, { | 326 | }, { |
327 | .name = "mfc", | ||
328 | .devname = "s5p-mfc", | ||
329 | .parent = &clk_pclk_psys.clk, | ||
330 | .enable = s5pv210_clk_ip0_ctrl, | ||
331 | .ctrlbit = (1 << 16), | ||
332 | }, { | ||
327 | .name = "otg", | 333 | .name = "otg", |
328 | .parent = &clk_hclk_psys.clk, | 334 | .parent = &clk_hclk_psys.clk, |
329 | .enable = s5pv210_clk_ip1_ctrl, | 335 | .enable = s5pv210_clk_ip1_ctrl, |
@@ -879,6 +885,7 @@ static struct clksrc_clk clksrcs[] = { | |||
879 | }, { | 885 | }, { |
880 | .clk = { | 886 | .clk = { |
881 | .name = "sclk_mfc", | 887 | .name = "sclk_mfc", |
888 | .devname = "s5p-mfc", | ||
882 | .enable = s5pv210_clk_ip0_ctrl, | 889 | .enable = s5pv210_clk_ip0_ctrl, |
883 | .ctrlbit = (1 << 16), | 890 | .ctrlbit = (1 << 16), |
884 | }, | 891 | }, |
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c index 61e6c24b90ac..79907ec78d43 100644 --- a/arch/arm/mach-s5pv210/cpu.c +++ b/arch/arm/mach-s5pv210/cpu.c | |||
@@ -126,7 +126,7 @@ void __init s5pv210_map_io(void) | |||
126 | s5pv210_default_sdhci2(); | 126 | s5pv210_default_sdhci2(); |
127 | s5pv210_default_sdhci3(); | 127 | s5pv210_default_sdhci3(); |
128 | 128 | ||
129 | s3c_adc_setname("s3c64xx-adc"); | 129 | s3c_adc_setname("samsung-adc-v3"); |
130 | 130 | ||
131 | s3c_cfcon_setname("s5pv210-pata"); | 131 | s3c_cfcon_setname("s5pv210-pata"); |
132 | 132 | ||
diff --git a/arch/arm/mach-s5pv210/dev-audio.c b/arch/arm/mach-s5pv210/dev-audio.c index 8d58f1926241..63f5d82004b5 100644 --- a/arch/arm/mach-s5pv210/dev-audio.c +++ b/arch/arm/mach-s5pv210/dev-audio.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <mach/map.h> | 18 | #include <mach/map.h> |
19 | #include <mach/dma.h> | 19 | #include <mach/dma.h> |
20 | #include <mach/irqs.h> | 20 | #include <mach/irqs.h> |
21 | #include <mach/regs-audss.h> | ||
21 | 22 | ||
22 | static const char *rclksrc[] = { | 23 | static const char *rclksrc[] = { |
23 | [0] = "busclk", | 24 | [0] = "busclk", |
@@ -52,6 +53,7 @@ static struct s3c_audio_pdata i2sv5_pdata = { | |||
52 | .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | 53 | .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI |
53 | | QUIRK_NEED_RSTCLR, | 54 | | QUIRK_NEED_RSTCLR, |
54 | .src_clk = rclksrc, | 55 | .src_clk = rclksrc, |
56 | .idma_addr = S5PV210_AUDSS_INT_MEM, | ||
55 | }, | 57 | }, |
56 | }, | 58 | }, |
57 | }; | 59 | }; |
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h index 1dd58836fd4f..aac343c180b2 100644 --- a/arch/arm/mach-s5pv210/include/mach/map.h +++ b/arch/arm/mach-s5pv210/include/mach/map.h | |||
@@ -59,6 +59,8 @@ | |||
59 | 59 | ||
60 | #define S5PV210_PA_CFCON 0xE8200000 | 60 | #define S5PV210_PA_CFCON 0xE8200000 |
61 | 61 | ||
62 | #define S5PV210_PA_MFC 0xF1700000 | ||
63 | |||
62 | #define S5PV210_PA_HSMMC(x) (0xEB000000 + ((x) * 0x100000)) | 64 | #define S5PV210_PA_HSMMC(x) (0xEB000000 + ((x) * 0x100000)) |
63 | 65 | ||
64 | #define S5PV210_PA_HSOTG 0xEC000000 | 66 | #define S5PV210_PA_HSOTG 0xEC000000 |
@@ -107,6 +109,7 @@ | |||
107 | #define S5P_PA_FIMC1 S5PV210_PA_FIMC1 | 109 | #define S5P_PA_FIMC1 S5PV210_PA_FIMC1 |
108 | #define S5P_PA_FIMC2 S5PV210_PA_FIMC2 | 110 | #define S5P_PA_FIMC2 S5PV210_PA_FIMC2 |
109 | #define S5P_PA_MIPI_CSIS0 S5PV210_PA_MIPI_CSIS | 111 | #define S5P_PA_MIPI_CSIS0 S5PV210_PA_MIPI_CSIS |
112 | #define S5P_PA_MFC S5PV210_PA_MFC | ||
110 | #define S5P_PA_ONENAND S5PC110_PA_ONENAND | 113 | #define S5P_PA_ONENAND S5PC110_PA_ONENAND |
111 | #define S5P_PA_ONENAND_DMA S5PC110_PA_ONENAND_DMA | 114 | #define S5P_PA_ONENAND_DMA S5PC110_PA_ONENAND_DMA |
112 | #define S5P_PA_SDRAM S5PV210_PA_SDRAM | 115 | #define S5P_PA_SDRAM S5PV210_PA_SDRAM |
diff --git a/arch/arm/mach-s5pv210/include/mach/pm-core.h b/arch/arm/mach-s5pv210/include/mach/pm-core.h index e8d394f8b057..3e22109e1b7b 100644 --- a/arch/arm/mach-s5pv210/include/mach/pm-core.h +++ b/arch/arm/mach-s5pv210/include/mach/pm-core.h | |||
@@ -41,3 +41,6 @@ static inline void s3c_pm_arch_update_uart(void __iomem *regs, | |||
41 | { | 41 | { |
42 | /* nothing here yet */ | 42 | /* nothing here yet */ |
43 | } | 43 | } |
44 | |||
45 | static inline void s3c_pm_restored_gpios(void) { } | ||
46 | static inline void s3c_pm_saved_gpios(void) { } | ||
diff --git a/arch/arm/mach-s5pv210/include/mach/regs-audss.h b/arch/arm/mach-s5pv210/include/mach/regs-audss.h new file mode 100644 index 000000000000..eacc1f790807 --- /dev/null +++ b/arch/arm/mach-s5pv210/include/mach/regs-audss.h | |||
@@ -0,0 +1,18 @@ | |||
1 | /* arch/arm/mach-s5pv210/include/mach/regs-audss.h | ||
2 | * | ||
3 | * Copyright (c) 2011 Samsung Electronics | ||
4 | * http://www.samsung.com | ||
5 | * | ||
6 | * S5PV210 Audio SubSystem clock register definitions | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #ifndef __PLAT_REGS_AUDSS_H | ||
14 | #define __PLAT_REGS_AUDSS_H __FILE__ | ||
15 | |||
16 | #define S5PV210_AUDSS_INT_MEM (0xC0000000) | ||
17 | |||
18 | #endif /* _PLAT_REGS_AUDSS_H */ | ||
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c index e0c4d06b9db6..85c2d51a0956 100644 --- a/arch/arm/mach-s5pv210/mach-goni.c +++ b/arch/arm/mach-s5pv210/mach-goni.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include <plat/sdhci.h> | 46 | #include <plat/sdhci.h> |
47 | #include <plat/clock.h> | 47 | #include <plat/clock.h> |
48 | #include <plat/s5p-time.h> | 48 | #include <plat/s5p-time.h> |
49 | #include <plat/mfc.h> | ||
49 | #include <plat/regs-fb-v4.h> | 50 | #include <plat/regs-fb-v4.h> |
50 | 51 | ||
51 | /* Following are default values for UCON, ULCON and UFCON UART registers */ | 52 | /* Following are default values for UCON, ULCON and UFCON UART registers */ |
@@ -808,6 +809,9 @@ static struct platform_device *goni_devices[] __initdata = { | |||
808 | &goni_i2c_gpio5, | 809 | &goni_i2c_gpio5, |
809 | &mmc2_fixed_voltage, | 810 | &mmc2_fixed_voltage, |
810 | &goni_device_gpiokeys, | 811 | &goni_device_gpiokeys, |
812 | &s5p_device_mfc, | ||
813 | &s5p_device_mfc_l, | ||
814 | &s5p_device_mfc_r, | ||
811 | &s3c_device_i2c0, | 815 | &s3c_device_i2c0, |
812 | &s5p_device_fimc0, | 816 | &s5p_device_fimc0, |
813 | &s5p_device_fimc1, | 817 | &s5p_device_fimc1, |
@@ -841,6 +845,11 @@ static void __init goni_map_io(void) | |||
841 | s5p_set_timer_source(S5P_PWM3, S5P_PWM4); | 845 | s5p_set_timer_source(S5P_PWM3, S5P_PWM4); |
842 | } | 846 | } |
843 | 847 | ||
848 | static void __init goni_reserve(void) | ||
849 | { | ||
850 | s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20); | ||
851 | } | ||
852 | |||
844 | static void __init goni_machine_init(void) | 853 | static void __init goni_machine_init(void) |
845 | { | 854 | { |
846 | /* Radio: call before I2C 1 registeration */ | 855 | /* Radio: call before I2C 1 registeration */ |
@@ -893,4 +902,5 @@ MACHINE_START(GONI, "GONI") | |||
893 | .map_io = goni_map_io, | 902 | .map_io = goni_map_io, |
894 | .init_machine = goni_machine_init, | 903 | .init_machine = goni_machine_init, |
895 | .timer = &s5p_timer, | 904 | .timer = &s5p_timer, |
905 | .reserve = &goni_reserve, | ||
896 | MACHINE_END | 906 | MACHINE_END |
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c index ef20f922249d..5e011fc6720d 100644 --- a/arch/arm/mach-s5pv210/mach-smdkv210.c +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c | |||
@@ -229,6 +229,7 @@ static struct platform_device *smdkv210_devices[] __initdata = { | |||
229 | &s5pv210_device_iis0, | 229 | &s5pv210_device_iis0, |
230 | &s5pv210_device_spdif, | 230 | &s5pv210_device_spdif, |
231 | &samsung_asoc_dma, | 231 | &samsung_asoc_dma, |
232 | &samsung_asoc_idma, | ||
232 | &samsung_device_keypad, | 233 | &samsung_device_keypad, |
233 | &smdkv210_dm9000, | 234 | &smdkv210_dm9000, |
234 | &smdkv210_lcd_lte480wv, | 235 | &smdkv210_lcd_lte480wv, |