forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'mvebu-dt64-6.1-1' of git://git.kernel.org/pub/scm/linux/ke…
…rnel/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: Arnd Bergmann <[email protected]>
- Loading branch information
Showing
9 changed files
with
262 additions
and
185 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
Documentation/devicetree/bindings/arm/marvell/armada-37xx.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| # 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 <[email protected]> | ||
|
|
||
| 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
|
|
||
| /dts-v1/; | ||
|
|
||
| #include "armada-3720-uDPU.dtsi" | ||
|
|
||
| / { | ||
| model = "Methode eDPU Board"; | ||
| compatible = "methode,edpu", "marvell,armada3720", "marvell,armada3710"; | ||
| }; | ||
|
|
||
| ð0 { | ||
| phy-mode = "2500base-x"; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,66 +1,12 @@ | ||
| // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| /* | ||
| * Device tree for the uDPU board. | ||
| * Based on Marvell Armada 3720 development board (DB-88F3720-DDR3) | ||
| * Copyright (C) 2016 Marvell | ||
| * Copyright (C) 2019 Methode Electronics | ||
| * Copyright (C) 2019 Telus | ||
| * | ||
| * Vladimir Vid <[email protected]> | ||
| */ | ||
|
|
||
| /dts-v1/; | ||
|
|
||
| #include <dt-bindings/gpio/gpio.h> | ||
| #include "armada-372x.dtsi" | ||
| #include "armada-3720-uDPU.dtsi" | ||
|
|
||
| / { | ||
| model = "Methode uDPU Board"; | ||
| compatible = "methode,udpu", "marvell,armada3720"; | ||
|
|
||
| chosen { | ||
| stdout-path = "serial0:115200n8"; | ||
| }; | ||
|
|
||
| memory@0 { | ||
| device_type = "memory"; | ||
| reg = <0x00000000 0x00000000 0x00000000 0x20000000>; | ||
| }; | ||
|
|
||
| leds { | ||
| pinctrl-names = "default"; | ||
| compatible = "gpio-leds"; | ||
|
|
||
| power1 { | ||
| label = "udpu:green:power"; | ||
| gpios = <&gpionb 11 GPIO_ACTIVE_LOW>; | ||
| }; | ||
|
|
||
| power2 { | ||
| label = "udpu:red:power"; | ||
| gpios = <&gpionb 12 GPIO_ACTIVE_LOW>; | ||
| }; | ||
|
|
||
| network1 { | ||
| label = "udpu:green:network"; | ||
| gpios = <&gpionb 13 GPIO_ACTIVE_LOW>; | ||
| }; | ||
|
|
||
| network2 { | ||
| label = "udpu:red:network"; | ||
| gpios = <&gpionb 14 GPIO_ACTIVE_LOW>; | ||
| }; | ||
|
|
||
| alarm1 { | ||
| label = "udpu:green:alarm"; | ||
| gpios = <&gpionb 15 GPIO_ACTIVE_LOW>; | ||
| }; | ||
|
|
||
| alarm2 { | ||
| label = "udpu:red:alarm"; | ||
| gpios = <&gpionb 16 GPIO_ACTIVE_LOW>; | ||
| }; | ||
| }; | ||
| compatible = "methode,udpu", "marvell,armada3720", "marvell,armada3710"; | ||
|
|
||
| sfp_eth0: sfp-eth0 { | ||
| compatible = "sff,sfp"; | ||
|
|
@@ -71,67 +17,13 @@ | |
| tx-fault-gpios = <&gpiosb 5 GPIO_ACTIVE_HIGH>; | ||
| maximum-power-milliwatt = <3000>; | ||
| }; | ||
|
|
||
| sfp_eth1: sfp-eth1 { | ||
| compatible = "sff,sfp"; | ||
| i2c-bus = <&i2c1>; | ||
| los-gpios = <&gpiosb 7 GPIO_ACTIVE_HIGH>; | ||
| mod-def0-gpios = <&gpiosb 8 GPIO_ACTIVE_LOW>; | ||
| tx-disable-gpios = <&gpiosb 9 GPIO_ACTIVE_HIGH>; | ||
| tx-fault-gpios = <&gpiosb 10 GPIO_ACTIVE_HIGH>; | ||
| maximum-power-milliwatt = <3000>; | ||
| }; | ||
| }; | ||
|
|
||
| &sdhci0 { | ||
| status = "okay"; | ||
| bus-width = <8>; | ||
| mmc-ddr-1_8v; | ||
| mmc-hs400-1_8v; | ||
| marvell,pad-type = "fixed-1-8v"; | ||
| non-removable; | ||
| no-sd; | ||
| no-sdio; | ||
| }; | ||
|
|
||
| &spi0 { | ||
| status = "okay"; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&spi_quad_pins>; | ||
|
|
||
| flash@0 { | ||
| compatible = "jedec,spi-nor"; | ||
| reg = <0>; | ||
| spi-max-frequency = <54000000>; | ||
|
|
||
| partitions { | ||
| compatible = "fixed-partitions"; | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
|
|
||
| partition@0 { | ||
| label = "firmware"; | ||
| reg = <0x0 0x180000>; | ||
| }; | ||
|
|
||
| partition@180000 { | ||
| label = "u-boot-env"; | ||
| reg = <0x180000 0x10000>; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &pinctrl_nb { | ||
| i2c1_recovery_pins: i2c1-recovery-pins { | ||
| groups = "i2c1"; | ||
| function = "gpio"; | ||
| }; | ||
|
|
||
| i2c2_recovery_pins: i2c2-recovery-pins { | ||
| groups = "i2c2"; | ||
| function = "gpio"; | ||
| }; | ||
| }; | ||
|
|
||
| &i2c0 { | ||
|
|
@@ -144,50 +36,7 @@ | |
| sda-gpios = <&gpionb 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; | ||
| }; | ||
|
|
||
| &i2c1 { | ||
| status = "okay"; | ||
| pinctrl-names = "default", "recovery"; | ||
| pinctrl-0 = <&i2c2_pins>; | ||
| pinctrl-1 = <&i2c2_recovery_pins>; | ||
| /delete-property/mrvl,i2c-fast-mode; | ||
| scl-gpios = <&gpionb 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; | ||
| sda-gpios = <&gpionb 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; | ||
|
|
||
| nct375@48 { | ||
| status = "okay"; | ||
| compatible = "ti,tmp75c"; | ||
| reg = <0x48>; | ||
| }; | ||
|
|
||
| nct375@49 { | ||
| status = "okay"; | ||
| compatible = "ti,tmp75c"; | ||
| reg = <0x49>; | ||
| }; | ||
| }; | ||
|
|
||
| ð0 { | ||
| phy-mode = "sgmii"; | ||
| status = "okay"; | ||
| managed = "in-band-status"; | ||
| phys = <&comphy1 0>; | ||
| sfp = <&sfp_eth0>; | ||
| }; | ||
|
|
||
| ð1 { | ||
| phy-mode = "sgmii"; | ||
| status = "okay"; | ||
| managed = "in-band-status"; | ||
| phys = <&comphy0 1>; | ||
| sfp = <&sfp_eth1>; | ||
| }; | ||
|
|
||
| &usb3 { | ||
| status = "okay"; | ||
| phys = <&usb2_utmi_otg_phy>; | ||
| phy-names = "usb2-utmi-otg-phy"; | ||
| }; | ||
|
|
||
| &uart0 { | ||
| status = "okay"; | ||
| }; | ||
Oops, something went wrong.