|
@@ -351,6 +351,7 @@ static struct regulator_consumer_supply __initdata max8997_ldo1_[] = {
|
|
|
REGULATOR_SUPPLY("vdd", "s5p-adc"), /* Used by CPU's ADC drv */
|
|
|
};
|
|
|
static struct regulator_consumer_supply __initdata max8997_ldo3_[] = {
|
|
|
+ REGULATOR_SUPPLY("vusb_d", "s3c-hsotg"), /* USB */
|
|
|
REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), /* MIPI */
|
|
|
};
|
|
|
static struct regulator_consumer_supply __initdata max8997_ldo4_[] = {
|
|
@@ -366,7 +367,7 @@ static struct regulator_consumer_supply __initdata max8997_ldo7_[] = {
|
|
|
REGULATOR_SUPPLY("dig_18", "0-001f"), /* HCD803 */
|
|
|
};
|
|
|
static struct regulator_consumer_supply __initdata max8997_ldo8_[] = {
|
|
|
- REGULATOR_SUPPLY("vusb_d", NULL), /* Used by CPU */
|
|
|
+ REGULATOR_SUPPLY("vusb_a", "s3c-hsotg"), /* USB */
|
|
|
REGULATOR_SUPPLY("vdac", NULL), /* Used by CPU */
|
|
|
};
|
|
|
static struct regulator_consumer_supply __initdata max8997_ldo11_[] = {
|
|
@@ -822,6 +823,7 @@ static struct regulator_init_data __initdata max8997_esafeout1_data = {
|
|
|
.constraints = {
|
|
|
.name = "SAFEOUT1",
|
|
|
.valid_ops_mask = REGULATOR_CHANGE_STATUS,
|
|
|
+ .always_on = 1,
|
|
|
.state_mem = {
|
|
|
.disabled = 1,
|
|
|
},
|
|
@@ -1079,6 +1081,9 @@ static void __init nuri_ehci_init(void)
|
|
|
s5p_ehci_set_platdata(pdata);
|
|
|
}
|
|
|
|
|
|
+/* USB OTG */
|
|
|
+static struct s3c_hsotg_plat nuri_hsotg_pdata;
|
|
|
+
|
|
|
/* CAMERA */
|
|
|
static struct regulator_consumer_supply cam_vt_cam15_supply =
|
|
|
REGULATOR_SUPPLY("vdd_core", "6-003c");
|
|
@@ -1291,6 +1296,7 @@ static struct platform_device *nuri_devices[] __initdata = {
|
|
|
&s5p_device_mfc_l,
|
|
|
&s5p_device_mfc_r,
|
|
|
&s5p_device_fimc_md,
|
|
|
+ &s3c_device_usb_hsotg,
|
|
|
|
|
|
/* NURI Devices */
|
|
|
&nuri_gpio_keys,
|
|
@@ -1339,6 +1345,7 @@ static void __init nuri_machine_init(void)
|
|
|
nuri_camera_init();
|
|
|
|
|
|
nuri_ehci_init();
|
|
|
+ s3c_hsotg_set_platdata(&nuri_hsotg_pdata);
|
|
|
|
|
|
/* Last */
|
|
|
platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices));
|