diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-22 16:16:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-22 16:16:01 -0400 |
commit | 06b8147c5dbd385b5b97ca74e19f6f3951ebc1cb (patch) | |
tree | 6ed9de7ca0ab3a65af6a189a89deb0a36ab35f6b /Documentation | |
parent | 53baaaa9682c230410a057263d1ce2922f43ddc4 (diff) | |
parent | 8725f25acc656c1522d48a6746055099efdaca4c (diff) |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (49 commits)
powerpc: Fix build bug with binutils < 2.18 and GCC < 4.2
powerpc/eeh: Don't panic when EEH_MAX_FAILS is exceeded
fbdev: Teaches offb about palette on radeon r5xx/r6xx
powerpc/cell/edac: Log a syndrome code in case of correctable error
powerpc/cell: Add DMA_ATTR_WEAK_ORDERING dma attribute and use in Cell IOMMU code
powerpc: Indicate which oprofile counters to use while in compat mode
powerpc/boot: Change spaces to tabs
powerpc: Remove duplicate 6xx option in Kconfig
powerpc: Use PPC_LONG and PPC_LONG_ALIGN in lib/string.S
powerpc: Use PPC_LONG_ALIGN in uaccess.h
powerpc: Add a #define for aligning to a long-sized boundary
powerpc: Fix OF parsing of 64 bits PCI addresses
powerpc: Use WARN_ON(1) instead of __WARN()
powerpc: Fix support for latencytop
powerpc/ps3: Update ps3_defconfig
powerpc/ps3: Add a sub-match id to ps3_system_bus
powerpc: Add a 6xx defconfig
powerpc/dma: Use the struct dma_attrs in iommu code
powerpc/cell: Add support for power button of future IBM cell blades
powerpc/cell: Cleanup sysreset_hack for IBM cell blades
...
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/DMA-attributes.txt | 9 | ||||
-rw-r--r-- | Documentation/powerpc/booting-without-of.txt | 189 | ||||
-rw-r--r-- | Documentation/powerpc/dts-bindings/fsl/cpm_qe/gpio.txt | 38 | ||||
-rw-r--r-- | Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/usb.txt | 53 | ||||
-rw-r--r-- | Documentation/powerpc/dts-bindings/fsl/mcu-mpc8349emitx.txt | 17 | ||||
-rw-r--r-- | Documentation/powerpc/dts-bindings/fsl/pmc.txt | 63 | ||||
-rw-r--r-- | Documentation/powerpc/dts-bindings/fsl/tsec.txt | 31 | ||||
-rw-r--r-- | Documentation/powerpc/dts-bindings/fsl/upm-nand.txt | 28 | ||||
-rw-r--r-- | Documentation/powerpc/dts-bindings/gpio/led.txt | 15 |
9 files changed, 329 insertions, 114 deletions
diff --git a/Documentation/DMA-attributes.txt b/Documentation/DMA-attributes.txt index 6d772f84b477..b768cc0e402b 100644 --- a/Documentation/DMA-attributes.txt +++ b/Documentation/DMA-attributes.txt | |||
@@ -22,3 +22,12 @@ ready and available in memory. The DMA of the "completion indication" | |||
22 | could race with data DMA. Mapping the memory used for completion | 22 | could race with data DMA. Mapping the memory used for completion |
23 | indications with DMA_ATTR_WRITE_BARRIER would prevent the race. | 23 | indications with DMA_ATTR_WRITE_BARRIER would prevent the race. |
24 | 24 | ||
25 | DMA_ATTR_WEAK_ORDERING | ||
26 | ---------------------- | ||
27 | |||
28 | DMA_ATTR_WEAK_ORDERING specifies that reads and writes to the mapping | ||
29 | may be weakly ordered, that is that reads and writes may pass each other. | ||
30 | |||
31 | Since it is optional for platforms to implement DMA_ATTR_WEAK_ORDERING, | ||
32 | those that do not will simply ignore the attribute and exhibit default | ||
33 | behavior. | ||
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt index aee243a846a2..ea1b70b35793 100644 --- a/Documentation/powerpc/booting-without-of.txt +++ b/Documentation/powerpc/booting-without-of.txt | |||
@@ -89,10 +89,12 @@ Table of Contents | |||
89 | 3) OpenPIC Interrupt Controllers | 89 | 3) OpenPIC Interrupt Controllers |
90 | 4) ISA Interrupt Controllers | 90 | 4) ISA Interrupt Controllers |
91 | 91 | ||
92 | VIII - Specifying GPIO information for devices | 92 | IX - Specifying GPIO information for devices |
93 | 1) gpios property | 93 | 1) gpios property |
94 | 2) gpio-controller nodes | 94 | 2) gpio-controller nodes |
95 | 95 | ||
96 | X - Specifying device power management information (sleep property) | ||
97 | |||
96 | Appendix A - Sample SOC node for MPC8540 | 98 | Appendix A - Sample SOC node for MPC8540 |
97 | 99 | ||
98 | 100 | ||
@@ -2488,8 +2490,8 @@ encodings listed below: | |||
2488 | 2 = high to low edge sensitive type enabled | 2490 | 2 = high to low edge sensitive type enabled |
2489 | 3 = low to high edge sensitive type enabled | 2491 | 3 = low to high edge sensitive type enabled |
2490 | 2492 | ||
2491 | VIII - Specifying GPIO information for devices | 2493 | IX - Specifying GPIO information for devices |
2492 | ============================================== | 2494 | ============================================ |
2493 | 2495 | ||
2494 | 1) gpios property | 2496 | 1) gpios property |
2495 | ----------------- | 2497 | ----------------- |
@@ -2537,116 +2539,151 @@ Example of two SOC GPIO banks defined as gpio-controller nodes: | |||
2537 | gpio-controller; | 2539 | gpio-controller; |
2538 | }; | 2540 | }; |
2539 | 2541 | ||
2542 | X - Specifying Device Power Management Information (sleep property) | ||
2543 | =================================================================== | ||
2544 | |||
2545 | Devices on SOCs often have mechanisms for placing devices into low-power | ||
2546 | states that are decoupled from the devices' own register blocks. Sometimes, | ||
2547 | this information is more complicated than a cell-index property can | ||
2548 | reasonably describe. Thus, each device controlled in such a manner | ||
2549 | may contain a "sleep" property which describes these connections. | ||
2550 | |||
2551 | The sleep property consists of one or more sleep resources, each of | ||
2552 | which consists of a phandle to a sleep controller, followed by a | ||
2553 | controller-specific sleep specifier of zero or more cells. | ||
2554 | |||
2555 | The semantics of what type of low power modes are possible are defined | ||
2556 | by the sleep controller. Some examples of the types of low power modes | ||
2557 | that may be supported are: | ||
2558 | |||
2559 | - Dynamic: The device may be disabled or enabled at any time. | ||
2560 | - System Suspend: The device may request to be disabled or remain | ||
2561 | awake during system suspend, but will not be disabled until then. | ||
2562 | - Permanent: The device is disabled permanently (until the next hard | ||
2563 | reset). | ||
2564 | |||
2565 | Some devices may share a clock domain with each other, such that they should | ||
2566 | only be suspended when none of the devices are in use. Where reasonable, | ||
2567 | such nodes should be placed on a virtual bus, where the bus has the sleep | ||
2568 | property. If the clock domain is shared among devices that cannot be | ||
2569 | reasonably grouped in this manner, then create a virtual sleep controller | ||
2570 | (similar to an interrupt nexus, except that defining a standardized | ||
2571 | sleep-map should wait until its necessity is demonstrated). | ||
2572 | |||
2540 | Appendix A - Sample SOC node for MPC8540 | 2573 | Appendix A - Sample SOC node for MPC8540 |
2541 | ======================================== | 2574 | ======================================== |
2542 | 2575 | ||
2543 | Note that the #address-cells and #size-cells for the SoC node | 2576 | soc@e0000000 { |
2544 | in this example have been explicitly listed; these are likely | ||
2545 | not necessary as they are usually the same as the root node. | ||
2546 | |||
2547 | soc8540@e0000000 { | ||
2548 | #address-cells = <1>; | 2577 | #address-cells = <1>; |
2549 | #size-cells = <1>; | 2578 | #size-cells = <1>; |
2550 | #interrupt-cells = <2>; | 2579 | compatible = "fsl,mpc8540-ccsr", "simple-bus"; |
2551 | device_type = "soc"; | 2580 | device_type = "soc"; |
2552 | ranges = <00000000 e0000000 00100000> | 2581 | ranges = <0x00000000 0xe0000000 0x00100000> |
2553 | reg = <e0000000 00003000>; | ||
2554 | bus-frequency = <0>; | 2582 | bus-frequency = <0>; |
2555 | 2583 | interrupt-parent = <&pic>; | |
2556 | mdio@24520 { | ||
2557 | reg = <24520 20>; | ||
2558 | device_type = "mdio"; | ||
2559 | compatible = "gianfar"; | ||
2560 | |||
2561 | ethernet-phy@0 { | ||
2562 | linux,phandle = <2452000> | ||
2563 | interrupt-parent = <40000>; | ||
2564 | interrupts = <35 1>; | ||
2565 | reg = <0>; | ||
2566 | device_type = "ethernet-phy"; | ||
2567 | }; | ||
2568 | |||
2569 | ethernet-phy@1 { | ||
2570 | linux,phandle = <2452001> | ||
2571 | interrupt-parent = <40000>; | ||
2572 | interrupts = <35 1>; | ||
2573 | reg = <1>; | ||
2574 | device_type = "ethernet-phy"; | ||
2575 | }; | ||
2576 | |||
2577 | ethernet-phy@3 { | ||
2578 | linux,phandle = <2452002> | ||
2579 | interrupt-parent = <40000>; | ||
2580 | interrupts = <35 1>; | ||
2581 | reg = <3>; | ||
2582 | device_type = "ethernet-phy"; | ||
2583 | }; | ||
2584 | |||
2585 | }; | ||
2586 | 2584 | ||
2587 | ethernet@24000 { | 2585 | ethernet@24000 { |
2588 | #size-cells = <0>; | 2586 | #address-cells = <1>; |
2587 | #size-cells = <1>; | ||
2589 | device_type = "network"; | 2588 | device_type = "network"; |
2590 | model = "TSEC"; | 2589 | model = "TSEC"; |
2591 | compatible = "gianfar"; | 2590 | compatible = "gianfar", "simple-bus"; |
2592 | reg = <24000 1000>; | 2591 | reg = <0x24000 0x1000>; |
2593 | mac-address = [ 00 E0 0C 00 73 00 ]; | 2592 | local-mac-address = [ 00 E0 0C 00 73 00 ]; |
2594 | interrupts = <d 3 e 3 12 3>; | 2593 | interrupts = <29 2 30 2 34 2>; |
2595 | interrupt-parent = <40000>; | 2594 | phy-handle = <&phy0>; |
2596 | phy-handle = <2452000>; | 2595 | sleep = <&pmc 00000080>; |
2596 | ranges; | ||
2597 | |||
2598 | mdio@24520 { | ||
2599 | reg = <0x24520 0x20>; | ||
2600 | compatible = "fsl,gianfar-mdio"; | ||
2601 | |||
2602 | phy0: ethernet-phy@0 { | ||
2603 | interrupts = <5 1>; | ||
2604 | reg = <0>; | ||
2605 | device_type = "ethernet-phy"; | ||
2606 | }; | ||
2607 | |||
2608 | phy1: ethernet-phy@1 { | ||
2609 | interrupts = <5 1>; | ||
2610 | reg = <1>; | ||
2611 | device_type = "ethernet-phy"; | ||
2612 | }; | ||
2613 | |||
2614 | phy3: ethernet-phy@3 { | ||
2615 | interrupts = <7 1>; | ||
2616 | reg = <3>; | ||
2617 | device_type = "ethernet-phy"; | ||
2618 | }; | ||
2619 | }; | ||
2597 | }; | 2620 | }; |
2598 | 2621 | ||
2599 | ethernet@25000 { | 2622 | ethernet@25000 { |
2600 | #address-cells = <1>; | ||
2601 | #size-cells = <0>; | ||
2602 | device_type = "network"; | 2623 | device_type = "network"; |
2603 | model = "TSEC"; | 2624 | model = "TSEC"; |
2604 | compatible = "gianfar"; | 2625 | compatible = "gianfar"; |
2605 | reg = <25000 1000>; | 2626 | reg = <0x25000 0x1000>; |
2606 | mac-address = [ 00 E0 0C 00 73 01 ]; | 2627 | local-mac-address = [ 00 E0 0C 00 73 01 ]; |
2607 | interrupts = <13 3 14 3 18 3>; | 2628 | interrupts = <13 2 14 2 18 2>; |
2608 | interrupt-parent = <40000>; | 2629 | phy-handle = <&phy1>; |
2609 | phy-handle = <2452001>; | 2630 | sleep = <&pmc 00000040>; |
2610 | }; | 2631 | }; |
2611 | 2632 | ||
2612 | ethernet@26000 { | 2633 | ethernet@26000 { |
2613 | #address-cells = <1>; | ||
2614 | #size-cells = <0>; | ||
2615 | device_type = "network"; | 2634 | device_type = "network"; |
2616 | model = "FEC"; | 2635 | model = "FEC"; |
2617 | compatible = "gianfar"; | 2636 | compatible = "gianfar"; |
2618 | reg = <26000 1000>; | 2637 | reg = <0x26000 0x1000>; |
2619 | mac-address = [ 00 E0 0C 00 73 02 ]; | 2638 | local-mac-address = [ 00 E0 0C 00 73 02 ]; |
2620 | interrupts = <19 3>; | 2639 | interrupts = <41 2>; |
2621 | interrupt-parent = <40000>; | 2640 | phy-handle = <&phy3>; |
2622 | phy-handle = <2452002>; | 2641 | sleep = <&pmc 00000020>; |
2623 | }; | 2642 | }; |
2624 | 2643 | ||
2625 | serial@4500 { | 2644 | serial@4500 { |
2626 | device_type = "serial"; | 2645 | #address-cells = <1>; |
2627 | compatible = "ns16550"; | 2646 | #size-cells = <1>; |
2628 | reg = <4500 100>; | 2647 | compatible = "fsl,mpc8540-duart", "simple-bus"; |
2629 | clock-frequency = <0>; | 2648 | sleep = <&pmc 00000002>; |
2630 | interrupts = <1a 3>; | 2649 | ranges; |
2631 | interrupt-parent = <40000>; | 2650 | |
2651 | serial@4500 { | ||
2652 | device_type = "serial"; | ||
2653 | compatible = "ns16550"; | ||
2654 | reg = <0x4500 0x100>; | ||
2655 | clock-frequency = <0>; | ||
2656 | interrupts = <42 2>; | ||
2657 | }; | ||
2658 | |||
2659 | serial@4600 { | ||
2660 | device_type = "serial"; | ||
2661 | compatible = "ns16550"; | ||
2662 | reg = <0x4600 0x100>; | ||
2663 | clock-frequency = <0>; | ||
2664 | interrupts = <42 2>; | ||
2665 | }; | ||
2632 | }; | 2666 | }; |
2633 | 2667 | ||
2634 | pic@40000 { | 2668 | pic: pic@40000 { |
2635 | linux,phandle = <40000>; | ||
2636 | interrupt-controller; | 2669 | interrupt-controller; |
2637 | #address-cells = <0>; | 2670 | #address-cells = <0>; |
2638 | reg = <40000 40000>; | 2671 | #interrupt-cells = <2>; |
2672 | reg = <0x40000 0x40000>; | ||
2639 | compatible = "chrp,open-pic"; | 2673 | compatible = "chrp,open-pic"; |
2640 | device_type = "open-pic"; | 2674 | device_type = "open-pic"; |
2641 | }; | 2675 | }; |
2642 | 2676 | ||
2643 | i2c@3000 { | 2677 | i2c@3000 { |
2644 | interrupt-parent = <40000>; | 2678 | interrupts = <43 2>; |
2645 | interrupts = <1b 3>; | 2679 | reg = <0x3000 0x100>; |
2646 | reg = <3000 18>; | ||
2647 | device_type = "i2c"; | ||
2648 | compatible = "fsl-i2c"; | 2680 | compatible = "fsl-i2c"; |
2649 | dfsrr; | 2681 | dfsrr; |
2682 | sleep = <&pmc 00000004>; | ||
2650 | }; | 2683 | }; |
2651 | 2684 | ||
2685 | pmc: power@e0070 { | ||
2686 | compatible = "fsl,mpc8540-pmc", "fsl,mpc8548-pmc"; | ||
2687 | reg = <0xe0070 0x20>; | ||
2688 | }; | ||
2652 | }; | 2689 | }; |
diff --git a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/gpio.txt b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/gpio.txt new file mode 100644 index 000000000000..1815dfede1bc --- /dev/null +++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/gpio.txt | |||
@@ -0,0 +1,38 @@ | |||
1 | Every GPIO controller node must have #gpio-cells property defined, | ||
2 | this information will be used to translate gpio-specifiers. | ||
3 | |||
4 | On CPM1 devices, all ports are using slightly different register layouts. | ||
5 | Ports A, C and D are 16bit ports and Ports B and E are 32bit ports. | ||
6 | |||
7 | On CPM2 devices, all ports are 32bit ports and use a common register layout. | ||
8 | |||
9 | Required properties: | ||
10 | - compatible : "fsl,cpm1-pario-bank-a", "fsl,cpm1-pario-bank-b", | ||
11 | "fsl,cpm1-pario-bank-c", "fsl,cpm1-pario-bank-d", | ||
12 | "fsl,cpm1-pario-bank-e", "fsl,cpm2-pario-bank" | ||
13 | - #gpio-cells : Should be two. The first cell is the pin number and the | ||
14 | second cell is used to specify optional paramters (currently unused). | ||
15 | - gpio-controller : Marks the port as GPIO controller. | ||
16 | |||
17 | Example of three SOC GPIO banks defined as gpio-controller nodes: | ||
18 | |||
19 | CPM1_PIO_A: gpio-controller@950 { | ||
20 | #gpio-cells = <2>; | ||
21 | compatible = "fsl,cpm1-pario-bank-a"; | ||
22 | reg = <0x950 0x10>; | ||
23 | gpio-controller; | ||
24 | }; | ||
25 | |||
26 | CPM1_PIO_B: gpio-controller@ab8 { | ||
27 | #gpio-cells = <2>; | ||
28 | compatible = "fsl,cpm1-pario-bank-b"; | ||
29 | reg = <0xab8 0x10>; | ||
30 | gpio-controller; | ||
31 | }; | ||
32 | |||
33 | CPM1_PIO_E: gpio-controller@ac8 { | ||
34 | #gpio-cells = <2>; | ||
35 | compatible = "fsl,cpm1-pario-bank-e"; | ||
36 | reg = <0xac8 0x18>; | ||
37 | gpio-controller; | ||
38 | }; | ||
diff --git a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/usb.txt b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/usb.txt index c8f44d6bcbcf..9ccd5f30405b 100644 --- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/usb.txt +++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/usb.txt | |||
@@ -1,22 +1,37 @@ | |||
1 | * USB (Universal Serial Bus Controller) | 1 | Freescale QUICC Engine USB Controller |
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | - compatible : could be "qe_udc" or "fhci-hcd". | 4 | - compatible : should be "fsl,<chip>-qe-usb", "fsl,mpc8323-qe-usb". |
5 | - mode : the could be "host" or "slave". | 5 | - reg : the first two cells should contain usb registers location and |
6 | - reg : Offset and length of the register set for the device | 6 | length, the next two two cells should contain PRAM location and |
7 | - interrupts : <a b> where a is the interrupt number and b is a | 7 | length. |
8 | field that represents an encoding of the sense and level | 8 | - interrupts : should contain USB interrupt. |
9 | information for the interrupt. This should be encoded based on | 9 | - interrupt-parent : interrupt source phandle. |
10 | the information in section 2) depending on the type of interrupt | 10 | - fsl,fullspeed-clock : specifies the full speed USB clock source: |
11 | controller you have. | 11 | "none": clock source is disabled |
12 | - interrupt-parent : the phandle for the interrupt controller that | 12 | "brg1" through "brg16": clock source is BRG1-BRG16, respectively |
13 | services interrupts for this device. | 13 | "clk1" through "clk24": clock source is CLK1-CLK24, respectively |
14 | - fsl,lowspeed-clock : specifies the low speed USB clock source: | ||
15 | "none": clock source is disabled | ||
16 | "brg1" through "brg16": clock source is BRG1-BRG16, respectively | ||
17 | "clk1" through "clk24": clock source is CLK1-CLK24, respectively | ||
18 | - hub-power-budget : USB power budget for the root hub, in mA. | ||
19 | - gpios : should specify GPIOs in this order: USBOE, USBTP, USBTN, USBRP, | ||
20 | USBRN, SPEED (optional), and POWER (optional). | ||
14 | 21 | ||
15 | Example(slave): | 22 | Example: |
16 | usb@6c0 { | 23 | |
17 | compatible = "qe_udc"; | 24 | usb@6c0 { |
18 | reg = <6c0 40>; | 25 | compatible = "fsl,mpc8360-qe-usb", "fsl,mpc8323-qe-usb"; |
19 | interrupts = <8b 0>; | 26 | reg = <0x6c0 0x40 0x8b00 0x100>; |
20 | interrupt-parent = <700>; | 27 | interrupts = <11>; |
21 | mode = "slave"; | 28 | interrupt-parent = <&qeic>; |
22 | }; | 29 | fsl,fullspeed-clock = "clk21"; |
30 | gpios = <&qe_pio_b 2 0 /* USBOE */ | ||
31 | &qe_pio_b 3 0 /* USBTP */ | ||
32 | &qe_pio_b 8 0 /* USBTN */ | ||
33 | &qe_pio_b 9 0 /* USBRP */ | ||
34 | &qe_pio_b 11 0 /* USBRN */ | ||
35 | &qe_pio_e 20 0 /* SPEED */ | ||
36 | &qe_pio_e 21 0 /* POWER */>; | ||
37 | }; | ||
diff --git a/Documentation/powerpc/dts-bindings/fsl/mcu-mpc8349emitx.txt b/Documentation/powerpc/dts-bindings/fsl/mcu-mpc8349emitx.txt new file mode 100644 index 000000000000..0f766333b6eb --- /dev/null +++ b/Documentation/powerpc/dts-bindings/fsl/mcu-mpc8349emitx.txt | |||
@@ -0,0 +1,17 @@ | |||
1 | Freescale MPC8349E-mITX-compatible Power Management Micro Controller Unit (MCU) | ||
2 | |||
3 | Required properties: | ||
4 | - compatible : "fsl,<mcu-chip>-<board>", "fsl,mcu-mpc8349emitx". | ||
5 | - reg : should specify I2C address (0x0a). | ||
6 | - #gpio-cells : should be 2. | ||
7 | - gpio-controller : should be present. | ||
8 | |||
9 | Example: | ||
10 | |||
11 | mcu@0a { | ||
12 | #gpio-cells = <2>; | ||
13 | compatible = "fsl,mc9s08qg8-mpc8349emitx", | ||
14 | "fsl,mcu-mpc8349emitx"; | ||
15 | reg = <0x0a>; | ||
16 | gpio-controller; | ||
17 | }; | ||
diff --git a/Documentation/powerpc/dts-bindings/fsl/pmc.txt b/Documentation/powerpc/dts-bindings/fsl/pmc.txt new file mode 100644 index 000000000000..02f6f43ee1b7 --- /dev/null +++ b/Documentation/powerpc/dts-bindings/fsl/pmc.txt | |||
@@ -0,0 +1,63 @@ | |||
1 | * Power Management Controller | ||
2 | |||
3 | Properties: | ||
4 | - compatible: "fsl,<chip>-pmc". | ||
5 | |||
6 | "fsl,mpc8349-pmc" should be listed for any chip whose PMC is | ||
7 | compatible. "fsl,mpc8313-pmc" should also be listed for any chip | ||
8 | whose PMC is compatible, and implies deep-sleep capability. | ||
9 | |||
10 | "fsl,mpc8548-pmc" should be listed for any chip whose PMC is | ||
11 | compatible. "fsl,mpc8536-pmc" should also be listed for any chip | ||
12 | whose PMC is compatible, and implies deep-sleep capability. | ||
13 | |||
14 | "fsl,mpc8641d-pmc" should be listed for any chip whose PMC is | ||
15 | compatible; all statements below that apply to "fsl,mpc8548-pmc" also | ||
16 | apply to "fsl,mpc8641d-pmc". | ||
17 | |||
18 | Compatibility does not include bit assigments in SCCR/PMCDR/DEVDISR; these | ||
19 | bit assigments are indicated via the sleep specifier in each device's | ||
20 | sleep property. | ||
21 | |||
22 | - reg: For devices compatible with "fsl,mpc8349-pmc", the first resource | ||
23 | is the PMC block, and the second resource is the Clock Configuration | ||
24 | block. | ||
25 | |||
26 | For devices compatible with "fsl,mpc8548-pmc", the first resource | ||
27 | is a 32-byte block beginning with DEVDISR. | ||
28 | |||
29 | - interrupts: For "fsl,mpc8349-pmc"-compatible devices, the first | ||
30 | resource is the PMC block interrupt. | ||
31 | |||
32 | - fsl,mpc8313-wakeup-timer: For "fsl,mpc8313-pmc"-compatible devices, | ||
33 | this is a phandle to an "fsl,gtm" node on which timer 4 can be used as | ||
34 | a wakeup source from deep sleep. | ||
35 | |||
36 | Sleep specifiers: | ||
37 | |||
38 | fsl,mpc8349-pmc: Sleep specifiers consist of one cell. For each bit | ||
39 | that is set in the cell, the corresponding bit in SCCR will be saved | ||
40 | and cleared on suspend, and restored on resume. This sleep controller | ||
41 | supports disabling and resuming devices at any time. | ||
42 | |||
43 | fsl,mpc8536-pmc: Sleep specifiers consist of three cells, the third of | ||
44 | which will be ORed into PMCDR upon suspend, and cleared from PMCDR | ||
45 | upon resume. The first two cells are as described for fsl,mpc8578-pmc. | ||
46 | This sleep controller only supports disabling devices during system | ||
47 | sleep, or permanently. | ||
48 | |||
49 | fsl,mpc8548-pmc: Sleep specifiers consist of one or two cells, the | ||
50 | first of which will be ORed into DEVDISR (and the second into | ||
51 | DEVDISR2, if present -- this cell should be zero or absent if the | ||
52 | hardware does not have DEVDISR2) upon a request for permanent device | ||
53 | disabling. This sleep controller does not support configuring devices | ||
54 | to disable during system sleep (unless supported by another compatible | ||
55 | match), or dynamically. | ||
56 | |||
57 | Example: | ||
58 | |||
59 | power@b00 { | ||
60 | compatible = "fsl,mpc8313-pmc", "fsl,mpc8349-pmc"; | ||
61 | reg = <0xb00 0x100 0xa00 0x100>; | ||
62 | interrupts = <80 8>; | ||
63 | }; | ||
diff --git a/Documentation/powerpc/dts-bindings/fsl/tsec.txt b/Documentation/powerpc/dts-bindings/fsl/tsec.txt index 583ef6b56c43..cf55fa4112d2 100644 --- a/Documentation/powerpc/dts-bindings/fsl/tsec.txt +++ b/Documentation/powerpc/dts-bindings/fsl/tsec.txt | |||
@@ -24,46 +24,39 @@ Example: | |||
24 | 24 | ||
25 | * Gianfar-compatible ethernet nodes | 25 | * Gianfar-compatible ethernet nodes |
26 | 26 | ||
27 | Required properties: | 27 | Properties: |
28 | 28 | ||
29 | - device_type : Should be "network" | 29 | - device_type : Should be "network" |
30 | - model : Model of the device. Can be "TSEC", "eTSEC", or "FEC" | 30 | - model : Model of the device. Can be "TSEC", "eTSEC", or "FEC" |
31 | - compatible : Should be "gianfar" | 31 | - compatible : Should be "gianfar" |
32 | - reg : Offset and length of the register set for the device | 32 | - reg : Offset and length of the register set for the device |
33 | - mac-address : List of bytes representing the ethernet address of | 33 | - local-mac-address : List of bytes representing the ethernet address of |
34 | this controller | 34 | this controller |
35 | - interrupts : <a b> where a is the interrupt number and b is a | 35 | - interrupts : For FEC devices, the first interrupt is the device's |
36 | field that represents an encoding of the sense and level | 36 | interrupt. For TSEC and eTSEC devices, the first interrupt is |
37 | information for the interrupt. This should be encoded based on | 37 | transmit, the second is receive, and the third is error. |
38 | the information in section 2) depending on the type of interrupt | ||
39 | controller you have. | ||
40 | - interrupt-parent : the phandle for the interrupt controller that | ||
41 | services interrupts for this device. | ||
42 | - phy-handle : The phandle for the PHY connected to this ethernet | 38 | - phy-handle : The phandle for the PHY connected to this ethernet |
43 | controller. | 39 | controller. |
44 | - fixed-link : <a b c d e> where a is emulated phy id - choose any, | 40 | - fixed-link : <a b c d e> where a is emulated phy id - choose any, |
45 | but unique to the all specified fixed-links, b is duplex - 0 half, | 41 | but unique to the all specified fixed-links, b is duplex - 0 half, |
46 | 1 full, c is link speed - d#10/d#100/d#1000, d is pause - 0 no | 42 | 1 full, c is link speed - d#10/d#100/d#1000, d is pause - 0 no |
47 | pause, 1 pause, e is asym_pause - 0 no asym_pause, 1 asym_pause. | 43 | pause, 1 pause, e is asym_pause - 0 no asym_pause, 1 asym_pause. |
48 | |||
49 | Recommended properties: | ||
50 | |||
51 | - phy-connection-type : a string naming the controller/PHY interface type, | 44 | - phy-connection-type : a string naming the controller/PHY interface type, |
52 | i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id", "sgmii", | 45 | i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id", "sgmii", |
53 | "tbi", or "rtbi". This property is only really needed if the connection | 46 | "tbi", or "rtbi". This property is only really needed if the connection |
54 | is of type "rgmii-id", as all other connection types are detected by | 47 | is of type "rgmii-id", as all other connection types are detected by |
55 | hardware. | 48 | hardware. |
56 | 49 | - fsl,magic-packet : If present, indicates that the hardware supports | |
50 | waking up via magic packet. | ||
57 | 51 | ||
58 | Example: | 52 | Example: |
59 | ethernet@24000 { | 53 | ethernet@24000 { |
60 | #size-cells = <0>; | ||
61 | device_type = "network"; | 54 | device_type = "network"; |
62 | model = "TSEC"; | 55 | model = "TSEC"; |
63 | compatible = "gianfar"; | 56 | compatible = "gianfar"; |
64 | reg = <24000 1000>; | 57 | reg = <0x24000 0x1000>; |
65 | mac-address = [ 00 E0 0C 00 73 00 ]; | 58 | local-mac-address = [ 00 E0 0C 00 73 00 ]; |
66 | interrupts = <d 3 e 3 12 3>; | 59 | interrupts = <29 2 30 2 34 2>; |
67 | interrupt-parent = <40000>; | 60 | interrupt-parent = <&mpic>; |
68 | phy-handle = <2452000> | 61 | phy-handle = <&phy0> |
69 | }; | 62 | }; |
diff --git a/Documentation/powerpc/dts-bindings/fsl/upm-nand.txt b/Documentation/powerpc/dts-bindings/fsl/upm-nand.txt new file mode 100644 index 000000000000..84a04d5eb8e6 --- /dev/null +++ b/Documentation/powerpc/dts-bindings/fsl/upm-nand.txt | |||
@@ -0,0 +1,28 @@ | |||
1 | Freescale Localbus UPM programmed to work with NAND flash | ||
2 | |||
3 | Required properties: | ||
4 | - compatible : "fsl,upm-nand". | ||
5 | - reg : should specify localbus chip select and size used for the chip. | ||
6 | - fsl,upm-addr-offset : UPM pattern offset for the address latch. | ||
7 | - fsl,upm-cmd-offset : UPM pattern offset for the command latch. | ||
8 | - gpios : may specify optional GPIO connected to the Ready-Not-Busy pin. | ||
9 | |||
10 | Example: | ||
11 | |||
12 | upm@1,0 { | ||
13 | compatible = "fsl,upm-nand"; | ||
14 | reg = <1 0 1>; | ||
15 | fsl,upm-addr-offset = <16>; | ||
16 | fsl,upm-cmd-offset = <8>; | ||
17 | gpios = <&qe_pio_e 18 0>; | ||
18 | |||
19 | flash { | ||
20 | #address-cells = <1>; | ||
21 | #size-cells = <1>; | ||
22 | compatible = "..."; | ||
23 | |||
24 | partition@0 { | ||
25 | ... | ||
26 | }; | ||
27 | }; | ||
28 | }; | ||
diff --git a/Documentation/powerpc/dts-bindings/gpio/led.txt b/Documentation/powerpc/dts-bindings/gpio/led.txt new file mode 100644 index 000000000000..ff51f4c0fa9d --- /dev/null +++ b/Documentation/powerpc/dts-bindings/gpio/led.txt | |||
@@ -0,0 +1,15 @@ | |||
1 | LED connected to GPIO | ||
2 | |||
3 | Required properties: | ||
4 | - compatible : should be "gpio-led". | ||
5 | - label : (optional) the label for this LED. If omitted, the label is | ||
6 | taken from the node name (excluding the unit address). | ||
7 | - gpios : should specify LED GPIO. | ||
8 | |||
9 | Example: | ||
10 | |||
11 | led@0 { | ||
12 | compatible = "gpio-led"; | ||
13 | label = "hdd"; | ||
14 | gpios = <&mcu_pio 0 1>; | ||
15 | }; | ||