shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 20:32:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

hdmitx: add drm flag in hdmitx driver

Browse Source 
PD#165128: hdmitx: add drm flag in hdmitx driver

Change-Id: I56e4dc7ecf88a7ec330665d9dcff9744eac3d701
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
This commit is contained in:
Yi Zhou
2018-04-27 17:00:15 +08:00
parent 8adcc4775c
commit 6db36ed854
4 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
View File

@@ -632,18 +632,6 @@
pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
};
&drm_vpu {
status = "okay";
};
&drm_amhdmitx {
status = "okay";
};
&drm_lcd {
status = "okay";
};
&i2c0 {
status = "okay";
pinctrl-names="default";

9
arch/arm64/boot/dts/amlogic/meson_drm.dtsi
View File

@@ -21,7 +21,6 @@
compatible = "amlogic,drm-amhdmitx";
dev_name = "meson-amhdmitx";
interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>;
drm_feature = <1>;
ports {
port {
#address-cells = <1>;
@@ -81,14 +80,6 @@
};
};
&drm_vpu {
status = "okay";
};
&drm_amhdmitx {
status = "okay";
};
&gpu{
/*gpu max freq is 750M*/
def_clk = <1>;

1
arch/arm64/boot/dts/amlogic/mesong12a_drm.dtsi
View File

@@ -42,7 +42,6 @@
compatible = "amlogic,drm-amhdmitx";
dev_name = "meson-amhdmitx";
interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>;
drm_feature = <1>;
ports {
port {
#address-cells = <1>;

12
drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c
View File

@@ -3529,6 +3529,7 @@ static int amhdmitx_get_dt_info(struct platform_device *pdev)
phandle phandle;
struct device_node *init_data;
struct device_node *drm_node;
unsigned char *drm_status;
#endif
/* HDMITX pinctrl config for hdp and ddc*/
@@ -3604,13 +3605,18 @@ static int amhdmitx_get_dt_info(struct platform_device *pdev)
/* Get drm feature information */
drm_node = of_find_node_by_path("/drm-amhdmitx");
if (drm_node) {
ret = of_property_read_u32(drm_node, "drm_feature",
&(hdmitx_device.drm_feature));
ret = of_property_read_string(drm_node, "status",
(const char **)&(drm_status));
if (ret)
pr_info(SYS "not find drm_feature\n");
else
else {
if (memcmp(drm_status, "okay", 4) == 0)
hdmitx_device.drm_feature = 1;
else
hdmitx_device.drm_feature = 0;
pr_info(SYS "hdmitx_device.drm_feature : %d\n",
hdmitx_device.drm_feature);
}
} else {
pr_info(SYS "not find drm_amhdmitx\n");
}