From df64b33f0722528f9f42563f1c982b528d2a74d3 Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Wed, 30 May 2012 12:19:03 +0200 Subject: [PATCH] --- yaml --- r: 340187 b: refs/heads/master c: 3015fb33483b80f64f82092f8acc89ce9c3f07e3 h: refs/heads/master i: 340185: 099171b3505014286c866de765842e9c983748d9 340183: c75c4b4dadeb329d481f48728e2ec860a9035eab v: v3 --- [refs] | 2 +- .../devicetree/bindings/arm/davinci.txt | 4 +++ trunk/arch/arm/boot/dts/da850-enbw-cmc.dts | 30 +++++++++++++++++++ trunk/arch/arm/mach-davinci/da8xx-dt.c | 1 + 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 trunk/arch/arm/boot/dts/da850-enbw-cmc.dts diff --git a/[refs] b/[refs] index 16c7711f36d2..342cc5f5babd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27e6e0d3dafa5b487dc28b219753443db300f289 +refs/heads/master: 3015fb33483b80f64f82092f8acc89ce9c3f07e3 diff --git a/trunk/Documentation/devicetree/bindings/arm/davinci.txt b/trunk/Documentation/devicetree/bindings/arm/davinci.txt index 2dda756414cc..cfaeda4274e6 100644 --- a/trunk/Documentation/devicetree/bindings/arm/davinci.txt +++ b/trunk/Documentation/devicetree/bindings/arm/davinci.txt @@ -5,6 +5,10 @@ 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 ---------------------- diff --git a/trunk/arch/arm/boot/dts/da850-enbw-cmc.dts b/trunk/arch/arm/boot/dts/da850-enbw-cmc.dts new file mode 100644 index 000000000000..422fdb3fcfc1 --- /dev/null +++ b/trunk/arch/arm/boot/dts/da850-enbw-cmc.dts @@ -0,0 +1,30 @@ +/* + * Device Tree for AM1808 EnBW CMC board + * + * Copyright 2012 DENX Software Engineering GmbH + * Heiko Schocher + * + * 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"; + }; + }; +}; diff --git a/trunk/arch/arm/mach-davinci/da8xx-dt.c b/trunk/arch/arm/mach-davinci/da8xx-dt.c index 94b09fd4cca4..37c27af18fa0 100644 --- a/trunk/arch/arm/mach-davinci/da8xx-dt.c +++ b/trunk/arch/arm/mach-davinci/da8xx-dt.c @@ -47,6 +47,7 @@ static void __init da850_init_machine(void) } static const char *da850_boards_compat[] __initdata = { + "enbw,cmc", "ti,da850-evm", "ti,da850", NULL,