summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ryabinin <ryabinin.a.a@gmail.com>2013-04-04 15:30:32 +0400
committerAndrew Ryabinin <ryabinin.a.a@gmail.com>2013-04-04 15:47:24 +0400
commitf84602aa68e8bc45f0e15de23e454927fe603a29 (patch)
tree90f055d7210088533788d94908d5cd7ec517e9b9
parent670af6344ea5fd2b3f84e33bde305d3e2f3c13a3 (diff)
downloadrockbox-f84602aa68e8bc45f0e15de23e454927fe603a29.tar.gz
rockbox-f84602aa68e8bc45f0e15de23e454927fe603a29.zip
Fix identations.
Change-Id: I98acabd5c8ab024d553726cfabe5654242a18b3b
-rw-r--r--firmware/target/arm/rk27xx/debug-rk27xx.c2
-rw-r--r--firmware/target/arm/rk27xx/nand-rk27xx.c2
-rw-r--r--firmware/target/arm/rk27xx/pcm-rk27xx.c26
3 files changed, 15 insertions, 15 deletions
diff --git a/firmware/target/arm/rk27xx/debug-rk27xx.c b/firmware/target/arm/rk27xx/debug-rk27xx.c
index d6be51595a..98ceaf634a 100644
--- a/firmware/target/arm/rk27xx/debug-rk27xx.c
+++ b/firmware/target/arm/rk27xx/debug-rk27xx.c
@@ -66,7 +66,7 @@ bool dbg_hw_info(void)
66 _DEBUG_PRINTF("SCU_CHIPCFG: 0x%0x", SCU_CHIPCFG); 66 _DEBUG_PRINTF("SCU_CHIPCFG: 0x%0x", SCU_CHIPCFG);
67 67
68#ifdef HM60X 68#ifdef HM60X
69 _DEBUG_PRINTF("LCD type: %s", lcd_type == LCD_V1 ? "V1 (HX8340b)": "V2"); 69 _DEBUG_PRINTF("LCD type: %s", lcd_type == LCD_V1 ? "V1 (HX8340b)": "V2");
70#endif 70#endif
71 line++; 71 line++;
72 _DEBUG_PRINTF("sd_debug_time_rd: %d", sd_debug_time_rd); 72 _DEBUG_PRINTF("sd_debug_time_rd: %d", sd_debug_time_rd);
diff --git a/firmware/target/arm/rk27xx/nand-rk27xx.c b/firmware/target/arm/rk27xx/nand-rk27xx.c
index 84e60a47e1..a4c28b9fb7 100644
--- a/firmware/target/arm/rk27xx/nand-rk27xx.c
+++ b/firmware/target/arm/rk27xx/nand-rk27xx.c
@@ -176,7 +176,7 @@ void flash_init(void)
176 /* Redundat - we will use special macros 176 /* Redundat - we will use special macros
177 * just for reference what OF does 177 * just for reference what OF does
178 */ 178 */
179 flash_spec[i].cmd = 0x180E8200 + (i<<9); 179 flash_spec[i].cmd = 0x180E8200 + (i<<9);
180 flash_spec[i].addr = 0x180E204 + (i<<9); 180 flash_spec[i].addr = 0x180E204 + (i<<9);
181 flash_spec[i].data = 0x180E208 + (i<<9); 181 flash_spec[i].data = 0x180E208 + (i<<9);
182 182
diff --git a/firmware/target/arm/rk27xx/pcm-rk27xx.c b/firmware/target/arm/rk27xx/pcm-rk27xx.c
index a4ce568a83..4e6b8fe6b6 100644
--- a/firmware/target/arm/rk27xx/pcm-rk27xx.c
+++ b/firmware/target/arm/rk27xx/pcm-rk27xx.c
@@ -203,16 +203,16 @@ static void set_codec_freq(unsigned int freq)
203 /* {CLKR, CLKF, CLKOD, CODECPLL_DIV} */ 203 /* {CLKR, CLKF, CLKOD, CODECPLL_DIV} */
204 static const unsigned int pcm_freq_params[HW_NUM_FREQ][4] = 204 static const unsigned int pcm_freq_params[HW_NUM_FREQ][4] =
205 { 205 {
206 [HW_FREQ_96] = {24, 255, 4, 1}, 206 [HW_FREQ_96] = {24, 255, 4, 1},
207 [HW_FREQ_48] = {24, 127, 4, 1}, 207 [HW_FREQ_48] = {24, 127, 4, 1},
208 [HW_FREQ_44] = {24, 293, 4, 4}, 208 [HW_FREQ_44] = {24, 293, 4, 4},
209 [HW_FREQ_32] = {24, 127, 4, 2}, 209 [HW_FREQ_32] = {24, 127, 4, 2},
210 [HW_FREQ_24] = {24, 127, 4, 3}, 210 [HW_FREQ_24] = {24, 127, 4, 3},
211 [HW_FREQ_22] = {24, 146, 4, 4}, 211 [HW_FREQ_22] = {24, 146, 4, 4},
212 [HW_FREQ_16] = {24, 127, 5, 4}, 212 [HW_FREQ_16] = {24, 127, 5, 4},
213 [HW_FREQ_12] = {24, 127, 4, 7}, 213 [HW_FREQ_12] = {24, 127, 4, 7},
214 [HW_FREQ_11] = {24, 146, 4, 9}, 214 [HW_FREQ_11] = {24, 146, 4, 9},
215 [HW_FREQ_8] = {24, 127, 5, 9}, 215 [HW_FREQ_8] = {24, 127, 5, 9},
216 }; 216 };
217 /* select divider output from codec pll */ 217 /* select divider output from codec pll */
218 SCU_DIVCON1 &= ~((1<<9) | (0xF<<5)); 218 SCU_DIVCON1 &= ~((1<<9) | (0xF<<5));
@@ -223,9 +223,9 @@ static void set_codec_freq(unsigned int freq)
223 223
224 SCU_PLLCON3 = (1<<24) | /* Saturation behavior enable */ 224 SCU_PLLCON3 = (1<<24) | /* Saturation behavior enable */
225 (1<<23) | /* Enable fast locking circuit */ 225 (1<<23) | /* Enable fast locking circuit */
226 (pcm_freq_params[freq][0]<<16) | /* CLKR factor */ 226 (pcm_freq_params[freq][0]<<16) | /* CLKR factor */
227 (pcm_freq_params[freq][1]<<4) | /* CLKF factor */ 227 (pcm_freq_params[freq][1]<<4) | /* CLKF factor */
228 (pcm_freq_params[freq][2]<<1) ; /* CLKOD factor */ 228 (pcm_freq_params[freq][2]<<1) ; /* CLKOD factor */
229 229
230/* wait for CODEC PLL lock with 10 ms timeout 230/* wait for CODEC PLL lock with 10 ms timeout
231 * datasheet states that pll lock should take approx. 0.3 ms 231 * datasheet states that pll lock should take approx. 0.3 ms