diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-10-23 08:45:23 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-23 08:45:23 +1000 |
| commit | 3cfa8f6c542467bd046aedb9d2e394b3d0e8467f (patch) | |
| tree | fe8e6c5e4ad1bfb51bc1896b6dd8f616f266eb76 /Documentation | |
| parent | 55b70a0300b873c0ec7ea6e33752af56f41250ce (diff) | |
| parent | 9dda78b711ca4d507251a7e896b2f41ec019fc58 (diff) | |
| download | op-kernel-dev-3cfa8f6c542467bd046aedb9d2e394b3d0e8467f.zip op-kernel-dev-3cfa8f6c542467bd046aedb9d2e394b3d0e8467f.tar.gz | |
Merge branch 'for-2.6.24' of git://git.secretlab.ca/git/linux-2.6-mpc52xx
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 5f7d536..5e03610 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 Recommended soc5200 child nodes; populate as needed for your board name device_type compatible Description ---- ----------- ---------- ----------- -gpt@<addr> gpt mpc5200-gpt General purpose timers +gpt@<addr> gpt fsl,mpc5200-gpt General purpose timers rtc@<addr> rtc mpc5200-rtc Real time clock mscan@<addr> mscan mpc5200-mscan CAN bus controller pci@<addr> pci mpc5200-pci PCI bridge @@ -213,7 +213,7 @@ cell-index int When multiple devices are present, is the 5) General Purpose Timer nodes (child of soc5200 node) On the mpc5200 and 5200b, GPT0 has a watchdog timer function. If the board design supports the internal wdt, then the device node for GPT0 should -include the empty property 'has-wdt'. +include the empty property 'fsl,has-wdt'. 6) PSC nodes (child of soc5200 node) PSC nodes can define the optional 'port-number' property to force assignment |
