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

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

Documentation/devicetree/bindings/arm/davinci/nand.txt

+12 −25
Original line number Original line Diff line number Diff line
@@ -23,23 +23,11 @@ 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";

	#address-cells = <2>;

	#size-cells = <1>;

	reg = <0x68000000 0x80000>;

	ranges = <2 0 0x60000000 0x02000000

		  3 0 0x62000000 0x02000000

		  4 0 0x64000000 0x02000000

		  5 0 0x66000000 0x02000000

		  6 0 0x68000000 0x02000000>;

	nand@3,0 {

	compatible = "ti,davinci-nand";

	compatible = "ti,davinci-nand";

		reg = <3 0x0 0x807ff

	reg = <0x62000000 0x807ff

			6 0x0 0x8000>;

		0x68000000 0x8000>;

		#address-cells = <1>;

		#size-cells = <1>;

	ti,davinci-chipselect = <1>;

	ti,davinci-chipselect = <1>;

	ti,davinci-mask-ale = <0>;

	ti,davinci-mask-ale = <0>;

	ti,davinci-mask-cle = <0>;

	ti,davinci-mask-cle = <0>;
@@ -48,4 +36,3 @@ aemif@60000000 { 
	ti,davinci-ecc-bits = <4>;

	ti,davinci-ecc-bits = <4>;

	ti,davinci-nand-use-bbt;

	ti,davinci-nand-use-bbt;

};
 
};
 
};

Documentation/devicetree/bindings/arm/l2cc.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -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>;