diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2009-03-22 02:13:27 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2009-03-22 02:13:27 +0000 |
commit | ba71cc540cea33806ff6c2c2e8fe5fe5defa2463 (patch) | |
tree | bb0439bc8769f1a27d923d89c6cb6565eba1d2ce | |
parent | b7f7655dc2ae979fee8b01ed894224e5c2f7c719 (diff) | |
download | rockbox-ba71cc540cea33806ff6c2c2e8fe5fe5defa2463.tar.gz rockbox-ba71cc540cea33806ff6c2c2e8fe5fe5defa2463.zip |
imx31: Rename clkctl-imx31.* to ccm-imx31.* and move up from ...imx31/gigabeat-s to .../imx31. A bunch more should probably go up a level too.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20443 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/SOURCES | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/ccm-imx31.c (renamed from firmware/target/arm/imx31/gigabeat-s/clkctl-imx31.c) | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/ccm-imx31.h (renamed from firmware/target/arm/imx31/gigabeat-s/clkctl-imx31.h) | 0 | ||||
-rw-r--r-- | firmware/target/arm/imx31/debug-imx31.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/ata-imx31.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/button-imx31.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/i2c-imx31.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/kernel-imx31.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/spi-imx31.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/system-imx31.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/timer-imx31.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/usb-imx31.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c | 8 | ||||
-rw-r--r-- | firmware/target/arm/imx31/sdma-imx31.c | 2 |
15 files changed, 17 insertions, 17 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 43d9f9fd06..95ed27bd89 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -758,6 +758,7 @@ target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c | |||
758 | #ifndef SIMULATOR | 758 | #ifndef SIMULATOR |
759 | target/arm/lcd-as-memframe.S | 759 | target/arm/lcd-as-memframe.S |
760 | target/arm/mmu-arm.S | 760 | target/arm/mmu-arm.S |
761 | target/arm/imx31/ccm-imx31.c | ||
761 | target/arm/imx31/debug-imx31.c | 762 | target/arm/imx31/debug-imx31.c |
762 | target/arm/imx31/rolo_restart.S | 763 | target/arm/imx31/rolo_restart.S |
763 | target/arm/imx31/sdma-imx31.c | 764 | target/arm/imx31/sdma-imx31.c |
@@ -766,7 +767,6 @@ target/arm/imx31/gigabeat-s/ata-imx31.c | |||
766 | target/arm/imx31/gigabeat-s/avic-imx31.c | 767 | target/arm/imx31/gigabeat-s/avic-imx31.c |
767 | target/arm/imx31/gigabeat-s/backlight-imx31.c | 768 | target/arm/imx31/gigabeat-s/backlight-imx31.c |
768 | target/arm/imx31/gigabeat-s/button-imx31.c | 769 | target/arm/imx31/gigabeat-s/button-imx31.c |
769 | target/arm/imx31/gigabeat-s/clkctl-imx31.c | ||
770 | target/arm/imx31/gigabeat-s/gpio-gigabeat-s.c | 770 | target/arm/imx31/gigabeat-s/gpio-gigabeat-s.c |
771 | target/arm/imx31/gigabeat-s/gpio-imx31.c | 771 | target/arm/imx31/gigabeat-s/gpio-imx31.c |
772 | target/arm/imx31/gigabeat-s/kernel-imx31.c | 772 | target/arm/imx31/gigabeat-s/kernel-imx31.c |
diff --git a/firmware/target/arm/imx31/gigabeat-s/clkctl-imx31.c b/firmware/target/arm/imx31/ccm-imx31.c index 761cf8f701..272f00aca9 100644 --- a/firmware/target/arm/imx31/gigabeat-s/clkctl-imx31.c +++ b/firmware/target/arm/imx31/ccm-imx31.c | |||
@@ -22,7 +22,7 @@ | |||
22 | ****************************************************************************/ | 22 | ****************************************************************************/ |
23 | #include "system.h" | 23 | #include "system.h" |
24 | #include "cpu.h" | 24 | #include "cpu.h" |
25 | #include "clkctl-imx31.h" | 25 | #include "ccm-imx31.h" |
26 | 26 | ||
27 | unsigned int ccm_get_src_pll(void) | 27 | unsigned int ccm_get_src_pll(void) |
28 | { | 28 | { |
diff --git a/firmware/target/arm/imx31/gigabeat-s/clkctl-imx31.h b/firmware/target/arm/imx31/ccm-imx31.h index e1057a9618..e1057a9618 100644 --- a/firmware/target/arm/imx31/gigabeat-s/clkctl-imx31.h +++ b/firmware/target/arm/imx31/ccm-imx31.h | |||
diff --git a/firmware/target/arm/imx31/debug-imx31.c b/firmware/target/arm/imx31/debug-imx31.c index abf180cfd2..cc1e200c11 100644 --- a/firmware/target/arm/imx31/debug-imx31.c +++ b/firmware/target/arm/imx31/debug-imx31.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "debug-target.h" | 28 | #include "debug-target.h" |
29 | #include "mc13783.h" | 29 | #include "mc13783.h" |
30 | #include "adc.h" | 30 | #include "adc.h" |
31 | #include "clkctl-imx31.h" | 31 | #include "ccm-imx31.h" |
32 | 32 | ||
33 | bool __dbg_hw_info(void) | 33 | bool __dbg_hw_info(void) |
34 | { | 34 | { |
diff --git a/firmware/target/arm/imx31/gigabeat-s/ata-imx31.c b/firmware/target/arm/imx31/gigabeat-s/ata-imx31.c index c941037317..5ce7ad0a03 100644 --- a/firmware/target/arm/imx31/gigabeat-s/ata-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/ata-imx31.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "panic.h" | 27 | #include "panic.h" |
28 | #include "ata.h" | 28 | #include "ata.h" |
29 | #include "ata-target.h" | 29 | #include "ata-target.h" |
30 | #include "clkctl-imx31.h" | 30 | #include "ccm-imx31.h" |
31 | #ifdef HAVE_ATA_DMA | 31 | #ifdef HAVE_ATA_DMA |
32 | #include "sdma-imx31.h" | 32 | #include "sdma-imx31.h" |
33 | #include "mmu-imx31.h" | 33 | #include "mmu-imx31.h" |
diff --git a/firmware/target/arm/imx31/gigabeat-s/button-imx31.c b/firmware/target/arm/imx31/gigabeat-s/button-imx31.c index 505ba397d9..320af7ca66 100644 --- a/firmware/target/arm/imx31/gigabeat-s/button-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/button-imx31.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "system.h" | 27 | #include "system.h" |
28 | #include "backlight-target.h" | 28 | #include "backlight-target.h" |
29 | #include "avic-imx31.h" | 29 | #include "avic-imx31.h" |
30 | #include "clkctl-imx31.h" | 30 | #include "ccm-imx31.h" |
31 | #include "mc13783.h" | 31 | #include "mc13783.h" |
32 | 32 | ||
33 | /* Most code in here is taken from the Linux BSP provided by Freescale | 33 | /* Most code in here is taken from the Linux BSP provided by Freescale |
diff --git a/firmware/target/arm/imx31/gigabeat-s/i2c-imx31.c b/firmware/target/arm/imx31/gigabeat-s/i2c-imx31.c index 05d761c9ce..1ffdce38ea 100644 --- a/firmware/target/arm/imx31/gigabeat-s/i2c-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/i2c-imx31.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "system.h" | 23 | #include "system.h" |
24 | #include "kernel.h" | 24 | #include "kernel.h" |
25 | #include "avic-imx31.h" | 25 | #include "avic-imx31.h" |
26 | #include "clkctl-imx31.h" | 26 | #include "ccm-imx31.h" |
27 | #include "i2c-imx31.h" | 27 | #include "i2c-imx31.h" |
28 | 28 | ||
29 | /* Forward interrupt handler declarations */ | 29 | /* Forward interrupt handler declarations */ |
diff --git a/firmware/target/arm/imx31/gigabeat-s/kernel-imx31.c b/firmware/target/arm/imx31/gigabeat-s/kernel-imx31.c index 01e9b8b721..4ed3b3053b 100644 --- a/firmware/target/arm/imx31/gigabeat-s/kernel-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/kernel-imx31.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "avic-imx31.h" | 23 | #include "avic-imx31.h" |
24 | #include "spi-imx31.h" | 24 | #include "spi-imx31.h" |
25 | #include "mc13783.h" | 25 | #include "mc13783.h" |
26 | #include "clkctl-imx31.h" | 26 | #include "ccm-imx31.h" |
27 | #include "sdma-imx31.h" | 27 | #include "sdma-imx31.h" |
28 | #include "kernel.h" | 28 | #include "kernel.h" |
29 | #include "thread.h" | 29 | #include "thread.h" |
diff --git a/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c b/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c index 00f196a512..6cec3ecdd3 100644 --- a/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "kernel.h" | 23 | #include "kernel.h" |
24 | #include "audio.h" | 24 | #include "audio.h" |
25 | #include "sound.h" | 25 | #include "sound.h" |
26 | #include "clkctl-imx31.h" | 26 | #include "ccm-imx31.h" |
27 | #include "sdma-imx31.h" | 27 | #include "sdma-imx31.h" |
28 | #include "mmu-imx31.h" | 28 | #include "mmu-imx31.h" |
29 | 29 | ||
diff --git a/firmware/target/arm/imx31/gigabeat-s/spi-imx31.c b/firmware/target/arm/imx31/gigabeat-s/spi-imx31.c index f905057372..ac063f9b10 100644 --- a/firmware/target/arm/imx31/gigabeat-s/spi-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/spi-imx31.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include "system.h" | 22 | #include "system.h" |
23 | #include "spi-imx31.h" | 23 | #include "spi-imx31.h" |
24 | #include "avic-imx31.h" | 24 | #include "avic-imx31.h" |
25 | #include "clkctl-imx31.h" | 25 | #include "ccm-imx31.h" |
26 | #include "debug.h" | 26 | #include "debug.h" |
27 | #include "kernel.h" | 27 | #include "kernel.h" |
28 | 28 | ||
diff --git a/firmware/target/arm/imx31/gigabeat-s/system-imx31.c b/firmware/target/arm/imx31/gigabeat-s/system-imx31.c index c710c5b93c..de39128497 100644 --- a/firmware/target/arm/imx31/gigabeat-s/system-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/system-imx31.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include "lcd.h" | 29 | #include "lcd.h" |
30 | #include "serial-imx31.h" | 30 | #include "serial-imx31.h" |
31 | #include "debug.h" | 31 | #include "debug.h" |
32 | #include "clkctl-imx31.h" | 32 | #include "ccm-imx31.h" |
33 | #include "mc13783.h" | 33 | #include "mc13783.h" |
34 | 34 | ||
35 | static unsigned long product_rev; | 35 | static unsigned long product_rev; |
diff --git a/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c b/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c index c4734a543b..9de3a9e9ec 100644 --- a/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include "config.h" | 21 | #include "config.h" |
22 | #include "system.h" | 22 | #include "system.h" |
23 | #include "timer.h" | 23 | #include "timer.h" |
24 | #include "clkctl-imx31.h" | 24 | #include "ccm-imx31.h" |
25 | #include "avic-imx31.h" | 25 | #include "avic-imx31.h" |
26 | 26 | ||
27 | static void __attribute__((interrupt("IRQ"))) EPIT2_HANDLER(void) | 27 | static void __attribute__((interrupt("IRQ"))) EPIT2_HANDLER(void) |
diff --git a/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c b/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c index 2011d0c633..64ff04e7ae 100644 --- a/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c | |||
@@ -27,7 +27,7 @@ | |||
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 "clkctl-imx31.h" | 30 | #include "ccm-imx31.h" |
31 | #include "power-imx31.h" | 31 | #include "power-imx31.h" |
32 | #include "avic-imx31.h" | 32 | #include "avic-imx31.h" |
33 | #include "mc13783.h" | 33 | #include "mc13783.h" |
diff --git a/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c b/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c index cf9331144a..2572b88fee 100644 --- a/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c | |||
@@ -53,10 +53,10 @@ void audiohw_init(void) | |||
53 | * INT_BIT_CLK (MCLK) / 1.5 = 11289600Hz = 256*fs = SYSCLK | 53 | * INT_BIT_CLK (MCLK) / 1.5 = 11289600Hz = 256*fs = SYSCLK |
54 | */ | 54 | */ |
55 | imx31_regmod32(&CCM_PDR1, | 55 | imx31_regmod32(&CCM_PDR1, |
56 | (1-1) << CCM_PDR1_SSI1_PRE_PODF_POS | | 56 | ((1-1) << CCM_PDR1_SSI1_PRE_PODF_POS) | |
57 | (5-1) << CCM_PDR1_SSI1_PODF_POS | | 57 | ((5-1) << CCM_PDR1_SSI1_PODF_POS) | |
58 | (8-1) << CCM_PDR1_SSI2_PRE_PODF_POS, | 58 | ((8-1) << CCM_PDR1_SSI2_PRE_PODF_POS), |
59 | (64-1) << CCM_PDR1_SSI2_PODF_POS | | 59 | ((64-1) << CCM_PDR1_SSI2_PODF_POS) | |
60 | CCM_PDR1_SSI1_PODF | CCM_PDR1_SSI2_PODF | | 60 | CCM_PDR1_SSI1_PODF | CCM_PDR1_SSI2_PODF | |
61 | CCM_PDR1_SSI1_PRE_PODF | CCM_PDR1_SSI2_PRE_PODF); | 61 | CCM_PDR1_SSI1_PRE_PODF | CCM_PDR1_SSI2_PRE_PODF); |
62 | 62 | ||
diff --git a/firmware/target/arm/imx31/sdma-imx31.c b/firmware/target/arm/imx31/sdma-imx31.c index 97af419077..6f715ebb3f 100644 --- a/firmware/target/arm/imx31/sdma-imx31.c +++ b/firmware/target/arm/imx31/sdma-imx31.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <string.h> | 23 | #include <string.h> |
24 | #include "logf.h" | 24 | #include "logf.h" |
25 | #include "panic.h" | 25 | #include "panic.h" |
26 | #include "clkctl-imx31.h" | 26 | #include "ccm-imx31.h" |
27 | #include "avic-imx31.h" | 27 | #include "avic-imx31.h" |
28 | #include "sdma_struct.h" | 28 | #include "sdma_struct.h" |
29 | #include "sdma-imx31.h" | 29 | #include "sdma-imx31.h" |