summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ryabinin <ryabinin.a.a@gmail.com>2012-02-23 22:58:04 +0400
committerAndrew Ryabinin <ryabinin.a.a@gmail.com>2012-02-24 13:51:05 +0400
commit35153885c14b78f46a5b3b7588aa17b8df19c691 (patch)
tree0934f0751f76658d2e18b657f204c8586b06b548
parent7b993187103c05aa87bca5393a17c3d737d2f160 (diff)
downloadrockbox-35153885c14b78f46a5b3b7588aa17b8df19c691.tar.gz
rockbox-35153885c14b78f46a5b3b7588aa17b8df19c691.zip
hm60x/hm801: Fix USB DAC functionality
GPIOA pin 1 used for USB DAC. This configures IO mux for using GPIOA 0-4 pins instead of lcd data16-18,20,22, which are not needed, because hifiman's lcd works in 16bit mode. Change-Id: I47fe72abee56aebc56ef1c4c8a07a93698dcaa49
-rw-r--r--firmware/target/arm/rk27xx/lcdif-rk27xx.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/firmware/target/arm/rk27xx/lcdif-rk27xx.c b/firmware/target/arm/rk27xx/lcdif-rk27xx.c
index a5e18b0800..ff60279315 100644
--- a/firmware/target/arm/rk27xx/lcdif-rk27xx.c
+++ b/firmware/target/arm/rk27xx/lcdif-rk27xx.c
@@ -122,13 +122,16 @@ static void lcdctrl_init(void)
122 LCDC_INTR_MASK = INTR_MASK_LINE; /* INTR_MASK_EVENLINE; */ 122 LCDC_INTR_MASK = INTR_MASK_LINE; /* INTR_MASK_EVENLINE; */
123} 123}
124 124
125/* configure pins to drive lcd in 18bit mode */ 125/* configure pins to drive lcd in 18bit mode (16bit mode for HiFiMAN's) */
126static void iomux_lcd(void) 126static void iomux_lcd(void)
127{ 127{
128 unsigned long muxa; 128 unsigned long muxa;
129 129
130 muxa = SCU_IOMUXA_CON & ~(IOMUX_LCD_VSYNC|IOMUX_LCD_DEN|0xff); 130 muxa = SCU_IOMUXA_CON & ~(IOMUX_LCD_VSYNC|IOMUX_LCD_DEN|0xff);
131
132#if !defined(HM801) && !defined(HM60x)
131 muxa |= IOMUX_LCD_D18|IOMUX_LCD_D20|IOMUX_LCD_D22|IOMUX_LCD_D17|IOMUX_LCD_D16; 133 muxa |= IOMUX_LCD_D18|IOMUX_LCD_D20|IOMUX_LCD_D22|IOMUX_LCD_D17|IOMUX_LCD_D16;
134#endif
132 135
133 SCU_IOMUXA_CON = muxa; 136 SCU_IOMUXA_CON = muxa;
134 SCU_IOMUXB_CON |= IOMUX_LCD_D815; 137 SCU_IOMUXB_CON |= IOMUX_LCD_D815;