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

Commit ffd76d8b authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'for_3.4/dts_updates' of... 

Merge branch 'for_3.4/dts_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into dt
parents bfe9c8ae f0e15e2b

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -3318,6 +3318,12 @@ S: Maintained 
F:	net/ieee802154/

F:	drivers/ieee802154/



IIO SUBSYSTEM AND DRIVERS

M:	Jonathan Cameron <jic23@cam.ac.uk>

L:	linux-iio@vger.kernel.org

S:	Maintained

F:	drivers/staging/iio/



IKANOS/ADI EAGLE ADSL USB DRIVER

M:	Matthieu Castet <castet.matthieu@free.fr>

M:	Stanislaw Gruszka <stf_xl@wp.pl>

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 3

SUBLEVEL = 0

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/boot/dts/exynos4210.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
		compatible = "arm,cortex-a9-gic";

		#interrupt-cells = <3>;

		interrupt-controller;

		cpu-offset = <0x8000>;

		reg = <0x10490000 0x1000>, <0x10480000 0x100>;

	};

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

0 → 100644
+20 −0
Original line number 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

+21 −0
Original line number Diff line number Diff line
@@ -90,5 +90,26 @@ 
			ti,hwmods = "uart4";

			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";

		};

	};

};