Patchwork powerpc/kernel: Don't add disabled serial device

login
register
mail settings
Submitter Prabhakar Kushwaha
Date April 6, 2011, 7:26 a.m.
Message ID <1302074789-442-1-git-send-email-prabhakar@freescale.com>
Download mbox | patch
Permalink /patch/89992/
State Accepted, archived
Commit 07d9fce24d871785dbd25458469032fea73f17b8
Headers show

Comments

Prabhakar Kushwaha - April 6, 2011, 7:26 a.m.
serial port nodes with the property status="disabled" are not usable and so
avoid adding "disabled" port with the system.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
---
 Based upon git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git(branch master)
 
 This patch is made to support "Re-organizing P1020RDB P2020RDB dts". Creation
 of Serial port node doesn't follow of_platform_device_create() way which takes
 care case status = "disabled".

 arch/powerpc/kernel/legacy_serial.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

Patch

diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index c834757..26566ca 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -330,9 +330,11 @@  void __init find_legacy_serial_ports(void)
 		if (!parent)
 			continue;
 		if (of_match_node(legacy_serial_parents, parent) != NULL) {
-			index = add_legacy_soc_port(np, np);
-			if (index >= 0 && np == stdout)
-				legacy_serial_console = index;
+			if (of_device_is_available(np)) {
+				index = add_legacy_soc_port(np, np);
+				if (index >= 0 && np == stdout)
+					legacy_serial_console = index;
+			}
 		}
 		of_node_put(parent);
 	}