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

Commit 5330fb41 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm/panel/for-3.16-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next 

drm/panel: Changes for v3.16-rc1

This set of commits contains a couple of fixes to existing panel drivers
and support for some new panels.

One commit touches the DRM core in that in modifies the MIPI DSI support
to hook up the shutdown function so that drivers can provide code that's
run on shutdown. This is used by a subsequent commit to make the simple
panel driver power off the backlight on shutdown.

* tag 'drm/panel/for-3.16-rc1' of git://anongit.freedesktop.org/tegra/linux:
  drm/panel: simple - Add AUO B133XTN01 panel support
  drm/panel: simple - Disable panel on shutdown
  drm/panel: add support for EDT ET057090DHU panel
  drm/panel: Add support for EDT ETM0700G0DH6 and ET070080DH6 panels
  drm/panel: ld9040: add power control sequence
  drm/panel: s6e8aa0: silence array overflow warning
  drm/dsi: Support device shutdown
parents 6c8a02bb a333f7ad

Documentation/devicetree/bindings/panel/auo,b133xtn01.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
AU Optronics Corporation 13.3" WXGA (1366x768) TFT LCD panel



Required properties:

- compatible: should be "auo,b133xtn01"



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/panel/edt,et057090dhu.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
Emerging Display Technology Corp. 5.7" VGA TFT LCD panel



Required properties:

- compatible: should be "edt,et057090dhu"



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/panel/edt,et070080dh6.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
Emerging Display Technology Corp. ET070080DH6 7.0" WVGA TFT LCD panel



Required properties:

- compatible: should be "edt,et070080dh6"



This panel is the same as ETM0700G0DH6 except for the touchscreen.

ET070080DH6 is the model with resistive touch.



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/panel/edt,etm0700g0dh6.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
Emerging Display Technology Corp. ETM0700G0DH6 7.0" WVGA TFT LCD panel



Required properties:

- compatible: should be "edt,etm0700g0dh6"



This panel is the same as ET070080DH6 except for the touchscreen.

ETM0700G0DH6 is the model with capacitive multitouch.



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory.

drivers/gpu/drm/drm_mipi_dsi.c

+10 −0
Original line number Diff line number Diff line
@@ -282,6 +282,14 @@ static int mipi_dsi_drv_remove(struct device *dev) 
	return drv->remove(dsi);

}



static void mipi_dsi_drv_shutdown(struct device *dev)

{

	struct mipi_dsi_driver *drv = to_mipi_dsi_driver(dev->driver);

	struct mipi_dsi_device *dsi = to_mipi_dsi_device(dev);



	drv->shutdown(dsi);

}



/**

 * mipi_dsi_driver_register - register a driver for DSI devices

 * @drv: DSI driver structure
@@ -293,6 +301,8 @@ int mipi_dsi_driver_register(struct mipi_dsi_driver *drv) 
		drv->driver.probe = mipi_dsi_drv_probe;

	if (drv->remove)

		drv->driver.remove = mipi_dsi_drv_remove;

	if (drv->shutdown)

		drv->driver.shutdown = mipi_dsi_drv_shutdown;



	return driver_register(&drv->driver);

}