summaryrefslogtreecommitdiff
path: root/firmware/target/arm/imx233/creative-zenxfi3/audio-zenxfi3.c
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2013-06-16 19:18:56 +0200
committerAmaury Pouly <amaury.pouly@gmail.com>2013-06-17 00:29:24 +0200
commit918a06a12ad633a29634f3249990ba04ce9fb00b (patch)
treeecaa391890d391626a5cf849d08001391926b772 /firmware/target/arm/imx233/creative-zenxfi3/audio-zenxfi3.c
parentabb7d1dcfe204da217a67235811ebb278dc8fbe1 (diff)
downloadrockbox-918a06a12ad633a29634f3249990ba04ce9fb00b.tar.gz
rockbox-918a06a12ad633a29634f3249990ba04ce9fb00b.zip
imx233: normalise pinctrl names
The current pinctrl functions were a mess. Normalise the functions names to make them shorter and clearer. Change-Id: Iac6ff84625ef2b7610268e3a5802dc0088de3167
Diffstat (limited to 'firmware/target/arm/imx233/creative-zenxfi3/audio-zenxfi3.c')
-rw-r--r--firmware/target/arm/imx233/creative-zenxfi3/audio-zenxfi3.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/audio-zenxfi3.c b/firmware/target/arm/imx233/creative-zenxfi3/audio-zenxfi3.c
index 9394c88f2c..3ea757aedb 100644
--- a/firmware/target/arm/imx233/creative-zenxfi3/audio-zenxfi3.c
+++ b/firmware/target/arm/imx233/creative-zenxfi3/audio-zenxfi3.c
@@ -34,15 +34,15 @@ static bool initialized = false;
34static void init(void) 34static void init(void)
35{ 35{
36 /* HP gate */ 36 /* HP gate */
37 imx233_pinctrl_acquire_pin(1, 30, "hp gate"); 37 imx233_pinctrl_acquire(1, 30, "hp gate");
38 imx233_set_pin_function(1, 30, PINCTRL_FUNCTION_GPIO); 38 imx233_pinctrl_set_function(1, 30, PINCTRL_FUNCTION_GPIO);
39 imx233_enable_gpio_output(1, 30, true); 39 imx233_pinctrl_enable_gpio(1, 30, true);
40 imx233_set_gpio_output(1, 30, false); 40 imx233_pinctrl_set_gpio(1, 30, false);
41 /* SPKR gate */ 41 /* SPKR gate */
42 imx233_pinctrl_acquire_pin(1, 22, "spkr gate"); 42 imx233_pinctrl_acquire(1, 22, "spkr gate");
43 imx233_set_pin_function(1, 22, PINCTRL_FUNCTION_GPIO); 43 imx233_pinctrl_set_function(1, 22, PINCTRL_FUNCTION_GPIO);
44 imx233_enable_gpio_output(1, 22, true); 44 imx233_pinctrl_enable_gpio(1, 22, true);
45 imx233_set_gpio_output(1, 22, false); 45 imx233_pinctrl_set_gpio(1, 22, false);
46 46
47 initialized = true; 47 initialized = true;
48} 48}
@@ -52,7 +52,7 @@ static void select_audio_path(void)
52 if(!initialized) 52 if(!initialized)
53 init(); 53 init();
54 /* route audio to HP */ 54 /* route audio to HP */
55 imx233_set_gpio_output(1, 30, true); 55 imx233_pinctrl_set_gpio(1, 30, true);
56 56
57 if(input_source == AUDIO_SRC_PLAYBACK) 57 if(input_source == AUDIO_SRC_PLAYBACK)
58 imx233_audioout_select_hp_input(false); 58 imx233_audioout_select_hp_input(false);