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

Commit 1443f8a0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-for-v3.8/defconfig' of... 

Merge tag 'davinci-for-v3.8/defconfig' of git://gitorious.org/linux-davinci/linux-davinci into next/boards

From Sekhar Nori:

This change enables DT related options in DA8XX
defconfig.

* tag 'davinci-for-v3.8/defconfig' of git://gitorious.org/linux-davinci/linux-davinci

:
  ARM: davinci: da8xx defconfig: enable DT config options

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 00b2fa57 001b35ff

Documentation/devicetree/bindings/arm/davinci.txt

0 → 100644
+17 −0
Original line number Original line Diff line number Diff line 
Texas Instruments DaVinci Platforms Device Tree Bindings

--------------------------------------------------------



DA850/OMAP-L138/AM18x Evaluation Module (EVM) board

Required root node properties:

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



EnBW AM1808 based CMC board

Required root node properties:

    - compatible = "enbw,cmc", "ti,da850;



Generic DaVinci Boards

----------------------



DA850/OMAP-L138/AM18x generic board

Required root node properties:

    - compatible = "ti,da850";

arch/arm/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -924,6 +924,7 @@ config ARCH_DAVINCI 
	select GENERIC_IRQ_CHIP

	select GENERIC_IRQ_CHIP

	select HAVE_IDE

	select HAVE_IDE

	select NEED_MACH_GPIO_H

	select NEED_MACH_GPIO_H

	select USE_OF

	select ZONE_DMA

	select ZONE_DMA

	help

	help

	  Support for TI's DaVinci platform.

	  Support for TI's DaVinci platform.

arch/arm/boot/dts/da850-enbw-cmc.dts

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

 * Device Tree for AM1808 EnBW CMC board

 *

 * Copyright 2012 DENX Software Engineering GmbH

 * Heiko Schocher <hs@denx.de>

 *

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

 * under  the terms of  the GNU General  Public License as published by the

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 */

/dts-v1/;

/include/ "da850.dtsi"



/ {

	compatible = "enbw,cmc", "ti,da850";

	model = "EnBW CMC";



	soc {

		serial0: serial@1c42000 {

			status = "okay";

		};

		serial1: serial@1d0c000 {

			status = "okay";

		};

		serial2: serial@1d0d000 {

			status = "okay";

		};

	};

};

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

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

 * Device Tree for DA850 EVM board

 *

 * 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 as published by the

 * Free Software Foundation, version 2.

 */

/dts-v1/;

/include/ "da850.dtsi"



/ {

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

	model = "DA850/AM1808/OMAP-L138 EVM";



	soc {

		serial0: serial@1c42000 {

			status = "okay";

		};

		serial1: serial@1d0c000 {

			status = "okay";

		};

		serial2: serial@1d0d000 {

			status = "okay";

		};

	};

};

arch/arm/boot/dts/da850.dtsi

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

 * Copyright 2012 DENX Software Engineering GmbH

 * Heiko Schocher <hs@denx.de>

 *

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

 * under  the terms of  the GNU General  Public License as published by the

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 */

/include/ "skeleton.dtsi"



/ {

	arm {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

		intc: interrupt-controller {

			compatible = "ti,cp-intc";

			interrupt-controller;

			#interrupt-cells = <1>;

			ti,intc-size = <100>;

			reg = <0xfffee000 0x2000>;

		};

	};

	soc {

		compatible = "simple-bus";

		model = "da850";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0x0 0x01c00000 0x400000>;



		serial0: serial@1c42000 {

			compatible = "ns16550a";

			reg = <0x42000 0x100>;

			clock-frequency = <150000000>;

			reg-shift = <2>;

			interrupts = <25>;

			interrupt-parent = <&intc>;

			status = "disabled";

		};

		serial1: serial@1d0c000 {

			compatible = "ns16550a";

			reg = <0x10c000 0x100>;

			clock-frequency = <150000000>;

			reg-shift = <2>;

			interrupts = <53>;

			interrupt-parent = <&intc>;

			status = "disabled";

		};

		serial2: serial@1d0d000 {

			compatible = "ns16550a";

			reg = <0x10d000 0x100>;

			clock-frequency = <150000000>;

			reg-shift = <2>;

			interrupts = <61>;

			interrupt-parent = <&intc>;

			status = "disabled";

		};

	};

};