summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
Diffstat (limited to 'firmware')
-rw-r--r--firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c5
-rw-r--r--firmware/target/arm/as3525/sd-as3525v2.c2
2 files changed, 2 insertions, 5 deletions
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c
index 1bc16babdd..29e145053c 100644
--- a/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c
+++ b/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c
@@ -35,9 +35,6 @@ void _backlight_set_brightness(int brightness)
35 35
36bool _backlight_init(void) 36bool _backlight_init(void)
37{ 37{
38 GPIOB_DIR |= 1<<5; /* for buttonlight, stuff below seems to be needed
39 for buttonlight as well*/
40
41 ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x80); 38 ascodec_write_pmu(AS3543_BACKLIGHT, 1, 0x80);
42 ascodec_write_pmu(AS3543_BACKLIGHT, 2, backlight_brightness * 10); 39 ascodec_write_pmu(AS3543_BACKLIGHT, 2, backlight_brightness * 10);
43 40
@@ -62,6 +59,7 @@ void _backlight_off(void)
62 59
63void _buttonlight_on(void) 60void _buttonlight_on(void)
64{ 61{
62 GPIOB_DIR |= 1<<5;
65 GPIOB_PIN(5) = (1<<5); 63 GPIOB_PIN(5) = (1<<5);
66 buttonlight_is_on = 1; 64 buttonlight_is_on = 1;
67} 65}
@@ -69,5 +67,6 @@ void _buttonlight_on(void)
69void _buttonlight_off(void) 67void _buttonlight_off(void)
70{ 68{
71 GPIOB_PIN(5) = 0; 69 GPIOB_PIN(5) = 0;
70 GPIOB_DIR &= ~(1<<5);
72 buttonlight_is_on = 0; 71 buttonlight_is_on = 0;
73} 72}
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c
index 94ba019183..37d72217b3 100644
--- a/firmware/target/arm/as3525/sd-as3525v2.c
+++ b/firmware/target/arm/as3525/sd-as3525v2.c
@@ -700,8 +700,6 @@ static void init_controller(void)
700 /* Rx watermark = 63(sd reads) Tx watermark = 128 (sd writes) */ 700 /* Rx watermark = 63(sd reads) Tx watermark = 128 (sd writes) */
701 MCI_FIFOTH = (MCI_FIFOTH & MCI_FIFOTH_MASK) | 0x503f0080; 701 MCI_FIFOTH = (MCI_FIFOTH & MCI_FIFOTH_MASK) | 0x503f0080;
702 702
703 GPIOB_DIR |= (1<<5); /* Set pin B5 to output */
704
705 /* Mask all MCI Interrupts initially */ 703 /* Mask all MCI Interrupts initially */
706 MCI_MASK = 0; 704 MCI_MASK = 0;
707 705