aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLukasz Majewski <l.majewski@samsung.com>2012-05-12 19:27:33 -0400
committerKukjin Kim <kgene.kim@samsung.com>2012-05-16 09:32:13 -0400
commit3a36dd068f4308461661d28e8e14e11e426eba6b (patch)
tree9e1f4422cf47bbeb426ffb25d4dee65c4a457dc2 /arch/arm
parent8d07dbb9e862832a6ecd4dfd98aa9e74aedc6159 (diff)
ARM: EXYNOS: Add s3c-hsotg device support for Universal C210 board
This patch adds platform data for using S3C-HSOTG driver at Universal_C210 target. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-exynos/Kconfig2
-rw-r--r--arch/arm/mach-exynos/mach-universal_c210.c10
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index cbe0dad6c05..a6a6a9417a0 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -250,6 +250,7 @@ config MACH_UNIVERSAL_C210
250 select S3C_DEV_I2C1 250 select S3C_DEV_I2C1
251 select S3C_DEV_I2C3 251 select S3C_DEV_I2C3
252 select S3C_DEV_I2C5 252 select S3C_DEV_I2C5
253 select S3C_DEV_USB_HSOTG
253 select S5P_DEV_I2C_HDMIPHY 254 select S5P_DEV_I2C_HDMIPHY
254 select S5P_DEV_MFC 255 select S5P_DEV_MFC
255 select S5P_DEV_ONENAND 256 select S5P_DEV_ONENAND
@@ -262,6 +263,7 @@ config MACH_UNIVERSAL_C210
262 select EXYNOS4_SETUP_SDHCI 263 select EXYNOS4_SETUP_SDHCI
263 select EXYNOS4_SETUP_FIMC 264 select EXYNOS4_SETUP_FIMC
264 select S5P_SETUP_MIPIPHY 265 select S5P_SETUP_MIPIPHY
266 select EXYNOS4_SETUP_USB_PHY
265 help 267 help
266 Machine support for Samsung Mobile Universal S5PC210 Reference 268 Machine support for Samsung Mobile Universal S5PC210 Reference
267 Board. 269 Board.
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index a34036eb8ba..620f05341eb 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -205,6 +205,7 @@ static struct regulator_init_data lp3974_ldo2_data = {
205}; 205};
206 206
207static struct regulator_consumer_supply lp3974_ldo3_consumer[] = { 207static struct regulator_consumer_supply lp3974_ldo3_consumer[] = {
208 REGULATOR_SUPPLY("vusb_a", "s3c-hsotg"),
208 REGULATOR_SUPPLY("vdd", "exynos4-hdmi"), 209 REGULATOR_SUPPLY("vdd", "exynos4-hdmi"),
209 REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"), 210 REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"),
210 REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), 211 REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"),
@@ -290,6 +291,7 @@ static struct regulator_init_data lp3974_ldo7_data = {
290}; 291};
291 292
292static struct regulator_consumer_supply lp3974_ldo8_consumer[] = { 293static struct regulator_consumer_supply lp3974_ldo8_consumer[] = {
294 REGULATOR_SUPPLY("vusb_d", "s3c-hsotg"),
293 REGULATOR_SUPPLY("vdd33a_dac", "s5p-sdo"), 295 REGULATOR_SUPPLY("vdd33a_dac", "s5p-sdo"),
294}; 296};
295 297
@@ -486,7 +488,10 @@ static struct regulator_init_data lp3974_vichg_data = {
486static struct regulator_init_data lp3974_esafeout1_data = { 488static struct regulator_init_data lp3974_esafeout1_data = {
487 .constraints = { 489 .constraints = {
488 .name = "SAFEOUT1", 490 .name = "SAFEOUT1",
491 .min_uV = 4800000,
492 .max_uV = 4800000,
489 .valid_ops_mask = REGULATOR_CHANGE_STATUS, 493 .valid_ops_mask = REGULATOR_CHANGE_STATUS,
494 .always_on = 1,
490 .state_mem = { 495 .state_mem = {
491 .enabled = 1, 496 .enabled = 1,
492 }, 497 },
@@ -994,6 +999,9 @@ static struct gpio universal_camera_gpios[] = {
994 { GPIO_CAM_VGA_NSTBY, GPIOF_OUT_INIT_LOW, "CAM_VGA_NSTBY" }, 999 { GPIO_CAM_VGA_NSTBY, GPIOF_OUT_INIT_LOW, "CAM_VGA_NSTBY" },
995}; 1000};
996 1001
1002/* USB OTG */
1003static struct s3c_hsotg_plat universal_hsotg_pdata;
1004
997static void __init universal_camera_init(void) 1005static void __init universal_camera_init(void)
998{ 1006{
999 s3c_set_platdata(&mipi_csis_platdata, sizeof(mipi_csis_platdata), 1007 s3c_set_platdata(&mipi_csis_platdata, sizeof(mipi_csis_platdata),
@@ -1049,6 +1057,7 @@ static struct platform_device *universal_devices[] __initdata = {
1049 &s5p_device_onenand, 1057 &s5p_device_onenand,
1050 &s5p_device_fimd0, 1058 &s5p_device_fimd0,
1051 &s5p_device_jpeg, 1059 &s5p_device_jpeg,
1060 &s3c_device_usb_hsotg,
1052 &s5p_device_mfc, 1061 &s5p_device_mfc,
1053 &s5p_device_mfc_l, 1062 &s5p_device_mfc_l,
1054 &s5p_device_mfc_r, 1063 &s5p_device_mfc_r,
@@ -1102,6 +1111,7 @@ static void __init universal_machine_init(void)
1102 i2c_register_board_info(I2C_GPIO_BUS_12, i2c_gpio12_devs, 1111 i2c_register_board_info(I2C_GPIO_BUS_12, i2c_gpio12_devs,
1103 ARRAY_SIZE(i2c_gpio12_devs)); 1112 ARRAY_SIZE(i2c_gpio12_devs));
1104 1113
1114 s3c_hsotg_set_platdata(&universal_hsotg_pdata);
1105 universal_camera_init(); 1115 universal_camera_init();
1106 1116
1107 /* Last */ 1117 /* Last */