Skip to content

Commit d2eaa59

Browse files
airliedairlied
committed
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
2 parents 9864fd7 + a2b5f9b commit d2eaa59

File tree

5 files changed

+1359
-0
lines changed

5 files changed

+1359
-0
lines changed

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

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
Rockchip specific extensions to the Innosilicon HDMI
2+
================================
3+
4+
Required properties:
5+
- compatible:
6+
"rockchip,rk3036-inno-hdmi";
7+
- reg:
8+
Physical base address and length of the controller's registers.
9+
- clocks, clock-names:
10+
Phandle to hdmi controller clock, name should be "pclk"
11+
- interrupts:
12+
HDMI interrupt number
13+
- ports:
14+
Contain one port node with endpoint definitions as defined in
15+
Documentation/devicetree/bindings/graph.txt.
16+
- pinctrl-0, pinctrl-name:
17+
Switch the iomux of HPD/CEC pins to HDMI function.
18+
19+
Example:
20+
hdmi: hdmi@20034000 {
21+
compatible = "rockchip,rk3036-inno-hdmi";
22+
reg = <0x20034000 0x4000>;
23+
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
24+
clocks = <&cru PCLK_HDMI>;
25+
clock-names = "pclk";
26+
pinctrl-names = "default";
27+
pinctrl-0 = <&hdmi_ctl>;
28+
status = "disabled";
29+
30+
hdmi_in: port {
31+
#address-cells = <1>;
32+
#size-cells = <0>;
33+
hdmi_in_lcdc: endpoint@0 {
34+
reg = <0>;
35+
remote-endpoint = <&lcdc_out_hdmi>;
36+
};
37+
};
38+
};
39+
40+
&pinctrl {
41+
hdmi {
42+
hdmi_ctl: hdmi-ctl {
43+
rockchip,pins = <1 8 RK_FUNC_1 &pcfg_pull_none>,
44+
<1 9 RK_FUNC_1 &pcfg_pull_none>,
45+
<1 10 RK_FUNC_1 &pcfg_pull_none>,
46+
<1 11 RK_FUNC_1 &pcfg_pull_none>;
47+
};
48+
};
49+
50+
};

‎drivers/gpu/drm/rockchip/Kconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,11 @@ config ROCKCHIP_DW_MIPI_DSI
3535
for the Synopsys DesignWare HDMI driver. If you want to
3636
enable MIPI DSI on RK3288 based SoC, you should selet this
3737
option.
38+
39+
config ROCKCHIP_INNO_HDMI
40+
tristate "Rockchip specific extensions for Innosilicon HDMI"
41+
depends on DRM_ROCKCHIP
42+
help
43+
This selects support for Rockchip SoC specific extensions
44+
for the Innosilicon HDMI driver. If you want to enable
45+
HDMI on RK3036 based SoC, you should select this option.

‎drivers/gpu/drm/rockchip/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ rockchipdrm-$(CONFIG_DRM_FBDEV_EMULATION) += rockchip_drm_fbdev.o
88

99
obj-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
1010
obj-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o
11+
obj-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o
1112

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

0 commit comments

Comments
 (0)