Skip to content
Snippets Groups Projects
Commit b58ed041 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6

Pull device tree changes from Grant Likely:
 "Here are the DT changes I've got queued up for v3.8.  As described
  below, there are a lot of bug fixes here and documentation updates but
  nothing major:

  Bug fixes, little cleanups, and documentation changes.  The most
  invasive thing here touches a bunch of the arch directories to use a
  common build rule for .dtb files.  There are no major changes to
  functionality here other than a few new helper functions."

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6: (34 commits)
  arm64: Fix the dtbs target building
  mtd: nand: davinci: fix the binding documentation
  rtc: rtc-mv: Add the device tree binding documentation
  devicetree/bindings: Move gpio-leds binding into leds directory
  of/vendor-prefixes: add Imagination Technologies
  microblaze: use new common dtc rule
  c6x: use new common dtc rule
  openrisc: use new common dtc rule
  arm64: Add dtbs target for building all the enabled dtb files
  arm64: use new common dtc rule
  ARM: dt: change .dtb build rules to build in dts directory
  kbuild: centralize .dts->.dtb rule
  Fix build when CONFIG_W1_MASTER_GPIO=m b exporting "allnodes"
  of/spi: Honour "status=disabled" property of device
  of_mdio: Honour "status=disabled" property of device
  of_i2c: Honour "status=disabled" property of device
  powerpc: Fix fallout from device_node->name constification
  of: add 'const' for of_parse_phandle parameter *np
  Documentation: correct of_platform_populate() argument list
  script: dtc: clean generated files
  ...
parents 259cdbee 58fea354
No related branches found
No related tags found
No related merge requests found
Showing
with 54 additions and 44 deletions
...@@ -23,29 +23,16 @@ Recommended properties : ...@@ -23,29 +23,16 @@ Recommended properties :
- ti,davinci-nand-buswidth: buswidth 8 or 16 - ti,davinci-nand-buswidth: buswidth 8 or 16
- ti,davinci-nand-use-bbt: use flash based bad block table support. - ti,davinci-nand-use-bbt: use flash based bad block table support.
Example (enbw_cmc board): Example(da850 EVM ):
aemif@60000000 { nand_cs3@62000000 {
compatible = "ti,davinci-aemif"; compatible = "ti,davinci-nand";
#address-cells = <2>; reg = <0x62000000 0x807ff
#size-cells = <1>; 0x68000000 0x8000>;
reg = <0x68000000 0x80000>; ti,davinci-chipselect = <1>;
ranges = <2 0 0x60000000 0x02000000 ti,davinci-mask-ale = <0>;
3 0 0x62000000 0x02000000 ti,davinci-mask-cle = <0>;
4 0 0x64000000 0x02000000 ti,davinci-mask-chipsel = <0>;
5 0 0x66000000 0x02000000 ti,davinci-ecc-mode = "hw";
6 0 0x68000000 0x02000000>; ti,davinci-ecc-bits = <4>;
nand@3,0 { ti,davinci-nand-use-bbt;
compatible = "ti,davinci-nand";
reg = <3 0x0 0x807ff
6 0x0 0x8000>;
#address-cells = <1>;
#size-cells = <1>;
ti,davinci-chipselect = <1>;
ti,davinci-mask-ale = <0>;
ti,davinci-mask-cle = <0>;
ti,davinci-mask-chipsel = <0>;
ti,davinci-ecc-mode = "hw";
ti,davinci-ecc-bits = <4>;
ti,davinci-nand-use-bbt;
};
}; };
...@@ -37,7 +37,7 @@ L2: cache-controller { ...@@ -37,7 +37,7 @@ L2: cache-controller {
reg = <0xfff12000 0x1000>; reg = <0xfff12000 0x1000>;
arm,data-latency = <1 1 1>; arm,data-latency = <1 1 1>;
arm,tag-latency = <2 2 2>; arm,tag-latency = <2 2 2>;
arm,filter-latency = <0x80000000 0x8000000>; arm,filter-ranges = <0x80000000 0x8000000>;
cache-unified; cache-unified;
cache-level = <2>; cache-level = <2>;
interrupts = <45>; interrupts = <45>;
......
* Marvell MV64XXX I2C controller
Required properties :
- reg : Offset and length of the register set for the device
- compatible : Should be "marvell,mv64xxx-i2c"
- interrupts : The interrupt number
- clock-frequency : Desired I2C bus clock frequency in Hz.
Examples:
i2c@11000 {
compatible = "marvell,mv64xxx-i2c";
reg = <0x11000 0x20>;
interrupts = <29>;
clock-frequency = <100000>;
};
...@@ -31,21 +31,3 @@ Examples: ...@@ -31,21 +31,3 @@ Examples:
reg = <0xd4025000 0x1000>; reg = <0xd4025000 0x1000>;
interrupts = <58>; interrupts = <58>;
}; };
* Marvell MV64XXX I2C controller
Required properties :
- reg : Offset and length of the register set for the device
- compatible : Should be "marvell,mv64xxx-i2c"
- interrupts : The interrupt number
- clock-frequency : Desired I2C bus clock frequency in Hz.
Examples:
i2c@11000 {
compatible = "marvell,mv64xxx-i2c";
reg = <0x11000 0x20>;
interrupts = <29>;
clock-frequency = <100000>;
};
Common leds properties.
Optional properties for child nodes:
- label : The label for this LED. If omitted, the label is
taken from the node name (excluding the unit address).
- linux,default-trigger : This parameter, if present, is a
string defining the trigger assigned to the LED. Current triggers are:
"backlight" - LED will act as a back-light, controlled by the framebuffer
system
"default-on" - LED will turn on (but for leds-gpio see "default-state"
property in Documentation/devicetree/bindings/gpio/led.txt)
"heartbeat" - LED "double" flashes at a load average based rate
"ide-disk" - LED indicates disk activity
"timer" - LED flashes at a fixed, configurable rate
Examples:
system-status {
label = "Status";
linux,default-trigger = "heartbeat";
...
};
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment