Skip to content

Commit

Permalink
HDMI : CEC porting
Browse files Browse the repository at this point in the history 
NOTE:
[PATCH 01/29] UPSTREAM: [media] cec-edid: add module for EDID CEC
[PATCH 02/29] UPSTREAM: [media] cec: add HDMI CEC framework
[PATCH 03/29] UPSTREAM: [media] cec: fix Kconfig dependency problems
[PATCH 04/29] UPSTREAM: [media] cec: limit the size of the transmit
[PATCH 05/29] UPSTREAM: [media] cec: rename cec_devnode fhs_lock to just lock
[PATCH 06/29] UPSTREAM: [media] cec-edid: check for IEEE identifier
[PATCH 07/29] UPSTREAM: [media] cec: move the CEC framework out of staging and to media
[PATCH 08/29] UPSTREAM: [media] cec: sanitize msg.flags
[PATCH 09/29] UPSTREAM: [media] cec.h/cec-funcs.h: don't use bool in public headers
[PATCH 10/29] UPSTREAM: [media] cec: an inner loop clobbered the outer loop variable
[PATCH 11/29] UPSTREAM: [media] cec: zero counters in cec_received_msg()
[PATCH 12/29] UPSTREAM: [media] cec: ignore messages that we initiated
[PATCH 13/29] UPSTREAM: [media] cec: pass parent device in register(), not allocate()
[PATCH 14/29] UPSTREAM: [media] cec: fix report_current_latency
[PATCH 15/29] UPSTREAM: [media] cec: when canceling a message, don't overwrite old status info
[PATCH 16/29] UPSTREAM: [media] cec: CEC_MSG_GIVE_FEATURES should abort for CEC version < 2
[PATCH 17/29] UPSTREAM: [media] cec: update log_addr[] before finishing configuration
[PATCH 18/29] UPSTREAM: [media] cec: replace cec_report_features by cec_fill_msg_report_features
[PATCH 19/29] UPSTREAM: [media] cec: move cec_report_phys_addr into cec_config_thread_func
[PATCH 20/29] UPSTREAM: [media] cec: fix race between configuring and unconfiguring
[PATCH 21/29] UPSTREAM: [media] cec: fix wrong last_la determination
[PATCH 22/29] UPSTREAM: [media] rc-main: assign driver type during allocation
[PATCH 23/29] UPSTREAM: [media] cec: initiator should be the same as the destination for, poll
[PATCH 24/29] Revert "FROMLIST: video: rmk's HDMI notification prototype"
[PATCH 25/29] FROMLIST: video: add HDMI state notifier support
[PATCH 26/29] FROMLIST: drm/bridge: dw_hdmi: remove CEC engine register definitions
[PATCH 27/29] FROMLIST: drm/bridge: dw_hdmi: add HDMI notifier support
[PATCH 28/29] FROMLIST: drm/bridge: add dw-hdmi cec driver using Hans Verkuil's CEC code
[PATCH 29/29] drm/bridge: HDMI CEC support with dw-hdmi

Change-Id: Ie5290a8d4216b5067155854595796cca9c1abf9c
Reviewed-on: https://tp-biosrd-v02/gerrit/81116
Reviewed-by: Jamess Huang(黃以民) <[email protected]>
Tested-by: Jamess Huang(黃以民) <[email protected]>
  • Loading branch information
@jamess-huang
shin_lin authored and jamess-huang committed Oct 17, 2017
1 parent 5ad5858 commit 19d99d8
Show file tree
Hide file tree
Showing 27 changed files with 7,172 additions and 126 deletions.
2 changes: 0 additions & 2 deletions arch/arm/boot/dts/rk3288-miniarm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,6 @@
#address-cells = <1>;
#size-cells = <0>;
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_ddc>;
status = "okay";
/* Don't use vopl for HDMI */
ports {
Expand Down
11 changes: 8 additions & 3 deletions arch/arm/boot/dts/rk3288.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,8 @@
<&cru PCLK_MIPI_DSI1>,
<&cru SCLK_EDP_24M>,
<&cru SCLK_EDP>,
<&cru SCLK_HDMI_CEC>,
<&cru SCLK_HDMI_HDCP>,
<&cru SCLK_ISP_JPE>,
<&cru SCLK_ISP>,
<&cru SCLK_RGA>;
Expand Down Expand Up @@ -1430,10 +1432,10 @@
reg-io-width = <4>;
rockchip,grf = <&grf>;
interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>;
clock-names = "iahb", "isfr";
clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>, <&cru SCLK_HDMI_CEC>;
clock-names = "iahb", "isfr", "clk_cec";
pinctrl-names = "default";
pinctrl-0 = <&hdmi_ddc>;
pinctrl-0 = <&hdmi_ddc &hdmi_cec>;
power-domains = <&power RK3288_PD_VIO>;
status = "disabled";

Expand Down Expand Up @@ -1785,6 +1787,9 @@
rockchip,pins = <7 19 RK_FUNC_2 &pcfg_pull_none>,
<7 20 RK_FUNC_2 &pcfg_pull_none>;
};
hdmi_cec: hdmi-cec {
rockchip,pins = <7 16 RK_FUNC_2 &pcfg_pull_none>;
};
};

pcfg_pull_up: pcfg-pull-up {
Expand Down
4 changes: 4 additions & 0 deletions arch/arm/configs/miniarm-rk3288_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,9 @@ CONFIG_REGULATOR_RK808=y
CONFIG_REGULATOR_TPS6586X=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
CONFIG_MEDIA_CEC_EDID=y
CONFIG_MEDIA_USB_SUPPORT=y
CONFIG_USB_VIDEO_CLASS=y
# CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV is not set
Expand All @@ -518,6 +521,7 @@ CONFIG_DRM_UDL=y
CONFIG_ROCKCHIP_DW_MIPI_DSI2=y
CONFIG_DRM_PANEL_TOSHIBA_TC358762=y
CONFIG_DRM_DW_HDMI_I2S_AUDIO=y
CONFIG_DRM_DW_HDMI_CEC=y
CONFIG_MALI_MIDGARD=y
CONFIG_MALI_DEVFREQ=y
CONFIG_MALI_MIDGARD_FOR_LINUX=y
Expand Down
7 changes: 7 additions & 0 deletions drivers/gpu/drm/bridge/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ config DRM_DW_HDMI_I2S_AUDIO
Support the I2S Audio interface which is part of the Synopsis
Designware HDMI block.

config DRM_DW_HDMI_CEC
tristate "Synopsis Designware CEC interface"
depends on DRM_DW_HDMI && MEDIA_CEC_SUPPORT
help
Support the CE interface which is part of the Synopsis
Designware HDMI block.

config DRM_NXP_PTN3460
tristate "NXP PTN3460 DP/LVDS bridge"
depends on OF
Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/bridge/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ ccflags-y := -Iinclude/drm
obj-$(CONFIG_DRM_DW_HDMI) += dw-hdmi.o dw-hdmi-hdcp.o
obj-$(CONFIG_DRM_DW_HDMI_AHB_AUDIO) += dw-hdmi-ahb-audio.o
obj-$(CONFIG_DRM_DW_HDMI_I2S_AUDIO) += dw-hdmi-i2s-audio.o
obj-$(CONFIG_DRM_DW_HDMI_CEC) += dw-hdmi-cec.o
obj-$(CONFIG_DRM_NXP_PTN3460) += nxp-ptn3460.o
obj-$(CONFIG_DRM_PARADE_PS8622) += parade-ps8622.o
obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix/
Loading

0 comments on commit 19d99d8

Please sign in to comment.