From 461f8cfc7ea788428240271818363333ceff5c4c Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 6 May 2015 08:56:43 +0200 Subject: dts: update to v4.1-rc1 Signed-off-by: Sascha Hauer --- dts/Bindings/mips/brcm/bcm3384-intc.txt | 37 ----------------------------- dts/Bindings/mips/brcm/bmips.txt | 8 ------- dts/Bindings/mips/brcm/brcm,bmips.txt | 8 +++++++ dts/Bindings/mips/brcm/cm-dsl.txt | 11 --------- dts/Bindings/mips/brcm/soc.txt | 12 ++++++++++ dts/Bindings/mips/brcm/usb.txt | 11 --------- dts/Bindings/mips/img/pistachio.txt | 42 +++++++++++++++++++++++++++++++++ 7 files changed, 62 insertions(+), 67 deletions(-) delete mode 100644 dts/Bindings/mips/brcm/bcm3384-intc.txt delete mode 100644 dts/Bindings/mips/brcm/bmips.txt create mode 100644 dts/Bindings/mips/brcm/brcm,bmips.txt delete mode 100644 dts/Bindings/mips/brcm/cm-dsl.txt create mode 100644 dts/Bindings/mips/brcm/soc.txt delete mode 100644 dts/Bindings/mips/brcm/usb.txt create mode 100644 dts/Bindings/mips/img/pistachio.txt (limited to 'dts/Bindings/mips') diff --git a/dts/Bindings/mips/brcm/bcm3384-intc.txt b/dts/Bindings/mips/brcm/bcm3384-intc.txt deleted file mode 100644 index d4e0141d36..0000000000 --- a/dts/Bindings/mips/brcm/bcm3384-intc.txt +++ /dev/null @@ -1,37 +0,0 @@ -* Interrupt Controller - -Properties: -- compatible: "brcm,bcm3384-intc" - - Compatibility with BCM3384 and possibly other BCM33xx/BCM63xx SoCs. - -- reg: Address/length pairs for each mask/status register set. Length must - be 8. If multiple register sets are specified, the first set will - handle IRQ offsets 0..31, the second set 32..63, and so on. - -- interrupt-controller: This is an interrupt controller. - -- #interrupt-cells: Must be <1>. Just a simple IRQ offset; no level/edge - or polarity configuration is possible with this controller. - -- interrupt-parent: This controller is cascaded from a MIPS CPU HW IRQ, or - from another INTC. - -- interrupts: The IRQ on the parent controller. - -Example: - periph_intc: periph_intc@14e00038 { - compatible = "brcm,bcm3384-intc"; - - /* - * IRQs 0..31: mask reg 0x14e00038, status reg 0x14e0003c - * IRQs 32..63: mask reg 0x14e00340, status reg 0x14e00344 - */ - reg = <0x14e00038 0x8 0x14e00340 0x8>; - - interrupt-controller; - #interrupt-cells = <1>; - - interrupt-parent = <&cpu_intc>; - interrupts = <4>; - }; diff --git a/dts/Bindings/mips/brcm/bmips.txt b/dts/Bindings/mips/brcm/bmips.txt deleted file mode 100644 index 8ef71b4085..0000000000 --- a/dts/Bindings/mips/brcm/bmips.txt +++ /dev/null @@ -1,8 +0,0 @@ -* Broadcom MIPS (BMIPS) CPUs - -Required properties: -- compatible: "brcm,bmips3300", "brcm,bmips4350", "brcm,bmips4380", - "brcm,bmips5000" - -- mips-hpt-frequency: This is common to all CPUs in the system so it lives - under the "cpus" node. diff --git a/dts/Bindings/mips/brcm/brcm,bmips.txt b/dts/Bindings/mips/brcm/brcm,bmips.txt new file mode 100644 index 0000000000..8ef71b4085 --- /dev/null +++ b/dts/Bindings/mips/brcm/brcm,bmips.txt @@ -0,0 +1,8 @@ +* Broadcom MIPS (BMIPS) CPUs + +Required properties: +- compatible: "brcm,bmips3300", "brcm,bmips4350", "brcm,bmips4380", + "brcm,bmips5000" + +- mips-hpt-frequency: This is common to all CPUs in the system so it lives + under the "cpus" node. diff --git a/dts/Bindings/mips/brcm/cm-dsl.txt b/dts/Bindings/mips/brcm/cm-dsl.txt deleted file mode 100644 index 8a139cb3c0..0000000000 --- a/dts/Bindings/mips/brcm/cm-dsl.txt +++ /dev/null @@ -1,11 +0,0 @@ -* Broadcom cable/DSL platforms - -SoCs: - -Required properties: -- compatible: "brcm,bcm3384", "brcm,bcm33843" - -Boards: - -Required properties: -- compatible: "brcm,bcm93384wvg" diff --git a/dts/Bindings/mips/brcm/soc.txt b/dts/Bindings/mips/brcm/soc.txt new file mode 100644 index 0000000000..7bab90cc4a --- /dev/null +++ b/dts/Bindings/mips/brcm/soc.txt @@ -0,0 +1,12 @@ +* Broadcom cable/DSL/settop platforms + +Required properties: + +- compatible: "brcm,bcm3384", "brcm,bcm33843" + "brcm,bcm3384-viper", "brcm,bcm33843-viper" + "brcm,bcm6328", "brcm,bcm6368", + "brcm,bcm7125", "brcm,bcm7346", "brcm,bcm7358", "brcm,bcm7360", + "brcm,bcm7362", "brcm,bcm7420", "brcm,bcm7425" + +The experimental -viper variants are for running Linux on the 3384's +BMIPS4355 cable modem CPU instead of the BMIPS5000 application processor. diff --git a/dts/Bindings/mips/brcm/usb.txt b/dts/Bindings/mips/brcm/usb.txt deleted file mode 100644 index 452c45c7bf..0000000000 --- a/dts/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 diff --git a/dts/Bindings/mips/img/pistachio.txt b/dts/Bindings/mips/img/pistachio.txt new file mode 100644 index 0000000000..a736d889c2 --- /dev/null +++ b/dts/Bindings/mips/img/pistachio.txt @@ -0,0 +1,42 @@ +Imagination Pistachio SoC +========================= + +Required properties: +-------------------- + - compatible: Must include "img,pistachio". + +CPU nodes: +---------- +A "cpus" node is required. Required properties: + - #address-cells: Must be 1. + - #size-cells: Must be 0. +A CPU sub-node is also required for at least CPU 0. Since the topology may +be probed via CPS, it is not necessary to specify secondary CPUs. Required +propertis: + - device_type: Must be "cpu". + - compatible: Must be "mti,interaptiv". + - reg: CPU number. + - clocks: Must include the CPU clock. See ../../clock/clock-bindings.txt for + details on clock bindings. +Example: + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu0: cpu@0 { + device_type = "cpu"; + compatible = "mti,interaptiv"; + reg = <0>; + clocks = <&clk_core CLK_MIPS>; + }; + }; + + +Boot protocol: +-------------- +In accordance with the MIPS UHI specification[1], the bootloader must pass the +following arguments to the kernel: + - $a0: -2. + - $a1: KSEG0 address of the flattened device-tree blob. + +[1] http://prplfoundation.org/wiki/MIPS_documentation -- cgit v1.2.3