diff options
Diffstat (limited to 'firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c')
-rw-r--r-- | firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c | 34 |
1 files changed, 17 insertions, 17 deletions
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 | ||