-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'omap-devel-dt-for-v3.6' of git://git.kernel.org/pub/scm/li…
…nux/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: Arnd Bergmann <arnd@arndb.de>
- Loading branch information
Showing
16 changed files
with
556 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| 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"; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /* | ||
| * 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 */ | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /* | ||
| * 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 */ | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| /* | ||
| * 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"; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| * 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 AM3517 EVM (AM3517/05)"; | ||
| compatible = "ti,am3517-evm", "ti,omap3"; | ||
|
|
||
| memory { | ||
| device_type = "memory"; | ||
| reg = <0x80000000 0x10000000>; /* 256 MB */ | ||
| }; | ||
| }; | ||
|
|
||
| &i2c1 { | ||
| clock-frequency = <400000>; | ||
| }; | ||
|
|
||
| &i2c2 { | ||
| clock-frequency = <400000>; | ||
| }; | ||
|
|
||
| &i2c3 { | ||
| clock-frequency = <400000>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /* | ||
| * 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/ "omap2.dtsi" | ||
|
|
||
| / { | ||
| model = "TI OMAP2420 H4 board"; | ||
| compatible = "ti,omap2420-h4", "ti,omap2420", "ti,omap2"; | ||
|
|
||
| memory { | ||
| device_type = "memory"; | ||
| reg = <0x80000000 0x84000000>; /* 64 MB */ | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
| /include/ "omap4-panda.dts" | ||
|
|
||
| /* Audio routing is differnet between PandaBoard4430 and PandaBoardES */ | ||
| &sound { | ||
| ti,model = "PandaBoardES"; | ||
|
|
||
| /* Audio routing */ | ||
| ti,audio-routing = | ||
| "Headset Stereophone", "HSOL", | ||
| "Headset Stereophone", "HSOR", | ||
| "Ext Spk", "HFL", | ||
| "Ext Spk", "HFR", | ||
| "Line Out", "AUXL", | ||
| "Line Out", "AUXR", | ||
| "AFML", "Line In", | ||
| "AFMR", "Line In"; | ||
| }; |
Oops, something went wrong.