forked from openwrt/openwrt
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
uDPU DTS has pending upstream fixups, so backport those as well as split the DTS into a DTSI and DTS in preparation for euroDPU support which uses uDPU as the base. Ethernet aliases have not yet been sent upstream but will be soon in order for U-boot to set the correct MAC on both ethernet interfaces instead of just one. Since U-boot environment now has its own partition, update the envtools config script to search for it instead. Patch hardcoding PHY mode is also not applicable anymore, so drop it and set in the uDPU DTS directly. Signed-off-by: Robert Marko <robert.marko@sartura.hr>
- Loading branch information
Showing
4 changed files
with
216 additions
and
34 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
46 changes: 46 additions & 0 deletions
46
target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
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,46 @@ | ||
// SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
|
||
/dts-v1/; | ||
|
||
#include "armada-3720-uDPU.dtsi" | ||
|
||
/ { | ||
model = "Methode uDPU Board"; | ||
compatible = "methode,udpu", "marvell,armada3720", "marvell,armada3710"; | ||
|
||
sfp_eth0: sfp-eth0 { | ||
compatible = "sff,sfp"; | ||
i2c-bus = <&i2c0>; | ||
los-gpio = <&gpiosb 2 GPIO_ACTIVE_HIGH>; | ||
mod-def0-gpio = <&gpiosb 3 GPIO_ACTIVE_LOW>; | ||
tx-disable-gpio = <&gpiosb 4 GPIO_ACTIVE_HIGH>; | ||
tx-fault-gpio = <&gpiosb 5 GPIO_ACTIVE_HIGH>; | ||
maximum-power-milliwatt = <3000>; | ||
}; | ||
}; | ||
|
||
&pinctrl_nb { | ||
i2c1_recovery_pins: i2c1-recovery-pins { | ||
groups = "i2c1"; | ||
function = "gpio"; | ||
}; | ||
}; | ||
|
||
&i2c0 { | ||
status = "okay"; | ||
pinctrl-names = "default", "recovery"; | ||
pinctrl-0 = <&i2c1_pins>; | ||
pinctrl-1 = <&i2c1_recovery_pins>; | ||
/delete-property/mrvl,i2c-fast-mode; | ||
scl-gpios = <&gpionb 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; | ||
sda-gpios = <&gpionb 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; | ||
}; | ||
|
||
ð0 { | ||
phy-mode = "2500base-x"; | ||
sfp = <&sfp_eth0>; | ||
}; | ||
|
||
ð1 { | ||
phy-mode = "2500base-x"; | ||
}; |
165 changes: 165 additions & 0 deletions
165
target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi
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,165 @@ | ||
// 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 <vladimir.vid@sartura.hr> | ||
*/ | ||
|
||
/dts-v1/; | ||
|
||
#include <dt-bindings/gpio/gpio.h> | ||
#include "armada-372x.dtsi" | ||
|
||
/ { | ||
chosen { | ||
stdout-path = "serial0:115200n8"; | ||
}; | ||
|
||
memory@0 { | ||
device_type = "memory"; | ||
reg = <0x00000000 0x00000000 0x00000000 0x20000000>; | ||
}; | ||
|
||
aliases { | ||
ethernet0 = ð0; | ||
ethernet1 = ð1; | ||
}; | ||
|
||
leds { | ||
compatible = "gpio-leds"; | ||
|
||
led-power1 { | ||
label = "udpu:green:power"; | ||
gpios = <&gpionb 11 GPIO_ACTIVE_LOW>; | ||
}; | ||
|
||
led-power2 { | ||
label = "udpu:red:power"; | ||
gpios = <&gpionb 12 GPIO_ACTIVE_LOW>; | ||
}; | ||
|
||
led-network1 { | ||
label = "udpu:green:network"; | ||
gpios = <&gpionb 13 GPIO_ACTIVE_LOW>; | ||
}; | ||
|
||
led-network2 { | ||
label = "udpu:red:network"; | ||
gpios = <&gpionb 14 GPIO_ACTIVE_LOW>; | ||
}; | ||
|
||
led-alarm1 { | ||
label = "udpu:green:alarm"; | ||
gpios = <&gpionb 15 GPIO_ACTIVE_LOW>; | ||
}; | ||
|
||
led-alarm2 { | ||
label = "udpu:red:alarm"; | ||
gpios = <&gpionb 16 GPIO_ACTIVE_LOW>; | ||
}; | ||
}; | ||
|
||
sfp_eth1: sfp-eth1 { | ||
compatible = "sff,sfp"; | ||
i2c-bus = <&i2c1>; | ||
los-gpio = <&gpiosb 7 GPIO_ACTIVE_HIGH>; | ||
mod-def0-gpio = <&gpiosb 8 GPIO_ACTIVE_LOW>; | ||
tx-disable-gpio = <&gpiosb 9 GPIO_ACTIVE_HIGH>; | ||
tx-fault-gpio = <&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 { | ||
i2c2_recovery_pins: i2c2-recovery-pins { | ||
groups = "i2c2"; | ||
function = "gpio"; | ||
}; | ||
}; | ||
|
||
&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)>; | ||
|
||
temp-sensor@48 { | ||
compatible = "ti,tmp75c"; | ||
reg = <0x48>; | ||
}; | ||
|
||
temp-sensor@49 { | ||
compatible = "ti,tmp75c"; | ||
reg = <0x49>; | ||
}; | ||
}; | ||
|
||
ð0 { | ||
status = "okay"; | ||
managed = "in-band-status"; | ||
phys = <&comphy1 0>; | ||
}; | ||
|
||
ð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"; | ||
}; |
34 changes: 0 additions & 34 deletions
34
...t/linux/mvebu/patches-5.10/314-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch
This file was deleted.
Oops, something went wrong.