diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/pp5020.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/ipod/backlight-4g_color.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/ipod/lcd-color_nano.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/ipod/lcd-gray.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/ata-c200_e200.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/power-c200_e200.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/sansa-e200/lcd-e200.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/usb-fw-pp502x.c | 2 |
8 files changed, 9 insertions, 8 deletions
diff --git a/firmware/export/pp5020.h b/firmware/export/pp5020.h index 22a53e7ad7..47f73b9f4c 100644 --- a/firmware/export/pp5020.h +++ b/firmware/export/pp5020.h | |||
@@ -334,6 +334,7 @@ | |||
334 | 334 | ||
335 | /* 32 bit GPO port */ | 335 | /* 32 bit GPO port */ |
336 | #define GPO32_VAL (*(volatile unsigned long *)(0x70000080)) | 336 | #define GPO32_VAL (*(volatile unsigned long *)(0x70000080)) |
337 | #define GPO32_ENABLE (*(volatile unsigned long *)(0x70000084)) | ||
337 | 338 | ||
338 | /* IIS */ | 339 | /* IIS */ |
339 | #define IISDIV (*(volatile unsigned long*)(0x60006080)) | 340 | #define IISDIV (*(volatile unsigned long*)(0x60006080)) |
diff --git a/firmware/target/arm/ipod/backlight-4g_color.c b/firmware/target/arm/ipod/backlight-4g_color.c index be1dff7c0b..3097d8690b 100644 --- a/firmware/target/arm/ipod/backlight-4g_color.c +++ b/firmware/target/arm/ipod/backlight-4g_color.c | |||
@@ -43,6 +43,6 @@ inline void __backlight_on(void) | |||
43 | inline void __backlight_off(void) | 43 | inline void __backlight_off(void) |
44 | { | 44 | { |
45 | /* fades backlight off on 4g */ | 45 | /* fades backlight off on 4g */ |
46 | outl(inl(0x70000084) & ~0x2000000, 0x70000084); | 46 | GPO32_ENABLE &= ~0x2000000; |
47 | outl(0x80000000, 0x7000a010); | 47 | outl(0x80000000, 0x7000a010); |
48 | } | 48 | } |
diff --git a/firmware/target/arm/ipod/lcd-color_nano.c b/firmware/target/arm/ipod/lcd-color_nano.c index 5306925ded..fd65290872 100644 --- a/firmware/target/arm/ipod/lcd-color_nano.c +++ b/firmware/target/arm/ipod/lcd-color_nano.c | |||
@@ -105,7 +105,7 @@ void lcd_init_device(void) | |||
105 | 105 | ||
106 | GPIOB_ENABLE |= 0x4; /* B02 enable */ | 106 | GPIOB_ENABLE |= 0x4; /* B02 enable */ |
107 | GPIOB_ENABLE |= 0x8; /* B03 enable */ | 107 | GPIOB_ENABLE |= 0x8; /* B03 enable */ |
108 | outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */ | 108 | GPO32_ENABLE |= 0x2000000; /* D01 enable */ |
109 | GPO32_VAL |= 0x2000000; /* D01 =1 */ | 109 | GPO32_VAL |= 0x2000000; /* D01 =1 */ |
110 | 110 | ||
111 | DEV_EN |= 0x20000; /* PWM enable */ | 111 | DEV_EN |= 0x20000; /* PWM enable */ |
diff --git a/firmware/target/arm/ipod/lcd-gray.c b/firmware/target/arm/ipod/lcd-gray.c index b9b5619c20..9f732265b4 100644 --- a/firmware/target/arm/ipod/lcd-gray.c +++ b/firmware/target/arm/ipod/lcd-gray.c | |||
@@ -170,7 +170,7 @@ void lcd_init_device(void) | |||
170 | #ifdef IPOD_4G | 170 | #ifdef IPOD_4G |
171 | GPIOB_ENABLE |= 0x4; /* B02 enable */ | 171 | GPIOB_ENABLE |= 0x4; /* B02 enable */ |
172 | GPIOB_ENABLE |= 0x8; /* B03 enable */ | 172 | GPIOB_ENABLE |= 0x8; /* B03 enable */ |
173 | outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */ | 173 | GPO32_ENABLE |= 0x2000000; /* D01 enable */ |
174 | GPO32_VAL |= 0x2000000; /* D01 =1 */ | 174 | GPO32_VAL |= 0x2000000; /* D01 =1 */ |
175 | 175 | ||
176 | DEV_EN |= 0x20000; /* PWM enable */ | 176 | DEV_EN |= 0x20000; /* PWM enable */ |
diff --git a/firmware/target/arm/sandisk/ata-c200_e200.c b/firmware/target/arm/sandisk/ata-c200_e200.c index 91ff1d9365..f9c9f6fb3a 100644 --- a/firmware/target/arm/sandisk/ata-c200_e200.c +++ b/firmware/target/arm/sandisk/ata-c200_e200.c | |||
@@ -1163,7 +1163,7 @@ int ata_init(void) | |||
1163 | /* init controller */ | 1163 | /* init controller */ |
1164 | outl(inl(0x70000088) & ~(0x4), 0x70000088); | 1164 | outl(inl(0x70000088) & ~(0x4), 0x70000088); |
1165 | outl(inl(0x7000008c) & ~(0x4), 0x7000008c); | 1165 | outl(inl(0x7000008c) & ~(0x4), 0x7000008c); |
1166 | outl(inl(0x70000084) | 0x4, 0x70000084); | 1166 | GPO32_ENABLE |= 0x4; |
1167 | 1167 | ||
1168 | GPIOG_ENABLE |= (0x3 << 5); | 1168 | GPIOG_ENABLE |= (0x3 << 5); |
1169 | GPIOG_OUTPUT_EN |= (0x3 << 5); | 1169 | GPIOG_OUTPUT_EN |= (0x3 << 5); |
diff --git a/firmware/target/arm/sandisk/power-c200_e200.c b/firmware/target/arm/sandisk/power-c200_e200.c index 40aa792dce..f3f78de05c 100644 --- a/firmware/target/arm/sandisk/power-c200_e200.c +++ b/firmware/target/arm/sandisk/power-c200_e200.c | |||
@@ -86,7 +86,7 @@ bool tuner_power(bool status) | |||
86 | { | 86 | { |
87 | /* init mystery amplification device */ | 87 | /* init mystery amplification device */ |
88 | #if defined(SANSA_E200) | 88 | #if defined(SANSA_E200) |
89 | outl(inl(0x70000084) | 0x1, 0x70000084); | 89 | GPO32_ENABLE |= 0x1; |
90 | #else /* SANSA_C200 */ | 90 | #else /* SANSA_C200 */ |
91 | DEV_INIT2 &= ~0x800; | 91 | DEV_INIT2 &= ~0x800; |
92 | #endif | 92 | #endif |
@@ -121,7 +121,7 @@ bool tuner_power(bool status) | |||
121 | 121 | ||
122 | /* turn off mystery amplification device */ | 122 | /* turn off mystery amplification device */ |
123 | #if defined (SANSA_E200) | 123 | #if defined (SANSA_E200) |
124 | outl(inl(0x70000084) & ~0x1, 0x70000084); | 124 | GPO32_ENABLE &= ~0x1; |
125 | #else | 125 | #else |
126 | DEV_INIT2 |= 0x800; | 126 | DEV_INIT2 |= 0x800; |
127 | #endif | 127 | #endif |
diff --git a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c index 3a26c47376..aa969d2bff 100644 --- a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c +++ b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c | |||
@@ -370,7 +370,7 @@ void lcd_init_device(void) | |||
370 | /* Init GPIO ports */ | 370 | /* Init GPIO ports */ |
371 | lcd_init_gpio(); | 371 | lcd_init_gpio(); |
372 | /* Controller init */ | 372 | /* Controller init */ |
373 | outl((inl(0x70000084) | (1 << 28)), 0x70000084); | 373 | GPO32_ENABLE |= (1 << 28); |
374 | GPO32_VAL &= ~(1 << 28); | 374 | GPO32_VAL &= ~(1 << 28); |
375 | DEV_INIT1 = ( (DEV_INIT1 & 0x03ffffff) | (0x15 << 26) ); | 375 | DEV_INIT1 = ( (DEV_INIT1 & 0x03ffffff) | (0x15 << 26) ); |
376 | outl(((inl(0x70000014) & (0x0fffffff)) | (0x5 << 28)), 0x70000014); | 376 | outl(((inl(0x70000014) & (0x0fffffff)) | (0x5 << 28)), 0x70000014); |
diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/usb-fw-pp502x.c index 7d197f03b8..d8eb0c6352 100644 --- a/firmware/target/arm/usb-fw-pp502x.c +++ b/firmware/target/arm/usb-fw-pp502x.c | |||
@@ -36,7 +36,7 @@ | |||
36 | void usb_init_device(void) | 36 | void usb_init_device(void) |
37 | { | 37 | { |
38 | int r0; | 38 | int r0; |
39 | outl(inl(0x70000084) | 0x200, 0x70000084); | 39 | GPO32_ENABLE |= 0x200; |
40 | 40 | ||
41 | outl(inl(0x7000002C) | 0x3000000, 0x7000002C); | 41 | outl(inl(0x7000002C) | 0x3000000, 0x7000002C); |
42 | DEV_EN |= DEV_USB; | 42 | DEV_EN |= DEV_USB; |