---

yaml --- r: 296705 b: refs/heads/master c: 4905af0 h: refs/heads/master i: 296703: 8b30f81 v: v3
git-mirror · Mar 16, 2012 · c2e3082 · c2e3082
1 parent 4aa53bb
commit c2e3082
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dab6487e35680ac5043c58a60554c49052276f5e
+refs/heads/master: 4905af0e13a665da5f72d2629e93161ba781d03b
diff --git a/trunk/arch/arm/boot/dts/snowball.dts b/trunk/arch/arm/boot/dts/snowball.dts
@@ -96,6 +96,18 @@
 			status = "enabled";
 		};
 
+		uart@80120000 {
+			status = "okay";
+		};
+
+		uart@80121000 {
+			status = "okay";
+		};
+
+		uart@80007000 {
+			status = "okay";
+		};
+
 		i2c@80004000 {
 			tc3589x@42 {
 				//compatible = "tc3589x";

diff --git a/trunk/arch/arm/mach-ux500/board-mop500.c b/trunk/arch/arm/mach-ux500/board-mop500.c
@@ -746,6 +746,9 @@ MACHINE_END
 #ifdef CONFIG_MACH_UX500_DT
 
 struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
+	OF_DEV_AUXDATA("arm,pl011", 0x80120000, "uart0", &uart0_plat),
+	OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", &uart1_plat),
+	OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", &uart2_plat),
 	{},
 };
 
@@ -802,7 +805,6 @@ static void __init u8500_init_machine(void)
 	}
 	mop500_i2c_init(parent);
 	mop500_spi_init(parent);
-	mop500_uart_init(parent);
 
 	i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);
 	i2c_register_board_info(2, mop500_i2c2_devices,