Commit 642f12b4 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

arm/dts: Add omap36xx.dtsi file and rename omap3-beagle to omap3-beagle-xm 



The extra serial port is not available on 34xx. And the current
omap3-beagle.dts file is for omap3-beagle-xm.dts as it lists 512MB
of memory.

Please somebody submit a new omap3-beagle.dts for the original 34xx
BeagleBoard after testing it properly.

Cc: Benoit Cousson <b-cousson@ti.com>
Cc: devicetree-discuss@lists.ozlabs.org
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 84eca270

arch/arm/boot/dts/omap3-beagle.dts→arch/arm/boot/dts/omap3-beagle-xm.dts

+3 −3
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ 
 */

/dts-v1/;



/include/ "omap3.dtsi"

/include/ "omap36xx.dtsi"



/ {

	model = "TI OMAP3 BeagleBoard";

	compatible = "ti,omap3-beagle", "ti,omap3";

	model = "TI OMAP3 BeagleBoard xM";

	compatible = "ti,omap3-beagle-xm, ti,omap3-beagle", "ti,omap3";



	memory {

		device_type = "memory";

arch/arm/boot/dts/omap3.dtsi

+0 −7
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
		serial0 = &uart1;

		serial1 = &uart2;

		serial2 = &uart3;

		serial3 = &uart4;

	};



	cpus {
@@ -141,12 +140,6 @@ 
			clock-frequency = <48000000>;

		};



		uart4: serial@49042000 {

			compatible = "ti,omap3-uart";

			ti,hwmods = "uart4";

			clock-frequency = <48000000>;

		};



		i2c1: i2c@48070000 {

			compatible = "ti,omap3-i2c";

			#address-cells = <1>;

arch/arm/boot/dts/omap36xx.dtsi

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for OMAP3 SoC

 *

 * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



/include/ "omap3.dtsi"



/ {

	aliases {

		serial3 = &uart4;

	};



	ocp {

		uart4: serial@49042000 {

			compatible = "ti,omap3-uart";

			ti,hwmods = "uart4";

			clock-frequency = <48000000>;

		};

	};

};

arch/arm/mach-omap2/Makefile.boot

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ params_phys-y := 0x80000100 
initrd_phys-y		:= 0x80800000



dtb-$(CONFIG_SOC_OMAP2420)	+= omap2420-h4.dtb

dtb-$(CONFIG_ARCH_OMAP3)	+= omap3-beagle.dtb omap3-evm.dtb omap3-tobi.dtb

dtb-$(CONFIG_ARCH_OMAP3)	+= omap3-beagle-xm.dtb omap3-evm.dtb omap3-tobi.dtb

dtb-$(CONFIG_ARCH_OMAP4)	+= omap4-panda.dtb omap4-pandaES.dtb

dtb-$(CONFIG_ARCH_OMAP4)	+= omap4-var_som.dtb omap4-sdp.dtb

dtb-$(CONFIG_SOC_OMAP5)		+= omap5-evm.dtb

CRA Git | Maintained and supported by SUSTech CRA and CCSE