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

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

Merge branch 'drm-rockchip-next-2016-02-18' of... 

Merge branch 'drm-rockchip-next-2016-02-18' of https://github.com/markyzq/kernel-drm-rockchip into drm-next

add Innosilicon HDMI support.

* 'drm-rockchip-next-2016-02-18' of https://github.com/markyzq/kernel-drm-rockchip:
  dt-bindings: add document for Innosilicon HDMI on Rockchip platform
  drm/rockchip: hdmi: add Innosilicon HDMI support
parents 9864fd76 a2b5f9b9

Documentation/devicetree/bindings/display/rockchip/inno_hdmi-rockchip.txt

0 → 100644
+50 −0
Original line number Original line Diff line number Diff line 
Rockchip specific extensions to the Innosilicon HDMI

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



Required properties:

- compatible:

	"rockchip,rk3036-inno-hdmi";

- reg:

	Physical base address and length of the controller's registers.

- clocks, clock-names:

	Phandle to hdmi controller clock, name should be "pclk"

- interrupts:

	HDMI interrupt number

- ports:

	Contain one port node with endpoint definitions as defined in

	Documentation/devicetree/bindings/graph.txt.

- pinctrl-0, pinctrl-name:

	Switch the iomux of HPD/CEC pins to HDMI function.



Example:

hdmi: hdmi@20034000 {

	compatible = "rockchip,rk3036-inno-hdmi";

	reg = <0x20034000 0x4000>;

	interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;

	clocks = <&cru  PCLK_HDMI>;

	clock-names = "pclk";

	pinctrl-names = "default";

	pinctrl-0 = <&hdmi_ctl>;

	status = "disabled";



	hdmi_in: port {

		#address-cells = <1>;

		#size-cells = <0>;

		hdmi_in_lcdc: endpoint@0 {

			reg = <0>;

			remote-endpoint = <&lcdc_out_hdmi>;

		};

	};

};



&pinctrl {

	hdmi {

		hdmi_ctl: hdmi-ctl {

			rockchip,pins = <1 8  RK_FUNC_1 &pcfg_pull_none>,

					<1 9  RK_FUNC_1 &pcfg_pull_none>,

					<1 10 RK_FUNC_1 &pcfg_pull_none>,

					<1 11 RK_FUNC_1 &pcfg_pull_none>;

		};

	};



};

drivers/gpu/drm/rockchip/Kconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -35,3 +35,11 @@ config ROCKCHIP_DW_MIPI_DSI 
	 for the Synopsys DesignWare HDMI driver. If you want to

	 for the Synopsys DesignWare HDMI driver. If you want to

	 enable MIPI DSI on RK3288 based SoC, you should selet this

	 enable MIPI DSI on RK3288 based SoC, you should selet this

	 option.

	 option.



config ROCKCHIP_INNO_HDMI

	tristate "Rockchip specific extensions for Innosilicon HDMI"

	depends on DRM_ROCKCHIP

	help

	  This selects support for Rockchip SoC specific extensions

	  for the Innosilicon HDMI driver. If you want to enable

	  HDMI on RK3036 based SoC, you should select this option.

drivers/gpu/drm/rockchip/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -8,5 +8,6 @@ rockchipdrm-$(CONFIG_DRM_FBDEV_EMULATION) += rockchip_drm_fbdev.o 




obj-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o

obj-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o

obj-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o

obj-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o

obj-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o





obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o rockchip_vop_reg.o
 
obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o rockchip_vop_reg.o