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

Commit ca18e142 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'tilcdc-next' of git://people.freedesktop.org/~robclark/linux into drm-next 

KMS driver for TI LCD controller

* 'tilcdc-next' of git://people.freedesktop.org/~robclark/linux:
  drm/tilcdc: add support for LCD panels (v5)
  drm/tilcdc: add encoder slave (v2)
  drm/i2c: nxp-tda998x (v3)
  drm/tilcdc: add TI LCD Controller DRM driver (v4)
  drm/nouveau: use i2c encoder helper wrappers
  drm: i2c encoder helper wrappers
  drm/cma: add debugfs helpers
  drm: small fix in drm_send_vblank_event()
  drm: Don't set the plane->fb to NULL on successfull set_plane
  drm/cma-helper: fixup compilation

Conflicts:
	drivers/gpu/drm/Kconfig
	drivers/gpu/drm/Makefile
	drivers/gpu/drm/drm_fb_cma_helper.c
parents 74e16974 0d4bbaf9

Documentation/devicetree/bindings/drm/tilcdc/panel.txt

0 → 100644
+59 −0
Original line number Diff line number Diff line 
Device-Tree bindings for tilcdc DRM generic panel output driver



Required properties:

 - compatible: value should be "ti,tilcdc,panel".

 - panel-info: configuration info to configure LCDC correctly for the panel

   - ac-bias: AC Bias Pin Frequency

   - ac-bias-intrpt: AC Bias Pin Transitions per Interrupt

   - dma-burst-sz: DMA burst size

   - bpp: Bits per pixel

   - fdd: FIFO DMA Request Delay

   - sync-edge: Horizontal and Vertical Sync Edge: 0=rising 1=falling

   - sync-ctrl: Horizontal and Vertical Sync: Control: 0=ignore

   - raster-order: Raster Data Order Select: 1=Most-to-least 0=Least-to-most

   - fifo-th: DMA FIFO threshold

 - display-timings: typical videomode of lcd panel.  Multiple video modes

   can be listed if the panel supports multiple timings, but the 'native-mode'

   should be the preferred/default resolution.  Refer to

   Documentation/devicetree/bindings/video/display-timing.txt for display

   timing binding details.



Recommended properties:

 - pinctrl-names, pinctrl-0: the pincontrol settings to configure

   muxing properly for pins that connect to TFP410 device



Example:



	/* Settings for CDTech_S035Q01 / LCD3 cape: */

	lcd3 {

		compatible = "ti,tilcdc,panel";

		pinctrl-names = "default";

		pinctrl-0 = <&bone_lcd3_cape_lcd_pins>;

		panel-info {

			ac-bias           = <255>;

			ac-bias-intrpt    = <0>;

			dma-burst-sz      = <16>;

			bpp               = <16>;

			fdd               = <0x80>;

			sync-edge         = <0>;

			sync-ctrl         = <1>;

			raster-order      = <0>;

			fifo-th           = <0>;

		};

		display-timings {

			native-mode = <&timing0>;

			timing0: 320x240 {

				hactive         = <320>;

				vactive         = <240>;

				hback-porch     = <21>;

				hfront-porch    = <58>;

				hsync-len       = <47>;

				vback-porch     = <11>;

				vfront-porch    = <23>;

				vsync-len       = <2>;

				clock-frequency = <8000000>;

				hsync-active    = <0>;

				vsync-active    = <0>;

			};

		};

	};

Documentation/devicetree/bindings/drm/tilcdc/slave.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Device-Tree bindings for tilcdc DRM encoder slave output driver



Required properties:

 - compatible: value should be "ti,tilcdc,slave".

 - i2c: the phandle for the i2c device the encoder slave is connected to



Recommended properties:

 - pinctrl-names, pinctrl-0: the pincontrol settings to configure

   muxing properly for pins that connect to TFP410 device



Example:



	hdmi {

		compatible = "ti,tilcdc,slave";

		i2c = <&i2c0>;

		pinctrl-names = "default";

		pinctrl-0 = <&nxp_hdmi_bonelt_pins>;

	};

Documentation/devicetree/bindings/drm/tilcdc/tfp410.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Device-Tree bindings for tilcdc DRM TFP410 output driver



Required properties:

 - compatible: value should be "ti,tilcdc,tfp410".

 - i2c: the phandle for the i2c device to use for DDC



Recommended properties:

 - pinctrl-names, pinctrl-0: the pincontrol settings to configure

   muxing properly for pins that connect to TFP410 device

 - powerdn-gpio: the powerdown GPIO, pulled low to power down the

   TFP410 device (for DPMS_OFF)



Example:



	dvicape {

		compatible = "ti,tilcdc,tfp410";

		i2c = <&i2c2>;

		pinctrl-names = "default";

		pinctrl-0 = <&bone_dvi_cape_dvi_00A1_pins>;

		powerdn-gpio = <&gpio2 31 0>;

	};

Documentation/devicetree/bindings/drm/tilcdc/tilcdc.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Device-Tree bindings for tilcdc DRM driver



Required properties:

 - compatible: value should be "ti,am33xx-tilcdc".

 - interrupts: the interrupt number

 - reg: base address and size of the LCDC device



Recommended properties:

 - interrupt-parent: the phandle for the interrupt controller that

   services interrupts for this device.

 - ti,hwmods: Name of the hwmod associated to the LCDC



Example:



	fb: fb@4830e000 {

		compatible = "ti,am33xx-tilcdc";

		reg = <0x4830e000 0x1000>;

		interrupt-parent = <&intc>;

		interrupts = <36>;

		ti,hwmods = "lcdc";

	};

drivers/gpu/drm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -217,3 +217,5 @@ source "drivers/gpu/drm/shmobile/Kconfig" 
source "drivers/gpu/drm/tegra/Kconfig"



source "drivers/gpu/drm/omapdrm/Kconfig"



source "drivers/gpu/drm/tilcdc/Kconfig"