On 10/05/16 15:26, Hans Verkuil wrote: >>> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi >>> index 2bd9c83..1bb490f 100644 >>> --- a/arch/arm/boot/dts/omap4.dtsi >>> +++ b/arch/arm/boot/dts/omap4.dtsi >>> @@ -1006,8 +1006,9 @@ >>> reg = <0x58006000 0x200>, >>> <0x58006200 0x100>, >>> <0x58006300 0x100>, >>> - <0x58006400 0x1000>; >>> - reg-names = "wp", "pll", "phy", "core"; >>> + <0x58006400 0x900>, >>> + <0x58006D00 0x100>; >>> + reg-names = "wp", "pll", "phy", "core", "cec"; >> >> "core" contains four blocks, all of which are currently included there >> in the "core" space. I'm not sure why they weren't split up properly >> when the driver was written, but I think we should either keep the core >> as one big block, or split it up to those four sections, instead of just >> separating the CEC block. > > I don't entirely agree with that, partially because it would mean extra work for > me :-) and partially because CEC is different from the other blocks in that it > is an optional HDMI feature. I don't think it matters in this context if it's an optional HDMI feature or not. This is about representing the HW memory areas, and I'd like to keep it consistent, so either one big block, or if we want to split it, split it up properly as shown in the TRM. I'm fine with keeping one big "core" memory area there, that should work fine for CEC, shouldn't it? And it would be the easiest option for you ;). > >> >>> interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>; >>> status = "disabled"; >>> ti,hwmods = "dss_hdmi"; >>> diff --git a/drivers/gpu/drm/omapdrm/dss/Kconfig b/drivers/gpu/drm/omapdrm/dss/Kconfig >>> index d1fa730..69638e9 100644 >>> --- a/drivers/gpu/drm/omapdrm/dss/Kconfig >>> +++ b/drivers/gpu/drm/omapdrm/dss/Kconfig >>> @@ -71,9 +71,17 @@ config OMAP4_DSS_HDMI >>> bool "HDMI support for OMAP4" >>> default y >>> select OMAP2_DSS_HDMI_COMMON >>> + select MEDIA_CEC_EDID >> >> Hmm, what's in MEDIA_CEC_EDID, why does OMAP4 HDMI need to select that? > > Helper functions that manipulate the physical address in an EDID. CEC may be > optional, but the EDID isn't. These functions were just too big to make them > static inlines, so instead it's a simple module. Oh, I see, even if OMAP4's HDMI CEC is disabled, you use cec edid functions in hdmi4.c. >>> diff --git a/drivers/gpu/drm/omapdrm/dss/Makefile b/drivers/gpu/drm/omapdrm/dss/Makefile >>> index b651ec9..37eb597 100644 >>> --- a/drivers/gpu/drm/omapdrm/dss/Makefile >>> +++ b/drivers/gpu/drm/omapdrm/dss/Makefile >>> @@ -10,6 +10,9 @@ omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o >>> omapdss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o >>> omapdss-$(CONFIG_OMAP2_DSS_HDMI_COMMON) += hdmi_common.o hdmi_wp.o hdmi_pll.o \ >>> hdmi_phy.o >>> +ifeq ($(CONFIG_OMAP2_DSS_HDMI_CEC),y) >>> + omapdss-$(CONFIG_OMAP2_DSS_HDMI_COMMON) += hdmi_cec.o >>> +endif >> >> The file should be hdmi4_cec.o, as it's for omap4. And why the ifeq? >> Isn't just >> >> omapdss-$(OMAP4_DSS_HDMI_CEC) += hdmi4_cec.o > > OMAP4_DSS_HDMI_CEC is a bool, not a tristate. Yes, and that's fine. You're not compiling hdmi4_cec.o as a module, you're compiling it into omapdss.o. Objects are added with "omapdss-y += xyz" to omapdss.o. Tomi
Attachment:
signature.asc
Description: OpenPGP digital signature
