diff options
| author | Robert Winkler <robert.winkler@boundarydevices.com> | 2013-07-23 15:07:56 -0700 |
|---|---|---|
| committer | Liu Ying <Ying.Liu@freescale.com> | 2013-11-22 17:28:20 +0800 |
| commit | 7d765929153595578db47d5d21ff66e9cd5bc5c6 (patch) | |
| tree | 69b925115af270bc67f052ae385bfba2a7d17042 | |
| parent | 17321f6a9eae314058eec29d1b30c9cb721457ea (diff) | |
| download | u-boot-imx-7d765929153595578db47d5d21ff66e9cd5bc5c6.zip u-boot-imx-7d765929153595578db47d5d21ff66e9cd5bc5c6.tar.gz u-boot-imx-7d765929153595578db47d5d21ff66e9cd5bc5c6.tar.bz2 | |
imx: nitrogen6x: mx6qsabrelite: Add support for DVI monitors
A little background is probably appropriate for this patch.
Since "the beginning" of usage of the SABRE Lite and Nitrogen6x
boards, DVI detection has been somewhat broken.
Some (most) DVI monitors don't produce the "HPD" bit in
the PHY_STAT0 register, but do show proper toggling of the
RX_SENSE0..3 bits.
Creating a new the bit-mask to include all five bits and
modifying the 'hdmidet' command and internal detection
routines allows these monitors to function properly in U-Boot.
A related patch to our kernels allows things to work under
Linux:
https://github.com/boundarydevices/linux-imx6/commit/7d8752905c118af9063738a533227de0b2f6ecd4
Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
Acked-by: Stefano Babic <sbabic@denx.de>
(cherry picked from commit 10f779da54b8a8c85df6d58592c40836d8e7ed49)
Signed-off-by: Jason Liu <r64343@freescale.com>
(cherry picked from commit c5f576bb0effceb232986d1b6ca76f06f129516f)
| -rw-r--r-- | arch/arm/imx-common/cmd_hdmidet.c | 3 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/mxc_hdmi.h | 3 | ||||
| -rw-r--r-- | board/boundary/nitrogen6x/nitrogen6x.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/imx-common/cmd_hdmidet.c b/arch/arm/imx-common/cmd_hdmidet.c index 794bf50..ce0b26e 100644 --- a/arch/arm/imx-common/cmd_hdmidet.c +++ b/arch/arm/imx-common/cmd_hdmidet.c @@ -27,8 +27,7 @@ static int do_hdmidet(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { struct hdmi_regs *hdmi = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR; - u8 reg = readb(&hdmi->phy_stat0) & HDMI_PHY_HPD; - return (reg&HDMI_PHY_HPD) ? 0 : 1; + return (readb(&hdmi->phy_stat0) & HDMI_DVI_STAT) ? 0 : 1; } U_BOOT_CMD(hdmidet, 1, 1, do_hdmidet, diff --git a/arch/arm/include/asm/arch-mx6/mxc_hdmi.h b/arch/arm/include/asm/arch-mx6/mxc_hdmi.h index 5cd6aa6..2d93658 100644 --- a/arch/arm/include/asm/arch-mx6/mxc_hdmi.h +++ b/arch/arm/include/asm/arch-mx6/mxc_hdmi.h @@ -901,6 +901,9 @@ enum { HDMI_PHY_HPD = 0x02, HDMI_PHY_TX_PHY_LOCK = 0x01, +/* Convenience macro RX_SENSE | HPD */ + HDMI_DVI_STAT = 0xF2, + /* PHY_I2CM_SLAVE_ADDR field values */ HDMI_PHY_I2CM_SLAVE_ADDR_PHY_GEN2 = 0x69, HDMI_PHY_I2CM_SLAVE_ADDR_HEAC_PHY = 0x49, diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c index 081847c..fdd2401 100644 --- a/board/boundary/nitrogen6x/nitrogen6x.c +++ b/board/boundary/nitrogen6x/nitrogen6x.c @@ -484,7 +484,7 @@ struct display_info_t { static int detect_hdmi(struct display_info_t const *dev) { struct hdmi_regs *hdmi = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR; - return readb(&hdmi->phy_stat0) & HDMI_PHY_HPD; + return readb(&hdmi->phy_stat0) & HDMI_DVI_STAT; } static void do_enable_hdmi(struct display_info_t const *dev) |