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

Commit 51007df3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next/mxsfb' of... 

Merge branch 'drm-next/mxsfb' of git://git.kernel.org/pub/scm/linux/kernel/git/marex/linux-2.6 into drm-next

Add new driver for MXSFB.

* 'drm-next/mxsfb' of git://git.kernel.org/pub/scm/linux/kernel/git/marex/linux-2.6:
  drm: Add new driver for MXSFB controller
  dt-bindings: mxsfb: Add new bindings for the MXSFB driver
  dt-bindings: mxsfb: Indentation cleanup
parents 197aa6ed 45d59d70

Documentation/devicetree/bindings/display/mxsfb.txt

+45 −8
Original line number Diff line number Diff line 
* Freescale MXS LCD Interface (LCDIF)



New bindings:

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

Required properties:

- compatible: Should be "fsl,<chip>-lcdif".  Supported chips include

  imx23 and imx28.

- reg: Address and length of the register set for lcdif

- interrupts: Should contain lcdif interrupts

- compatible:	Should be "fsl,imx23-lcdif" for i.MX23.

		Should be "fsl,imx28-lcdif" for i.MX28.

		Should be "fsl,imx6sx-lcdif" for i.MX6SX.

- reg:		Address and length of the register set for LCDIF

- interrupts:	Should contain LCDIF interrupt

- clocks:	A list of phandle + clock-specifier pairs, one for each

		entry in 'clock-names'.

- clock-names:	A list of clock names. For MXSFB it should contain:

    - "pix" for the LCDIF block clock

    - (MX6SX-only) "axi", "disp_axi" for the bus interface clock



Required sub-nodes:

  - port: The connection to an encoder chip.



Example:



	lcdif1: display-controller@2220000 {

		compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";

		reg = <0x02220000 0x4000>;

		interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clks IMX6SX_CLK_LCDIF1_PIX>,

			 <&clks IMX6SX_CLK_LCDIF_APB>,

			 <&clks IMX6SX_CLK_DISPLAY_AXI>;

		clock-names = "pix", "axi", "disp_axi";



		port {

			parallel_out: endpoint {

				remote-endpoint = <&panel_in_parallel>;

			};

		};

	};



Deprecated bindings:

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

Required properties:

- compatible:	Should be "fsl,imx23-lcdif" for i.MX23.

		Should be "fsl,imx28-lcdif" for i.MX28.

- reg:		Address and length of the register set for LCDIF

- interrupts:	Should contain LCDIF interrupts

- display:	phandle to display node (see below for details)



* display node

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -8319,6 +8319,12 @@ T: git git://linuxtv.org/mkrufky/tuners.git 
S:	Maintained

F:	drivers/media/tuners/mxl5007t.*



MXSFB DRM DRIVER

M:	Marek Vasut <marex@denx.de>

S:	Supported

F:	drivers/gpu/drm/mxsfb/

F:	Documentation/devicetree/bindings/display/mxsfb-drm.txt



MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)

M:	Hyong-Youb Kim <hykim@myri.com>

L:	netdev@vger.kernel.org

drivers/gpu/drm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -240,6 +240,8 @@ source "drivers/gpu/drm/mediatek/Kconfig" 


source "drivers/gpu/drm/zte/Kconfig"



source "drivers/gpu/drm/mxsfb/Kconfig"



# Keep legacy drivers last



menuconfig DRM_LEGACY

drivers/gpu/drm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -89,3 +89,4 @@ obj-$(CONFIG_DRM_ETNAVIV) += etnaviv/ 
obj-$(CONFIG_DRM_ARCPGU)+= arc/

obj-y			+= hisilicon/

obj-$(CONFIG_DRM_ZTE)	+= zte/

obj-$(CONFIG_DRM_MXSFB)	+= mxsfb/

drivers/gpu/drm/mxsfb/Kconfig

0 → 100644
+18 −0
Original line number Diff line number Diff line 
config DRM_MXS

	bool

	help

	  Choose this option to select drivers for MXS FB devices



config DRM_MXSFB

	tristate "i.MX23/i.MX28/i.MX6SX MXSFB LCD controller"

	depends on DRM && OF

	depends on COMMON_CLK

	select DRM_MXS

	select DRM_KMS_HELPER

	select DRM_KMS_FB_HELPER

	select DRM_KMS_CMA_HELPER

	help

	  Choose this option if you have an i.MX23/i.MX28/i.MX6SX MXSFB

	  LCD controller.



	  If M is selected the module will be called mxsfb.