Unverified Commit 141258d4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt64-6.1-1' of... 

Merge tag 'mvebu-dt64-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/dt

mvebu dt64 for 6.1 (part 1)

 - Add UART1-3 for AC5/AC5X SoC
 - Improve uDPU support (Aramda 3720 based board)
 - Add new eDPU based on uDPU

* tag 'mvebu-dt64-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  arm64: dts: marvell: 98dx25xx: use correct property for i2c gpios
  arm64: dts: marvell: add support for Methode eDPU
  dt-bindings: marvell: armada-37xx: add Methode eDPU compatible
  arm64: dts: marvell: split Methode uDPU DTS
  arm64: dts: marvell: rename temp sensor nodes
  arm64: dts: marvell: uDPU: remove LED node pinctrl-names
  arm64: dts: marvell: uDPU: align LED-s with bindings
  arm64: dts: marvell: uDPU: add missing SoC compatible
  arm64: dts: marvell: espressobin-ultra: add generic Espressobin compatible
  dt-bindings: marvell: convert Armada 37xx compatibles to YAML
  dt-bindings: vendor-prefixes: add Methode Electronics
  arm64: dts: marvell: Add UART1-3 for AC5/AC5X

Link: https://lore.kernel.org/r/87h70yxfmy.fsf@BL-laptop


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6972b275 2b14d382

Documentation/devicetree/bindings/arm/marvell/armada-37xx.txt

+0 −26
Original line number Diff line number Diff line 
Marvell Armada 37xx Platforms Device Tree Bindings

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



Boards using a SoC of the Marvell Armada 37xx family must carry the

following root node property:



 - compatible: must contain "marvell,armada3710"



In addition, boards using the Marvell Armada 3720 SoC shall have the

following property before the previous one:



 - compatible: must contain "marvell,armada3720"



Example:



compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3710";





Power management

----------------
@@ -48,11 +30,3 @@ avs: avs@11500 { 
	compatible = "marvell,armada-3700-avs", "syscon";

	reg = <0x11500 0x40>;

}
 




CZ.NIC's Turris Mox SOHO router Device Tree Bindings

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



Required root node property:



 - compatible: must contain "cznic,turris-mox"

Documentation/devicetree/bindings/arm/marvell/armada-37xx.yaml

0 → 100644
+47 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/marvell/armada-37xx.yaml#

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



title: Marvell Armada 37xx Platforms



maintainers:

  - Robert Marko <robert.marko@sartura.hr>



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:

      - description: Armada 3720 SoC boards

        items:

          - enum:

              - cznic,turris-mox

              - globalscale,espressobin

              - marvell,armada-3720-db

              - methode,edpu

              - methode,udpu

          - const: marvell,armada3720

          - const: marvell,armada3710



      - description: Globalscale Espressobin boards

        items:

          - enum:

              - globalscale,espressobin-emmc

              - globalscale,espressobin-ultra

              - globalscale,espressobin-v7

          - const: globalscale,espressobin

          - const: marvell,armada3720

          - const: marvell,armada3710



      - description: Globalscale Espressobin V7 boards

        items:

          - enum:

              - globalscale,espressobin-v7-emmc

          - const: globalscale,espressobin-v7

          - const: globalscale,espressobin

          - const: marvell,armada3720

          - const: marvell,armada3710



additionalProperties: true

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -789,6 +789,8 @@ patternProperties: 
    description: Cisco Meraki, LLC

  "^merrii,.*":

    description: Merrii Technology Co., Ltd.

  "^methode,.*":

    description: Methode Electronics, Inc.

  "^micrel,.*":

    description: Micrel Inc.

  "^microchip,.*":

arch/arm64/boot/dts/marvell/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# Mvebu SoC Family

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-db.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-eDPU.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin-emmc.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin-ultra.dtb

arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi

+34 −4
Original line number Diff line number Diff line
@@ -95,6 +95,36 @@ uart0: serial@12000 { 
				status = "okay";

			};



			uart1: serial@12100 {

				compatible = "snps,dw-apb-uart";

				reg = <0x11000 0x100>;

				reg-shift = <2>;

				interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;

				reg-io-width = <1>;

				clocks = <&cnm_clock>;

				status = "disabled";

			};



			uart2: serial@12200 {

				compatible = "snps,dw-apb-uart";

				reg = <0x12200 0x100>;

				reg-shift = <2>;

				interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;

				reg-io-width = <1>;

				clocks = <&cnm_clock>;

				status = "disabled";

			};



			uart3: serial@12300 {

				compatible = "snps,dw-apb-uart";

				reg = <0x12300 0x100>;

				reg-shift = <2>;

				interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;

				reg-io-width = <1>;

				clocks = <&cnm_clock>;

				status = "disabled";

			};



			mdio: mdio@22004 {

				#address-cells = <1>;

				#size-cells = <0>;
@@ -117,8 +147,8 @@ i2c0: i2c@11000{ 
				pinctrl-names = "default", "gpio";

				pinctrl-0 = <&i2c0_pins>;

				pinctrl-1 = <&i2c0_gpio>;

				scl_gpio = <&gpio0 26 GPIO_ACTIVE_HIGH>;

				sda_gpio = <&gpio0 27 GPIO_ACTIVE_HIGH>;

				scl-gpios = <&gpio0 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

				sda-gpios = <&gpio0 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

				status = "disabled";

			};
@@ -136,8 +166,8 @@ i2c1: i2c@11100{ 
				pinctrl-names = "default", "gpio";

				pinctrl-0 = <&i2c1_pins>;

				pinctrl-1 = <&i2c1_gpio>;

				scl_gpio = <&gpio0 20 GPIO_ACTIVE_HIGH>;

				sda_gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>;

				scl-gpios = <&gpio0 20 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

				sda-gpios = <&gpio0 21 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

				status = "disabled";

			};