mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-11-09 13:12:37 -05:00
Merge s5l8700.h and s5l8702.h into s5l87xx.h
This is part of the preparation to add support for iPod Nano 3G and Nano 4G. There are some optimisations left, like merging similar blocks of registers that share the same layout, but the base address have changed between SoC generations. Change-Id: I4f06727b4061977141b65d39ae19591bd5b29680
This commit is contained in:
Vencislav Atanasov
parent
7fcc6a34a5
commit
9e2c85e076
44 changed files with 818 additions and 910 deletions
|
|
@ -22,7 +22,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include "inttypes.h"
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "adc.h"
|
||||
#include "adc-target.h"
|
||||
#include "kernel.h"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "dma-target.h"
|
||||
#include "panic.h"
|
||||
#include "system.h"
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include "inttypes.h"
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "generic_i2c.h"
|
||||
#include "fmradio_i2c.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include "inttypes.h"
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "adc.h"
|
||||
#include "adc-target.h"
|
||||
#include "pmu-target.h"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <stdbool.h>
|
||||
#include "config.h"
|
||||
#include "inttypes.h"
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "power.h"
|
||||
#include "panic.h"
|
||||
#include "pmu-target.h"
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#include "system.h"
|
||||
#include "serial.h"
|
||||
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "uc87xx.h"
|
||||
|
||||
/* Define LOGF_ENABLE to enable logf output in this file */
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include "inttypes.h"
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "button-target.h"
|
||||
|
||||
/* Button driver for the meizu M3
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#include "system.h"
|
||||
#include "cpu.h"
|
||||
#include "inttypes.h"
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
|
||||
/*** definitions ***/
|
||||
#define STAT_BUS_IDLE (1<<8) /* Data bus idle */
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include "inttypes.h"
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "button-target.h"
|
||||
|
||||
/* Button driver for the meizu M6SP
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include <inttypes.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "lcd.h"
|
||||
|
||||
/* LCD driver for the Meizu M6 SP using the CLCD controller in the S5L8700
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include "config.h"
|
||||
#include "system.h"
|
||||
#include "audio.h"
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "panic.h"
|
||||
#include "audiohw.h"
|
||||
#include "pcm.h"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <stdbool.h>
|
||||
#include "config.h"
|
||||
#include "inttypes.h"
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "power.h"
|
||||
|
||||
/* Power handling for S5L8700 based Meizu players
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include "inttypes.h"
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "system.h"
|
||||
#include "timer.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include "config.h"
|
||||
#include "system.h"
|
||||
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "uc87xx.h"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include "config.h"
|
||||
#include "system.h"
|
||||
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "uc87xx.h"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include "config.h"
|
||||
#include "kernel.h"
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "i2c-s5l8700.h"
|
||||
#include "uda1380.h"
|
||||
#include "udacodec.h"
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
****************************************************************************/
|
||||
|
||||
#include "config.h"
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "usb.h"
|
||||
|
||||
void usb_init_device(void)
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
#include "power.h"
|
||||
#endif
|
||||
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "usb-designware.h"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include "inttypes.h"
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "button.h"
|
||||
#include "button-target.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "lcd.h"
|
||||
|
||||
/* LCD driver for the Samsung YP-S3
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <string.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "nand-target.h"
|
||||
|
||||
/* Driver for the S5L8700 flash memory controller for low-level access to the
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
****************************************************************************/
|
||||
#include <stdbool.h>
|
||||
#include "config.h"
|
||||
#include "s5l8700.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "power.h"
|
||||
|
||||
/* Power handling for the S5L8700 based Samsung YP-S3
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
#include "config.h"
|
||||
#include "system.h" /* udelay() */
|
||||
#include "s5l8702.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "clocking-s5l8702.h"
|
||||
|
||||
/* returns configured frequency (PLLxFreq, when locked) */
|
||||
|
|
|
|||
|
|
@ -180,7 +180,7 @@
|
|||
|
||||
/* TODO: join all these definitions in an unique place */
|
||||
#if 1
|
||||
#include "s5l8702.h"
|
||||
#include "s5l87xx.h"
|
||||
#else
|
||||
#define CLKCON0 (*((volatile uint32_t*)(0x3C500000)))
|
||||
#define CLKCON1 (*((volatile uint32_t*)(0x3C500004)))
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
#include "config.h"
|
||||
#include "system.h"
|
||||
|
||||
#include "s5l8702.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "clocking-s5l8702.h"
|
||||
#include "crypto-s5l8702.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ bool dbg_hw_info(void)
|
|||
|
||||
f_clk = get_system_freqs(&c_clk, &h_clk, &p_clk);
|
||||
s_clk = h_clk / soc_get_hsdiv();
|
||||
l_clk = h_clk >> ((LCD_CONFIG & 7) + 1); /* div = 2^(val+1) */
|
||||
l_clk = h_clk >> ((LCD_CON & 7) + 1); /* div = 2^(val+1) */
|
||||
|
||||
#define MHZ 1000000
|
||||
#define TMHZ 100000
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include <config.h>
|
||||
|
||||
#include "s5l8702.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "pl080.h"
|
||||
#include "dma-s5l8702.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include "inttypes.h"
|
||||
#include "s5l8702.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "adc.h"
|
||||
#include "adc-target.h"
|
||||
#include "pmu-target.h"
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include "system.h"
|
||||
#include "audiohw.h"
|
||||
#include "i2c-s5l8702.h"
|
||||
#include "s5l8702.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "cscodec.h"
|
||||
|
||||
void audiohw_init(void)
|
||||
|
|
|
|||
|
|
@ -415,7 +415,7 @@ void lcd_init_device(void)
|
|||
lcd_type = (PDAT6 & 0x30) >> 4;
|
||||
|
||||
while (!(LCD_STATUS & 0x2));
|
||||
LCD_CONFIG = 0x80100db0;
|
||||
LCD_CON = 0x80100db0;
|
||||
LCD_PHTIME = 0x33;
|
||||
|
||||
/* Configure DMA channel */
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <stdbool.h>
|
||||
#include "config.h"
|
||||
#include "inttypes.h"
|
||||
#include "s5l8702.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "power.h"
|
||||
#include "panic.h"
|
||||
#include "pmu-target.h"
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#include "system.h"
|
||||
#include "serial.h"
|
||||
|
||||
#include "s5l8702.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "uc87xx.h"
|
||||
|
||||
/* Define LOGF_ENABLE to enable logf output in this file */
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
#include "panic.h"
|
||||
#include "mmu-arm.h"
|
||||
#include "mmcdefs-target.h"
|
||||
#include "s5l8702.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "led.h"
|
||||
#include "debug.h"
|
||||
#include "panic.h"
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
#include "config.h"
|
||||
#include "system.h"
|
||||
#include "s5l8702.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "spi-s5l8702.h"
|
||||
#include "crypto-s5l8702.h"
|
||||
#include "nor-target.h"
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include "config.h"
|
||||
#include "system.h"
|
||||
#include "audio.h"
|
||||
#include "s5l8702.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "panic.h"
|
||||
#include "audiohw.h"
|
||||
#include "pcm.h"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include <stdbool.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "s5l8702.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "clocking-s5l8702.h"
|
||||
#include "spi-s5l8702.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include "inttypes.h"
|
||||
#include "s5l8702.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "system.h"
|
||||
#include "timer.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
#include "cpu.h"
|
||||
#include "system.h"
|
||||
|
||||
#include "s5l8702.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "uc87xx.h"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
#include "usb_core.h"
|
||||
#endif
|
||||
|
||||
#include "s5l8702.h"
|
||||
#include "s5l87xx.h"
|
||||
#include "clocking-s5l8702.h"
|
||||
#include "usb-designware.h"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue