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

Commit 6de7351c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-devel-dt-for-v3.6' of... 

Merge tag 'omap-devel-dt-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

From Tony Lindgren <tony@atomide.com>:

Device tree related patches for omaps

* tag 'omap-devel-dt-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  arm/dts: New dts file for PandaBoardES (4460)
  arm/dts: omap4-panda: Audio support for PandaBoard 4430
  arm/dts: omap4-sdp: Enable audio support via device tree
  arm/dts: omap4-sdp: Add support for twl6040
  arm/dts: omap4-sdp: Add fixed regulator to represent VBAT
  arm/dts: omap4: Add entry for OMAP DMIC IP
  arm/dts: omap4: Add entry for OMAP McPDM IP
  arm/dts: am33xx wdt node
  arm/dts: remove MMC/SD and SPI related entries from am33xx.dtsi
  watchdog: omap_wdt: add device tree support
  ARM: OMAP: avoid build wdt platform device if with dt support
  arm/dts: add wdt node for omap3 and omap4
  arm/dts: OMAP4: Add Variscite OMAP4 System-On-Modeule support
  arm/dts: Add support for AM335x BeagleBone
  arm/dts: Add support for AM335x EVM
  arm/dts: Add initial DT support for AM33XX SoC family
  arm/dts: omap3-evm: Add i2c and twl4030 support
  arm/dts: Add support for TI AM3517/05 EVM board
  arm/dts: OMAP2: Add support for OMAP2420H4 Board

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents eae10c68 f700c4d7

Documentation/devicetree/bindings/arm/omap/omap.txt

+3 −0
Original line number Diff line number Diff line
@@ -47,3 +47,6 @@ Boards: 


- AM335X EVM : Software Developement Board for AM335x

  compatible = "ti,am335x-evm", "ti,am33xx", "ti,omap3"



- AM335X Bone : Low cost community board

  compatible = "ti,am335x-bone", "ti,am33xx", "ti,omap3"

Documentation/devicetree/bindings/watchdog/omap-wdt.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
TI Watchdog Timer (WDT) Controller for OMAP



Required properties:

compatible:

- "ti,omap3-wdt" for OMAP3

- "ti,omap4-wdt" for OMAP4

- ti,hwmods: Name of the hwmod associated to the WDT



Examples:



wdt2: wdt@4a314000 {

	compatible = "ti,omap4-wdt", "ti,omap3-wdt";

	ti,hwmods = "wd_timer2";

};

arch/arm/boot/dts/am335x-bone.dts

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

 * Copyright (C) 2012 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/ "am33xx.dtsi"



/ {

	model = "TI AM335x BeagleBone";

	compatible = "ti,am335x-bone", "ti,am33xx";



	memory {

		device_type = "memory";

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

	};

};

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

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

 * Copyright (C) 2012 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/ "am33xx.dtsi"



/ {

	model = "TI AM335x EVM";

	compatible = "ti,am335x-evm", "ti,am33xx";



	memory {

		device_type = "memory";

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

	};

};

arch/arm/boot/dts/am33xx.dtsi

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

 * Device Tree Source for AM33XX 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/ "skeleton.dtsi"



/ {

	compatible = "ti,am33xx";



	aliases {

		serial0 = &uart1;

		serial1 = &uart2;

		serial2 = &uart3;

		serial3 = &uart4;

		serial4 = &uart5;

		serial5 = &uart6;

	};



	cpus {

		cpu@0 {

			compatible = "arm,cortex-a8";

		};

	};



	/*

	 * The soc node represents the soc top level view. It is uses for IPs

	 * that are not memory mapped in the MPU view or for the MPU itself.

	 */

	soc {

		compatible = "ti,omap-infra";

		mpu {

			compatible = "ti,omap3-mpu";

			ti,hwmods = "mpu";

		};

	};



	/*

	 * XXX: Use a flat representation of the AM33XX interconnect.

	 * The real AM33XX interconnect network is quite complex.Since

	 * that will not bring real advantage to represent that in DT

	 * for the moment, just use a fake OCP bus entry to represent

	 * the whole bus hierarchy.

	 */

	ocp {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

		ti,hwmods = "l3_main";



		intc: interrupt-controller@48200000 {

			compatible = "ti,omap2-intc";

			interrupt-controller;

			#interrupt-cells = <1>;

			ti,intc-size = <128>;

			reg = <0x48200000 0x1000>;

		};



		gpio1: gpio@44e07000 {

			compatible = "ti,omap4-gpio";

			ti,hwmods = "gpio1";

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

		};



		gpio2: gpio@4804C000 {

			compatible = "ti,omap4-gpio";

			ti,hwmods = "gpio2";

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

		};



		gpio3: gpio@481AC000 {

			compatible = "ti,omap4-gpio";

			ti,hwmods = "gpio3";

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

		};



		gpio4: gpio@481AE000 {

			compatible = "ti,omap4-gpio";

			ti,hwmods = "gpio4";

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

		};



		uart1: serial@44E09000 {

			compatible = "ti,omap3-uart";

			ti,hwmods = "uart1";

			clock-frequency = <48000000>;

		};



		uart2: serial@48022000 {

			compatible = "ti,omap3-uart";

			ti,hwmods = "uart2";

			clock-frequency = <48000000>;

		};



		uart3: serial@48024000 {

			compatible = "ti,omap3-uart";

			ti,hwmods = "uart3";

			clock-frequency = <48000000>;

		};



		uart4: serial@481A6000 {

			compatible = "ti,omap3-uart";

			ti,hwmods = "uart4";

			clock-frequency = <48000000>;

		};



		uart5: serial@481A8000 {

			compatible = "ti,omap3-uart";

			ti,hwmods = "uart5";

			clock-frequency = <48000000>;

		};



		uart6: serial@481AA000 {

			compatible = "ti,omap3-uart";

			ti,hwmods = "uart6";

			clock-frequency = <48000000>;

		};



		i2c1: i2c@44E0B000 {

			compatible = "ti,omap4-i2c";

			#address-cells = <1>;

			#size-cells = <0>;

			ti,hwmods = "i2c1";

		};



		i2c2: i2c@4802A000 {

			compatible = "ti,omap4-i2c";

			#address-cells = <1>;

			#size-cells = <0>;

			ti,hwmods = "i2c2";

		};



		i2c3: i2c@4819C000 {

			compatible = "ti,omap4-i2c";

			#address-cells = <1>;

			#size-cells = <0>;

			ti,hwmods = "i2c3";

		};

	};

};