diff options
Diffstat (limited to 'arch/arm/mach-exynos/mach-nuri.c')
-rw-r--r-- | arch/arm/mach-exynos/mach-nuri.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c index 85fc2feb0af0..c05d7aa84031 100644 --- a/arch/arm/mach-exynos/mach-nuri.c +++ b/arch/arm/mach-exynos/mach-nuri.c | |||
@@ -378,10 +378,10 @@ static struct regulator_consumer_supply __initdata max8997_ldo1_[] = { | |||
378 | }; | 378 | }; |
379 | static struct regulator_consumer_supply __initdata max8997_ldo3_[] = { | 379 | static struct regulator_consumer_supply __initdata max8997_ldo3_[] = { |
380 | REGULATOR_SUPPLY("vusb_d", "s3c-hsotg"), /* USB */ | 380 | REGULATOR_SUPPLY("vusb_d", "s3c-hsotg"), /* USB */ |
381 | REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), /* MIPI */ | 381 | REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"), /* MIPI */ |
382 | }; | 382 | }; |
383 | static struct regulator_consumer_supply __initdata max8997_ldo4_[] = { | 383 | static struct regulator_consumer_supply __initdata max8997_ldo4_[] = { |
384 | REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"), /* MIPI */ | 384 | REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"), /* MIPI */ |
385 | }; | 385 | }; |
386 | static struct regulator_consumer_supply __initdata max8997_ldo5_[] = { | 386 | static struct regulator_consumer_supply __initdata max8997_ldo5_[] = { |
387 | REGULATOR_SUPPLY("vhsic", "modemctl"), /* MODEM */ | 387 | REGULATOR_SUPPLY("vhsic", "modemctl"), /* MODEM */ |
@@ -1180,9 +1180,7 @@ static struct platform_device cam_8m_12v_fixed_rdev = { | |||
1180 | static struct s5p_platform_mipi_csis mipi_csis_platdata = { | 1180 | static struct s5p_platform_mipi_csis mipi_csis_platdata = { |
1181 | .clk_rate = 166000000UL, | 1181 | .clk_rate = 166000000UL, |
1182 | .lanes = 2, | 1182 | .lanes = 2, |
1183 | .alignment = 32, | ||
1184 | .hs_settle = 12, | 1183 | .hs_settle = 12, |
1185 | .phy_enable = s5p_csis_phy_enable, | ||
1186 | }; | 1184 | }; |
1187 | 1185 | ||
1188 | #define GPIO_CAM_MEGA_RST EXYNOS4_GPY3(7) /* ISP_RESET */ | 1186 | #define GPIO_CAM_MEGA_RST EXYNOS4_GPY3(7) /* ISP_RESET */ |
@@ -1226,7 +1224,6 @@ static struct s5p_fimc_isp_info nuri_camera_sensors[] = { | |||
1226 | .bus_type = FIMC_MIPI_CSI2, | 1224 | .bus_type = FIMC_MIPI_CSI2, |
1227 | .board_info = &m5mols_board_info, | 1225 | .board_info = &m5mols_board_info, |
1228 | .clk_frequency = 24000000UL, | 1226 | .clk_frequency = 24000000UL, |
1229 | .csi_data_align = 32, | ||
1230 | }, | 1227 | }, |
1231 | }; | 1228 | }; |
1232 | 1229 | ||