# CONFIG_SENSORS_MAX1619 is not set
# CONFIG_SENSORS_MAX6639 is not set
# CONFIG_SENSORS_MAX6642 is not set
-# CONFIG_SENSORS_MAX17135 is not set
+CONFIG_SENSORS_MAX17135=y
# CONFIG_SENSORS_MAX6650 is not set
# CONFIG_SENSORS_PC87360 is not set
# CONFIG_SENSORS_PC87427 is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_SYS_FOPS is not set
# CONFIG_FB_WMT_GE_ROPS is not set
+CONFIG_FB_DEFERRED_IO=y
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
# CONFIG_FB_MXC_CH7026 is not set
# CONFIG_FB_MXC_TVOUT_CH7024 is not set
# CONFIG_FB_MXC_ASYNC_PANEL is not set
-# CONFIG_FB_MXC_EINK_PANEL is not set
+CONFIG_FB_MXC_EINK_PANEL=y
+# CONFIG_FB_MXC_EINK_AUTO_UPDATE_MODE is not set
# CONFIG_FB_MXC_ELCDIF_FB is not set
CONFIG_FB_MXC_HDMI=y
extern struct regulator *(*get_cpu_regulator)(void);
extern void (*put_cpu_regulator)(void);
extern char *gp_reg_id;
+extern int epdc_enabled;
extern void mx6_cpu_regulator_init(void);
static int max17135_regulator_init(struct max17135 *max17135);
struct max17135_platform_data *pdata = &max17135_pdata;
int i, ret;
+ if (!epdc_enabled) {
+ printk(KERN_DEBUG
+ "max17135_regulator_init abort: EPDC not enabled\n");
+ return 0;
+ }
+
max17135->gvee_pwrup = pdata->gvee_pwrup;
max17135->vneg_pwrup = pdata->vneg_pwrup;
max17135->vpos_pwrup = pdata->vpos_pwrup;
imx6q_add_perfmon(2);
imx6q_add_mlb150(&mx6_arm2_mlb150_data);
- if (cpu_is_mx6dl()) {
+ if (cpu_is_mx6dl() && epdc_enabled) {
imx6dl_add_imx_pxp();
imx6dl_add_imx_pxp_client();
mxc_register_device(&max17135_sensor_device, NULL);
* parameters, in order to set the EPDC parent clock to the Video PLL.
* This will have an impact on the behavior of HDMI and LVDS.
*/
-static int epdc_use_video_pll;
-static int __init epdc_clk_setup(char *__unused)
+int epdc_enabled;
+static int __init epdc_setup(char *__unused)
{
- epdc_use_video_pll = 1;
+ epdc_enabled = 1;
return 1;
}
-__setup("epdc", epdc_clk_setup);
+__setup("epdc", epdc_setup);
static void __calc_pre_post_dividers(u32 max_podf, u32 div, u32 *pre, u32 *post)
{
}
if (cpu_is_mx6dl()) {
- if (epdc_use_video_pll)
+ if (epdc_enabled)
clk_set_parent(&ipu2_di_clk[1], &pll5_video_main_clk);
else
clk_set_parent(&ipu2_di_clk[1], &pll3_pfd_540M);