Merge branch 'next-s5p' into for-next (4dbe8460) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/mach-s5pv210/mach-aquila.c

+17 −35

Original line number	Original line	Diff line number	Diff line
	@@ -296,13 +296,11 @@ static struct regulator_init_data aquila_ldo17_data = {
	};		};

	/* BUCK */		/* BUCK */
	static struct regulator_consumer_supply buck1_consumer[] = {		static struct regulator_consumer_supply buck1_consumer =
	{ .supply = "vddarm", },		REGULATOR_SUPPLY("vddarm", NULL);
	};

	static struct regulator_consumer_supply buck2_consumer[] = {		static struct regulator_consumer_supply buck2_consumer =
	{ .supply = "vddint", },		REGULATOR_SUPPLY("vddint", NULL);
	};

	static struct regulator_init_data aquila_buck1_data = {		static struct regulator_init_data aquila_buck1_data = {
	.constraints = {		.constraints = {
	@@ -313,8 +311,8 @@ static struct regulator_init_data aquila_buck1_data = {
	.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE \|		.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE \|
	REGULATOR_CHANGE_STATUS,		REGULATOR_CHANGE_STATUS,
	},		},
	.num_consumer_supplies = ARRAY_SIZE(buck1_consumer),		.num_consumer_supplies = 1,
	.consumer_supplies = buck1_consumer,		.consumer_supplies = &buck1_consumer,
	};		};

	static struct regulator_init_data aquila_buck2_data = {		static struct regulator_init_data aquila_buck2_data = {
	@@ -326,8 +324,8 @@ static struct regulator_init_data aquila_buck2_data = {
	.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE \|		.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE \|
	REGULATOR_CHANGE_STATUS,		REGULATOR_CHANGE_STATUS,
	},		},
	.num_consumer_supplies = ARRAY_SIZE(buck2_consumer),		.num_consumer_supplies = 1,
	.consumer_supplies = buck2_consumer,		.consumer_supplies = &buck2_consumer,
	};		};

	static struct regulator_init_data aquila_buck3_data = {		static struct regulator_init_data aquila_buck3_data = {
	@@ -391,26 +389,14 @@ static struct max8998_platform_data aquila_max8998_pdata = {
	#endif		#endif

	static struct regulator_consumer_supply wm8994_fixed_voltage0_supplies[] = {		static struct regulator_consumer_supply wm8994_fixed_voltage0_supplies[] = {
	{		REGULATOR_SUPPLY("DBVDD", "5-001a"),
	.dev_name = "5-001a",		REGULATOR_SUPPLY("AVDD2", "5-001a"),
	.supply = "DBVDD",		REGULATOR_SUPPLY("CPVDD", "5-001a"),
	}, {
	.dev_name = "5-001a",
	.supply = "AVDD2",
	}, {
	.dev_name = "5-001a",
	.supply = "CPVDD",
	},
	};		};

	static struct regulator_consumer_supply wm8994_fixed_voltage1_supplies[] = {		static struct regulator_consumer_supply wm8994_fixed_voltage1_supplies[] = {
	{		REGULATOR_SUPPLY("SPKVDD1", "5-001a"),
	.dev_name = "5-001a",		REGULATOR_SUPPLY("SPKVDD2", "5-001a"),
	.supply = "SPKVDD1",
	}, {
	.dev_name = "5-001a",
	.supply = "SPKVDD2",
	},
	};		};

	static struct regulator_init_data wm8994_fixed_voltage0_init_data = {		static struct regulator_init_data wm8994_fixed_voltage0_init_data = {
	@@ -459,15 +445,11 @@ static struct platform_device wm8994_fixed_voltage1 = {
	},		},
	};		};

	static struct regulator_consumer_supply wm8994_avdd1_supply = {		static struct regulator_consumer_supply wm8994_avdd1_supply =
	.dev_name = "5-001a",		REGULATOR_SUPPLY("AVDD1", "5-001a");
	.supply = "AVDD1",
	};

	static struct regulator_consumer_supply wm8994_dcvdd_supply = {		static struct regulator_consumer_supply wm8994_dcvdd_supply =
	.dev_name = "5-001a",		REGULATOR_SUPPLY("DCVDD", "5-001a");
	.supply = "DCVDD",
	};

	static struct regulator_init_data wm8994_ldo1_data = {		static struct regulator_init_data wm8994_ldo1_data = {
	.constraints = {		.constraints = {

arch/arm/mach-s5pv210/mach-goni.c

+59 −44

Original line number	Original line	Diff line number	Diff line
	@@ -108,6 +108,8 @@ static struct s3c_fb_pd_win goni_fb_win0 = {
	},		},
	.max_bpp = 32,		.max_bpp = 32,
	.default_bpp = 16,		.default_bpp = 16,
			.virtual_x = 480,
			.virtual_y = 2 * 800,
	};		};

	static struct s3c_fb_platdata goni_lcd_pdata __initdata = {		static struct s3c_fb_platdata goni_lcd_pdata __initdata = {
	@@ -269,10 +271,30 @@ static void __init goni_tsp_init(void)
	/* MAX8998 regulators */		/* MAX8998 regulators */
	#if defined(CONFIG_REGULATOR_MAX8998) \|\| defined(CONFIG_REGULATOR_MAX8998_MODULE)		#if defined(CONFIG_REGULATOR_MAX8998) \|\| defined(CONFIG_REGULATOR_MAX8998_MODULE)

			static struct regulator_consumer_supply goni_ldo3_consumers[] = {
			REGULATOR_SUPPLY("vusb_a", "s3c-hsotg"),
			};

	static struct regulator_consumer_supply goni_ldo5_consumers[] = {		static struct regulator_consumer_supply goni_ldo5_consumers[] = {
	REGULATOR_SUPPLY("vmmc", "s3c-sdhci.0"),		REGULATOR_SUPPLY("vmmc", "s3c-sdhci.0"),
	};		};

			static struct regulator_consumer_supply goni_ldo8_consumers[] = {
			REGULATOR_SUPPLY("vusb_d", "s3c-hsotg"),
			};

			static struct regulator_consumer_supply goni_ldo11_consumers[] = {
			REGULATOR_SUPPLY("vddio", "0-0030"), /* "CAM_IO_2.8V" */
			};

			static struct regulator_consumer_supply goni_ldo13_consumers[] = {
			REGULATOR_SUPPLY("vdda", "0-0030"), /* "CAM_A_2.8V" */
			};

			static struct regulator_consumer_supply goni_ldo14_consumers[] = {
			REGULATOR_SUPPLY("vdd_core", "0-0030"), /* "CAM_CIF_1.8V" */
			};

	static struct regulator_init_data goni_ldo2_data = {		static struct regulator_init_data goni_ldo2_data = {
	.constraints = {		.constraints = {
	.name = "VALIVE_1.1V",		.name = "VALIVE_1.1V",
	@@ -292,8 +314,10 @@ static struct regulator_init_data goni_ldo3_data = {
	.min_uV = 1100000,		.min_uV = 1100000,
	.max_uV = 1100000,		.max_uV = 1100000,
	.apply_uV = 1,		.apply_uV = 1,
	.always_on = 1,		.valid_ops_mask = REGULATOR_CHANGE_STATUS,
	},		},
			.num_consumer_supplies = ARRAY_SIZE(goni_ldo3_consumers),
			.consumer_supplies = goni_ldo3_consumers,
	};		};

	static struct regulator_init_data goni_ldo4_data = {		static struct regulator_init_data goni_ldo4_data = {
	@@ -311,6 +335,7 @@ static struct regulator_init_data goni_ldo5_data = {
	.min_uV = 2800000,		.min_uV = 2800000,
	.max_uV = 2800000,		.max_uV = 2800000,
	.apply_uV = 1,		.apply_uV = 1,
			.valid_ops_mask = REGULATOR_CHANGE_STATUS,
	},		},
	.num_consumer_supplies = ARRAY_SIZE(goni_ldo5_consumers),		.num_consumer_supplies = ARRAY_SIZE(goni_ldo5_consumers),
	.consumer_supplies = goni_ldo5_consumers,		.consumer_supplies = goni_ldo5_consumers,
	@@ -341,8 +366,10 @@ static struct regulator_init_data goni_ldo8_data = {
	.min_uV = 3300000,		.min_uV = 3300000,
	.max_uV = 3300000,		.max_uV = 3300000,
	.apply_uV = 1,		.apply_uV = 1,
	.always_on = 1,		.valid_ops_mask = REGULATOR_CHANGE_STATUS,
	},		},
			.num_consumer_supplies = ARRAY_SIZE(goni_ldo8_consumers),
			.consumer_supplies = goni_ldo8_consumers,
	};		};

	static struct regulator_init_data goni_ldo9_data = {		static struct regulator_init_data goni_ldo9_data = {
	@@ -351,7 +378,6 @@ static struct regulator_init_data goni_ldo9_data = {
	.min_uV = 2800000,		.min_uV = 2800000,
	.max_uV = 2800000,		.max_uV = 2800000,
	.apply_uV = 1,		.apply_uV = 1,
	.always_on = 1,
	},		},
	};		};

	@@ -371,8 +397,10 @@ static struct regulator_init_data goni_ldo11_data = {
	.min_uV = 2800000,		.min_uV = 2800000,
	.max_uV = 2800000,		.max_uV = 2800000,
	.apply_uV = 1,		.apply_uV = 1,
	.always_on = 1,		.valid_ops_mask = REGULATOR_CHANGE_STATUS,
	},		},
			.num_consumer_supplies = ARRAY_SIZE(goni_ldo11_consumers),
			.consumer_supplies = goni_ldo11_consumers,
	};		};

	static struct regulator_init_data goni_ldo12_data = {		static struct regulator_init_data goni_ldo12_data = {
	@@ -381,7 +409,6 @@ static struct regulator_init_data goni_ldo12_data = {
	.min_uV = 1200000,		.min_uV = 1200000,
	.max_uV = 1200000,		.max_uV = 1200000,
	.apply_uV = 1,		.apply_uV = 1,
	.always_on = 1,
	},		},
	};		};

	@@ -391,8 +418,10 @@ static struct regulator_init_data goni_ldo13_data = {
	.min_uV = 2800000,		.min_uV = 2800000,
	.max_uV = 2800000,		.max_uV = 2800000,
	.apply_uV = 1,		.apply_uV = 1,
	.always_on = 1,		.valid_ops_mask = REGULATOR_CHANGE_STATUS,
	},		},
			.num_consumer_supplies = ARRAY_SIZE(goni_ldo13_consumers),
			.consumer_supplies = goni_ldo13_consumers,
	};		};

	static struct regulator_init_data goni_ldo14_data = {		static struct regulator_init_data goni_ldo14_data = {
	@@ -401,8 +430,10 @@ static struct regulator_init_data goni_ldo14_data = {
	.min_uV = 1800000,		.min_uV = 1800000,
	.max_uV = 1800000,		.max_uV = 1800000,
	.apply_uV = 1,		.apply_uV = 1,
	.always_on = 1,		.valid_ops_mask = REGULATOR_CHANGE_STATUS,
	},		},
			.num_consumer_supplies = ARRAY_SIZE(goni_ldo14_consumers),
			.consumer_supplies = goni_ldo14_consumers,
	};		};

	static struct regulator_init_data goni_ldo15_data = {		static struct regulator_init_data goni_ldo15_data = {
	@@ -411,7 +442,6 @@ static struct regulator_init_data goni_ldo15_data = {
	.min_uV = 3300000,		.min_uV = 3300000,
	.max_uV = 3300000,		.max_uV = 3300000,
	.apply_uV = 1,		.apply_uV = 1,
	.always_on = 1,
	},		},
	};		};

	@@ -421,7 +451,6 @@ static struct regulator_init_data goni_ldo16_data = {
	.min_uV = 1800000,		.min_uV = 1800000,
	.max_uV = 1800000,		.max_uV = 1800000,
	.apply_uV = 1,		.apply_uV = 1,
	.always_on = 1,
	},		},
	};		};

	@@ -436,13 +465,11 @@ static struct regulator_init_data goni_ldo17_data = {
	};		};

	/* BUCK */		/* BUCK */
	static struct regulator_consumer_supply buck1_consumer[] = {		static struct regulator_consumer_supply buck1_consumer =
	{ .supply = "vddarm", },		REGULATOR_SUPPLY("vddarm", NULL);
	};

	static struct regulator_consumer_supply buck2_consumer[] = {		static struct regulator_consumer_supply buck2_consumer =
	{ .supply = "vddint", },		REGULATOR_SUPPLY("vddint", NULL);
	};

	static struct regulator_init_data goni_buck1_data = {		static struct regulator_init_data goni_buck1_data = {
	.constraints = {		.constraints = {
	@@ -453,8 +480,8 @@ static struct regulator_init_data goni_buck1_data = {
	.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE \|		.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE \|
	REGULATOR_CHANGE_STATUS,		REGULATOR_CHANGE_STATUS,
	},		},
	.num_consumer_supplies = ARRAY_SIZE(buck1_consumer),		.num_consumer_supplies = 1,
	.consumer_supplies = buck1_consumer,		.consumer_supplies = &buck1_consumer,
	};		};

	static struct regulator_init_data goni_buck2_data = {		static struct regulator_init_data goni_buck2_data = {
	@@ -466,8 +493,8 @@ static struct regulator_init_data goni_buck2_data = {
	.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE \|		.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE \|
	REGULATOR_CHANGE_STATUS,		REGULATOR_CHANGE_STATUS,
	},		},
	.num_consumer_supplies = ARRAY_SIZE(buck2_consumer),		.num_consumer_supplies = 1,
	.consumer_supplies = buck2_consumer,		.consumer_supplies = &buck2_consumer,
	};		};

	static struct regulator_init_data goni_buck3_data = {		static struct regulator_init_data goni_buck3_data = {
	@@ -531,26 +558,14 @@ static struct max8998_platform_data goni_max8998_pdata = {
	#endif		#endif

	static struct regulator_consumer_supply wm8994_fixed_voltage0_supplies[] = {		static struct regulator_consumer_supply wm8994_fixed_voltage0_supplies[] = {
	{		REGULATOR_SUPPLY("DBVDD", "5-001a"),
	.dev_name = "5-001a",		REGULATOR_SUPPLY("AVDD2", "5-001a"),
	.supply = "DBVDD",		REGULATOR_SUPPLY("CPVDD", "5-001a"),
	}, {
	.dev_name = "5-001a",
	.supply = "AVDD2",
	}, {
	.dev_name = "5-001a",
	.supply = "CPVDD",
	},
	};		};

	static struct regulator_consumer_supply wm8994_fixed_voltage1_supplies[] = {		static struct regulator_consumer_supply wm8994_fixed_voltage1_supplies[] = {
	{		REGULATOR_SUPPLY("SPKVDD1", "5-001a"),
	.dev_name = "5-001a",		REGULATOR_SUPPLY("SPKVDD2", "5-001a"),
	.supply = "SPKVDD1",
	}, {
	.dev_name = "5-001a",
	.supply = "SPKVDD2",
	},
	};		};

	static struct regulator_init_data wm8994_fixed_voltage0_init_data = {		static struct regulator_init_data wm8994_fixed_voltage0_init_data = {
	@@ -599,15 +614,11 @@ static struct platform_device wm8994_fixed_voltage1 = {
	},		},
	};		};

	static struct regulator_consumer_supply wm8994_avdd1_supply = {		static struct regulator_consumer_supply wm8994_avdd1_supply =
	.dev_name = "5-001a",		REGULATOR_SUPPLY("AVDD1", "5-001a");
	.supply = "AVDD1",
	};

	static struct regulator_consumer_supply wm8994_dcvdd_supply = {		static struct regulator_consumer_supply wm8994_dcvdd_supply =
	.dev_name = "5-001a",		REGULATOR_SUPPLY("DCVDD", "5-001a");
	.supply = "DCVDD",
	};

	static struct regulator_init_data wm8994_ldo1_data = {		static struct regulator_init_data wm8994_ldo1_data = {
	.constraints = {		.constraints = {
	@@ -794,6 +805,7 @@ static struct platform_device *goni_devices[] __initdata = {
	&goni_i2c_gpio5,		&goni_i2c_gpio5,
	&mmc2_fixed_voltage,		&mmc2_fixed_voltage,
	&goni_device_gpiokeys,		&goni_device_gpiokeys,
			&s3c_device_i2c0,
	&s5p_device_fimc0,		&s5p_device_fimc0,
	&s5p_device_fimc1,		&s5p_device_fimc1,
	&s5p_device_fimc2,		&s5p_device_fimc2,
	@@ -830,6 +842,9 @@ static void __init goni_machine_init(void)
	/* Radio: call before I2C 1 registeration */		/* Radio: call before I2C 1 registeration */
	goni_radio_init();		goni_radio_init();

			/* I2C0 */
			s3c_i2c0_set_platdata(NULL);

	/* I2C1 */		/* I2C1 */
	s3c_i2c1_set_platdata(NULL);		s3c_i2c1_set_platdata(NULL);
	i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs));		i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs));