summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2012-01-31 20:02:26 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2012-02-01 15:02:22 +0100
commitb1702a569ab8b72bc91fdb812884c99eff18ac76 (patch)
tree67a638f8d2174e427f7e013f75a6e4e906aeee43
parent289440605aeda05b0722c64f8798906dcd0af41a (diff)
downloadrockbox-b1702a569ab8b72bc91fdb812884c99eff18ac76.zip
rockbox-b1702a569ab8b72bc91fdb812884c99eff18ac76.tar.gz
rockbox-b1702a569ab8b72bc91fdb812884c99eff18ac76.tar.bz2
rockbox-b1702a569ab8b72bc91fdb812884c99eff18ac76.tar.xz
fuze+: pin B1P30 is volume down key and has no relation with SD
Change-Id: Iee93e90d3054442ae873c55c05c030ed690ccbd6
-rw-r--r--firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c6
-rw-r--r--firmware/target/arm/imx233/sd-imx233.c3
2 files changed, 5 insertions, 4 deletions
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c
index b61ce68..26e5a0a 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c
@@ -324,14 +324,18 @@ void button_init_device(void)
create_thread(rmi_thread, rmi_stack, sizeof(rmi_stack), 0,
rmi_thread_name IF_PRIO(, PRIORITY_USER_INTERFACE) IF_COP(, CPU));
/* enable interrupt */
+ imx233_set_pin_function(0, 27, PINCTRL_FUNCTION_GPIO);
+ imx233_enable_gpio_output(0, 27, false);
imx233_setup_pin_irq(0, 27, true, true, false, &rmi_attn_cb);
+ /* Volume down */
+ imx233_set_pin_function(1, 30, PINCTRL_FUNCTION_GPIO);
+ imx233_enable_gpio_output(1, 30, false);
}
#else
void button_init_device(void)
{
-
}
int touchpad_read_device(void)
diff --git a/firmware/target/arm/imx233/sd-imx233.c b/firmware/target/arm/imx233/sd-imx233.c
index b42d92d..b68950b 100644
--- a/firmware/target/arm/imx233/sd-imx233.c
+++ b/firmware/target/arm/imx233/sd-imx233.c
@@ -69,9 +69,6 @@ void sd_power(bool on)
imx233_set_gpio_output(0, 8, !on);
/* disable pull ups when not needed to save power */
imx233_ssp_setup_ssp1_sd_mmc_pins(on, 4, PINCTRL_DRIVE_4mA, false);
- /* It also setups pin B1P30, unknown purpose */
- imx233_set_pin_function(1, 30, PINCTRL_FUNCTION_GPIO);
- imx233_enable_gpio_output(1, 30, false);
#endif
}