diff options
Diffstat (limited to 'firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c')
-rw-r--r-- | firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c b/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c index 0685963166..b990becf26 100644 --- a/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c +++ b/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c | |||
@@ -71,13 +71,13 @@ void button_init_device(void) | |||
71 | imx233_touchscreen_enable(true); | 71 | imx233_touchscreen_enable(true); |
72 | 72 | ||
73 | /* power button */ | 73 | /* power button */ |
74 | imx233_pinctrl_acquire_pin(0, 11, "power"); | 74 | imx233_pinctrl_acquire(0, 11, "power"); |
75 | imx233_set_pin_function(0, 11, PINCTRL_FUNCTION_GPIO); | 75 | imx233_pinctrl_set_function(0, 11, PINCTRL_FUNCTION_GPIO); |
76 | imx233_enable_gpio_output(0, 11, false); | 76 | imx233_pinctrl_enable_gpio(0, 11, false); |
77 | /* select button */ | 77 | /* select button */ |
78 | imx233_pinctrl_acquire_pin(0, 14, "select"); | 78 | imx233_pinctrl_acquire(0, 14, "select"); |
79 | imx233_set_pin_function(0, 14, PINCTRL_FUNCTION_GPIO); | 79 | imx233_pinctrl_set_function(0, 14, PINCTRL_FUNCTION_GPIO); |
80 | imx233_enable_gpio_output(0, 14, false); | 80 | imx233_pinctrl_enable_gpio(0, 14, false); |
81 | } | 81 | } |
82 | 82 | ||
83 | static int touch_to_pixels(int *val_x, int *val_y) | 83 | static int touch_to_pixels(int *val_x, int *val_y) |
@@ -119,7 +119,7 @@ int button_read_device(int *data) | |||
119 | int res = 0; | 119 | int res = 0; |
120 | /* B0P11: #power | 120 | /* B0P11: #power |
121 | * B0P14: #select */ | 121 | * B0P14: #select */ |
122 | uint32_t mask = imx233_get_gpio_input_mask(0, 0x4800); | 122 | uint32_t mask = imx233_pinctrl_get_gpio_mask(0, 0x4800); |
123 | if(!(mask & 0x800)) | 123 | if(!(mask & 0x800)) |
124 | res |= BUTTON_POWER; | 124 | res |= BUTTON_POWER; |
125 | if(!(mask & 0x4000)) | 125 | if(!(mask & 0x4000)) |