Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c21ab56 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: qcs405: Enable FB driver for qcs405"

parents 81ad066a 4a1c0947

arch/arm/configs/qcs405_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -300,6 +300,11 @@ CONFIG_V4L_PLATFORM_DRIVERS=y 
CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_PLATFORM=y

CONFIG_FB=y

CONFIG_FB_MSM=y

CONFIG_FB_MSM_MDSS=y

CONFIG_FB_MSM_MDSS_WRITEBACK=y

CONFIG_FB_MSM_MDSS_DSI_CTRL_STATUS=y

CONFIG_FB_MSM_MDSS_XLOG_DEBUG=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_SOUND=y

CONFIG_SND=y

arch/arm64/configs/qcs405_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -301,6 +301,11 @@ CONFIG_V4L_PLATFORM_DRIVERS=y 
CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_PLATFORM=y

CONFIG_FB=y

CONFIG_FB_MSM=y

CONFIG_FB_MSM_MDSS=y

CONFIG_FB_MSM_MDSS_WRITEBACK=y

CONFIG_FB_MSM_MDSS_DSI_CTRL_STATUS=y

CONFIG_FB_MSM_MDSS_XLOG_DEBUG=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_SOUND=y

CONFIG_SND=y

drivers/video/fbdev/msm/mdss_fb.c

+1 −17
Original line number Diff line number Diff line
@@ -123,18 +123,6 @@ static int mdss_fb_send_panel_event(struct msm_fb_data_type *mfd, 
static void mdss_fb_set_mdp_sync_pt_threshold(struct msm_fb_data_type *mfd,

		int type);



int of_led_classdev_register(struct device *parent, struct device_node *np,

				struct led_classdev *led_cdev)

{

	/* Stub out till LEDS CLASS defconfig is enabled */

	return 0;

}



void led_classdev_unregister(struct led_classdev *led_cdev)

{

	/* Stub out till LEDS CLASS defconfig is enabled */

}



void mdss_fb_no_update_notify_timer_cb(unsigned long data)

{

	struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)data;
@@ -1341,9 +1329,6 @@ static int mdss_fb_probe(struct platform_device *pdev) 
	if (!lcd_backlight_registered) {

		backlight_led.brightness = mfd->panel_info->brightness_max;

		backlight_led.max_brightness = mfd->panel_info->brightness_max;

		if (led_classdev_register(&pdev->dev, &backlight_led))

			pr_err("led_classdev_register failed\n");

		else

		lcd_backlight_registered = 1;

	}
@@ -1441,7 +1426,6 @@ static int mdss_fb_remove(struct platform_device *pdev) 


	if (lcd_backlight_registered) {

		lcd_backlight_registered = 0;

		led_classdev_unregister(&backlight_led);

	}



	return 0;