diff options
-rw-r--r-- | arch/arm/mach-mxc91231/iomux.c | 14 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mxc91231.h | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/mach-mxc91231/iomux.c b/arch/arm/mach-mxc91231/iomux.c index 405d9b19d891..66fc41cbf2ca 100644 --- a/arch/arm/mach-mxc91231/iomux.c +++ b/arch/arm/mach-mxc91231/iomux.c | |||
@@ -50,7 +50,7 @@ unsigned long mxc_pin_alloc_map[NB_PORTS * 32 / BITS_PER_LONG]; | |||
50 | /* | 50 | /* |
51 | * set the mode for a IOMUX pin. | 51 | * set the mode for a IOMUX pin. |
52 | */ | 52 | */ |
53 | int mxc_iomux_mode(const unsigned int pin_mode) | 53 | int mxc_iomux_mode(unsigned int pin_mode) |
54 | { | 54 | { |
55 | u32 side, field, l, mode, ret = 0; | 55 | u32 side, field, l, mode, ret = 0; |
56 | void __iomem *reg; | 56 | void __iomem *reg; |
@@ -114,7 +114,7 @@ EXPORT_SYMBOL(mxc_iomux_set_pad); | |||
114 | * - reserves the pin so that it is not claimed by another driver | 114 | * - reserves the pin so that it is not claimed by another driver |
115 | * - setups the iomux according to the configuration | 115 | * - setups the iomux according to the configuration |
116 | */ | 116 | */ |
117 | int mxc_iomux_alloc_pin(const unsigned int pin_mode, const char *label) | 117 | int mxc_iomux_alloc_pin(unsigned int pin_mode, const char *label) |
118 | { | 118 | { |
119 | unsigned pad = PIN_GLOBAL_NUM(pin_mode); | 119 | unsigned pad = PIN_GLOBAL_NUM(pin_mode); |
120 | if (pad >= (PIN_MAX + 1)) { | 120 | if (pad >= (PIN_MAX + 1)) { |
@@ -134,10 +134,10 @@ int mxc_iomux_alloc_pin(const unsigned int pin_mode, const char *label) | |||
134 | } | 134 | } |
135 | EXPORT_SYMBOL(mxc_iomux_alloc_pin); | 135 | EXPORT_SYMBOL(mxc_iomux_alloc_pin); |
136 | 136 | ||
137 | int mxc_iomux_setup_multiple_pins(unsigned int *pin_list, unsigned count, | 137 | int mxc_iomux_setup_multiple_pins(const unsigned int *pin_list, unsigned count, |
138 | const char *label) | 138 | const char *label) |
139 | { | 139 | { |
140 | unsigned int *p = pin_list; | 140 | const unsigned int *p = pin_list; |
141 | int i; | 141 | int i; |
142 | int ret = -EINVAL; | 142 | int ret = -EINVAL; |
143 | 143 | ||
@@ -155,7 +155,7 @@ setup_error: | |||
155 | } | 155 | } |
156 | EXPORT_SYMBOL(mxc_iomux_setup_multiple_pins); | 156 | EXPORT_SYMBOL(mxc_iomux_setup_multiple_pins); |
157 | 157 | ||
158 | void mxc_iomux_release_pin(const unsigned int pin_mode) | 158 | void mxc_iomux_release_pin(unsigned int pin_mode) |
159 | { | 159 | { |
160 | unsigned pad = PIN_GLOBAL_NUM(pin_mode); | 160 | unsigned pad = PIN_GLOBAL_NUM(pin_mode); |
161 | 161 | ||
@@ -164,9 +164,9 @@ void mxc_iomux_release_pin(const unsigned int pin_mode) | |||
164 | } | 164 | } |
165 | EXPORT_SYMBOL(mxc_iomux_release_pin); | 165 | EXPORT_SYMBOL(mxc_iomux_release_pin); |
166 | 166 | ||
167 | void mxc_iomux_release_multiple_pins(unsigned int *pin_list, int count) | 167 | void mxc_iomux_release_multiple_pins(const unsigned int *pin_list, int count) |
168 | { | 168 | { |
169 | unsigned int *p = pin_list; | 169 | const unsigned int *p = pin_list; |
170 | int i; | 170 | int i; |
171 | 171 | ||
172 | for (i = 0; i < count; i++) { | 172 | for (i = 0; i < count; i++) { |
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mxc91231.h b/arch/arm/plat-mxc/include/mach/iomux-mxc91231.h index 15d59510f597..bf28df0d58b7 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mxc91231.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mxc91231.h | |||
@@ -46,12 +46,12 @@ | |||
46 | * - setups the iomux according to the configuration | 46 | * - setups the iomux according to the configuration |
47 | * - if the pin is configured as a GPIO, we claim it through kernel gpiolib | 47 | * - if the pin is configured as a GPIO, we claim it through kernel gpiolib |
48 | */ | 48 | */ |
49 | int mxc_iomux_alloc_pin(const unsigned int pin_mode, const char *label); | 49 | int mxc_iomux_alloc_pin(unsigned int pin_mode, const char *label); |
50 | /* | 50 | /* |
51 | * setups mutliple pins | 51 | * setups mutliple pins |
52 | * convenient way to call the above function with tables | 52 | * convenient way to call the above function with tables |
53 | */ | 53 | */ |
54 | int mxc_iomux_setup_multiple_pins(unsigned int *pin_list, unsigned count, | 54 | int mxc_iomux_setup_multiple_pins(const unsigned int *pin_list, unsigned count, |
55 | const char *label); | 55 | const char *label); |
56 | 56 | ||
57 | /* | 57 | /* |
@@ -60,12 +60,12 @@ int mxc_iomux_setup_multiple_pins(unsigned int *pin_list, unsigned count, | |||
60 | * - frees the GPIO if the pin was configured as GPIO | 60 | * - frees the GPIO if the pin was configured as GPIO |
61 | * - DOES NOT reconfigure the IOMUX in its reset state | 61 | * - DOES NOT reconfigure the IOMUX in its reset state |
62 | */ | 62 | */ |
63 | void mxc_iomux_release_pin(const unsigned int pin_mode); | 63 | void mxc_iomux_release_pin(unsigned int pin_mode); |
64 | /* | 64 | /* |
65 | * releases multiple pins | 65 | * releases multiple pins |
66 | * convenvient way to call the above function with tables | 66 | * convenvient way to call the above function with tables |
67 | */ | 67 | */ |
68 | void mxc_iomux_release_multiple_pins(unsigned int *pin_list, int count); | 68 | void mxc_iomux_release_multiple_pins(const unsigned int *pin_list, int count); |
69 | 69 | ||
70 | #define MUX_SIDE_AP (0) | 70 | #define MUX_SIDE_AP (0) |
71 | #define MUX_SIDE_SP (1) | 71 | #define MUX_SIDE_SP (1) |