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

Commit 15b58830 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-omap-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into next 

Pull omap fbdev changes from Tomi Valkeinen:
 - DT support for the panel drivers that were still missing it
 - TI AM43xx support
 - TI OMAP5 support

* tag 'fbdev-omap-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (46 commits)
  OMAPDSS: move 'compatible' converter to omapdss driver
  OMAPDSS: HDMI: fix devm_ioremap_resource error checks
  OMAPDSS: HDMI: remove unused defines
  OMAPDSS: HDMI: cleanup WP ioremaps
  OMAPDSS: panel NEC-NL8048HL11 DT support
  Doc/DT: Add DT binding documentation for TPO td043mtea1 panel
  OMAPDSS: Panel TPO-TD043MTEA1 DT support
  Doc/DT: Add DT binding documentation for SHARP LS037V7DW01
  OMAPDSS: panel sharp-ls037v7dw01 DT support
  OMAPDSS: panel-sharp-ls037v7dw01: update to use gpiod
  Doc/DT: Add binding doc for lgphilips,lb035q02.txt
  OMAPDSS: panel-lgphilips-lb035q02: Add DT support
  OMAPDSS: panel-lgphilips-lb035q02: use gpiod for enable gpio
  OMAPDSS: hdmi5_core: Fix compilation with OMAP5_DSS_HDMI_AUDIO
  OMAPDSS: panel-dpi: enable-gpio
  OMAPDSS: Fix writes to DISPC_POL_FREQ
  Doc/DT: Add OMAP5 DSS DT bindings
  OMAPDSS: HDMI: cleanup ioremaps
  OMAPDSS: HDMI: Add OMAP5 HDMI support
  OMAPDSS: HDMI: PLL changes for OMAP5
  ...
parents d55696af f2dd36ac

Documentation/devicetree/bindings/video/hdmi-connector.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 


Optional properties:

- label: a symbolic name for the connector

- hpd-gpios: HPD GPIO number



Required nodes:

- Video port for HDMI input

Documentation/devicetree/bindings/video/lgphilips,lb035q02.txt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
LG.Philips LB035Q02 Panel

=========================



Required properties:

- compatible: "lgphilips,lb035q02"

- enable-gpios: panel enable gpio



Optional properties:

- label: a symbolic name for the panel



Required nodes:

- Video port for DPI input



Example

-------



lcd-panel: panel@0 {

	compatible = "lgphilips,lb035q02";

	reg = <0>;

	spi-max-frequency = <100000>;

	spi-cpol;

	spi-cpha;



	label = "lcd";



	enable-gpios = <&gpio7 7 0>;



	port {

		lcd_in: endpoint {

			remote-endpoint = <&dpi_out>;

		};

	};

};

Documentation/devicetree/bindings/video/panel-dpi.txt

0 → 100644
+45 −0
Original line number Diff line number Diff line 
Generic MIPI DPI Panel

======================



Required properties:

- compatible: "panel-dpi"



Optional properties:

- label: a symbolic name for the panel

- enable-gpios: panel enable gpio



Required nodes:

- "panel-timing" containing video timings

  (Documentation/devicetree/bindings/video/display-timing.txt)

- Video port for DPI input



Example

-------



lcd0: display@0 {

        compatible = "samsung,lte430wq-f0c", "panel-dpi";

        label = "lcd";



        port {

            lcd_in: endpoint {

                    remote-endpoint = <&dpi_out>;

            };

        };



        panel-timing {

                clock-frequency = <9200000>;

                hactive = <480>;

                vactive = <272>;

                hfront-porch = <8>;

                hback-porch = <4>;

                hsync-len = <41>;

                vback-porch = <2>;

                vfront-porch = <4>;

                vsync-len = <10>;



                hsync-active = <0>;

                vsync-active = <0>;

                de-active = <1>;

                pixelclk-active = <1>;

        };

};

Documentation/devicetree/bindings/video/sharp,ls037v7dw01.txt

0 → 100644
+43 −0
Original line number Diff line number Diff line 
SHARP LS037V7DW01 TFT-LCD panel

===================================



Required properties:

- compatible: "sharp,ls037v7dw01"



Optional properties:

- label: a symbolic name for the panel

- enable-gpios: a GPIO spec for the optional enable pin.

  This pin is the INI pin as specified in the LS037V7DW01.pdf file.

- reset-gpios: a GPIO spec for the optional reset pin.

  This pin is the RESB pin as specified in the LS037V7DW01.pdf file.

- mode-gpios: a GPIO

  ordered MO, LR, and UD as specified in the LS037V7DW01.pdf file.



Required nodes:

- Video port for DPI input



This panel can have zero to five GPIOs to configure to change configuration

between QVGA and VGA mode and the scan direction. As these pins can be also

configured with external pulls, all the GPIOs are considered optional with holes

in the array.



Example

-------



Example when connected to a omap2+ based device:



lcd0: display {

	compatible = "sharp,ls037v7dw01";

	power-supply = <&lcd_3v3>;

	enable-gpios = <&gpio5 24 GPIO_ACTIVE_HIGH>;	/* gpio152, lcd INI */

	reset-gpios = <&gpio5 27 GPIO_ACTIVE_HIGH>;	/* gpio155, lcd RESB */

	mode-gpios = <&gpio5 26 GPIO_ACTIVE_HIGH	/* gpio154, lcd MO */

		      &gpio1 2 GPIO_ACTIVE_HIGH		/* gpio2, lcd LR */

		      &gpio1 3 GPIO_ACTIVE_HIGH>;	/* gpio3, lcd UD */



	port {

		lcd_in: endpoint {

			remote-endpoint = <&dpi_out>;

		};

	};

};

Documentation/devicetree/bindings/video/ti,omap4-dss.txt

+4 −0
Original line number Diff line number Diff line
@@ -109,3 +109,7 @@ Required properties: 


Optional nodes:

- Video port for HDMI output



HDMI Endpoint optional properties:

- lanes: list of 8 pin numbers for the HDMI lanes: CLK+, CLK-, D0+, D0-,

  D1+, D1-, D2+, D2-. (default: 0,1,2,3,4,5,6,7)