diff options
Diffstat (limited to 'arch/arm/mach-kirkwood/openrd-setup.c')
-rw-r--r-- | arch/arm/mach-kirkwood/openrd-setup.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c index 134ef50d58fc..7e81e9b586bf 100644 --- a/arch/arm/mach-kirkwood/openrd-setup.c +++ b/arch/arm/mach-kirkwood/openrd-setup.c | |||
@@ -121,14 +121,12 @@ static int __init uart1_mpp_config(void) | |||
121 | kirkwood_mpp_conf(openrd_uart1_mpp_config); | 121 | kirkwood_mpp_conf(openrd_uart1_mpp_config); |
122 | 122 | ||
123 | if (gpio_request(34, "SD_UART1_SEL")) { | 123 | if (gpio_request(34, "SD_UART1_SEL")) { |
124 | printk(KERN_ERR "GPIO request failed for SD/UART1 selection" | 124 | pr_err("GPIO request 34 failed for SD/UART1 selection\n"); |
125 | ", gpio: 34\n"); | ||
126 | return -EIO; | 125 | return -EIO; |
127 | } | 126 | } |
128 | 127 | ||
129 | if (gpio_request(28, "RS232_RS485_SEL")) { | 128 | if (gpio_request(28, "RS232_RS485_SEL")) { |
130 | printk(KERN_ERR "GPIO request failed for RS232/RS485 selection" | 129 | pr_err("GPIO request 28 failed for RS232/RS485 selection\n"); |
131 | ", gpio# 28\n"); | ||
132 | gpio_free(34); | 130 | gpio_free(34); |
133 | return -EIO; | 131 | return -EIO; |
134 | } | 132 | } |
@@ -185,15 +183,13 @@ static void __init openrd_init(void) | |||
185 | 183 | ||
186 | if (uart1 <= 0) { | 184 | if (uart1 <= 0) { |
187 | if (uart1 < 0) | 185 | if (uart1 < 0) |
188 | printk(KERN_ERR "Invalid kernel parameter to select " | 186 | pr_err("Invalid kernel parameter to select UART1. Defaulting to SD. ERROR CODE: %d\n", |
189 | "UART1. Defaulting to SD. ERROR CODE: %d\n", | 187 | uart1); |
190 | uart1); | ||
191 | 188 | ||
192 | /* Select SD | 189 | /* Select SD |
193 | * Pin # 34: 0 => UART1, 1 => SD */ | 190 | * Pin # 34: 0 => UART1, 1 => SD */ |
194 | if (gpio_request(34, "SD_UART1_SEL")) { | 191 | if (gpio_request(34, "SD_UART1_SEL")) { |
195 | printk(KERN_ERR "GPIO request failed for SD/UART1 " | 192 | pr_err("GPIO request 34 failed for SD/UART1 selection\n"); |
196 | "selection, gpio: 34\n"); | ||
197 | } else { | 193 | } else { |
198 | 194 | ||
199 | gpio_direction_output(34, 1); | 195 | gpio_direction_output(34, 1); |