Merge branch 'linux-4.1.0-rc5-tilcdc-refactor' of https://github.com/jsarha/linux into drm-next (6aa62725) · Commits · 戴 / test

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

deleted100644 → 0

+0 −18

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>;
		};

+27 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,12 @@ Optional properties:
		- max-pixelclock: The maximum pixel clock that can be supported
		by the lcd controller in KHz.

		Optional nodes:

		- port/ports: to describe a connection to an external encoder. The
		binding follows Documentation/devicetree/bindings/graph.txt and
		suppors a single port with a single endpoint.

		Example:

		fb: fb@4830e000 {
		@@ -26,4 +32,25 @@ Example:
		interrupt-parent = <&intc>;
		interrupts = <36>;
		ti,hwmods = "lcdc";

		port {
		lcdc_0: endpoint@0 {
		remote-endpoint = <&hdmi_0>;
		};
		};
		};

		tda19988: tda19988 {
		compatible = "nxp,tda998x";
		reg = <0x70>;

		pinctrl-names = "default", "off";
		pinctrl-0 = <&nxp_hdmi_bonelt_pins>;
		pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;

		port {
		hdmi_0: endpoint@0 {
		remote-endpoint = <&lcdc_0>;
		};
		};
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ obj-$(CONFIG_DRM_ATMEL_HLCDC) += atmel-hlcdc/
		obj-$(CONFIG_DRM_RCAR_DU) += rcar-du/
		obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
		obj-$(CONFIG_DRM_OMAP) += omapdrm/
		obj-$(CONFIG_DRM_TILCDC) += tilcdc/
		obj-y += tilcdc/
		obj-$(CONFIG_DRM_QXL) += qxl/
		obj-$(CONFIG_DRM_BOCHS) += bochs/
		obj-$(CONFIG_DRM_MSM) += msm/

+12 −0

Original line number	Diff line number	Diff line
		@@ -12,3 +12,15 @@ config DRM_TILCDC
		Choose this option if you have an TI SoC with LCDC display
		controller, for example AM33xx in beagle-bone, DA8xx, or
		OMAP-L1xx. This driver replaces the FB_DA8XX fbdev driver.

		config DRM_TILCDC_SLAVE_COMPAT
		bool "Support device tree blobs using TI LCDC Slave binding"
		depends on DRM_TILCDC
		default y
		select OF_RESOLVE
		select OF_OVERLAY
		help
		Choose this option if you need a kernel that is compatible
		with device tree blobs using the obsolete "ti,tilcdc,slave"
		binding. If you find "ti,tilcdc,slave"-string from your DTB,
		you probably need this. Otherwise you do not.

+4 −1

Original line number	Diff line number	Diff line
		@@ -3,11 +3,14 @@ ifeq (, $(findstring -W,$(EXTRA_CFLAGS)))
		ccflags-y += -Werror
		endif

		obj-$(CONFIG_DRM_TILCDC_SLAVE_COMPAT) += tilcdc_slave_compat.o \
		tilcdc_slave_compat.dtb.o

		tilcdc-y := \
		tilcdc_crtc.o \
		tilcdc_tfp410.o \
		tilcdc_slave.o \
		tilcdc_panel.o \
		tilcdc_external.o \
		tilcdc_drv.o

		obj-$(CONFIG_DRM_TILCDC) += tilcdc.o