summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--firmware/SOURCES2
-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.c2
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/ata-imx31.c2
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/button-imx31.c2
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/i2c-imx31.c2
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/kernel-imx31.c2
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c2
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/spi-imx31.c2
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/system-imx31.c2
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/timer-imx31.c2
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/usb-imx31.c2
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c8
-rw-r--r--firmware/target/arm/imx31/sdma-imx31.c2
15 files changed, 17 insertions, 17 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 43d9f9f..95ed27b 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -758,6 +758,7 @@ target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c
#ifndef SIMULATOR
target/arm/lcd-as-memframe.S
target/arm/mmu-arm.S
+target/arm/imx31/ccm-imx31.c
target/arm/imx31/debug-imx31.c
target/arm/imx31/rolo_restart.S
target/arm/imx31/sdma-imx31.c
@@ -766,7 +767,6 @@ target/arm/imx31/gigabeat-s/ata-imx31.c
target/arm/imx31/gigabeat-s/avic-imx31.c
target/arm/imx31/gigabeat-s/backlight-imx31.c
target/arm/imx31/gigabeat-s/button-imx31.c
-target/arm/imx31/gigabeat-s/clkctl-imx31.c
target/arm/imx31/gigabeat-s/gpio-gigabeat-s.c
target/arm/imx31/gigabeat-s/gpio-imx31.c
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 761cf8f..272f00a 100644
--- a/firmware/target/arm/imx31/gigabeat-s/clkctl-imx31.c
+++ b/firmware/target/arm/imx31/ccm-imx31.c
@@ -22,7 +22,7 @@
****************************************************************************/
#include "system.h"
#include "cpu.h"
-#include "clkctl-imx31.h"
+#include "ccm-imx31.h"
unsigned int ccm_get_src_pll(void)
{
diff --git a/firmware/target/arm/imx31/gigabeat-s/clkctl-imx31.h b/firmware/target/arm/imx31/ccm-imx31.h
index e1057a9..e1057a9 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 abf180c..cc1e200 100644
--- a/firmware/target/arm/imx31/debug-imx31.c
+++ b/firmware/target/arm/imx31/debug-imx31.c
@@ -28,7 +28,7 @@
#include "debug-target.h"
#include "mc13783.h"
#include "adc.h"
-#include "clkctl-imx31.h"
+#include "ccm-imx31.h"
bool __dbg_hw_info(void)
{
diff --git a/firmware/target/arm/imx31/gigabeat-s/ata-imx31.c b/firmware/target/arm/imx31/gigabeat-s/ata-imx31.c
index c941037..5ce7ad0 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 @@
#include "panic.h"
#include "ata.h"
#include "ata-target.h"
-#include "clkctl-imx31.h"
+#include "ccm-imx31.h"
#ifdef HAVE_ATA_DMA
#include "sdma-imx31.h"
#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 505ba39..320af7c 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 @@
#include "system.h"
#include "backlight-target.h"
#include "avic-imx31.h"
-#include "clkctl-imx31.h"
+#include "ccm-imx31.h"
#include "mc13783.h"
/* 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 05d761c..1ffdce3 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 @@
#include "system.h"
#include "kernel.h"
#include "avic-imx31.h"
-#include "clkctl-imx31.h"
+#include "ccm-imx31.h"
#include "i2c-imx31.h"
/* 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 01e9b8b..4ed3b30 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 @@
#include "avic-imx31.h"
#include "spi-imx31.h"
#include "mc13783.h"
-#include "clkctl-imx31.h"
+#include "ccm-imx31.h"
#include "sdma-imx31.h"
#include "kernel.h"
#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 00f196a..6cec3ecd 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 @@
#include "kernel.h"
#include "audio.h"
#include "sound.h"
-#include "clkctl-imx31.h"
+#include "ccm-imx31.h"
#include "sdma-imx31.h"
#include "mmu-imx31.h"
diff --git a/firmware/target/arm/imx31/gigabeat-s/spi-imx31.c b/firmware/target/arm/imx31/gigabeat-s/spi-imx31.c
index f905057..ac063f9 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 @@
#include "system.h"
#include "spi-imx31.h"
#include "avic-imx31.h"
-#include "clkctl-imx31.h"
+#include "ccm-imx31.h"
#include "debug.h"
#include "kernel.h"
diff --git a/firmware/target/arm/imx31/gigabeat-s/system-imx31.c b/firmware/target/arm/imx31/gigabeat-s/system-imx31.c
index c710c5b..de39128 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 @@
#include "lcd.h"
#include "serial-imx31.h"
#include "debug.h"
-#include "clkctl-imx31.h"
+#include "ccm-imx31.h"
#include "mc13783.h"
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 c4734a5..9de3a9e 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 @@
#include "config.h"
#include "system.h"
#include "timer.h"
-#include "clkctl-imx31.h"
+#include "ccm-imx31.h"
#include "avic-imx31.h"
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 2011d0c..64ff04e 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 @@
#include "usb_core.h"
#include "usb_drv.h"
#include "usb-target.h"
-#include "clkctl-imx31.h"
+#include "ccm-imx31.h"
#include "power-imx31.h"
#include "avic-imx31.h"
#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 cf93311..2572b88 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)
* INT_BIT_CLK (MCLK) / 1.5 = 11289600Hz = 256*fs = SYSCLK
*/
imx31_regmod32(&CCM_PDR1,
- (1-1) << CCM_PDR1_SSI1_PRE_PODF_POS |
- (5-1) << CCM_PDR1_SSI1_PODF_POS |
- (8-1) << CCM_PDR1_SSI2_PRE_PODF_POS,
- (64-1) << CCM_PDR1_SSI2_PODF_POS |
+ ((1-1) << CCM_PDR1_SSI1_PRE_PODF_POS) |
+ ((5-1) << CCM_PDR1_SSI1_PODF_POS) |
+ ((8-1) << CCM_PDR1_SSI2_PRE_PODF_POS),
+ ((64-1) << CCM_PDR1_SSI2_PODF_POS) |
CCM_PDR1_SSI1_PODF | CCM_PDR1_SSI2_PODF |
CCM_PDR1_SSI1_PRE_PODF | CCM_PDR1_SSI2_PRE_PODF);
diff --git a/firmware/target/arm/imx31/sdma-imx31.c b/firmware/target/arm/imx31/sdma-imx31.c
index 97af419..6f715eb 100644
--- a/firmware/target/arm/imx31/sdma-imx31.c
+++ b/firmware/target/arm/imx31/sdma-imx31.c
@@ -23,7 +23,7 @@
#include <string.h>
#include "logf.h"
#include "panic.h"
-#include "clkctl-imx31.h"
+#include "ccm-imx31.h"
#include "avic-imx31.h"
#include "sdma_struct.h"
#include "sdma-imx31.h"
generated by cgit v1.1 at 2026-05-04 08:01:00 +0000