The 8250_of never compiled since in the Kconfig we have SERIAL_OF_PLATFORM
but in the makefile we expect to have SERIAL_8250_OF...
In the Kconfig keep the SERIAL_OF_PLATFORM for compatibility reasons and
let it select the SERIAL_8250_OF. Later we can replace the
SERIAL_OF_PLATFORM use in defconfigs to SERIAL_8250_OF.
When the 8250_of.c is actually compiled we will have two errors:
missing linux/nwpserial.h and 8250/8250.h.
Fix those as well at the same time when enable the compilation of the
driver.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxx>
Fixes: afd7f88f1577 ("serial: 8250: move of_serial code to 8250 directory")
CC: Arnd Bergmann <arnd@xxxxxxxx>
---
Hi,
this is fixes linux-next. W/o the patch davinci devices are not booting in DT
mode for example.
Regards,
Peter
drivers/tty/serial/8250/8250_of.c | 3 +--
drivers/tty/serial/8250/Kconfig | 5 +++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c
index d66fd24f87cf..33021c1f7d55 100644
--- a/drivers/tty/serial/8250/8250_of.c
+++ b/drivers/tty/serial/8250/8250_of.c
@@ -18,10 +18,9 @@
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
-#include <linux/nwpserial.h>
#include <linux/clk.h>
-#include "8250/8250.h"
+#include "8250.h"
struct of_serial_info {
struct clk *clk;
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
index b03cb5175113..01f24613b0e6 100644
--- a/drivers/tty/serial/8250/Kconfig
+++ b/drivers/tty/serial/8250/Kconfig
@@ -379,6 +379,11 @@ config SERIAL_8250_MID
Intel platforms.
config SERIAL_OF_PLATFORM
+ tristate
+ depends on SERIAL_8250 && OF
+ select SERIAL_8250_OF
+
+config SERIAL_8250_OF
tristate "Devicetree based probing for 8250 ports"
depends on SERIAL_8250 && OF
help
--
2.6.4
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
