[PATCH 4/4] msm: serial: Move msm_uart_driver onto msm bus
flat view
DORMANTno replies
From: Patrick Pannuto <hidden>
Date: 2010-08-18 19:15:55
Also in:
linux-arm-msm, lkml
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
Proof of concept; move one device / driver pair Change-Id: I1afb6f54e6574057699db5b8f9fb7f4456a52010 Signed-off-by: Patrick Pannuto <redacted> --- arch/arm/mach-msm/board-qsd8x50.c | 3 ++- drivers/serial/msm_serial.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
index e3cc807..0deb369 100644
--- a/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c@@ -27,6 +27,7 @@ #include <asm/setup.h> #include <mach/board.h> +#include <mach/msm_device.h> #include <mach/irqs.h> #include <mach/sirc.h> #include <mach/gpio.h>
@@ -65,7 +66,7 @@ static void __init qsd8x50_init_irq(void) static void __init qsd8x50_init(void) { msm8x50_init_uart3(); - platform_add_devices(devices, ARRAY_SIZE(devices)); + msm_device_register(&msm_device_uart3); } MACHINE_START(QSD8X50_SURF, "QCT QSD8X50 SURF")
diff --git a/drivers/serial/msm_serial.c b/drivers/serial/msm_serial.c
index f8c816e..3332fe7 100644
--- a/drivers/serial/msm_serial.c
+++ b/drivers/serial/msm_serial.c@@ -32,6 +32,8 @@ #include <linux/clk.h> #include <linux/platform_device.h> +#include <mach/msm_device.h> + #include "msm_serial.h" struct msm_port {
@@ -732,7 +734,7 @@ static int __init msm_serial_init(void) if (unlikely(ret)) return ret; - ret = platform_driver_probe(&msm_platform_driver, msm_serial_probe); + ret = msm_driver_probe(&msm_platform_driver, msm_serial_probe); if (unlikely(ret)) uart_unregister_driver(&msm_uart_driver);
--
1.7.2.1