diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 13:15:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 13:15:46 -0400 |
commit | a637b0d45947df686979b85361ad5bfa9d19fdd3 (patch) | |
tree | 926207cdfbbde430d1e7b515f32fe1c740b15745 /Documentation/devicetree | |
parent | f78089e87e576f91396a5d428d14b552178dfb17 (diff) | |
parent | cdb6404cc53a166a1e3b0179bd8d1f4070beff41 (diff) |
Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd
Pull MTD update from David Woodhouse:
- Lots of cleanups from Artem, including deletion of some obsolete
drivers
- Support partitions larger than 4GiB in device tree
- Support for new SPI chips
* tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd: (83 commits)
mtd: omap2: Use module_platform_driver()
mtd: bf5xx_nand: Use module_platform_driver()
mtd: denali_dt: Remove redundant use of of_match_ptr
mtd: denali_dt: Change return value to fix smatch warning
mtd: denali_dt: Use module_platform_driver()
mtd: denali_dt: Fix incorrect error check
mtd: nand: subpage write support for hardware based ECC schemes
mtd: omap2: use msecs_to_jiffies()
mtd: nand_ids: use size macros
mtd: nand_ids: improve LEGACY_ID_NAND macro a bit
mtd: add 4 Toshiba nand chips for the full-id case
mtd: add the support to parse out the full-id nand type
mtd: add new fields to nand_flash_dev{}
mtd: sh_flctl: Use of_match_ptr() macro
mtd: gpio: Use of_match_ptr() macro
mtd: gpio: Use devm_kzalloc()
mtd: davinci_nand: Use of_match_ptr()
mtd: dataflash: Use of_match_ptr() macro
mtd: remove h720x flash support
mtd: onenand: remove OneNAND simulator
...
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r-- | Documentation/devicetree/bindings/mtd/partition.txt | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/mtd/partition.txt b/Documentation/devicetree/bindings/mtd/partition.txt index 6e1f61f1e789..9315ac96b49b 100644 --- a/Documentation/devicetree/bindings/mtd/partition.txt +++ b/Documentation/devicetree/bindings/mtd/partition.txt | |||
@@ -5,8 +5,12 @@ on platforms which have strong conventions about which portions of a flash are | |||
5 | used for what purposes, but which don't use an on-flash partition table such | 5 | used for what purposes, but which don't use an on-flash partition table such |
6 | as RedBoot. | 6 | as RedBoot. |
7 | 7 | ||
8 | #address-cells & #size-cells must both be present in the mtd device and be | 8 | #address-cells & #size-cells must both be present in the mtd device. There are |
9 | equal to 1. | 9 | two valid values for both: |
10 | <1>: for partitions that require a single 32-bit cell to represent their | ||
11 | size/address (aka the value is below 4 GiB) | ||
12 | <2>: for partitions that require two 32-bit cells to represent their | ||
13 | size/address (aka the value is 4 GiB or greater). | ||
10 | 14 | ||
11 | Required properties: | 15 | Required properties: |
12 | - reg : The partition's offset and size within the mtd bank. | 16 | - reg : The partition's offset and size within the mtd bank. |
@@ -36,3 +40,31 @@ flash@0 { | |||
36 | reg = <0x0100000 0x200000>; | 40 | reg = <0x0100000 0x200000>; |
37 | }; | 41 | }; |
38 | }; | 42 | }; |
43 | |||
44 | flash@1 { | ||
45 | #address-cells = <1>; | ||
46 | #size-cells = <2>; | ||
47 | |||
48 | /* a 4 GiB partition */ | ||
49 | partition@0 { | ||
50 | label = "filesystem"; | ||
51 | reg = <0x00000000 0x1 0x00000000>; | ||
52 | }; | ||
53 | }; | ||
54 | |||
55 | flash@2 { | ||
56 | #address-cells = <2>; | ||
57 | #size-cells = <2>; | ||
58 | |||
59 | /* an 8 GiB partition */ | ||
60 | partition@0 { | ||
61 | label = "filesystem #1"; | ||
62 | reg = <0x0 0x00000000 0x2 0x00000000>; | ||
63 | }; | ||
64 | |||
65 | /* a 4 GiB partition */ | ||
66 | partition@200000000 { | ||
67 | label = "filesystem #2"; | ||
68 | reg = <0x2 0x00000000 0x1 0x00000000>; | ||
69 | }; | ||
70 | }; | ||