diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 22:21:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 22:21:54 -0400 |
| commit | 8b0eaccab4584ace24d233214bfee3cb50e49a60 (patch) | |
| tree | a22c53631041504f357f06e0ab779b3d3b283423 /Documentation | |
| parent | f10f114f199dbcb9e1d6b5a0b36a34acf93f6179 (diff) | |
| parent | 3cfa8f6c542467bd046aedb9d2e394b3d0e8467f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Enable restart support for lite5200 board
[POWERPC] Add restart support for mpc52xx based platforms
[POWERPC] Update device tree binding for mpc5200 gpt
[POWERPC] Add mpc52xx_find_and_map_path(), refactor utility functions
[POWERPC] bestcomm: Restrict bus prefetch bugfix to original mpc5200 silicon.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/powerpc/mpc52xx-device-tree-bindings.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt b/Documentation/powerpc/mpc52xx-device-tree-bindings.txt index 5f7d536cb0c6..5e03610e186f 100644 --- a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt +++ b/Documentation/powerpc/mpc52xx-device-tree-bindings.txt | |||
| @@ -185,7 +185,7 @@ bestcomm@<addr> dma-controller mpc5200-bestcomm 5200 pic also requires | |||
| 185 | Recommended soc5200 child nodes; populate as needed for your board | 185 | Recommended soc5200 child nodes; populate as needed for your board |
| 186 | name device_type compatible Description | 186 | name device_type compatible Description |
| 187 | ---- ----------- ---------- ----------- | 187 | ---- ----------- ---------- ----------- |
| 188 | gpt@<addr> gpt mpc5200-gpt General purpose timers | 188 | gpt@<addr> gpt fsl,mpc5200-gpt General purpose timers |
| 189 | rtc@<addr> rtc mpc5200-rtc Real time clock | 189 | rtc@<addr> rtc mpc5200-rtc Real time clock |
| 190 | mscan@<addr> mscan mpc5200-mscan CAN bus controller | 190 | mscan@<addr> mscan mpc5200-mscan CAN bus controller |
| 191 | pci@<addr> pci mpc5200-pci PCI bridge | 191 | pci@<addr> pci mpc5200-pci PCI bridge |
| @@ -213,7 +213,7 @@ cell-index int When multiple devices are present, is the | |||
| 213 | 5) General Purpose Timer nodes (child of soc5200 node) | 213 | 5) General Purpose Timer nodes (child of soc5200 node) |
| 214 | On the mpc5200 and 5200b, GPT0 has a watchdog timer function. If the board | 214 | On the mpc5200 and 5200b, GPT0 has a watchdog timer function. If the board |
| 215 | design supports the internal wdt, then the device node for GPT0 should | 215 | design supports the internal wdt, then the device node for GPT0 should |
| 216 | include the empty property 'has-wdt'. | 216 | include the empty property 'fsl,has-wdt'. |
| 217 | 217 | ||
| 218 | 6) PSC nodes (child of soc5200 node) | 218 | 6) PSC nodes (child of soc5200 node) |
| 219 | PSC nodes can define the optional 'port-number' property to force assignment | 219 | PSC nodes can define the optional 'port-number' property to force assignment |