diff options
Diffstat (limited to 'firmware/target/arm/imx233/sansa-fuzeplus')
5 files changed, 114 insertions, 114 deletions
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c index 7f181a9672..efe9268989 100644 --- a/firmware/target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c +++ b/firmware/target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c | |||
@@ -30,21 +30,21 @@ void _backlight_set_brightness(int brightness) | |||
30 | { | 30 | { |
31 | if(brightness != 0) | 31 | if(brightness != 0) |
32 | brightness = 32 - (brightness * 32) / 100; | 32 | brightness = 32 - (brightness * 32) / 100; |
33 | imx233_set_gpio_output(1, 28, false); | 33 | imx233_pinctrl_set_gpio(1, 28, false); |
34 | udelay(600); | 34 | udelay(600); |
35 | while(brightness-- > 0) | 35 | while(brightness-- > 0) |
36 | { | 36 | { |
37 | imx233_set_gpio_output(1, 28, false); | 37 | imx233_pinctrl_set_gpio(1, 28, false); |
38 | imx233_set_gpio_output(1, 28, true); | 38 | imx233_pinctrl_set_gpio(1, 28, true); |
39 | } | 39 | } |
40 | } | 40 | } |
41 | 41 | ||
42 | bool _backlight_init(void) | 42 | bool _backlight_init(void) |
43 | { | 43 | { |
44 | imx233_pinctrl_acquire_pin(1, 28, "backlight"); | 44 | imx233_pinctrl_acquire(1, 28, "backlight"); |
45 | imx233_set_pin_function(1, 28, PINCTRL_FUNCTION_GPIO); | 45 | imx233_pinctrl_set_function(1, 28, PINCTRL_FUNCTION_GPIO); |
46 | imx233_set_pin_drive_strength(1, 28, PINCTRL_DRIVE_8mA); | 46 | imx233_pinctrl_set_drive(1, 28, PINCTRL_DRIVE_8mA); |
47 | imx233_enable_gpio_output(1, 28, true); | 47 | imx233_pinctrl_enable_gpio(1, 28, true); |
48 | _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); | 48 | _backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING); |
49 | return true; | 49 | return true; |
50 | } | 50 | } |
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c index 703e87fc42..6373038d2e 100644 --- a/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c +++ b/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c | |||
@@ -79,7 +79,7 @@ bool button_debug_screen(void) | |||
79 | lcd_putsf(0, 1, "RMI: id=%s p=%x s=%x", product_id, func_presence, sensor_prop); | 79 | lcd_putsf(0, 1, "RMI: id=%s p=%x s=%x", product_id, func_presence, sensor_prop); |
80 | lcd_putsf(0, 2, "xmax=%d ymax=%d res=%d", x_max, y_max, sensor_resol); | 80 | lcd_putsf(0, 2, "xmax=%d ymax=%d res=%d", x_max, y_max, sensor_resol); |
81 | lcd_putsf(0, 3, "attn=%d ctl=%x int=%x", | 81 | lcd_putsf(0, 3, "attn=%d ctl=%x int=%x", |
82 | imx233_get_gpio_input_mask(0, 0x08000000) ? 0 : 1, | 82 | imx233_pinctrl_get_gpio_mask(0, 0x08000000) ? 0 : 1, |
83 | rmi_read_single(RMI_DEVICE_CONTROL), | 83 | rmi_read_single(RMI_DEVICE_CONTROL), |
84 | rmi_read_single(RMI_INTERRUPT_REQUEST)); | 84 | rmi_read_single(RMI_INTERRUPT_REQUEST)); |
85 | lcd_putsf(0, 4, "sensi: %d min_dist: %d", (int)sensitivity.value, min_dist); | 85 | lcd_putsf(0, 4, "sensi: %d min_dist: %d", (int)sensitivity.value, min_dist); |
@@ -271,7 +271,7 @@ static void rmi_thread(void) | |||
271 | touchpad_btns = 0; | 271 | touchpad_btns = 0; |
272 | 272 | ||
273 | /* enable interrupt */ | 273 | /* enable interrupt */ |
274 | imx233_setup_pin_irq(0, 27, true, true, false, &rmi_attn_cb); | 274 | imx233_pinctrl_setup_irq(0, 27, true, true, false, &rmi_attn_cb); |
275 | } | 275 | } |
276 | } | 276 | } |
277 | 277 | ||
@@ -302,10 +302,10 @@ void button_init_device(void) | |||
302 | */ | 302 | */ |
303 | 303 | ||
304 | /* touchpad power */ | 304 | /* touchpad power */ |
305 | imx233_pinctrl_acquire_pin(0, 26, "touchpad power"); | 305 | imx233_pinctrl_acquire(0, 26, "touchpad power"); |
306 | imx233_set_pin_function(0, 26, PINCTRL_FUNCTION_GPIO); | 306 | imx233_pinctrl_set_function(0, 26, PINCTRL_FUNCTION_GPIO); |
307 | imx233_enable_gpio_output(0, 26, false); | 307 | imx233_pinctrl_enable_gpio(0, 26, false); |
308 | imx233_set_pin_drive_strength(0, 26, PINCTRL_DRIVE_8mA); | 308 | imx233_pinctrl_set_drive(0, 26, PINCTRL_DRIVE_8mA); |
309 | 309 | ||
310 | rmi_init(0x40); | 310 | rmi_init(0x40); |
311 | 311 | ||
@@ -325,14 +325,14 @@ void button_init_device(void) | |||
325 | create_thread(rmi_thread, rmi_stack, sizeof(rmi_stack), 0, | 325 | create_thread(rmi_thread, rmi_stack, sizeof(rmi_stack), 0, |
326 | rmi_thread_name IF_PRIO(, PRIORITY_USER_INTERFACE) IF_COP(, CPU)); | 326 | rmi_thread_name IF_PRIO(, PRIORITY_USER_INTERFACE) IF_COP(, CPU)); |
327 | /* enable interrupt */ | 327 | /* enable interrupt */ |
328 | imx233_pinctrl_acquire_pin(0, 27, "touchpad int"); | 328 | imx233_pinctrl_acquire(0, 27, "touchpad int"); |
329 | imx233_set_pin_function(0, 27, PINCTRL_FUNCTION_GPIO); | 329 | imx233_pinctrl_set_function(0, 27, PINCTRL_FUNCTION_GPIO); |
330 | imx233_enable_gpio_output(0, 27, false); | 330 | imx233_pinctrl_enable_gpio(0, 27, false); |
331 | imx233_setup_pin_irq(0, 27, true, true, false, &rmi_attn_cb); | 331 | imx233_pinctrl_setup_irq(0, 27, true, true, false, &rmi_attn_cb); |
332 | /* Volume down */ | 332 | /* Volume down */ |
333 | imx233_pinctrl_acquire_pin(1, 30, "volume down"); | 333 | imx233_pinctrl_acquire(1, 30, "volume down"); |
334 | imx233_set_pin_function(1, 30, PINCTRL_FUNCTION_GPIO); | 334 | imx233_pinctrl_set_function(1, 30, PINCTRL_FUNCTION_GPIO); |
335 | imx233_enable_gpio_output(1, 30, false); | 335 | imx233_pinctrl_enable_gpio(1, 30, false); |
336 | } | 336 | } |
337 | 337 | ||
338 | #else | 338 | #else |
@@ -340,9 +340,9 @@ void button_init_device(void) | |||
340 | void button_init_device(void) | 340 | void button_init_device(void) |
341 | { | 341 | { |
342 | /* Volume down */ | 342 | /* Volume down */ |
343 | imx233_pinctrl_acquire_pin(1, 30, "volume down"); | 343 | imx233_pinctrl_acquire(1, 30, "volume down"); |
344 | imx233_set_pin_function(1, 30, PINCTRL_FUNCTION_GPIO); | 344 | imx233_pinctrl_set_function(1, 30, PINCTRL_FUNCTION_GPIO); |
345 | imx233_enable_gpio_output(1, 30, false); | 345 | imx233_pinctrl_enable_gpio(1, 30, false); |
346 | } | 346 | } |
347 | 347 | ||
348 | int touchpad_read_device(void) | 348 | int touchpad_read_device(void) |
@@ -355,7 +355,7 @@ int touchpad_read_device(void) | |||
355 | int button_read_device(void) | 355 | int button_read_device(void) |
356 | { | 356 | { |
357 | int res = 0; | 357 | int res = 0; |
358 | if(!imx233_get_gpio_input_mask(1, 0x40000000)) | 358 | if(!imx233_pinctrl_get_gpio_mask(1, 0x40000000)) |
359 | res |= BUTTON_VOL_DOWN; | 359 | res |= BUTTON_VOL_DOWN; |
360 | /* The imx233 uses the voltage on the PSWITCH pin to detect power up/down | 360 | /* The imx233 uses the voltage on the PSWITCH pin to detect power up/down |
361 | * events as well as recovery mode. Since the power button is the power button | 361 | * events as well as recovery mode. Since the power button is the power button |
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c index 7988c4cb28..80c9d9149a 100644 --- a/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c +++ b/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c | |||
@@ -38,32 +38,32 @@ static int fmradio_i2c_bus = -1; | |||
38 | 38 | ||
39 | static void i2c_scl_dir(bool out) | 39 | static void i2c_scl_dir(bool out) |
40 | { | 40 | { |
41 | imx233_enable_gpio_output(1, 22, out); | 41 | imx233_pinctrl_enable_gpio(1, 22, out); |
42 | } | 42 | } |
43 | 43 | ||
44 | static void i2c_sda_dir(bool out) | 44 | static void i2c_sda_dir(bool out) |
45 | { | 45 | { |
46 | imx233_enable_gpio_output(1, 24, out); | 46 | imx233_pinctrl_enable_gpio(1, 24, out); |
47 | } | 47 | } |
48 | 48 | ||
49 | static void i2c_scl_out(bool high) | 49 | static void i2c_scl_out(bool high) |
50 | { | 50 | { |
51 | imx233_set_gpio_output(1, 22, high); | 51 | imx233_pinctrl_set_gpio(1, 22, high); |
52 | } | 52 | } |
53 | 53 | ||
54 | static void i2c_sda_out(bool high) | 54 | static void i2c_sda_out(bool high) |
55 | { | 55 | { |
56 | imx233_set_gpio_output(1, 24, high); | 56 | imx233_pinctrl_set_gpio(1, 24, high); |
57 | } | 57 | } |
58 | 58 | ||
59 | static bool i2c_scl_in(void) | 59 | static bool i2c_scl_in(void) |
60 | { | 60 | { |
61 | return imx233_get_gpio_input_mask(1, 1 << 22); | 61 | return imx233_pinctrl_get_gpio_mask(1, 1 << 22); |
62 | } | 62 | } |
63 | 63 | ||
64 | static bool i2c_sda_in(void) | 64 | static bool i2c_sda_in(void) |
65 | { | 65 | { |
66 | return imx233_get_gpio_input_mask(1, 1 << 24); | 66 | return imx233_pinctrl_get_gpio_mask(1, 1 << 24); |
67 | } | 67 | } |
68 | 68 | ||
69 | static void i2c_delay(int d) | 69 | static void i2c_delay(int d) |
@@ -90,10 +90,10 @@ struct i2c_interface fmradio_i2c = | |||
90 | 90 | ||
91 | void fmradio_i2c_init(void) | 91 | void fmradio_i2c_init(void) |
92 | { | 92 | { |
93 | imx233_pinctrl_acquire_pin(1, 24, "fmradio i2c"); | 93 | imx233_pinctrl_acquire(1, 24, "fmradio i2c"); |
94 | imx233_pinctrl_acquire_pin(1, 22, "fmradio i2c"); | 94 | imx233_pinctrl_acquire(1, 22, "fmradio i2c"); |
95 | imx233_set_pin_function(1, 24, PINCTRL_FUNCTION_GPIO); | 95 | imx233_pinctrl_set_function(1, 24, PINCTRL_FUNCTION_GPIO); |
96 | imx233_set_pin_function(1, 22, PINCTRL_FUNCTION_GPIO); | 96 | imx233_pinctrl_set_function(1, 22, PINCTRL_FUNCTION_GPIO); |
97 | fmradio_i2c_bus = i2c_add_node(&fmradio_i2c); | 97 | fmradio_i2c_bus = i2c_add_node(&fmradio_i2c); |
98 | } | 98 | } |
99 | 99 | ||
@@ -132,7 +132,7 @@ static void NORETURN_ATTR rds_thread(void) | |||
132 | if(si4700_rds_read_raw(rds_data) && rds_process(rds_data)) | 132 | if(si4700_rds_read_raw(rds_data) && rds_process(rds_data)) |
133 | si4700_rds_set_event(); | 133 | si4700_rds_set_event(); |
134 | /* renable callback */ | 134 | /* renable callback */ |
135 | imx233_setup_pin_irq(2, 27, true, true, false, &stc_rds_callback); | 135 | imx233_pinctrl_setup_irq(2, 27, true, true, false, &stc_rds_callback); |
136 | } | 136 | } |
137 | } | 137 | } |
138 | 138 | ||
@@ -141,16 +141,16 @@ void si4700_rds_powerup(bool on) | |||
141 | { | 141 | { |
142 | if(on) | 142 | if(on) |
143 | { | 143 | { |
144 | imx233_pinctrl_acquire_pin(2, 27, "tuner stc/rds"); | 144 | imx233_pinctrl_acquire(2, 27, "tuner stc/rds"); |
145 | imx233_set_pin_function(2, 27, PINCTRL_FUNCTION_GPIO); | 145 | imx233_pinctrl_set_function(2, 27, PINCTRL_FUNCTION_GPIO); |
146 | imx233_enable_gpio_output(2, 27, false); | 146 | imx233_pinctrl_enable_gpio(2, 27, false); |
147 | /* pin is set to 0 when an RDS packet has arrived */ | 147 | /* pin is set to 0 when an RDS packet has arrived */ |
148 | imx233_setup_pin_irq(2, 27, true, true, false, &stc_rds_callback); | 148 | imx233_pinctrl_setup_irq(2, 27, true, true, false, &stc_rds_callback); |
149 | } | 149 | } |
150 | else | 150 | else |
151 | { | 151 | { |
152 | imx233_setup_pin_irq(2, 27, false, false, false, NULL); | 152 | imx233_pinctrl_setup_irq(2, 27, false, false, false, NULL); |
153 | imx233_pinctrl_release_pin(2, 27, "tuner stc/rds"); | 153 | imx233_pinctrl_release(2, 27, "tuner stc/rds"); |
154 | } | 154 | } |
155 | } | 155 | } |
156 | 156 | ||
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c index bd584d1822..1ca159786a 100644 --- a/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c +++ b/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c | |||
@@ -67,36 +67,36 @@ static void setup_lcd_pins(bool use_lcdif) | |||
67 | /* WARNING | 67 | /* WARNING |
68 | * the B1P22 and B1P24 pins are used by the tuner i2c! Do NOT drive | 68 | * the B1P22 and B1P24 pins are used by the tuner i2c! Do NOT drive |
69 | * them as lcd_dotclk and lcd_hsync or it will break the tuner! */ | 69 | * them as lcd_dotclk and lcd_hsync or it will break the tuner! */ |
70 | imx233_pinctrl_acquire_pin(1, 18, "lcd reset"); | 70 | imx233_pinctrl_acquire(1, 18, "lcd reset"); |
71 | imx233_pinctrl_acquire_pin(1, 19, "lcd rs"); | 71 | imx233_pinctrl_acquire(1, 19, "lcd rs"); |
72 | imx233_pinctrl_acquire_pin(1, 20, "lcd wr"); | 72 | imx233_pinctrl_acquire(1, 20, "lcd wr"); |
73 | imx233_pinctrl_acquire_pin(1, 21, "lcd cs"); | 73 | imx233_pinctrl_acquire(1, 21, "lcd cs"); |
74 | imx233_pinctrl_acquire_pin(1, 23, "lcd enable"); | 74 | imx233_pinctrl_acquire(1, 23, "lcd enable"); |
75 | imx233_pinctrl_acquire_pin(1, 25, "lcd vsync"); | 75 | imx233_pinctrl_acquire(1, 25, "lcd vsync"); |
76 | imx233_pinctrl_acquire_pin_mask(1, 0x3ffff, "lcd data"); | 76 | imx233_pinctrl_acquire_mask(1, 0x3ffff, "lcd data"); |
77 | if(use_lcdif) | 77 | if(use_lcdif) |
78 | { | 78 | { |
79 | imx233_set_pin_function(1, 25, PINCTRL_FUNCTION_GPIO); /* lcd_vsync */ | 79 | imx233_pinctrl_set_function(1, 25, PINCTRL_FUNCTION_GPIO); /* lcd_vsync */ |
80 | imx233_set_pin_function(1, 21, PINCTRL_FUNCTION_MAIN); /* lcd_cs */ | 80 | imx233_pinctrl_set_function(1, 21, PINCTRL_FUNCTION_MAIN); /* lcd_cs */ |
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, 18, PINCTRL_FUNCTION_MAIN); /* lcd_reset */ | 82 | imx233_pinctrl_set_function(1, 18, PINCTRL_FUNCTION_MAIN); /* lcd_reset */ |
83 | imx233_set_pin_function(1, 19, PINCTRL_FUNCTION_MAIN); /* lcd_rs */ | 83 | imx233_pinctrl_set_function(1, 19, PINCTRL_FUNCTION_MAIN); /* lcd_rs */ |
84 | imx233_set_pin_function(1, 16, PINCTRL_FUNCTION_MAIN); /* lcd_d16 */ | 84 | imx233_pinctrl_set_function(1, 16, PINCTRL_FUNCTION_MAIN); /* lcd_d16 */ |
85 | imx233_set_pin_function(1, 17, PINCTRL_FUNCTION_MAIN); /* lcd_d17 */ | 85 | imx233_pinctrl_set_function(1, 17, PINCTRL_FUNCTION_MAIN); /* lcd_d17 */ |
86 | imx233_set_pin_function(1, 20, PINCTRL_FUNCTION_MAIN); /* lcd_wr */ | 86 | imx233_pinctrl_set_function(1, 20, PINCTRL_FUNCTION_MAIN); /* lcd_wr */ |
87 | HW_PINCTRL_MUXSELn_CLR(2) = 0xffffffff; /* lcd_d{0-15} */ | 87 | HW_PINCTRL_MUXSELn_CLR(2) = 0xffffffff; /* lcd_d{0-15} */ |
88 | } | 88 | } |
89 | else | 89 | else |
90 | { | 90 | { |
91 | HW_PINCTRL_MUXSELn_SET(2) = 0xffffffff; /* lcd_d{0-15} */ | 91 | HW_PINCTRL_MUXSELn_SET(2) = 0xffffffff; /* lcd_d{0-15} */ |
92 | HW_PINCTRL_DOEn_CLR(1) = 0x2bfffff; | 92 | HW_PINCTRL_DOEn_CLR(1) = 0x2bfffff; |
93 | imx233_set_pin_function(1, 16, PINCTRL_FUNCTION_GPIO); /* lcd_d16 */ | 93 | imx233_pinctrl_set_function(1, 16, PINCTRL_FUNCTION_GPIO); /* lcd_d16 */ |
94 | imx233_set_pin_function(1, 17, PINCTRL_FUNCTION_GPIO); /* lcd_d17 */ | 94 | imx233_pinctrl_set_function(1, 17, PINCTRL_FUNCTION_GPIO); /* lcd_d17 */ |
95 | imx233_set_pin_function(1, 19, PINCTRL_FUNCTION_GPIO); /* lcd_rs */ | 95 | imx233_pinctrl_set_function(1, 19, PINCTRL_FUNCTION_GPIO); /* lcd_rs */ |
96 | imx233_set_pin_function(1, 20, PINCTRL_FUNCTION_GPIO); /* lcd_wr */ | 96 | imx233_pinctrl_set_function(1, 20, PINCTRL_FUNCTION_GPIO); /* lcd_wr */ |
97 | imx233_set_pin_function(1, 21, PINCTRL_FUNCTION_GPIO); /* lcd_cs */ | 97 | imx233_pinctrl_set_function(1, 21, PINCTRL_FUNCTION_GPIO); /* lcd_cs */ |
98 | imx233_set_pin_function(1, 23, PINCTRL_FUNCTION_GPIO); /* lcd_enable */ | 98 | imx233_pinctrl_set_function(1, 23, PINCTRL_FUNCTION_GPIO); /* lcd_enable */ |
99 | imx233_set_pin_function(1, 25, PINCTRL_FUNCTION_GPIO); /* lcd_vsync */ | 99 | imx233_pinctrl_set_function(1, 25, PINCTRL_FUNCTION_GPIO); /* lcd_vsync */ |
100 | } | 100 | } |
101 | } | 101 | } |
102 | 102 | ||
@@ -104,41 +104,41 @@ static void setup_lcd_pins_i80(bool i80) | |||
104 | { | 104 | { |
105 | if(i80) | 105 | if(i80) |
106 | { | 106 | { |
107 | imx233_set_pin_drive_strength(1, 19, PINCTRL_DRIVE_12mA); /* lcd_rs */ | 107 | imx233_pinctrl_set_drive(1, 19, PINCTRL_DRIVE_12mA); /* lcd_rs */ |
108 | imx233_set_pin_drive_strength(1, 20, PINCTRL_DRIVE_12mA); /* lcd_wr */ | 108 | imx233_pinctrl_set_drive(1, 20, PINCTRL_DRIVE_12mA); /* lcd_wr */ |
109 | imx233_set_pin_drive_strength(1, 21, PINCTRL_DRIVE_12mA); /* lcd_cs */ | 109 | imx233_pinctrl_set_drive(1, 21, PINCTRL_DRIVE_12mA); /* lcd_cs */ |
110 | imx233_set_pin_drive_strength(1, 23, PINCTRL_DRIVE_12mA); /* lcd_enable */ | 110 | imx233_pinctrl_set_drive(1, 23, PINCTRL_DRIVE_12mA); /* lcd_enable */ |
111 | imx233_set_pin_function(1, 19, PINCTRL_FUNCTION_GPIO); /* lcd_rs */ | 111 | imx233_pinctrl_set_function(1, 19, PINCTRL_FUNCTION_GPIO); /* lcd_rs */ |
112 | imx233_set_pin_function(1, 20, PINCTRL_FUNCTION_GPIO); /* lcd_wr */ | 112 | imx233_pinctrl_set_function(1, 20, PINCTRL_FUNCTION_GPIO); /* lcd_wr */ |
113 | imx233_set_pin_function(1, 21, PINCTRL_FUNCTION_GPIO); /* lcd_cs */ | 113 | imx233_pinctrl_set_function(1, 21, PINCTRL_FUNCTION_GPIO); /* lcd_cs */ |
114 | imx233_set_pin_function(1, 23, PINCTRL_FUNCTION_GPIO); /* lcd_enable */ | 114 | imx233_pinctrl_set_function(1, 23, PINCTRL_FUNCTION_GPIO); /* lcd_enable */ |
115 | /* lcd_{rs,wr,cs,enable} */ | 115 | /* lcd_{rs,wr,cs,enable} */ |
116 | imx233_enable_gpio_output_mask(1, (1 << 19) | (1 << 20) | (1 << 21) | (1 << 23), true); | 116 | imx233_pinctrl_enable_gpio_mask(1, (1 << 19) | (1 << 20) | (1 << 21) | (1 << 23), true); |
117 | imx233_set_gpio_output_mask(1, (1 << 19) | (1 << 20) | (1 << 21) | (1 << 23), true); | 117 | imx233_pinctrl_set_gpio_mask(1, (1 << 19) | (1 << 20) | (1 << 21) | (1 << 23), true); |
118 | 118 | ||
119 | imx233_enable_gpio_output_mask(1, 0x3ffff, false); /* lcd_d{0-17} */ | 119 | imx233_pinctrl_enable_gpio_mask(1, 0x3ffff, false); /* lcd_d{0-17} */ |
120 | HW_PINCTRL_MUXSELn_SET(2) = 0xffffffff; /* lcd_d{0-15} as GPIO */ | 120 | HW_PINCTRL_MUXSELn_SET(2) = 0xffffffff; /* lcd_d{0-15} as GPIO */ |
121 | imx233_set_pin_function(1, 16, PINCTRL_FUNCTION_GPIO); /* lcd_d16 */ | 121 | imx233_pinctrl_set_function(1, 16, PINCTRL_FUNCTION_GPIO); /* lcd_d16 */ |
122 | imx233_set_pin_function(1, 17, PINCTRL_FUNCTION_GPIO); /* lcd_d17 */ | 122 | imx233_pinctrl_set_function(1, 17, PINCTRL_FUNCTION_GPIO); /* lcd_d17 */ |
123 | imx233_set_pin_function(1, 18, PINCTRL_FUNCTION_GPIO); /* lcd_reset */ | 123 | imx233_pinctrl_set_function(1, 18, PINCTRL_FUNCTION_GPIO); /* lcd_reset */ |
124 | imx233_set_pin_function(1, 19, PINCTRL_FUNCTION_GPIO); /* lcd_rs */ | 124 | imx233_pinctrl_set_function(1, 19, PINCTRL_FUNCTION_GPIO); /* lcd_rs */ |
125 | } | 125 | } |
126 | else | 126 | else |
127 | { | 127 | { |
128 | imx233_set_gpio_output_mask(1, (1 << 19) | (1 << 20) | (1 << 21) | (1 << 23), true); | 128 | imx233_pinctrl_set_gpio_mask(1, (1 << 19) | (1 << 20) | (1 << 21) | (1 << 23), true); |
129 | imx233_set_pin_drive_strength(1, 19, PINCTRL_DRIVE_4mA); /* lcd_rs */ | 129 | imx233_pinctrl_set_drive(1, 19, PINCTRL_DRIVE_4mA); /* lcd_rs */ |
130 | imx233_set_pin_drive_strength(1, 20, PINCTRL_DRIVE_4mA); /* lcd_wr */ | 130 | imx233_pinctrl_set_drive(1, 20, PINCTRL_DRIVE_4mA); /* lcd_wr */ |
131 | imx233_set_pin_drive_strength(1, 21, PINCTRL_DRIVE_4mA); /* lcd_cs */ | 131 | imx233_pinctrl_set_drive(1, 21, PINCTRL_DRIVE_4mA); /* lcd_cs */ |
132 | imx233_set_pin_drive_strength(1, 23, PINCTRL_DRIVE_4mA); /* lcd_enable */ | 132 | imx233_pinctrl_set_drive(1, 23, PINCTRL_DRIVE_4mA); /* lcd_enable */ |
133 | imx233_set_pin_function(1, 19, PINCTRL_FUNCTION_MAIN); /* lcd_rs */ | 133 | imx233_pinctrl_set_function(1, 19, PINCTRL_FUNCTION_MAIN); /* lcd_rs */ |
134 | imx233_set_pin_function(1, 20, PINCTRL_FUNCTION_MAIN); /* lcd_wr */ | 134 | imx233_pinctrl_set_function(1, 20, PINCTRL_FUNCTION_MAIN); /* lcd_wr */ |
135 | imx233_set_pin_function(1, 21, PINCTRL_FUNCTION_MAIN); /* lcd_cs */ | 135 | imx233_pinctrl_set_function(1, 21, PINCTRL_FUNCTION_MAIN); /* lcd_cs */ |
136 | imx233_enable_gpio_output_mask(1, 0x3ffff, false); /* lcd_d{0-17} */ | 136 | imx233_pinctrl_enable_gpio_mask(1, 0x3ffff, false); /* lcd_d{0-17} */ |
137 | HW_PINCTRL_MUXSELn_CLR(2) = 0xffffffff; /* lcd_d{0-15} as lcd_d{0-15} */ | 137 | HW_PINCTRL_MUXSELn_CLR(2) = 0xffffffff; /* lcd_d{0-15} as lcd_d{0-15} */ |
138 | imx233_set_pin_function(1, 16, PINCTRL_FUNCTION_MAIN); /* lcd_d16 */ | 138 | imx233_pinctrl_set_function(1, 16, PINCTRL_FUNCTION_MAIN); /* lcd_d16 */ |
139 | imx233_set_pin_function(1, 17, PINCTRL_FUNCTION_MAIN); /* lcd_d17 */ | 139 | imx233_pinctrl_set_function(1, 17, PINCTRL_FUNCTION_MAIN); /* lcd_d17 */ |
140 | imx233_set_pin_function(1, 18, PINCTRL_FUNCTION_MAIN); /* lcd_reset */ | 140 | imx233_pinctrl_set_function(1, 18, PINCTRL_FUNCTION_MAIN); /* lcd_reset */ |
141 | imx233_set_pin_function(1, 19, PINCTRL_FUNCTION_MAIN); /* lcd_rs */ | 141 | imx233_pinctrl_set_function(1, 19, PINCTRL_FUNCTION_MAIN); /* lcd_rs */ |
142 | } | 142 | } |
143 | } | 143 | } |
144 | 144 | ||
@@ -178,37 +178,37 @@ static uint32_t i80_read_register(uint32_t data_out) | |||
178 | { | 178 | { |
179 | imx233_lcdif_wait_ready(); | 179 | imx233_lcdif_wait_ready(); |
180 | /* lcd_enable is mapped to the RD pin of the controller */ | 180 | /* lcd_enable is mapped to the RD pin of the controller */ |
181 | imx233_set_gpio_output(1, 21, true); /* lcd_cs */ | 181 | imx233_pinctrl_set_gpio(1, 21, true); /* lcd_cs */ |
182 | imx233_set_gpio_output(1, 19, true); /* lcd_rs */ | 182 | imx233_pinctrl_set_gpio(1, 19, true); /* lcd_rs */ |
183 | imx233_set_gpio_output(1, 23, true); /* lcd_enable */ | 183 | imx233_pinctrl_set_gpio(1, 23, true); /* lcd_enable */ |
184 | imx233_set_gpio_output(1, 20, true); /* lcd_wr */ | 184 | imx233_pinctrl_set_gpio(1, 20, true); /* lcd_wr */ |
185 | imx233_enable_gpio_output_mask(1, 0x3ffff, true); /* lcd_d{0-17} */ | 185 | imx233_pinctrl_enable_gpio_mask(1, 0x3ffff, true); /* lcd_d{0-17} */ |
186 | udelay(2); | 186 | udelay(2); |
187 | imx233_set_gpio_output(1, 19, false); /* lcd_rs */ | 187 | imx233_pinctrl_set_gpio(1, 19, false); /* lcd_rs */ |
188 | udelay(1); | 188 | udelay(1); |
189 | imx233_set_gpio_output(1, 21, false); /* lcd_cs */ | 189 | imx233_pinctrl_set_gpio(1, 21, false); /* lcd_cs */ |
190 | udelay(1); | 190 | udelay(1); |
191 | imx233_set_gpio_output(1, 20, false); /* lcd_wr */ | 191 | imx233_pinctrl_set_gpio(1, 20, false); /* lcd_wr */ |
192 | udelay(1); | 192 | udelay(1); |
193 | imx233_set_gpio_output_mask(1, data_out & 0x3ffff, true); /* lcd_d{0-17} */ | 193 | imx233_pinctrl_set_gpio_mask(1, data_out & 0x3ffff, true); /* lcd_d{0-17} */ |
194 | udelay(1); | 194 | udelay(1); |
195 | imx233_set_gpio_output(1, 20, true); /* lcd_wr */ | 195 | imx233_pinctrl_set_gpio(1, 20, true); /* lcd_wr */ |
196 | udelay(3); | 196 | udelay(3); |
197 | imx233_enable_gpio_output_mask(1, 0x3ffff, false); /* lcd_d{0-17} */ | 197 | imx233_pinctrl_enable_gpio_mask(1, 0x3ffff, false); /* lcd_d{0-17} */ |
198 | udelay(2); | 198 | udelay(2); |
199 | imx233_set_gpio_output(1, 23, false); /* lcd_enable */ | 199 | imx233_pinctrl_set_gpio(1, 23, false); /* lcd_enable */ |
200 | udelay(1); | 200 | udelay(1); |
201 | imx233_set_gpio_output(1, 19, true); /* lcd_rs */ | 201 | imx233_pinctrl_set_gpio(1, 19, true); /* lcd_rs */ |
202 | udelay(1); | 202 | udelay(1); |
203 | imx233_set_gpio_output(1, 23, true); /* lcd_enable */ | 203 | imx233_pinctrl_set_gpio(1, 23, true); /* lcd_enable */ |
204 | udelay(3); | 204 | udelay(3); |
205 | imx233_set_gpio_output(1, 23, false); /* lcd_enable */ | 205 | imx233_pinctrl_set_gpio(1, 23, false); /* lcd_enable */ |
206 | udelay(2); | 206 | udelay(2); |
207 | uint32_t data_in = imx233_get_gpio_input_mask(1, 0x3ffff); /* lcd_d{0-17} */ | 207 | uint32_t data_in = imx233_pinctrl_get_gpio_mask(1, 0x3ffff); /* lcd_d{0-17} */ |
208 | udelay(1); | 208 | udelay(1); |
209 | imx233_set_gpio_output(1, 23, true); /* lcd_enable */ | 209 | imx233_pinctrl_set_gpio(1, 23, true); /* lcd_enable */ |
210 | udelay(1); | 210 | udelay(1); |
211 | imx233_set_gpio_output(1, 21, true); /* lcd_cs */ | 211 | imx233_pinctrl_set_gpio(1, 21, true); /* lcd_cs */ |
212 | udelay(1); | 212 | udelay(1); |
213 | return data_in; | 213 | return data_in; |
214 | } | 214 | } |
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/power-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/power-fuzeplus.c index 89dbfd3cb7..5d0377f77c 100644 --- a/firmware/target/arm/imx233/sansa-fuzeplus/power-fuzeplus.c +++ b/firmware/target/arm/imx233/sansa-fuzeplus/power-fuzeplus.c | |||
@@ -33,11 +33,11 @@ bool tuner_power(bool enable) | |||
33 | if(enable != tuner_enable) | 33 | if(enable != tuner_enable) |
34 | { | 34 | { |
35 | /* CE is B029 (active high) */ | 35 | /* CE is B029 (active high) */ |
36 | imx233_pinctrl_acquire_pin(0, 29, "tuner power"); | 36 | imx233_pinctrl_acquire(0, 29, "tuner power"); |
37 | imx233_set_pin_function(0, 29, PINCTRL_FUNCTION_GPIO); | 37 | imx233_pinctrl_set_function(0, 29, PINCTRL_FUNCTION_GPIO); |
38 | imx233_set_pin_drive_strength(0, 29, PINCTRL_DRIVE_4mA); | 38 | imx233_pinctrl_set_drive(0, 29, PINCTRL_DRIVE_4mA); |
39 | imx233_enable_gpio_output(0, 29, enable); | 39 | imx233_pinctrl_enable_gpio(0, 29, enable); |
40 | imx233_set_gpio_output(0, 29, enable); | 40 | imx233_pinctrl_set_gpio(0, 29, enable); |
41 | tuner_enable = enable; | 41 | tuner_enable = enable; |
42 | /* give time to power up */ | 42 | /* give time to power up */ |
43 | udelay(5); | 43 | udelay(5); |