Merge pull request #1008 from notro/uart1

BCM270x: Make uart1 work with Device Tree

Author: pelwell

arch/arm/boot/dts/bcm2708-rpi-b-plus.dts

@@ -18,6 +18,7 @@
 		audio = &audio;
 		sound = &sound;
 		uart0 = &uart0;
+		uart1 = &uart1;
 		clocks = &clocks;
 	};
 

arch/arm/boot/dts/bcm2708-rpi-b.dts

@@ -18,6 +18,7 @@
 		audio = &audio;
 		sound = &sound;
 		uart0 = &uart0;
+		uart1 = &uart1;
 		clocks = &clocks;
 	};
 

arch/arm/boot/dts/bcm2708-rpi-cm.dtsi

@@ -13,6 +13,7 @@
 		audio = &audio;
 		sound = &sound;
 		uart0 = &uart0;
+		uart1 = &uart1;
 		clocks = &clocks;
 	};
 

arch/arm/boot/dts/bcm2708_common.dtsi

@@ -134,6 +134,16 @@
 			status = "disabled";
 		};
 
+		uart1: uart@7e215040 {
+			compatible = "brcm,bcm2835-aux-uart", "ns16550";
+			reg = <0x7e215040 0x40>;
+			interrupts = <1 29>;
+			clock-frequency = <500000000>;
+			reg-shift = <2>;
+			no-loopback-test;
+			status = "disabled";
+	        };
+
 		i2c1: i2c@7e804000 {
 			compatible = "brcm,bcm2708-i2c";
 			reg = <0x7e804000 0x1000>;

arch/arm/boot/dts/bcm2709-rpi-2-b.dts

@@ -18,6 +18,7 @@
 		audio = &audio;
 		sound = &sound;
 		uart0 = &uart0;
+		uart1 = &uart1;
 		clocks = &clocks;
 	};
 

arch/arm/mach-bcm2708/bcm2708.c

@@ -353,28 +353,6 @@ static struct platform_device bcm2708_fb_device = {
 		},
 };
 
-static struct plat_serial8250_port bcm2708_uart1_platform_data[] = {
-	{
-	 .mapbase = UART1_BASE + 0x40,
-	 .irq = IRQ_AUX,
-	 .uartclk = 500000000,
-	 .regshift = 2,
-	 .iotype = UPIO_MEM,
-	 .flags = UPF_SHARE_IRQ | UPF_FIXED_TYPE | UPF_FIXED_PORT |
-		UPF_IOREMAP | UPF_SKIP_TEST,
-	 .type = PORT_16550,
-	 },
-	{},
-};
-
-static struct platform_device bcm2708_uart1_device = {
-	.name = "serial8250",
-	.id = PLAT8250_DEV_PLATFORM,
-	.dev = {
-		.platform_data = bcm2708_uart1_platform_data,
-		},
-};
-
 static struct resource bcm2708_usb_resources[] = {
 	[0] = {
 	       .start = USB_BASE,
@@ -897,6 +875,17 @@ static void bcm2708_power_off(void)
 	}
 }
 
+static void __init bcm2708_init_uart1(void)
+{
+	struct device_node *np;
+
+	np = of_find_compatible_node(NULL, NULL, "brcm,bcm2835-aux-uart");
+	if (of_device_is_available(np)) {
+		pr_info("bcm2708: Mini UART enabled\n");
+		writel(1, __io_address(UART1_BASE + 0x4));
+	}
+}
+
 #ifdef CONFIG_OF
 static void __init bcm2708_dt_init(void)
 {
@@ -952,13 +941,13 @@ void __init bcm2708_init(void)
 	bcm_register_device(&bcm2708_systemtimer_device);
 	bcm_register_device_dt(&bcm2708_fb_device);
 	bcm_register_device_dt(&bcm2708_usb_device);
-	bcm_register_device(&bcm2708_uart1_device);
 	bcm_register_device(&bcm2708_powerman_device);
 
 #ifdef CONFIG_MMC_BCM2835
 	bcm_register_device_dt(&bcm2835_emmc_device);
 #endif
 	bcm2708_init_led();
+	bcm2708_init_uart1();
 
 	/* Only create the platform devices for the ALSA driver in the
 	   absence of an enabled "audio" DT node */

arch/arm/mach-bcm2709/bcm2709.c

@@ -363,27 +363,6 @@ static struct platform_device bcm2708_fb_device = {
 		},
 };
 
-static struct plat_serial8250_port bcm2708_uart1_platform_data[] = {
-	{
-	 .mapbase = UART1_BASE + 0x40,
-	 .irq = IRQ_AUX,
-	 .uartclk = 125000000,
-	 .regshift = 2,
-	 .iotype = UPIO_MEM,
-	 .flags = UPF_FIXED_TYPE | UPF_IOREMAP | UPF_SKIP_TEST,
-	 .type = PORT_8250,
-	 },
-	{},
-};
-
-static struct platform_device bcm2708_uart1_device = {
-	.name = "serial8250",
-	.id = PLAT8250_DEV_PLATFORM,
-	.dev = {
-		.platform_data = bcm2708_uart1_platform_data,
-		},
-};
-
 static struct resource bcm2708_usb_resources[] = {
 	[0] = {
 	       .start = USB_BASE,
@@ -918,6 +897,17 @@ static void bcm2709_power_off(void)
 	}
 }
 
+static void __init bcm2709_init_uart1(void)
+{
+	struct device_node *np;
+
+	np = of_find_compatible_node(NULL, NULL, "brcm,bcm2835-aux-uart");
+	if (of_device_is_available(np)) {
+		pr_info("bcm2709: Mini UART enabled\n");
+		writel(1, __io_address(UART1_BASE + 0x4));
+	}
+}
+
 #ifdef CONFIG_OF
 static void __init bcm2709_dt_init(void)
 {
@@ -975,13 +965,13 @@ void __init bcm2709_init(void)
 #endif
 	bcm_register_device_dt(&bcm2708_fb_device);
 	bcm_register_device_dt(&bcm2708_usb_device);
-	bcm_register_device(&bcm2708_uart1_device);
 	bcm_register_device(&bcm2708_powerman_device);
 
 #ifdef CONFIG_MMC_BCM2835
 	bcm_register_device_dt(&bcm2835_emmc_device);
 #endif
 	bcm2709_init_led();
+	bcm2709_init_uart1();
 
 	/* Only create the platform devices for the ALSA driver in the
 	   absence of an enabled "audio" DT node */