diff options
Diffstat (limited to 'firmware/target/arm/imx233/creative-zenxfi3')
3 files changed, 48 insertions, 48 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; | |||
34 | static void init(void) | 34 | static 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); |
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c b/firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c index 70355bc24c..7f981b5d68 100644 --- a/firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c +++ b/firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c | |||
@@ -107,7 +107,7 @@ static void mpr121_thread(void) | |||
107 | if(status & 0x80) touchpad_btns |= BUTTON_PLAY; | 107 | if(status & 0x80) touchpad_btns |= BUTTON_PLAY; |
108 | } | 108 | } |
109 | /* enable interrupt */ | 109 | /* enable interrupt */ |
110 | imx233_setup_pin_irq(0, 18, true, true, false, &mpr121_irq_cb); | 110 | imx233_pinctrl_setup_irq(0, 18, true, true, false, &mpr121_irq_cb); |
111 | } | 111 | } |
112 | } | 112 | } |
113 | 113 | ||
@@ -122,28 +122,28 @@ void button_init_device(void) | |||
122 | create_thread(mpr121_thread, mpr121_stack, sizeof(mpr121_stack), 0, | 122 | create_thread(mpr121_thread, mpr121_stack, sizeof(mpr121_stack), 0, |
123 | mpr121_thread_name IF_PRIO(, PRIORITY_USER_INTERFACE) IF_COP(, CPU)); | 123 | mpr121_thread_name IF_PRIO(, PRIORITY_USER_INTERFACE) IF_COP(, CPU)); |
124 | /* enable interrupt */ | 124 | /* enable interrupt */ |
125 | imx233_pinctrl_acquire_pin(0, 18, "mpr121 int"); | 125 | imx233_pinctrl_acquire(0, 18, "mpr121 int"); |
126 | imx233_set_pin_function(0, 18, PINCTRL_FUNCTION_GPIO); | 126 | imx233_pinctrl_set_function(0, 18, PINCTRL_FUNCTION_GPIO); |
127 | imx233_enable_gpio_output(0, 18, false); | 127 | imx233_pinctrl_enable_gpio(0, 18, false); |
128 | imx233_setup_pin_irq(0, 18, true, true, false, &mpr121_irq_cb); | 128 | imx233_pinctrl_setup_irq(0, 18, true, true, false, &mpr121_irq_cb); |
129 | /* hold button */ | 129 | /* hold button */ |
130 | imx233_pinctrl_acquire_pin(0, 4, "hold"); | 130 | imx233_pinctrl_acquire(0, 4, "hold"); |
131 | imx233_set_pin_function(0, 4, PINCTRL_FUNCTION_GPIO); | 131 | imx233_pinctrl_set_function(0, 4, PINCTRL_FUNCTION_GPIO); |
132 | imx233_enable_gpio_output(0, 4, false); | 132 | imx233_pinctrl_enable_gpio(0, 4, false); |
133 | /* volume down button */ | 133 | /* volume down button */ |
134 | imx233_pinctrl_acquire_pin(2, 7, "volume down"); | 134 | imx233_pinctrl_acquire(2, 7, "volume down"); |
135 | imx233_set_pin_function(2, 7, PINCTRL_FUNCTION_GPIO); | 135 | imx233_pinctrl_set_function(2, 7, PINCTRL_FUNCTION_GPIO); |
136 | imx233_enable_gpio_output(2, 7, false); | 136 | imx233_pinctrl_enable_gpio(2, 7, false); |
137 | /* volume up button */ | 137 | /* volume up button */ |
138 | imx233_pinctrl_acquire_pin(2, 8, "volume up"); | 138 | imx233_pinctrl_acquire(2, 8, "volume up"); |
139 | imx233_set_pin_function(2, 8, PINCTRL_FUNCTION_GPIO); | 139 | imx233_pinctrl_set_function(2, 8, PINCTRL_FUNCTION_GPIO); |
140 | imx233_enable_gpio_output(2, 8, false); | 140 | imx233_pinctrl_enable_gpio(2, 8, false); |
141 | } | 141 | } |
142 | 142 | ||
143 | bool button_hold(void) | 143 | bool button_hold(void) |
144 | { | 144 | { |
145 | /* B0P04: #hold */ | 145 | /* B0P04: #hold */ |
146 | return !imx233_get_gpio_input_mask(0, 0x10); | 146 | return !imx233_pinctrl_get_gpio_mask(0, 0x10); |
147 | } | 147 | } |
148 | 148 | ||
149 | int button_read_device(void) | 149 | int button_read_device(void) |
@@ -171,7 +171,7 @@ int button_read_device(void) | |||
171 | /* B2P07: #volume- | 171 | /* B2P07: #volume- |
172 | * B2P08: #volume+ | 172 | * B2P08: #volume+ |
173 | * PSWITCH: power */ | 173 | * PSWITCH: power */ |
174 | uint32_t mask = imx233_get_gpio_input_mask(2, 0x180); | 174 | uint32_t mask = imx233_pinctrl_get_gpio_mask(2, 0x180); |
175 | if(!(mask & 0x80)) | 175 | if(!(mask & 0x80)) |
176 | res |= BUTTON_VOL_DOWN; | 176 | res |= BUTTON_VOL_DOWN; |
177 | if(!(mask & 0x100)) | 177 | if(!(mask & 0x100)) |
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c b/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c index bc669d1a60..253f37eef6 100644 --- a/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c +++ b/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c | |||
@@ -48,36 +48,36 @@ static void setup_lcd_pins(bool use_lcdif) | |||
48 | /* WARNING | 48 | /* WARNING |
49 | * the B1P22 pins is used to gate the speaker! Do NOT drive | 49 | * the B1P22 pins is used to gate the speaker! Do NOT drive |
50 | * them as lcd_dotclk and lcd_hsync or it will break audio */ | 50 | * them as lcd_dotclk and lcd_hsync or it will break audio */ |
51 | imx233_pinctrl_acquire_pin(1, 18, "lcd reset"); | 51 | imx233_pinctrl_acquire(1, 18, "lcd reset"); |
52 | imx233_pinctrl_acquire_pin(1, 19, "lcd rs"); | 52 | imx233_pinctrl_acquire(1, 19, "lcd rs"); |
53 | imx233_pinctrl_acquire_pin(1, 20, "lcd wr"); | 53 | imx233_pinctrl_acquire(1, 20, "lcd wr"); |
54 | imx233_pinctrl_acquire_pin(1, 21, "lcd cs"); | 54 | imx233_pinctrl_acquire(1, 21, "lcd cs"); |
55 | imx233_pinctrl_acquire_pin(1, 23, "lcd enable"); | 55 | imx233_pinctrl_acquire(1, 23, "lcd enable"); |
56 | imx233_pinctrl_acquire_pin(1, 25, "lcd vsync"); | 56 | imx233_pinctrl_acquire(1, 25, "lcd vsync"); |
57 | imx233_pinctrl_acquire_pin_mask(1, 0x3ffff, "lcd data"); | 57 | imx233_pinctrl_acquire_mask(1, 0x3ffff, "lcd data"); |
58 | if(use_lcdif) | 58 | if(use_lcdif) |
59 | { | 59 | { |
60 | imx233_set_pin_function(1, 25, PINCTRL_FUNCTION_MAIN); /* lcd_vsync */ | 60 | imx233_pinctrl_set_function(1, 25, PINCTRL_FUNCTION_MAIN); /* lcd_vsync */ |
61 | imx233_set_pin_function(1, 21, PINCTRL_FUNCTION_MAIN); /* lcd_cs */ | 61 | imx233_pinctrl_set_function(1, 21, PINCTRL_FUNCTION_MAIN); /* lcd_cs */ |
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, 18, PINCTRL_FUNCTION_MAIN); /* lcd_reset */ | 63 | imx233_pinctrl_set_function(1, 18, PINCTRL_FUNCTION_MAIN); /* lcd_reset */ |
64 | imx233_set_pin_function(1, 19, PINCTRL_FUNCTION_MAIN); /* lcd_rs */ | 64 | imx233_pinctrl_set_function(1, 19, PINCTRL_FUNCTION_MAIN); /* lcd_rs */ |
65 | imx233_set_pin_function(1, 16, PINCTRL_FUNCTION_MAIN); /* lcd_d16 */ | 65 | imx233_pinctrl_set_function(1, 16, PINCTRL_FUNCTION_MAIN); /* lcd_d16 */ |
66 | imx233_set_pin_function(1, 17, PINCTRL_FUNCTION_MAIN); /* lcd_d17 */ | 66 | imx233_pinctrl_set_function(1, 17, PINCTRL_FUNCTION_MAIN); /* lcd_d17 */ |
67 | imx233_set_pin_function(1, 20, PINCTRL_FUNCTION_MAIN); /* lcd_wr */ | 67 | imx233_pinctrl_set_function(1, 20, PINCTRL_FUNCTION_MAIN); /* lcd_wr */ |
68 | HW_PINCTRL_MUXSELn_CLR(2) = 0xffffffff; /* lcd_d{0-15} */ | 68 | HW_PINCTRL_MUXSELn_CLR(2) = 0xffffffff; /* lcd_d{0-15} */ |
69 | } | 69 | } |
70 | else | 70 | else |
71 | { | 71 | { |
72 | HW_PINCTRL_MUXSELn_SET(2) = 0xffffffff; /* lcd_d{0-15} */ | 72 | HW_PINCTRL_MUXSELn_SET(2) = 0xffffffff; /* lcd_d{0-15} */ |
73 | imx233_enable_gpio_output_mask(1, 0x2bfffff, false); /* lcd_{d{0-17},reset,rs,wr,cs,enable,vsync} */ | 73 | imx233_pinctrl_enable_gpio_mask(1, 0x2bfffff, false); /* lcd_{d{0-17},reset,rs,wr,cs,enable,vsync} */ |
74 | imx233_set_pin_function(1, 16, PINCTRL_FUNCTION_GPIO); /* lcd_d16 */ | 74 | imx233_pinctrl_set_function(1, 16, PINCTRL_FUNCTION_GPIO); /* lcd_d16 */ |
75 | imx233_set_pin_function(1, 17, PINCTRL_FUNCTION_GPIO); /* lcd_d17 */ | 75 | imx233_pinctrl_set_function(1, 17, PINCTRL_FUNCTION_GPIO); /* lcd_d17 */ |
76 | imx233_set_pin_function(1, 19, PINCTRL_FUNCTION_GPIO); /* lcd_rs */ | 76 | imx233_pinctrl_set_function(1, 19, PINCTRL_FUNCTION_GPIO); /* lcd_rs */ |
77 | imx233_set_pin_function(1, 20, PINCTRL_FUNCTION_GPIO); /* lcd_wr */ | 77 | imx233_pinctrl_set_function(1, 20, PINCTRL_FUNCTION_GPIO); /* lcd_wr */ |
78 | imx233_set_pin_function(1, 21, PINCTRL_FUNCTION_GPIO); /* lcd_cs */ | 78 | imx233_pinctrl_set_function(1, 21, PINCTRL_FUNCTION_GPIO); /* lcd_cs */ |
79 | imx233_set_pin_function(1, 23, PINCTRL_FUNCTION_GPIO); /* lcd_enable */ | 79 | imx233_pinctrl_set_function(1, 23, PINCTRL_FUNCTION_GPIO); /* lcd_enable */ |
80 | imx233_set_pin_function(1, 25, PINCTRL_FUNCTION_GPIO); /* lcd_vsync */ | 80 | imx233_pinctrl_set_function(1, 25, PINCTRL_FUNCTION_GPIO); /* lcd_vsync */ |
81 | } | 81 | } |
82 | } | 82 | } |
83 | 83 | ||