From 918a06a12ad633a29634f3249990ba04ce9fb00b Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Sun, 16 Jun 2013 19:18:56 +0200 Subject: imx233: normalise pinctrl names The current pinctrl functions were a mess. Normalise the functions names to make them shorter and clearer. Change-Id: Iac6ff84625ef2b7610268e3a5802dc0088de3167 --- .../target/arm/imx233/creative-zenxfi3/audio-zenxfi3.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'firmware/target/arm/imx233/creative-zenxfi3/audio-zenxfi3.c') 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; static void init(void) { /* HP gate */ - imx233_pinctrl_acquire_pin(1, 30, "hp gate"); - imx233_set_pin_function(1, 30, PINCTRL_FUNCTION_GPIO); - imx233_enable_gpio_output(1, 30, true); - imx233_set_gpio_output(1, 30, false); + imx233_pinctrl_acquire(1, 30, "hp gate"); + imx233_pinctrl_set_function(1, 30, PINCTRL_FUNCTION_GPIO); + imx233_pinctrl_enable_gpio(1, 30, true); + imx233_pinctrl_set_gpio(1, 30, false); /* SPKR gate */ - imx233_pinctrl_acquire_pin(1, 22, "spkr gate"); - imx233_set_pin_function(1, 22, PINCTRL_FUNCTION_GPIO); - imx233_enable_gpio_output(1, 22, true); - imx233_set_gpio_output(1, 22, false); + imx233_pinctrl_acquire(1, 22, "spkr gate"); + imx233_pinctrl_set_function(1, 22, PINCTRL_FUNCTION_GPIO); + imx233_pinctrl_enable_gpio(1, 22, true); + imx233_pinctrl_set_gpio(1, 22, false); initialized = true; } @@ -52,7 +52,7 @@ static void select_audio_path(void) if(!initialized) init(); /* route audio to HP */ - imx233_set_gpio_output(1, 30, true); + imx233_pinctrl_set_gpio(1, 30, true); if(input_source == AUDIO_SRC_PLAYBACK) imx233_audioout_select_hp_input(false); -- cgit