summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c1
-rw-r--r--firmware/target/mips/ingenic_jz47xx/xduoo_x3/lcd-xduoo_x3.c6
2 files changed, 5 insertions, 2 deletions
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c
index 8da1313cf8..55ffecce09 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c
@@ -1335,6 +1335,7 @@ int sd_init(void)
if(!inited)
{
+ __cpm_stop_msc0(); /* We don't use MSC0 */
#if SD_DMA_INTERRUPT || SD_INTERRUPT
semaphore_init(&sd_wakeup[SD_SLOT_1], 1, 0);
diff --git a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/lcd-xduoo_x3.c b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/lcd-xduoo_x3.c
index a7449f144d..0446fb2cce 100644
--- a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/lcd-xduoo_x3.c
+++ b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/lcd-xduoo_x3.c
@@ -118,6 +118,8 @@ void lcd_hw_init(void)
udelay(1);
__gpio_set_pin(PIN_LCD_RES);
__gpio_clear_pin(PIN_LCD_CS);
+
+ __cpm_stop_lcd(); /* We don't use the LCD controller */
}
void lcd_write_command(int byte)
@@ -167,7 +169,7 @@ int lcd_default_contrast(void)
void lcd_set_contrast(int val)
{
static int last_val = 0xFFFFFF;
-
+
if (val >= 0) /* brightness menu */
{
lcd_write_command(LCD_CNTL_CONTRAST);
@@ -175,7 +177,7 @@ void lcd_set_contrast(int val)
}
else if (val != last_val)
{
- /* here we change the voltage level and drive times
+ /* here we change the voltage level and drive times
* longer precharge = dimmer display
* higher voltage = shorter precharge required
*/