From d8bd356e565f5d1be946462616e8bb1e858fb833 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Sat, 28 Jul 2018 17:35:01 +0200 Subject: Revert "As3525 v1/v2 Add power savings menu" This reverts commit 6f0320a9535bc1aa81d83fa879ac14d5ee603658. Change-Id: I7425d422a4a0af7a49e9194cfe0bb55d431bc401 --- .../target/arm/as3525/sansa-clipzip/lcd-clipzip.c | 24 +--------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'firmware/target/arm/as3525/sansa-clipzip') diff --git a/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c b/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c index 8a3df517fb..e17bfc421b 100644 --- a/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c +++ b/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c @@ -35,26 +35,12 @@ static int lcd_type; static bool lcd_enabled; #endif -static void ssp_set_prescaler(unsigned int prescaler) -{ - int oldlevel = disable_interrupt_save(IRQ_FIQ_STATUS); - /* must be on to write regs */ - bool ssp_enabled = bitset32(&CGU_PERI, CGU_SSP_CLOCK_ENABLE) & - CGU_SSP_CLOCK_ENABLE; - SSP_CPSR = prescaler; - - if (!ssp_enabled) /* put it back how we found it */ - bitclr32(&CGU_PERI, CGU_SSP_CLOCK_ENABLE); - - restore_irq(oldlevel); -} - /* initialises the host lcd hardware, returns the lcd type */ static int lcd_hw_init(void) { /* configure SSP */ bitset32(&CGU_PERI, CGU_SSP_CLOCK_ENABLE); - ssp_set_prescaler(AS3525_SSP_PRESCALER); /* OF = 0x8 */ + SSP_CPSR = 4; /* TODO: use AS3525_SSP_PRESCALER, OF uses 8 */ SSP_CR0 = (0 << 8) | /* SCR, serial clock rate divider = 1 */ (1 << 7) | /* SPH, phase = 1 */ (1 << 6) | /* SPO, polarity = 1 */ @@ -451,11 +437,3 @@ void lcd_update(void) { lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT); } - -#if defined(CONFIG_POWER_SAVING) && (CONFIG_POWER_SAVING & POWERSV_DISP) -/* declared in system-as3525.c */ -void ams_ssp_set_low_speed(bool slow) -{ - ssp_set_prescaler(slow ? AS3525_SSP_PRESCALER_MAX : AS3525_SSP_PRESCALER); -} -#endif -- cgit v1.2.3