diff options
| author | Grant Likely <grant.likely@linaro.org> | 2015-03-29 08:59:58 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2015-03-29 08:59:58 +0100 |
| commit | a2166ca5f3204794e8b59f01c93a0f1564e3e138 (patch) | |
| tree | b667828c308ffd79f1b2bd8fc1da95e43dfef4e3 /Documentation/devicetree/bindings/mips | |
| parent | 37791b6fbe7ab772020e714d34515f144fa981a0 (diff) | |
| parent | 01218bf14ee60d4a2d6c667ebdbba3ae9a7a1d66 (diff) | |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Conflicts:
drivers/of/unittest.c
Diffstat (limited to 'Documentation/devicetree/bindings/mips')
| -rw-r--r-- | Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt (renamed from Documentation/devicetree/bindings/mips/brcm/bcm3384-intc.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/mips/brcm/brcm,bmips.txt (renamed from Documentation/devicetree/bindings/mips/brcm/bmips.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt (renamed from Documentation/devicetree/bindings/mips/brcm/cm-dsl.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/mips/brcm/usb.txt | 11 |
4 files changed, 0 insertions, 11 deletions
diff --git a/Documentation/devicetree/bindings/mips/brcm/bcm3384-intc.txt b/Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt index d4e0141d3620..d4e0141d3620 100644 --- a/Documentation/devicetree/bindings/mips/brcm/bcm3384-intc.txt +++ b/Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt diff --git a/Documentation/devicetree/bindings/mips/brcm/bmips.txt b/Documentation/devicetree/bindings/mips/brcm/brcm,bmips.txt index 8ef71b4085ca..8ef71b4085ca 100644 --- a/Documentation/devicetree/bindings/mips/brcm/bmips.txt +++ b/Documentation/devicetree/bindings/mips/brcm/brcm,bmips.txt diff --git a/Documentation/devicetree/bindings/mips/brcm/cm-dsl.txt b/Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt index 8a139cb3c0b5..8a139cb3c0b5 100644 --- a/Documentation/devicetree/bindings/mips/brcm/cm-dsl.txt +++ b/Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt diff --git a/Documentation/devicetree/bindings/mips/brcm/usb.txt b/Documentation/devicetree/bindings/mips/brcm/usb.txt deleted file mode 100644 index 452c45c7bf29..000000000000 --- a/Documentation/devicetree/bindings/mips/brcm/usb.txt +++ /dev/null @@ -1,11 +0,0 @@ -* Broadcom USB controllers - -Required properties: -- compatible: "brcm,bcm3384-ohci", "brcm,bcm3384-ehci" - - These currently use the generic-ohci and generic-ehci drivers. On some - systems, special handling may be needed in the following cases: - - - Restoring state after systemwide power save modes - - Sharing PHYs with the USBD (UDC) hardware - - Figuring out which controllers are disabled on ASIC bondout variants |