Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mx6: Provide a structure for accessing HDMI registers

Browse source 
Provide a structure for accessing HDMI registers, so that we can use proper
read/write accessors.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Eric Nelson <eric.nelson@boundarydevices.com>
This commit is contained in:
Fabio Estevam 2013-02-28 14:35:02 +00:00 committed by Stefano Babic
parent 3e9dc93051
commit 1b097cff51
2 changed files with 558 additions and 553 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1083
arch/arm/include/asm/arch-mx6/mxc_hdmi.h
View file

File diff suppressed because it is too large Load diff

28
board/freescale/mx6qsabrelite/mx6qsabrelite.c
View file

@ -455,32 +455,26 @@ struct display_info_t {
static int detect_hdmi(struct display_info_t const *dev) static int detect_hdmi(struct display_info_t const *dev)
{ {
return __raw_readb(HDMI_ARB_BASE_ADDR+HDMI_PHY_STAT0) & HDMI_PHY_HPD; struct hdmi_regs *hdmi = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR;
return readb(&hdmi->phy_stat0) & HDMI_PHY_HPD;
} }
static void enable_hdmi(struct display_info_t const *dev) static void enable_hdmi(struct display_info_t const *dev)
{ {
struct hdmi_regs *hdmi = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR;
u8 reg; u8 reg;
printf("%s: setup HDMI monitor\n", __func__); printf("%s: setup HDMI monitor\n", __func__);
reg = __raw_readb( reg = readb(&hdmi->phy_conf0);
HDMI_ARB_BASE_ADDR
+HDMI_PHY_CONF0);
reg |= HDMI_PHY_CONF0_PDZ_MASK; reg |= HDMI_PHY_CONF0_PDZ_MASK;
__raw_writeb(reg, writeb(reg, &hdmi->phy_conf0);
HDMI_ARB_BASE_ADDR
+HDMI_PHY_CONF0);
udelay(3000); udelay(3000);
reg |= HDMI_PHY_CONF0_ENTMDS_MASK; reg |= HDMI_PHY_CONF0_ENTMDS_MASK;
__raw_writeb(reg, writeb(reg, &hdmi->phy_conf0);
HDMI_ARB_BASE_ADDR
+HDMI_PHY_CONF0);
udelay(3000); udelay(3000);
reg |= HDMI_PHY_CONF0_GEN2_TXPWRON_MASK; reg |= HDMI_PHY_CONF0_GEN2_TXPWRON_MASK;
__raw_writeb(reg, writeb(reg, &hdmi->phy_conf0);
HDMI_ARB_BASE_ADDR writeb(HDMI_MC_PHYRSTZ_ASSERT, &hdmi->mc_phyrstz);
+HDMI_PHY_CONF0);
__raw_writeb(HDMI_MC_PHYRSTZ_ASSERT,
HDMI_ARB_BASE_ADDR+HDMI_MC_PHYRSTZ);
} }
static int detect_i2c(struct display_info_t const *dev) static int detect_i2c(struct display_info_t const *dev)
@ -638,6 +632,7 @@ static void setup_display(void)
struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR; struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR;
struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR;
struct hdmi_regs *hdmi = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR;
int reg; int reg;
@ -654,8 +649,7 @@ static void setup_display(void)
writel(reg, &mxc_ccm->CCGR2); writel(reg, &mxc_ccm->CCGR2);
/* clear HDMI PHY reset */ /* clear HDMI PHY reset */
__raw_writeb(HDMI_MC_PHYRSTZ_DEASSERT, writeb(HDMI_MC_PHYRSTZ_DEASSERT, &hdmi->mc_phyrstz);
HDMI_ARB_BASE_ADDR+HDMI_MC_PHYRSTZ);
/* set PFD1_FRAC to 0x13 == 455 MHz (480*18)/0x13 */ /* set PFD1_FRAC to 0x13 == 455 MHz (480*18)/0x13 */
writel(ANATOP_PFD_480_PFD1_FRAC_MASK, &anatop->pfd_480_clr); writel(ANATOP_PFD_480_PFD1_FRAC_MASK, &anatop->pfd_480_clr);