Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf3c79de authored Dec 14, 2011 by Rajendra Nayak Committed by Tony Lindgren Dec 16, 2011

ARM: omap: pass minimal SoC/board data for UART from dt



Pass minimal data needed for console boot, from dt, for
OMAP4 panda/sdp and OMAP3 beagle boards, and get rid of the
static initialization from generic board file.

Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Reviewed-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

parent f20b933d

arch/arm/boot/dts/omap3.dtsi

+31 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,13 @@
		/ {
		compatible = "ti,omap3430", "ti,omap3";

		aliases {
		serial0 = &uart1;
		serial1 = &uart2;
		serial2 = &uart3;
		serial3 = &uart4;
		};

		cpus {
		cpu@0 {
		compatible = "arm,cortex-a8";
		@@ -59,5 +66,29 @@
		interrupt-controller;
		#interrupt-cells = <1>;
		};

		uart1: serial@0x4806a000 {
		compatible = "ti,omap3-uart";
		ti,hwmods = "uart1";
		clock-frequency = <48000000>;
		};

		uart2: serial@0x4806c000 {
		compatible = "ti,omap3-uart";
		ti,hwmods = "uart2";
		clock-frequency = <48000000>;
		};

		uart3: serial@0x49020000 {
		compatible = "ti,omap3-uart";
		ti,hwmods = "uart3";
		clock-frequency = <48000000>;
		};

		uart4: serial@0x49042000 {
		compatible = "ti,omap3-uart";
		ti,hwmods = "uart4";
		clock-frequency = <48000000>;
		};
		};
		};

arch/arm/boot/dts/omap4.dtsi

+28 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,10 @@
		interrupt-parent = <&gic>;

		aliases {
		serial0 = &uart1;
		serial1 = &uart2;
		serial2 = &uart3;
		serial3 = &uart4;
		};

		cpus {
		@@ -99,5 +103,29 @@
		reg = <0x48241000 0x1000>,
		<0x48240100 0x0100>;
		};

		uart1: serial@0x4806a000 {
		compatible = "ti,omap4-uart";
		ti,hwmods = "uart1";
		clock-frequency = <48000000>;
		};

		uart2: serial@0x4806c000 {
		compatible = "ti,omap4-uart";
		ti,hwmods = "uart2";
		clock-frequency = <48000000>;
		};

		uart3: serial@0x48020000 {
		compatible = "ti,omap4-uart";
		ti,hwmods = "uart3";
		clock-frequency = <48000000>;
		};

		uart4: serial@0x4806e000 {
		compatible = "ti,omap4-uart";
		ti,hwmods = "uart4";
		clock-frequency = <48000000>;
		};
		};
		};

arch/arm/mach-omap2/board-generic.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ static void __init omap_generic_init(void)
		if (node)
		irq_domain_add_simple(node, 0);

		omap_serial_init();
		omap_sdrc_init(NULL, NULL);

		of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);