diff options
5 files changed, 21 insertions, 27 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c b/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c index d0f93eedd5..4710e2d82b 100644 --- a/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c @@ -51,7 +51,7 @@ void pcm_play_lock(void) if (++dma_play_data.locked == 1) { /* Atomically disable transmit interrupt */ - imx31_regmod32(&SSI_SIER1, 0, SSI_SIER_TIE); + imx31_regclr32(&SSI_SIER1, SSI_SIER_TIE); } } @@ -60,7 +60,7 @@ void pcm_play_unlock(void) if (--dma_play_data.locked == 0 && dma_play_data.state != 0) { /* Atomically enable transmit interrupt */ - imx31_regmod32(&SSI_SIER1, SSI_SIER_TIE, SSI_SIER_TIE); + imx31_regset32(&SSI_SIER1, SSI_SIER_TIE); } } diff --git a/firmware/target/arm/imx31/gigabeat-s/power-imx31.c b/firmware/target/arm/imx31/gigabeat-s/power-imx31.c index 07e6462bfb..17008cec4b 100644 --- a/firmware/target/arm/imx31/gigabeat-s/power-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/power-imx31.c @@ -63,7 +63,7 @@ void ide_power_enable(bool on) if (!on) { /* Bus must be isolated before power off */ - imx31_regmod32(&GPIO2_DR, (1 << 16), (1 << 16)); + imx31_regset32(&GPIO2_DR, (1 << 16)); } /* HD power switch */ @@ -73,7 +73,7 @@ void ide_power_enable(bool on) { /* Bus switch may be turned on after powerup */ sleep(HZ/10); - imx31_regmod32(&GPIO2_DR, 0, (1 << 16)); + imx31_regclr32(&GPIO2_DR, (1 << 16)); } } @@ -91,7 +91,7 @@ bool tuner_power(bool status) we can diable the i2c module when not in use */ i2c_enable_node(&si4700_i2c_node, true); /* enable the fm chip */ - imx31_regmod32(&GPIO1_DR, (1 << 26), (1 << 26)); + imx31_regset32(&GPIO1_DR, (1 << 26)); /* enable CLK32KMCU clock */ mc13783_set(MC13783_POWER_CONTROL0, MC13783_CLK32KMCUEN); } @@ -101,7 +101,7 @@ bool tuner_power(bool status) we can diable the i2c module when not in use */ i2c_enable_node(&si4700_i2c_node, false); /* disable the fm chip */ - imx31_regmod32(&GPIO1_DR, 0, (1 << 26)); + imx31_regclr32(&GPIO1_DR, (1 << 26)); /* disable CLK32KMCU clock */ mc13783_clear(MC13783_POWER_CONTROL0, MC13783_CLK32KMCUEN); } diff --git a/firmware/target/arm/imx31/gigabeat-s/system-imx31.c b/firmware/target/arm/imx31/gigabeat-s/system-imx31.c index a8af583212..6d4797e9df 100644 --- a/firmware/target/arm/imx31/gigabeat-s/system-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/system-imx31.c @@ -89,14 +89,14 @@ void system_init(void) /* MCR WFI enables wait mode */ CLKCTL_CCMR &= ~(3 << 14); - imx31_regmod32(&SDHC1_CLOCK_CONTROL, STOP_CLK, STOP_CLK); - imx31_regmod32(&SDHC2_CLOCK_CONTROL, STOP_CLK, STOP_CLK); - imx31_regmod32(&RNGA_CONTROL, RNGA_CONTROL_SLEEP, RNGA_CONTROL_SLEEP); - imx31_regmod32(&UCR1_1, 0, EUARTUCR1_UARTEN); - imx31_regmod32(&UCR1_2, 0, EUARTUCR1_UARTEN); - imx31_regmod32(&UCR1_3, 0, EUARTUCR1_UARTEN); - imx31_regmod32(&UCR1_4, 0, EUARTUCR1_UARTEN); - imx31_regmod32(&UCR1_5, 0, EUARTUCR1_UARTEN); + imx31_regset32(&SDHC1_CLOCK_CONTROL, STOP_CLK); + imx31_regset32(&SDHC2_CLOCK_CONTROL, STOP_CLK); + imx31_regset32(&RNGA_CONTROL, RNGA_CONTROL_SLEEP); + imx31_regclr32(&UCR1_1, EUARTUCR1_UARTEN); + imx31_regclr32(&UCR1_2, EUARTUCR1_UARTEN); + imx31_regclr32(&UCR1_3, EUARTUCR1_UARTEN); + imx31_regclr32(&UCR1_4, EUARTUCR1_UARTEN); + imx31_regclr32(&UCR1_5, EUARTUCR1_UARTEN); for (i = 0; i < ARRAYLEN(disable_clocks); i++) imx31_clkctl_module_clock_gating(disable_clocks[i], CGM_OFF); diff --git a/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c b/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c index cdc41cd43b..382bc326b7 100644 --- a/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c @@ -38,16 +38,16 @@ static void enable_transceiver(bool enable) { if (GPIO1_DR & (1 << 30)) { - imx31_regmod32(&GPIO3_DR, 0, (1 << 16)); /* Reset ISP1504 */ + imx31_regclr32(&GPIO3_DR, (1 << 16)); /* Reset ISP1504 */ sleep(HZ/100); - imx31_regmod32(&GPIO3_DR, (1 << 16), (1 << 16)); + imx31_regset32(&GPIO3_DR, (1 << 16)); sleep(HZ/10); - imx31_regmod32(&GPIO1_DR, 0, (1 << 30)); /* Select ISP1504 */ + imx31_regclr32(&GPIO1_DR, (1 << 30)); /* Select ISP1504 */ } } else { - imx31_regmod32(&GPIO1_DR, (1 << 30), (1 << 30)); /* Deselect ISP1504 */ + imx31_regset32(&GPIO1_DR, (1 << 30)); /* Deselect ISP1504 */ } } diff --git a/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c b/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c index 0bb9e49506..e307057978 100644 --- a/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c @@ -62,19 +62,13 @@ void audiohw_init(void) audiohw_preinit(); - GPIO3_DR |= (1 << 21); /* Turn on analogue LDO */ + imx31_regset32(&GPIO3_DR, (1 << 21)); /* Turn on analogue LDO */ } void audiohw_enable_headphone_jack(bool enable) { - if (enable) - { - GPIO3_DR |= (1 << 22); /* Turn on headphone jack output */ - } - else - { - GPIO3_DR &= ~(1 << 22); /* Turn off headphone jack output */ - } + /* Turn headphone jack output on or off. */ + imx31_regmod32(&GPIO3_DR, enable ? (1 << 22) : 0, (1 << 22)); } void wmcodec_write(int reg, int data) |