commit d55afebf8bc03f87d1a8b8f92144c2f8da6ca0ae
author Nico Huber <nico.huber@secunet.com> Fri Oct 21 14:31:10 2016 +0200
committer Nico Huber <nico.h@gmx.de> Sat Oct 29 01:26:13 2016 +0200
tree 7703f06d76adeaf58b1fd9c8980716410c92909d
parent 393aa8a8b62455d69651122d1aa3dacc21dd750c

gma i2c: Make I2C port for VGA displays a config option

Boards with a DVI-I connector share the I2C pins for both analog and
digital displays. In that case, the EDID for a VGA display has to be
read over the I2C interface of the coupled digital port.

TEST=Booted kontron/ktqm77 with DVI-I to VGA cable. Display is detected
     and enabled (but doesn't show anything, yet?).

Change-Id: I5c4f77d5ad1927f075877a3719361ed2193f4c39
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/17086
Tested-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

common/Makefile.inc

diff --git a/common/Makefile.inc b/common/Makefile.inc
index 31020a9..9745eb6 100644
--- a/common/Makefile.inc
+++ b/common/Makefile.inc
@@ -42,6 +42,7 @@
 CONFIG_GFX_GMA_CPU		:= $(call strip_quotes,$(CONFIG_GFX_GMA_CPU))
 CONFIG_GFX_GMA_CPU_VARIANT	:= $(call strip_quotes,$(CONFIG_GFX_GMA_CPU_VARIANT))
 CONFIG_GFX_GMA_INTERNAL_PORT	:= $(call strip_quotes,$(CONFIG_GFX_GMA_INTERNAL_PORT))
+CONFIG_GFX_GMA_ANALOG_I2C_PORT	:= $(call strip_quotes,$(CONFIG_GFX_GMA_ANALOG_I2C_PORT))
 
 hw-gfx-gma-config-ads := $(subst //,/,$(call src-to-obj,,$(dir)/hw-gfx-gma-config).ads)
 
@@ -50,6 +51,7 @@
 	sed -e's/<<CPU>>/$(CONFIG_GFX_GMA_CPU)/' \
 	    -e's/<<CPU_VARIANT>>/$(CONFIG_GFX_GMA_CPU_VARIANT)/' \
 	    -e's/<<INTERNAL_PORT>>/$(CONFIG_GFX_GMA_INTERNAL_PORT)/' \
+	    -e's/<<ANALOG_I2C_PORT>>/$(CONFIG_GFX_GMA_ANALOG_I2C_PORT)/' \
 	    -e's/<<DEFAULT_MMIO_BASE>>/$(CONFIG_GFX_GMA_DEFAULT_MMIO)/' \
 	    $< >$@
 gfxinit-gen-y += $(hw-gfx-gma-config-ads)

common/hw-gfx-gma-config.ads.template

diff --git a/common/hw-gfx-gma-config.ads.template b/common/hw-gfx-gma-config.ads.template
index c3a5152..1ba66a2 100644
--- a/common/hw-gfx-gma-config.ads.template
+++ b/common/hw-gfx-gma-config.ads.template
@@ -23,6 +23,8 @@
 
    Internal_Display : constant Internal_Type := <<INTERNAL_PORT>>;
 
+   Analog_I2C_Port : constant PCH_Port := <<ANALOG_I2C_PORT>>;
+
    EDP_Low_Voltage_Swing : constant Boolean := False;
 
    Default_MMIO_Base : constant := <<DEFAULT_MMIO_BASE>>;

common/hw-gfx-gma-connector_info.adb

diff --git a/common/hw-gfx-gma-connector_info.adb b/common/hw-gfx-gma-connector_info.adb
index 2ee0c05..c5dcad2 100644
--- a/common/hw-gfx-gma-connector_info.adb
+++ b/common/hw-gfx-gma-connector_info.adb
@@ -59,7 +59,9 @@
                Success  => Success);
          else
             I2C.I2C_Read
-              (Port     => Port_Cfg.PCH_Port,
+              (Port     => (if Port_Cfg.Display = VGA
+                            then Config.Analog_I2C_Port
+                            else Port_Cfg.PCH_Port),
                Address  => 16#50#,
                Length   => Raw_EDID_Length,
                Data     => Raw_EDID,