2 files changed, 47 insertions, 27 deletions

diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index 984b3f9984cd..d495000b81a0 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -244,6 +244,13 @@ static struct resource bfin_uart0_resources[] = {
                 .end = UART0_RBR+2,
                 .flags = IORESOURCE_MEM,
         },
+#ifdef CONFIG_EARLY_PRINTK
+        {
+                .start = PORTE_FER,
+                .end = PORTE_FER+2,
+                .flags = IORESOURCE_REG,
+        },
+#endif
         {
                 .start = IRQ_UART0_TX,
                 .end = IRQ_UART0_TX,
@@ -292,6 +299,13 @@ static struct resource bfin_uart1_resources[] = {
                 .end = UART1_RBR+2,
                 .flags = IORESOURCE_MEM,
         },
+#ifdef CONFIG_EARLY_PRINTK
+        {
+                .start = PORTH_FER,
+                .end = PORTH_FER+2,
+                .flags = IORESOURCE_REG,
+        },
+#endif
         {
                 .start = IRQ_UART1_TX,
                 .end = IRQ_UART1_TX,
@@ -356,6 +370,13 @@ static struct resource bfin_uart2_resources[] = {
                 .end = UART2_RBR+2,
                 .flags = IORESOURCE_MEM,
         },
+#ifdef CONFIG_EARLY_PRINTK
+        {
+                .start = PORTB_FER,
+                .end = PORTB_FER+2,
+                .flags = IORESOURCE_REG,
+        },
+#endif
         {
                 .start = IRQ_UART2_TX,
                 .end = IRQ_UART2_TX,
@@ -404,6 +425,13 @@ static struct resource bfin_uart3_resources[] = {
                 .end = UART3_RBR+2,
                 .flags = IORESOURCE_MEM,
         },
+#ifdef CONFIG_EARLY_PRINTK
+        {
+                .start = PORTB_FER,
+                .end = PORTB_FER+2,
+                .flags = IORESOURCE_REG,
+        },
+#endif
         {
                 .start = IRQ_UART3_TX,
                 .end = IRQ_UART3_TX,
@@ -2160,21 +2188,6 @@ static struct platform_device *ezkit_early_devices[] __initdata = {
         &bfin_uart3_device,
 #endif
 #endif
-
-#if defined(CONFIG_SERIAL_BFIN_SPORT_CONSOLE)
-#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
-        &bfin_sport0_uart_device,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART
-        &bfin_sport1_uart_device,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_SPORT2_UART
-        &bfin_sport2_uart_device,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_SPORT3_UART
-        &bfin_sport3_uart_device,
-#endif
-#endif
 };
 
 void __init native_machine_early_platform_add_devices(void)
diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c
index aba6b54489ff..82beedd953f6 100644
--- a/arch/blackfin/mach-bf609/boards/ezkit.c
+++ b/arch/blackfin/mach-bf609/boards/ezkit.c
@@ -213,6 +213,18 @@ static struct resource bfin_uart0_resources[] = {
                 .end = UART0_RXDIV+4,
                 .flags = IORESOURCE_MEM,
         },
+#ifdef CONFIG_EARLY_PRINTK
+        {
+                .start = PORTD_FER,
+                .end = PORTD_FER+2,
+                .flags = IORESOURCE_REG,
+        },
+        {
+                .start = PORTD_MUX,
+                .end = PORTD_MUX+3,
+                .flags = IORESOURCE_REG,
+        },
+#endif
         {
                 .start = IRQ_UART0_TX,
                 .end = IRQ_UART0_TX,
@@ -277,6 +289,13 @@ static struct resource bfin_uart1_resources[] = {
                 .end = UART1_RXDIV+4,
                 .flags = IORESOURCE_MEM,
         },
+#ifdef CONFIG_EARLY_PRINTK
+        {
+                .start = PORTG_FER_SET,
+                .end = PORTG_FER_SET+2,
+                .flags = IORESOURCE_REG,
+        },
+#endif
         {
                 .start = IRQ_UART1_TX,
                 .end = IRQ_UART1_TX,
@@ -2100,18 +2119,6 @@ static struct platform_device *ezkit_early_devices[] __initdata = {
         &bfin_uart1_device,
 #endif
 #endif
-
-#if defined(CONFIG_SERIAL_BFIN_SPORT_CONSOLE)
-#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
-        &bfin_sport0_uart_device,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART
-        &bfin_sport1_uart_device,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_SPORT2_UART
-        &bfin_sport2_uart_device,
-#endif
-#endif
 };
 
 void __init native_machine_early_platform_add_devices(void)