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

Commit 590d829a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt 

* 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  arm/dts: Add support for TI OMAP3 EVM board
  arm/dts: OMAP4: Update DTS file with new GIC bindings
  arm/dts: OMAP3: Add i2c controller nodes
  arm/dts: OMAP4: Add i2c controller nodes
  ARM: OMAP2+: Set Kconfig dependencies for PROC_DEVICETREE
  arm/dts: OMAP3&4: Remove the '0x' prefix for serial nodes
  ARM: OMAP1: kconfig: Enable IRQ_DOMAIN by default for OMAP1 platforms
  ARM: OMAP2+: pm: Do not init statically the SR and voltage layer with DT
  ARM: OMAP2+: omap_device: Replace dev_warn by dev_dbg in omap_device_build_from_dt
  ARM: OMAP2+: board-generic: Remove un-needed .atag_offset for DT_MACHINE
  ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems
  arm/dts: OMAP: Remove bootargs node from board files
parents e0e5ce59 ffd76d8b

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

+0 −9
Original line number Original line Diff line number Diff line
@@ -13,15 +13,6 @@ 
	model = "TI OMAP3 BeagleBoard";

	model = "TI OMAP3 BeagleBoard";

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

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





	/*

	 * Since the initial device tree board file does not create any

	 * devices (MMC, network...), the only way to boot is to provide a

	 * ramdisk.

	 */

	chosen {

		bootargs = "root=/dev/ram0 rw console=ttyO2,115200n8 initrd=0x81600000,20M ramdisk_size=20480 no_console_suspend debug earlyprintk";

	};



	memory {

	memory {

		device_type = "memory";

		device_type = "memory";

		reg = <0x80000000 0x20000000>; /* 512 MB */

		reg = <0x80000000 0x20000000>; /* 512 MB */

arch/arm/boot/dts/omap3-evm.dts

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

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

/dts-v1/;



/include/ "omap3.dtsi"



/ {

	model = "TI OMAP3 EVM (OMAP3530, AM/DM37x)";

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



	memory {

		device_type = "memory";

		reg = <0x80000000 0x10000000>; /* 256 MB */

	};

};

arch/arm/boot/dts/omap3.dtsi

+25 −4
Original line number Original line Diff line number Diff line
@@ -67,28 +67,49 @@ 
			#interrupt-cells = <1>;

			#interrupt-cells = <1>;

		};

		};





		uart1: serial@0x4806a000 {

		uart1: serial@4806a000 {

			compatible = "ti,omap3-uart";

			compatible = "ti,omap3-uart";

			ti,hwmods = "uart1";

			ti,hwmods = "uart1";

			clock-frequency = <48000000>;

			clock-frequency = <48000000>;

		};

		};





		uart2: serial@0x4806c000 {

		uart2: serial@4806c000 {

			compatible = "ti,omap3-uart";

			compatible = "ti,omap3-uart";

			ti,hwmods = "uart2";

			ti,hwmods = "uart2";

			clock-frequency = <48000000>;

			clock-frequency = <48000000>;

		};

		};





		uart3: serial@0x49020000 {

		uart3: serial@49020000 {

			compatible = "ti,omap3-uart";

			compatible = "ti,omap3-uart";

			ti,hwmods = "uart3";

			ti,hwmods = "uart3";

			clock-frequency = <48000000>;

			clock-frequency = <48000000>;

		};

		};





		uart4: serial@0x49042000 {

		uart4: serial@49042000 {

			compatible = "ti,omap3-uart";

			compatible = "ti,omap3-uart";

			ti,hwmods = "uart4";

			ti,hwmods = "uart4";

			clock-frequency = <48000000>;

			clock-frequency = <48000000>;

		};

		};



		i2c1: i2c@48070000 {

			compatible = "ti,omap3-i2c";

			#address-cells = <1>;

			#size-cells = <0>;

			ti,hwmods = "i2c1";

		};



		i2c2: i2c@48072000 {

			compatible = "ti,omap3-i2c";

			#address-cells = <1>;

			#size-cells = <0>;

			ti,hwmods = "i2c2";

		};



		i2c3: i2c@48060000 {

			compatible = "ti,omap3-i2c";

			#address-cells = <1>;

			#size-cells = <0>;

			ti,hwmods = "i2c3";

		};

	};

	};

};
 
};

arch/arm/boot/dts/omap4-panda.dts

+0 −9
Original line number Original line Diff line number Diff line
@@ -13,15 +13,6 @@ 
	model = "TI OMAP4 PandaBoard";

	model = "TI OMAP4 PandaBoard";

	compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4";

	compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4";





	/*

	 * Since the initial device tree board file does not create any

	 * devices (MMC, network...), the only way to boot is to provide a

	 * ramdisk.

	 */

	chosen {

		bootargs = "root=/dev/ram0 rw console=ttyO2,115200n8 initrd=0x81600000,20M ramdisk_size=20480 no_console_suspend debug";

	};



	memory {

	memory {

		device_type = "memory";

		device_type = "memory";

		reg = <0x80000000 0x40000000>; /* 1 GB */

		reg = <0x80000000 0x40000000>; /* 1 GB */

arch/arm/boot/dts/omap4-sdp.dts

+0 −9
Original line number Original line Diff line number Diff line
@@ -13,15 +13,6 @@ 
	model = "TI OMAP4 SDP board";

	model = "TI OMAP4 SDP board";

	compatible = "ti,omap4-sdp", "ti,omap4430", "ti,omap4";

	compatible = "ti,omap4-sdp", "ti,omap4430", "ti,omap4";





	/*

	 * Since the initial device tree board file does not create any

	 * devices (MMC, network...), the only way to boot is to provide a

	 * ramdisk.

	 */

	chosen {

		bootargs = "root=/dev/ram0 rw console=ttyO2,115200n8 initrd=0x81600000,20M ramdisk_size=20480 no_console_suspend debug";

	};



	memory {

	memory {

		device_type = "memory";

		device_type = "memory";

		reg = <0x80000000 0x40000000>; /* 1 GB */

		reg = <0x80000000 0x40000000>; /* 1 GB */