diff options
Diffstat (limited to 'firmware/target/arm/imx233/creative-zenxfi2')
-rw-r--r-- | firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c | 14 | ||||
-rw-r--r-- | firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c | 58 |
2 files changed, 36 insertions, 36 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)) |
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c b/firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c index 4f5033e3d3..0a16c995c1 100644 --- a/firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c +++ b/firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c | |||
@@ -45,42 +45,42 @@ static void setup_parameters(void) | |||
45 | 45 | ||
46 | static void setup_lcd_pins(bool use_lcdif) | 46 | static void setup_lcd_pins(bool use_lcdif) |
47 | { | 47 | { |
48 | imx233_pinctrl_acquire_pin(1, 18, "lcd reset"); | 48 | imx233_pinctrl_acquire(1, 18, "lcd reset"); |
49 | imx233_pinctrl_acquire_pin(1, 19, "lcd rs"); | 49 | imx233_pinctrl_acquire(1, 19, "lcd rs"); |
50 | imx233_pinctrl_acquire_pin(1, 20, "lcd wr"); | 50 | imx233_pinctrl_acquire(1, 20, "lcd wr"); |
51 | imx233_pinctrl_acquire_pin(1, 21, "lcd cs"); | 51 | imx233_pinctrl_acquire(1, 21, "lcd cs"); |
52 | imx233_pinctrl_acquire_pin(1, 22, "lcd dotclk"); | 52 | imx233_pinctrl_acquire(1, 22, "lcd dotclk"); |
53 | imx233_pinctrl_acquire_pin(1, 23, "lcd enable"); | 53 | imx233_pinctrl_acquire(1, 23, "lcd enable"); |
54 | imx233_pinctrl_acquire_pin(1, 24, "lcd hsync"); | 54 | imx233_pinctrl_acquire(1, 24, "lcd hsync"); |
55 | imx233_pinctrl_acquire_pin(1, 25, "lcd vsync"); | 55 | imx233_pinctrl_acquire(1, 25, "lcd vsync"); |
56 | imx233_pinctrl_acquire_pin_mask(1, 0x3ffff, "lcd data"); | 56 | imx233_pinctrl_acquire_mask(1, 0x3ffff, "lcd data"); |
57 | if(use_lcdif) | 57 | if(use_lcdif) |
58 | { | 58 | { |
59 | imx233_set_pin_function(1, 25, PINCTRL_FUNCTION_MAIN); /* lcd_vsync */ | 59 | imx233_pinctrl_set_function(1, 25, PINCTRL_FUNCTION_MAIN); /* lcd_vsync */ |
60 | imx233_set_pin_function(1, 21, PINCTRL_FUNCTION_MAIN); /* lcd_cs */ | 60 | imx233_pinctrl_set_function(1, 21, PINCTRL_FUNCTION_MAIN); /* lcd_cs */ |
61 | imx233_set_pin_function(1, 22, PINCTRL_FUNCTION_MAIN); /* lcd_dotclk */ | 61 | imx233_pinctrl_set_function(1, 22, PINCTRL_FUNCTION_MAIN); /* lcd_dotclk */ |
62 | imx233_set_pin_function(1, 23, PINCTRL_FUNCTION_MAIN); /* lcd_enable */ | 62 | imx233_pinctrl_set_function(1, 23, PINCTRL_FUNCTION_MAIN); /* lcd_enable */ |
63 | imx233_set_pin_function(1, 24, PINCTRL_FUNCTION_MAIN); /* lcd_hsync */ | 63 | imx233_pinctrl_set_function(1, 24, PINCTRL_FUNCTION_MAIN); /* lcd_hsync */ |
64 | imx233_set_pin_function(1, 18, PINCTRL_FUNCTION_MAIN); /* lcd_reset */ | 64 | imx233_pinctrl_set_function(1, 18, PINCTRL_FUNCTION_MAIN); /* lcd_reset */ |
65 | imx233_set_pin_function(1, 19, PINCTRL_FUNCTION_MAIN); /* lcd_rs */ | 65 | imx233_pinctrl_set_function(1, 19, PINCTRL_FUNCTION_MAIN); /* lcd_rs */ |
66 | imx233_set_pin_function(1, 16, PINCTRL_FUNCTION_MAIN); /* lcd_d16 */ | 66 | imx233_pinctrl_set_function(1, 16, PINCTRL_FUNCTION_MAIN); /* lcd_d16 */ |
67 | imx233_set_pin_function(1, 17, PINCTRL_FUNCTION_MAIN); /* lcd_d17 */ | 67 | imx233_pinctrl_set_function(1, 17, PINCTRL_FUNCTION_MAIN); /* lcd_d17 */ |
68 | imx233_set_pin_function(1, 20, PINCTRL_FUNCTION_MAIN); /* lcd_wr */ | 68 | imx233_pinctrl_set_function(1, 20, PINCTRL_FUNCTION_MAIN); /* lcd_wr */ |
69 | HW_PINCTRL_MUXSELn_CLR(2) = 0xffffffff; /* lcd_d{0-15} */ | 69 | HW_PINCTRL_MUXSELn_CLR(2) = 0xffffffff; /* lcd_d{0-15} */ |
70 | } | 70 | } |
71 | else | 71 | else |
72 | { | 72 | { |
73 | HW_PINCTRL_MUXSELn_SET(2) = 0xffffffff; /* lcd_d{0-15} */ | 73 | HW_PINCTRL_MUXSELn_SET(2) = 0xffffffff; /* lcd_d{0-15} */ |
74 | imx233_enable_gpio_output_mask(1, 0x3ffffff, false); /* lcd_{d{0-17},reset,rs,wr,cs,dotclk,enable,hsync,vsync} */ | 74 | imx233_pinctrl_enable_gpio_mask(1, 0x3ffffff, false); /* lcd_{d{0-17},reset,rs,wr,cs,dotclk,enable,hsync,vsync} */ |
75 | imx233_set_pin_function(1, 16, PINCTRL_FUNCTION_GPIO); /* lcd_d16 */ | 75 | imx233_pinctrl_set_function(1, 16, PINCTRL_FUNCTION_GPIO); /* lcd_d16 */ |
76 | imx233_set_pin_function(1, 17, PINCTRL_FUNCTION_GPIO); /* lcd_d17 */ | 76 | imx233_pinctrl_set_function(1, 17, PINCTRL_FUNCTION_GPIO); /* lcd_d17 */ |
77 | imx233_set_pin_function(1, 19, PINCTRL_FUNCTION_GPIO); /* lcd_rs */ | 77 | imx233_pinctrl_set_function(1, 19, PINCTRL_FUNCTION_GPIO); /* lcd_rs */ |
78 | imx233_set_pin_function(1, 20, PINCTRL_FUNCTION_GPIO); /* lcd_wr */ | 78 | imx233_pinctrl_set_function(1, 20, PINCTRL_FUNCTION_GPIO); /* lcd_wr */ |
79 | imx233_set_pin_function(1, 21, PINCTRL_FUNCTION_GPIO); /* lcd_cs */ | 79 | imx233_pinctrl_set_function(1, 21, PINCTRL_FUNCTION_GPIO); /* lcd_cs */ |
80 | imx233_set_pin_function(1, 22, PINCTRL_FUNCTION_GPIO); /* lcd_dotclk */ | 80 | imx233_pinctrl_set_function(1, 22, PINCTRL_FUNCTION_GPIO); /* lcd_dotclk */ |
81 | imx233_set_pin_function(1, 23, PINCTRL_FUNCTION_GPIO); /* lcd_enable */ | 81 | imx233_pinctrl_set_function(1, 23, PINCTRL_FUNCTION_GPIO); /* lcd_enable */ |
82 | imx233_set_pin_function(1, 24, PINCTRL_FUNCTION_GPIO); /* lcd_hsync */ | 82 | imx233_pinctrl_set_function(1, 24, PINCTRL_FUNCTION_GPIO); /* lcd_hsync */ |
83 | imx233_set_pin_function(1, 25, PINCTRL_FUNCTION_GPIO); /* lcd_vsync */ | 83 | imx233_pinctrl_set_function(1, 25, PINCTRL_FUNCTION_GPIO); /* lcd_vsync */ |
84 | } | 84 | } |
85 | } | 85 | } |
86 | 86 | ||