Commit bae92f33 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mmp-dt-for-v5.5' of... 

Merge tag 'mmp-dt-for-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp into arm/dt

ARM: Marvell MMP Device Tree patches for v5.5

This tag includes binding documentation for various hardware found on Marvell
MMP3 SoC along a DTS file for said hardware.

* tag 'mmp-dt-for-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp:
  ARM: dts: mmp3: Add MMP3 SoC dts file
  dt-bindings: phy-mmp3-usb: Add bindings
  dt-bindings: mrvl,intc: Add a MMP3 interrupt controller
  dt-bindings: arm: mrvl: Document MMP3 compatible string
  dt-bindings: arm: Convert Marvell MMP board/soc bindings to json-schema
  dt-bindings: arm: cpu: Add Marvell MMP3 SMP enable method

Link: https://lore.kernel.org/r/d4897c4a92319527c46147244282803cd9f5a1ff.camel@v3.sk


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5d8b20c1 5c272bee

Documentation/devicetree/bindings/arm/cpus.yaml

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ properties: 
              - marvell,armada-390-smp

              - marvell,armada-xp-smp

              - marvell,98dx3236-smp

              - marvell,mmp3-smp

              - mediatek,mt6589-smp

              - mediatek,mt81xx-tz-smp

              - qcom,gcc-msm8660

Documentation/devicetree/bindings/arm/mrvl/mrvl.txt

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
Marvell Platforms Device Tree Bindings

----------------------------------------------------



PXA168 Aspenite Board

Required root node properties:

	- compatible = "mrvl,pxa168-aspenite", "mrvl,pxa168";



PXA910 DKB Board

Required root node properties:

	- compatible = "mrvl,pxa910-dkb";



MMP2 Brownstone Board

Required root node properties:

	- compatible = "mrvl,mmp2-brownstone", "mrvl,mmp2";

Documentation/devicetree/bindings/arm/mrvl/mrvl.yaml

0 → 100644
+35 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/mrvl/mrvl.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Marvell Platforms Device Tree Bindings



maintainers:

  - Lubomir Rintel <lkundrak@v3.sk>



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:

      - description: PXA168 Aspenite Board

        items:

          - enum:

              - mrvl,pxa168-aspenite

          - const: mrvl,pxa168

      - description: PXA910 DKB Board

        items:

          - enum:

              - mrvl,pxa910-dkb

          - const: mrvl,pxa910

      - description: MMP2 based boards

        items:

          - enum:

              - mrvl,mmp2-brownstone

          - const: mrvl,mmp2

      - description: MMP3 based boards

        items:

          - const: mrvl,mmp3

...

Documentation/devicetree/bindings/interrupt-controller/mrvl,intc.txt

+9 −5
Original line number Diff line number Diff line 
* Marvell MMP Interrupt controller



Required properties:

- compatible : Should be "mrvl,mmp-intc", "mrvl,mmp2-intc" or

  "mrvl,mmp2-mux-intc"

- compatible : Should be

               "mrvl,mmp-intc" on Marvel MMP,

               "mrvl,mmp2-intc" along with "mrvl,mmp2-mux-intc" on MMP2 or

               "marvell,mmp3-intc" with "mrvl,mmp2-mux-intc" on MMP3

- reg : Address and length of the register set of the interrupt controller.

  If the interrupt controller is intc, address and length means the range

  of the whole interrupt controller. If the interrupt controller is mux-intc,

  address and length means one register. Since address of mux-intc is in the

  range of intc. mux-intc is secondary interrupt controller.

  of the whole interrupt controller. The "marvell,mmp3-intc" controller

  also has a secondary range for the second CPU core.  If the interrupt

  controller is mux-intc, address and length means one register. Since

  address of mux-intc is in the range of intc. mux-intc is secondary

  interrupt controller.

- reg-names : Name of the register set of the interrupt controller. It's

  only required in mux-intc interrupt controller.

- interrupts : Should be the port interrupt shared by mux interrupts. It's

Documentation/devicetree/bindings/phy/phy-mmp3-usb.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
Marvell MMP3 USB PHY

--------------------



Required properties:

- compatible: must be "marvell,mmp3-usb-phy"

- #phy-cells: must be 0



Example:

	usb-phy: usb-phy@d4207000 {

		compatible = "marvell,mmp3-usb-phy";

		reg = <0xd4207000 0x40>;

		#phy-cells = <0>;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE