diff options
Diffstat (limited to 'firmware/target/arm/imx31')
-rw-r--r-- | firmware/target/arm/imx31/ata-imx31.c (renamed from firmware/target/arm/imx31/gigabeat-s/ata-imx31.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/ata-target.h (renamed from firmware/target/arm/imx31/gigabeat-s/ata-target.h) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/avic-imx31.c (renamed from firmware/target/arm/imx31/gigabeat-s/avic-imx31.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/avic-imx31.h (renamed from firmware/target/arm/imx31/gigabeat-s/avic-imx31.h) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/adc-gigabeat-s.c (renamed from firmware/target/arm/imx31/gigabeat-s/adc-imx31.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/backlight-gigabeat-s.c (renamed from firmware/target/arm/imx31/gigabeat-s/backlight-imx31.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/button-gigabeat-s.c (renamed from firmware/target/arm/imx31/gigabeat-s/button-imx31.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/i2s-gigabeat-s.c (renamed from firmware/target/arm/imx31/gigabeat-s/i2s-imx31.c) | 21 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/kernel-gigabeat-s.c (renamed from firmware/target/arm/imx31/gigabeat-s/kernel-imx31.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c (renamed from firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c (renamed from firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c (renamed from firmware/target/arm/imx31/gigabeat-s/power-imx31.c) | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.h (renamed from firmware/target/arm/imx31/gigabeat-s/power-imx31.h) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c (renamed from firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c) | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c (renamed from firmware/target/arm/imx31/gigabeat-s/system-imx31.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/timer-gigabeat-s.c (renamed from firmware/target/arm/imx31/gigabeat-s/timer-imx31.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c (renamed from firmware/target/arm/imx31/gigabeat-s/usb-imx31.c) | 4 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/wmcodec-gigabeat-s.c (renamed from firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c) | 20 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gpio-imx31.c (renamed from firmware/target/arm/imx31/gigabeat-s/gpio-imx31.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gpio-imx31.h (renamed from firmware/target/arm/imx31/gigabeat-s/gpio-imx31.h) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/i2c-imx31.c (renamed from firmware/target/arm/imx31/gigabeat-s/i2c-imx31.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/i2c-imx31.h (renamed from firmware/target/arm/imx31/gigabeat-s/i2c-imx31.h) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/mc13783-imx31.c (renamed from firmware/target/arm/imx31/gigabeat-s/mc13783-imx31.c) | 5 | ||||
-rw-r--r-- | firmware/target/arm/imx31/mmu-imx31.c (renamed from firmware/target/arm/imx31/gigabeat-s/mmu-imx31.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/mmu-imx31.h (renamed from firmware/target/arm/imx31/gigabeat-s/mmu-imx31.h) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/serial-imx31.h (renamed from firmware/target/arm/imx31/gigabeat-s/serial-imx31.h) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/spi-imx31.c (renamed from firmware/target/arm/imx31/gigabeat-s/spi-imx31.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/spi-imx31.h (renamed from firmware/target/arm/imx31/gigabeat-s/spi-imx31.h) | 0 |
29 files changed, 27 insertions, 29 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/ata-imx31.c b/firmware/target/arm/imx31/ata-imx31.c index 5ce7ad0a03..5ce7ad0a03 100644 --- a/firmware/target/arm/imx31/gigabeat-s/ata-imx31.c +++ b/firmware/target/arm/imx31/ata-imx31.c | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/ata-target.h b/firmware/target/arm/imx31/ata-target.h index f7f84f82e9..f7f84f82e9 100644 --- a/firmware/target/arm/imx31/gigabeat-s/ata-target.h +++ b/firmware/target/arm/imx31/ata-target.h | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/avic-imx31.c b/firmware/target/arm/imx31/avic-imx31.c index 4ba7da4be0..4ba7da4be0 100644 --- a/firmware/target/arm/imx31/gigabeat-s/avic-imx31.c +++ b/firmware/target/arm/imx31/avic-imx31.c | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/avic-imx31.h b/firmware/target/arm/imx31/avic-imx31.h index a049713600..a049713600 100644 --- a/firmware/target/arm/imx31/gigabeat-s/avic-imx31.h +++ b/firmware/target/arm/imx31/avic-imx31.h | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/adc-imx31.c b/firmware/target/arm/imx31/gigabeat-s/adc-gigabeat-s.c index 52293228f8..52293228f8 100644 --- a/firmware/target/arm/imx31/gigabeat-s/adc-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/adc-gigabeat-s.c | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/backlight-imx31.c b/firmware/target/arm/imx31/gigabeat-s/backlight-gigabeat-s.c index ec7bf7e8a9..ec7bf7e8a9 100644 --- a/firmware/target/arm/imx31/gigabeat-s/backlight-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/backlight-gigabeat-s.c | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/button-imx31.c b/firmware/target/arm/imx31/gigabeat-s/button-gigabeat-s.c index ae158b811d..ae158b811d 100644 --- a/firmware/target/arm/imx31/gigabeat-s/button-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/button-gigabeat-s.c | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/i2s-imx31.c b/firmware/target/arm/imx31/gigabeat-s/i2s-gigabeat-s.c index d1c917a209..c2ec0d6cab 100644 --- a/firmware/target/arm/imx31/gigabeat-s/i2s-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/i2s-gigabeat-s.c | |||
@@ -18,9 +18,28 @@ | |||
18 | * KIND, either express or implied. | 18 | * KIND, either express or implied. |
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | #include "config.h" | |
22 | #include "system.h" | ||
22 | #include "i2s.h" | 23 | #include "i2s.h" |
23 | 24 | ||
24 | void i2s_reset(void) | 25 | void i2s_reset(void) |
25 | { | 26 | { |
27 | /* How SYSCLK for codec is derived (USBPLL=338.688MHz). | ||
28 | * | ||
29 | * SSI post dividers (SSI2 PODF=4, SSI2 PRE PODF=0): | ||
30 | * 338688000Hz / 5 = 67737600Hz = ssi1_clk | ||
31 | * | ||
32 | * SSI bit clock dividers (DIV2=1, PSR=0, PM=0): | ||
33 | * ssi1_clk / 4 = 16934400Hz = INT_BIT_CLK (MCLK) | ||
34 | * | ||
35 | * WM Codec post divider (MCLKDIV=1.5): | ||
36 | * INT_BIT_CLK (MCLK) / 1.5 = 11289600Hz = 256*fs = SYSCLK | ||
37 | */ | ||
38 | imx31_regmod32(&CCM_PDR1, | ||
39 | ((1-1) << CCM_PDR1_SSI1_PRE_PODF_POS) | | ||
40 | ((5-1) << CCM_PDR1_SSI1_PODF_POS) | | ||
41 | ((8-1) << CCM_PDR1_SSI2_PRE_PODF_POS) | | ||
42 | ((64-1) << CCM_PDR1_SSI2_PODF_POS), | ||
43 | CCM_PDR1_SSI1_PODF | CCM_PDR1_SSI2_PODF | | ||
44 | CCM_PDR1_SSI1_PRE_PODF | CCM_PDR1_SSI2_PRE_PODF); | ||
26 | } | 45 | } |
diff --git a/firmware/target/arm/imx31/gigabeat-s/kernel-imx31.c b/firmware/target/arm/imx31/gigabeat-s/kernel-gigabeat-s.c index 8e81447bd3..8e81447bd3 100644 --- a/firmware/target/arm/imx31/gigabeat-s/kernel-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/kernel-gigabeat-s.c | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c b/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c index 71d8e4bef4..71d8e4bef4 100644 --- a/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c index fc9ad719a6..2060b7bc6a 100644 --- a/firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c +++ b/firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "adc-target.h" | 27 | #include "adc-target.h" |
28 | #include "button-target.h" | 28 | #include "button-target.h" |
29 | #include "usb-target.h" | 29 | #include "usb-target.h" |
30 | #include "power-imx31.h" | 30 | #include "power-gigabeat-s.h" |
31 | #include "powermgmt-target.h" | 31 | #include "powermgmt-target.h" |
32 | 32 | ||
33 | /* Gigabeat S definitions for static MC13783 event registration */ | 33 | /* Gigabeat S definitions for static MC13783 event registration */ |
diff --git a/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c b/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c index 6cec3ecdd3..6cec3ecdd3 100644 --- a/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/power-imx31.c b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c index b29d3cd0fb..7e3b39dba8 100644 --- a/firmware/target/arm/imx31/gigabeat-s/power-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "usb.h" | 23 | #include "usb.h" |
24 | #include "usb_core.h" | 24 | #include "usb_core.h" |
25 | #include "power.h" | 25 | #include "power.h" |
26 | #include "power-imx31.h" | 26 | #include "power-gigabeat-s.h" |
27 | #include "backlight.h" | 27 | #include "backlight.h" |
28 | #include "backlight-target.h" | 28 | #include "backlight-target.h" |
29 | #include "avic-imx31.h" | 29 | #include "avic-imx31.h" |
diff --git a/firmware/target/arm/imx31/gigabeat-s/power-imx31.h b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.h index 9294de102c..9294de102c 100644 --- a/firmware/target/arm/imx31/gigabeat-s/power-imx31.h +++ b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.h | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c b/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c index bb9b8c23af..34abf04940 100644 --- a/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include "adc.h" | 26 | #include "adc.h" |
27 | #include "powermgmt.h" | 27 | #include "powermgmt.h" |
28 | #include "power.h" | 28 | #include "power.h" |
29 | #include "power-imx31.h" | 29 | #include "power-gigabeat-s.h" |
30 | 30 | ||
31 | /* TODO: Battery tests to get the right values! */ | 31 | /* TODO: Battery tests to get the right values! */ |
32 | const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = | 32 | const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = |
diff --git a/firmware/target/arm/imx31/gigabeat-s/system-imx31.c b/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c index cd684e77ac..cd684e77ac 100644 --- a/firmware/target/arm/imx31/gigabeat-s/system-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c b/firmware/target/arm/imx31/gigabeat-s/timer-gigabeat-s.c index f3f78a1ee1..f3f78a1ee1 100644 --- a/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/timer-gigabeat-s.c | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c b/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c index 64ff04e7ae..d873c19ed3 100644 --- a/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c | |||
@@ -27,10 +27,10 @@ | |||
27 | #include "usb_core.h" | 27 | #include "usb_core.h" |
28 | #include "usb_drv.h" | 28 | #include "usb_drv.h" |
29 | #include "usb-target.h" | 29 | #include "usb-target.h" |
30 | #include "mc13783.h" | ||
30 | #include "ccm-imx31.h" | 31 | #include "ccm-imx31.h" |
31 | #include "power-imx31.h" | ||
32 | #include "avic-imx31.h" | 32 | #include "avic-imx31.h" |
33 | #include "mc13783.h" | 33 | #include "power-gigabeat-s.h" |
34 | 34 | ||
35 | static int usb_status = USB_EXTRACTED; | 35 | static int usb_status = USB_EXTRACTED; |
36 | 36 | ||
diff --git a/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c b/firmware/target/arm/imx31/gigabeat-s/wmcodec-gigabeat-s.c index 06bb4d6306..96324cc162 100644 --- a/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/wmcodec-gigabeat-s.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include "kernel.h" | 25 | #include "kernel.h" |
26 | #include "sound.h" | 26 | #include "sound.h" |
27 | #include "wmcodec.h" | 27 | #include "wmcodec.h" |
28 | #include "i2s.h" | ||
28 | #include "i2c-imx31.h" | 29 | #include "i2c-imx31.h" |
29 | 30 | ||
30 | /* NOTE: Some port-specific bits will have to be moved away (node and GPIO | 31 | /* NOTE: Some port-specific bits will have to be moved away (node and GPIO |
@@ -41,24 +42,7 @@ static struct i2c_node wm8978_i2c_node = | |||
41 | 42 | ||
42 | void audiohw_init(void) | 43 | void audiohw_init(void) |
43 | { | 44 | { |
44 | /* How SYSCLK for codec is derived (USBPLL=338.688MHz). | 45 | i2s_reset(); |
45 | * | ||
46 | * SSI post dividers (SSI2 PODF=4, SSI2 PRE PODF=0): | ||
47 | * 338688000Hz / 5 = 67737600Hz = ssi1_clk | ||
48 | * | ||
49 | * SSI bit clock dividers (DIV2=1, PSR=0, PM=0): | ||
50 | * ssi1_clk / 4 = 16934400Hz = INT_BIT_CLK (MCLK) | ||
51 | * | ||
52 | * WM Codec post divider (MCLKDIV=1.5): | ||
53 | * INT_BIT_CLK (MCLK) / 1.5 = 11289600Hz = 256*fs = SYSCLK | ||
54 | */ | ||
55 | imx31_regmod32(&CCM_PDR1, | ||
56 | ((1-1) << CCM_PDR1_SSI1_PRE_PODF_POS) | | ||
57 | ((5-1) << CCM_PDR1_SSI1_PODF_POS) | | ||
58 | ((8-1) << CCM_PDR1_SSI2_PRE_PODF_POS) | | ||
59 | ((64-1) << CCM_PDR1_SSI2_PODF_POS), | ||
60 | CCM_PDR1_SSI1_PODF | CCM_PDR1_SSI2_PODF | | ||
61 | CCM_PDR1_SSI1_PRE_PODF | CCM_PDR1_SSI2_PRE_PODF); | ||
62 | 46 | ||
63 | i2c_enable_node(&wm8978_i2c_node, true); | 47 | i2c_enable_node(&wm8978_i2c_node, true); |
64 | 48 | ||
diff --git a/firmware/target/arm/imx31/gigabeat-s/gpio-imx31.c b/firmware/target/arm/imx31/gpio-imx31.c index 944f70eae3..944f70eae3 100644 --- a/firmware/target/arm/imx31/gigabeat-s/gpio-imx31.c +++ b/firmware/target/arm/imx31/gpio-imx31.c | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/gpio-imx31.h b/firmware/target/arm/imx31/gpio-imx31.h index 72956d4efa..72956d4efa 100644 --- a/firmware/target/arm/imx31/gigabeat-s/gpio-imx31.h +++ b/firmware/target/arm/imx31/gpio-imx31.h | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/i2c-imx31.c b/firmware/target/arm/imx31/i2c-imx31.c index 1ffdce38ea..1ffdce38ea 100644 --- a/firmware/target/arm/imx31/gigabeat-s/i2c-imx31.c +++ b/firmware/target/arm/imx31/i2c-imx31.c | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/i2c-imx31.h b/firmware/target/arm/imx31/i2c-imx31.h index b36acecfcb..b36acecfcb 100644 --- a/firmware/target/arm/imx31/gigabeat-s/i2c-imx31.h +++ b/firmware/target/arm/imx31/i2c-imx31.h | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/mc13783-imx31.c b/firmware/target/arm/imx31/mc13783-imx31.c index 2c5af8d5b7..fc5dfa72f6 100644 --- a/firmware/target/arm/imx31/gigabeat-s/mc13783-imx31.c +++ b/firmware/target/arm/imx31/mc13783-imx31.c | |||
@@ -26,11 +26,6 @@ | |||
26 | #include "debug.h" | 26 | #include "debug.h" |
27 | #include "kernel.h" | 27 | #include "kernel.h" |
28 | 28 | ||
29 | #include "power-imx31.h" | ||
30 | #include "button-target.h" | ||
31 | #include "adc-target.h" | ||
32 | #include "usb-target.h" | ||
33 | |||
34 | #ifdef BOOTLOADER | 29 | #ifdef BOOTLOADER |
35 | #define PMIC_DRIVER_CLOSE | 30 | #define PMIC_DRIVER_CLOSE |
36 | #endif | 31 | #endif |
diff --git a/firmware/target/arm/imx31/gigabeat-s/mmu-imx31.c b/firmware/target/arm/imx31/mmu-imx31.c index 920a8c9fd3..920a8c9fd3 100644 --- a/firmware/target/arm/imx31/gigabeat-s/mmu-imx31.c +++ b/firmware/target/arm/imx31/mmu-imx31.c | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/mmu-imx31.h b/firmware/target/arm/imx31/mmu-imx31.h index c66a3d941d..c66a3d941d 100644 --- a/firmware/target/arm/imx31/gigabeat-s/mmu-imx31.h +++ b/firmware/target/arm/imx31/mmu-imx31.h | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/serial-imx31.h b/firmware/target/arm/imx31/serial-imx31.h index cbb7be2ec3..cbb7be2ec3 100644 --- a/firmware/target/arm/imx31/gigabeat-s/serial-imx31.h +++ b/firmware/target/arm/imx31/serial-imx31.h | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/spi-imx31.c b/firmware/target/arm/imx31/spi-imx31.c index ac063f9b10..ac063f9b10 100644 --- a/firmware/target/arm/imx31/gigabeat-s/spi-imx31.c +++ b/firmware/target/arm/imx31/spi-imx31.c | |||
diff --git a/firmware/target/arm/imx31/gigabeat-s/spi-imx31.h b/firmware/target/arm/imx31/spi-imx31.h index cf536b646d..cf536b646d 100644 --- a/firmware/target/arm/imx31/gigabeat-s/spi-imx31.h +++ b/firmware/target/arm/imx31/spi-imx31.h | |||