openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mvebu dt64 for 5.11 (part 1) 

- Add support for IEI Puzzle-M801 board (Armada 8040 based)
  - Add support ESPRESSObin-Ultra (Armada 3720 based)
  - Clean-up and improve espressobin device tree
  - Switch to per-port SATA interrupts on CP110 based SoC
  - Use compliant node name for USB3  on CP110 based SoC
  - Add heartbeat LED on mcbin singleshot
  - Disable SMMU by default for Armada 7040 and 8040 to continued
    supporting custom bot firmware
  - Turris mox:
    - add 3W power capability to SFP cage
    - update ethernet-phy handle name
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCX8UWegAKCRALBhiOFHI7
 1c5BAJ4ilmwKGPP5eFE+fCfEjzxvskL3mQCdFKOIraWngVbX+GCAZ2UhZfYT6cA=
 =G+GT
 -----END PGP SIGNATURE-----

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

mvebu dt64 for 5.11 (part 1)

 - Add support for IEI Puzzle-M801 board (Armada 8040 based)
 - Add support ESPRESSObin-Ultra (Armada 3720 based)
 - Clean-up and improve espressobin device tree
 - Switch to per-port SATA interrupts on CP110 based SoC
 - Use compliant node name for USB3  on CP110 based SoC
 - Add heartbeat LED on mcbin singleshot
 - Disable SMMU by default for Armada 7040 and 8040 to continued
   supporting custom bot firmware
 - Turris mox:
   - add 3W power capability to SFP cage
   - update ethernet-phy handle name

* tag 'mvebu-dt64-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  arm64: dts: armada-3720-turris-mox: add 3W power capability to SFP cage
  arm64: dts: marvell: keep SMMU disabled by default for Armada 7040 and 8040
  arm64: dts: mcbin-singleshot: add heartbeat LED
  arm64: dts: marvell: cp11x: Harmonize xHCI DT nodes name
  arm64: dts: marvell: espressobin: Update link to V7 schematic
  arm64: dts: armada-3720-turris-mox: update ethernet-phy handle name
  arm64: dts: marvell: armada-cp110: Switch to per-port SATA interrupts
  arm64: dts: marvell: add DT for ESPRESSObin-Ultra
  arm64: dts: marvell: espressobin: Add support for LED2
  arm64: dts: marvell: Add a device tree for the IEI Puzzle-M801 board
  arm64: dts: marvell: espressobin: De-duplicate eMMC definitions
  arm64: dts: marvell: espressobin: Get rid of duplicate serial aliases
  arm64: dts: marvell: espressobin: Simplify v7 ethernet port labeling

Link: https://lore.kernel.org/r/87eekaj0i4.fsf@BL-laptop
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-12-08 23:45:58 +01:00
parent 9bc08aa60f a2081c09d7
commit a2f9886a9e
12 changed files with 778 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/marvell/Makefile
View File

@ -3,6 +3,7 @@
dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-db.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
dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin-v7.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin-v7-emmc.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-turris-mox.dtb
@ -12,6 +13,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-clearfog-gt-8k.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin-singleshot.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-puzzle-m801.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-8080-db.dtb
dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db.dtb
dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db.dtb

18
arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
View File

@ -21,24 +21,6 @@ / {
"marvell,armada3720", "marvell,armada3710";
};
/* U11 */
&sdhci0 {
non-removable;
bus-width = <8>;
mmc-ddr-1_8v;
mmc-hs400-1_8v;
marvell,xenon-emmc;
marvell,xenon-tun-count = <9>;
marvell,pad-type = "fixed-1-8v";
pinctrl-names = "default";
pinctrl-0 = <&mmc_pins>;
status = "okay";
#address-cells = <1>;
#size-cells = <0>;
mmccard: mmccard@0 {
compatible = "mmc-card";
reg = <0>;
};
};

165
arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts Normal file
View File

@ -0,0 +1,165 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Device Tree file for ESPRESSObin-Ultra board.
* Copyright (C) 2019 Globalscale technologies, Inc.
*
* Jason Hung <jhung@globalscaletechnologies.com>
*/
/dts-v1/;
#include "armada-3720-espressobin.dtsi"
/ {
model = "Globalscale Marvell ESPRESSOBin Ultra Board";
compatible = "globalscale,espressobin-ultra", "marvell,armada3720",
"marvell,armada3710";
aliases {
/* ethernet1 is WAN port */
ethernet1 = &switch0port5;
ethernet2 = &switch0port1;
ethernet3 = &switch0port2;
ethernet4 = &switch0port3;
ethernet5 = &switch0port4;
};
reg_usb3_vbus: usb3-vbus {
compatible = "regulator-fixed";
regulator-name = "usb3-vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
gpio = <&gpionb 19 GPIO_ACTIVE_HIGH>;
};
usb3_phy: usb3-phy {
compatible = "usb-nop-xceiv";
vcc-supply = <&reg_usb3_vbus>;
};
gpio-leds {
pinctrl-names = "default";
compatible = "gpio-leds";
/* No assigned functions to the LEDs by default */
led1 {
label = "ebin-ultra:blue:led1";
gpios = <&gpionb 11 GPIO_ACTIVE_LOW>;
};
led2 {
label = "ebin-ultra:green:led2";
gpios = <&gpionb 12 GPIO_ACTIVE_LOW>;
};
led3 {
label = "ebin-ultra:red:led3";
gpios = <&gpionb 13 GPIO_ACTIVE_LOW>;
};
led4 {
label = "ebin-ultra:yellow:led4";
gpios = <&gpionb 14 GPIO_ACTIVE_LOW>;
};
};
};
&sdhci0 {
status = "okay";
};
&sdhci1 {
status = "disabled";
};
&spi0 {
flash@0 {
spi-max-frequency = <108000000>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "firmware";
reg = <0x0 0x3e0000>;
};
partition@3e0000 {
label = "hw-info";
reg = <0x3e0000 0x10000>;
read-only;
};
partition@3f0000 {
label = "u-boot-env";
reg = <0x3f0000 0x10000>;
};
};
};
};
&i2c0 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
clock-frequency = <100000>;
rtc@51 {
compatible = "nxp,pcf8563";
reg = <0x51>;
};
};
&usb3 {
usb-phy = <&usb3_phy>;
status = "disabled";
};
&mdio {
extphy: ethernet-phy@1 {
reg = <1>;
};
};
&switch0 {
reg = <3>;
ports {
switch0port1: port@1 {
reg = <1>;
label = "lan0";
phy-handle = <&switch0phy0>;
};
switch0port2: port@2 {
reg = <2>;
label = "lan1";
phy-handle = <&switch0phy1>;
};
switch0port3: port@3 {
reg = <3>;
label = "lan2";
phy-handle = <&switch0phy2>;
};
switch0port4: port@4 {
reg = <4>;
label = "lan3";
phy-handle = <&switch0phy3>;
};
switch0port5: port@5 {
reg = <5>;
label = "wan";
phy-handle = <&extphy>;
phy-mode = "sgmii";
};
};
mdio {
switch0phy3: switch0phy3@14 {
reg = <0x14>;
};
};
};

44
arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
View File

@ -8,7 +8,7 @@
*
*/
/*
* Schematic available at http://wiki.espressobin.net/tiki-download_file.php?fileId=200
* Schematic available at http://espressobin.net/wp-content/uploads/2020/05/ESPRESSObin_V7-0_Schematic.pdf
*/
/dts-v1/;
@ -28,40 +28,18 @@ aliases {
};
};
&switch0 {
ports {
switch0port1: port@1 {
reg = <1>;
label = "lan1";
phy-handle = <&switch0phy0>;
};
switch0port3: port@3 {
reg = <3>;
label = "wan";
phy-handle = <&switch0phy2>;
};
};
&switch0port1 {
label = "lan1";
};
&switch0port3 {
label = "wan";
};
/* U11 */
&sdhci0 {
non-removable;
bus-width = <8>;
mmc-ddr-1_8v;
mmc-hs400-1_8v;
marvell,xenon-emmc;
marvell,xenon-tun-count = <9>;
marvell,pad-type = "fixed-1-8v";
pinctrl-names = "default";
pinctrl-0 = <&mmc_pins>;
status = "okay";
#address-cells = <1>;
#size-cells = <0>;
mmccard: mmccard@0 {
compatible = "mmc-card";
reg = <0>;
};
};
&led2 {
status = "okay";
};

26
arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
View File

@ -8,7 +8,7 @@
*
*/
/*
* Schematic available at http://wiki.espressobin.net/tiki-download_file.php?fileId=200
* Schematic available at http://espressobin.net/wp-content/uploads/2020/05/ESPRESSObin_V7-0_Schematic.pdf
*/
/dts-v1/;
@ -27,18 +27,14 @@ aliases {
};
};
&switch0 {
ports {
switch0port1: port@1 {
reg = <1>;
label = "lan1";
phy-handle = <&switch0phy0>;
};
switch0port3: port@3 {
reg = <3>;
label = "wan";
phy-handle = <&switch0phy2>;
};
};
&switch0port1 {
label = "lan1";
};
&switch0port3 {
label = "wan";
};
&led2 {
status = "okay";
};

39
arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
View File

@ -17,8 +17,6 @@ aliases {
ethernet1 = &switch0port1;
ethernet2 = &switch0port2;
ethernet3 = &switch0port3;
serial0 = &uart0;
serial1 = &uart1;
};
chosen {
@ -43,6 +41,19 @@ vcc_sd_reg1: regulator {
3300000 0x0>;
enable-active-high;
};
led2: gpio-led2 {
/* led2 is working only on v7 board */
status = "disabled";
compatible = "gpio-leds";
led2 {
label = "led2";
gpios = <&gpionb 2 GPIO_ACTIVE_LOW>;
default-state = "off";
};
};
};
/* J9 */
@ -60,6 +71,30 @@ &sata {
phy-names = "sata-phy";
};
/* U11 */
&sdhci0 {
/* Main DTS file for Espressobin is without eMMC */
status = "disabled";
non-removable;
bus-width = <8>;
mmc-ddr-1_8v;
mmc-hs400-1_8v;
marvell,xenon-emmc;
marvell,xenon-tun-count = <9>;
marvell,pad-type = "fixed-1-8v";
pinctrl-names = "default";
pinctrl-0 = <&mmc_pins>;
#address-cells = <1>;
#size-cells = <0>;
mmccard: mmccard@0 {
compatible = "mmc-card";
reg = <0>;
};
};
/* J1 */
&sdhci1 {
wp-inverted;

3
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
View File

@ -102,6 +102,7 @@ sfp: sfp {
mod-def0-gpio = <&moxtet_sfp 2 GPIO_ACTIVE_LOW>;
tx-disable-gpio = <&moxtet_sfp 4 GPIO_ACTIVE_HIGH>;
rate-select0-gpio = <&moxtet_sfp 5 GPIO_ACTIVE_HIGH>;
maximum-power-milliwatt = <3000>;
/* enabled by U-Boot if SFP module is present */
status = "disabled";
@ -146,7 +147,7 @@ &eth0 {
pinctrl-names = "default";
pinctrl-0 = <&rgmii_pins>;
phy-mode = "rgmii-id";
phy = <&phy1>;
phy-handle = <&phy1>;
status = "okay";
};

4
arch/arm64/boot/dts/marvell/armada-7040.dtsi
View File

@ -15,10 +15,6 @@ / {
"marvell,armada-ap806";
};
&smmu {
status = "okay";
};
&cp0_pcie0 {
iommu-map =
<0x0 &smmu 0x480 0x20>,

22
arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts
View File

@ -5,6 +5,8 @@
* Device Tree file for MACCHIATOBin Armada 8040 community board platform
*/
#include <dt-bindings/leds/common.h>
#include "armada-8040-mcbin.dtsi"
/ {
@ -12,6 +14,19 @@ / {
compatible = "marvell,armada8040-mcbin-singleshot",
"marvell,armada8040-mcbin", "marvell,armada8040",
"marvell,armada-ap806-quad", "marvell,armada-ap806";
leds {
compatible = "gpio-leds";
pinctrl-0 = <&cp0_led18_pins>;
pinctrl-names = "default";
led18 {
gpios = <&cp0_gpio2 1 GPIO_ACTIVE_LOW>;
function = LED_FUNCTION_HEARTBEAT;
color = <LED_COLOR_ID_GREEN>;
linux,default-trigger = "heartbeat";
};
};
};
&cp0_eth0 {
@ -27,3 +42,10 @@ &cp1_eth0 {
managed = "in-band-status";
sfp = <&sfp_eth1>;
};
&cp0_pinctrl {
cp0_led18_pins: led18-pins {
marvell,pins = "mpp33";
marvell,function = "gpio";
};
};

523
arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts Normal file
View File

@ -0,0 +1,523 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright (C) 2016 Marvell Technology Group Ltd.
* Copyright (C) 2020 Sartura Ltd.
*
* Device Tree file for IEI Puzzle-M801
*/
#include "armada-8040.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/leds/common.h>
/ {
model = "IEI-Puzzle-M801";
compatible = "marvell,armada8040", "marvell,armada-ap806-quad", "marvell,armada-ap806";
aliases {
ethernet0 = &cp0_eth0;
ethernet1 = &cp1_eth0;
ethernet2 = &cp0_eth1;
ethernet3 = &cp0_eth2;
ethernet4 = &cp1_eth1;
ethernet5 = &cp1_eth2;
};
chosen {
stdout-path = "serial0:115200n8";
};
memory@0 {
device_type = "memory";
reg = <0x0 0x0 0x0 0x80000000>;
};
/* Regulator labels correspond with schematics */
v_3_3: regulator-3-3v {
compatible = "regulator-fixed";
regulator-name = "v_3_3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
status = "okay";
};
v_5v0_usb3_hst_vbus: regulator-usb3-vbus0 {
compatible = "regulator-fixed";
enable-active-high;
gpio = <&cp0_gpio2 15 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&cp0_xhci_vbus_pins>;
regulator-name = "v_5v0_usb3_hst_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
status = "okay";
};
v_vddo_h: regulator-1-8v {
compatible = "regulator-fixed";
regulator-name = "v_vddo_h";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
status = "okay";
};
sfp_cp0_eth0: sfp-cp0-eth0 {
compatible = "sff,sfp";
i2c-bus = <&sfpplus0_i2c>;
los-gpio = <&sfpplus_gpio 11 GPIO_ACTIVE_HIGH>;
mod-def0-gpio = <&sfpplus_gpio 10 GPIO_ACTIVE_LOW>;
tx-disable-gpio = <&sfpplus_gpio 9 GPIO_ACTIVE_HIGH>;
tx-fault-gpio = <&sfpplus_gpio 8 GPIO_ACTIVE_HIGH>;
maximum-power-milliwatt = <3000>;
};
sfp_cp1_eth0: sfp-cp1-eth0 {
compatible = "sff,sfp";
i2c-bus = <&sfpplus1_i2c>;
los-gpio = <&sfpplus_gpio 3 GPIO_ACTIVE_HIGH>;
mod-def0-gpio = <&sfpplus_gpio 2 GPIO_ACTIVE_LOW>;
tx-disable-gpio = <&sfpplus_gpio 1 GPIO_ACTIVE_HIGH>;
tx-fault-gpio = <&sfpplus_gpio 0 GPIO_ACTIVE_HIGH>;
maximum-power-milliwatt = <3000>;
};
leds {
compatible = "gpio-leds";
status = "okay";
pinctrl-0 = <&cp0_sfpplus_led_pins &cp1_sfpplus_led_pins>;
pinctrl-names = "default";
led-0 {
/* SFP+ port 2: Activity */
function = LED_FUNCTION_LAN;
function-enumerator = <0>;
gpios = <&cp1_gpio1 6 GPIO_ACTIVE_LOW>;
};
led-1 {
/* SFP+ port 1: Activity */
function = LED_FUNCTION_LAN;
function-enumerator = <1>;
gpios = <&cp1_gpio1 14 GPIO_ACTIVE_LOW>;
};
led-2 {
/* SFP+ port 2: 10 Gbps indicator */
function = LED_FUNCTION_LAN;
function-enumerator = <2>;
gpios = <&cp1_gpio1 7 GPIO_ACTIVE_LOW>;
};
led-3 {
/* SFP+ port 2: 1 Gbps indicator */
function = LED_FUNCTION_LAN;
function-enumerator = <3>;
gpios = <&cp1_gpio1 8 GPIO_ACTIVE_LOW>;
};
led-4 {
/* SFP+ port 1: 10 Gbps indicator */
function = LED_FUNCTION_LAN;
function-enumerator = <4>;
gpios = <&cp1_gpio1 10 GPIO_ACTIVE_LOW>;
};
led-5 {
/* SFP+ port 1: 1 Gbps indicator */
function = LED_FUNCTION_LAN;
function-enumerator = <5>;
gpios = <&cp1_gpio1 31 GPIO_ACTIVE_LOW>;
};
led-6 {
function = LED_FUNCTION_DISK;
linux,default-trigger = "disk-activity";
gpios = <&cp0_gpio2 22 GPIO_ACTIVE_HIGH>;
};
};
};
&ap_sdhci0 {
bus-width = <8>;
/*
* Not stable in HS modes - phy needs "more calibration", so add
* the "slow-mode" and disable SDR104, SDR50 and DDR50 modes.
*/
marvell,xenon-phy-slow-mode;
no-1-8-v;
no-sd;
no-sdio;
non-removable;
status = "okay";
vqmmc-supply = <&v_vddo_h>;
};
&ap_thermal_cpu1 {
trips {
cpu_active: cpu-active {
temperature = <44000>;
hysteresis = <2000>;
type = "active";
};
};
cooling-maps {
fan-map {
trip = <&cpu_active>;
cooling-device = <&chassis_fan_group0 64 THERMAL_NO_LIMIT>,
<&chassis_fan_group1 64 THERMAL_NO_LIMIT>;
};
};
};
&i2c0 {
clock-frequency = <100000>;
status = "okay";
rtc@32 {
compatible = "epson,rx8010";
reg = <0x32>;
};
};
&spi0 {
status = "okay";
spi-flash@0 {
#address-cells = <0x1>;
#size-cells = <0x1>;
compatible = "jedec,spi-nor";
reg = <0x0>;
spi-max-frequency = <20000000>;
partition@u-boot {
label = "u-boot";
reg = <0x00000000 0x001f0000>;
};
partition@u-boot-env {
label = "u-boot-env";
reg = <0x001f0000 0x00010000>;
};
partition@ubi1 {
label = "ubi1";
reg = <0x00200000 0x03f00000>;
};
partition@ubi2 {
label = "ubi2";
reg = <0x04100000 0x03f00000>;
};
};
};
&uart0 {
status = "okay";
pinctrl-0 = <&uart0_pins>;
pinctrl-names = "default";
};
&uart1 {
status = "okay";
/* IEI WT61P803 PUZZLE MCU Controller */
mcu {
compatible = "iei,wt61p803-puzzle";
current-speed = <115200>;
enable-beep;
leds {
compatible = "iei,wt61p803-puzzle-leds";
#address-cells = <1>;
#size-cells = <0>;
led@0 {
reg = <0>;
function = LED_FUNCTION_POWER;
color = <LED_COLOR_ID_BLUE>;
};
};
hwmon {
compatible = "iei,wt61p803-puzzle-hwmon";
#address-cells = <1>;
#size-cells = <0>;
chassis_fan_group0:fan-group@0 {
#cooling-cells = <2>;
reg = <0x00>;
cooling-levels = <64 102 170 230 250>;
};
chassis_fan_group1:fan-group@1 {
#cooling-cells = <2>;
reg = <0x01>;
cooling-levels = <64 102 170 230 250>;
};
};
};
};
&cp0_rtc {
status = "disabled";
};
&cp0_i2c0 {
clock-frequency = <100000>;
pinctrl-names = "default";
pinctrl-0 = <&cp0_i2c0_pins>;
status = "okay";
sfpplus_gpio: gpio@21 {
compatible = "nxp,pca9555";
reg = <0x21>;
gpio-controller;
#gpio-cells = <2>;
};
eeprom@54 {
compatible = "atmel,24c04";
reg = <0x54>;
};
};
&cp0_i2c1 {
clock-frequency = <100000>;
pinctrl-names = "default";
pinctrl-0 = <&cp0_i2c1_pins>;
status = "okay";
i2c-switch@70 {
compatible = "nxp,pca9544";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x70>;
sfpplus0_i2c: i2c@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
};
sfpplus1_i2c: i2c@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>;
};
};
};
&cp0_uart1 {
pinctrl-names = "default";
pinctrl-0 = <&cp0_uart1_pins>;
status = "okay";
};
&cp0_mdio {
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
ge_phy2: ethernet-phy@0 {
reg = <0>;
};
ge_phy3: ethernet-phy@1 {
reg = <1>;
};
};
&cp0_pcie0 {
pinctrl-names = "default";
pinctrl-0 = <&cp0_pcie_pins>;
num-lanes = <1>;
num-viewport = <8>;
reset-gpios = <&cp0_gpio2 20 GPIO_ACTIVE_LOW>;
ranges = <0x82000000 0x0 0xc0000000 0x0 0xc0000000 0x0 0x20000000>;
phys = <&cp0_comphy0 0>;
phy-names = "cp0-pcie0-x1-phy";
status = "okay";
};
&cp0_pinctrl {
cp0_ge_mdio_pins: ge-mdio-pins {
marvell,pins = "mpp32", "mpp34";
marvell,function = "ge";
};
cp0_i2c1_pins: i2c1-pins {
marvell,pins = "mpp35", "mpp36";
marvell,function = "i2c1";
};
cp0_i2c0_pins: i2c0-pins {
marvell,pins = "mpp37", "mpp38";
marvell,function = "i2c0";
};
cp0_uart1_pins: uart1-pins {
marvell,pins = "mpp40", "mpp41";
marvell,function = "uart1";
};
cp0_xhci_vbus_pins: xhci0-vbus-pins {
marvell,pins = "mpp47";
marvell,function = "gpio";
};
cp0_pcie_pins: pcie-pins {
marvell,pins = "mpp52";
marvell,function = "gpio";
};
cp0_sdhci_pins: sdhci-pins {
marvell,pins = "mpp55", "mpp56", "mpp57", "mpp58", "mpp59",
"mpp60", "mpp61";
marvell,function = "sdio";
};
cp0_sfpplus_led_pins: sfpplus-led-pins {
marvell,pins = "mpp54";
marvell,function = "gpio";
};
};
&cp0_ethernet {
status = "okay";
};
&cp0_eth0 {
status = "okay";
phy-mode = "10gbase-r";
phys = <&cp0_comphy4 0>;
local-mac-address = [ae 00 00 00 ff 00];
sfp = <&sfp_cp0_eth0>;
managed = "in-band-status";
};
&cp0_eth1 {
status = "okay";
phy = <&ge_phy2>;
phy-mode = "sgmii";
local-mac-address = [ae 00 00 00 ff 01];
phys = <&cp0_comphy3 1>;
};
&cp0_eth2 {
status = "okay";
phy-mode = "sgmii";
phys = <&cp0_comphy1 2>;
local-mac-address = [ae 00 00 00 ff 02];
phy = <&ge_phy3>;
};
&cp0_sata0 {
status = "okay";
sata-port@0 {
phys = <&cp0_comphy2 0>;
phy-names = "cp0-sata0-0-phy";
};
sata-port@1 {
phys = <&cp0_comphy5 1>;
phy-names = "cp0-sata0-1-phy";
};
};
&cp0_sdhci0 {
broken-cd;
bus-width = <4>;
pinctrl-names = "default";
pinctrl-0 = <&cp0_sdhci_pins>;
status = "okay";
vqmmc-supply = <&v_3_3>;
};
&cp0_usb3_0 {
status = "okay";
};
&cp0_usb3_1 {
status = "okay";
};
&cp1_i2c0 {
clock-frequency = <100000>;
status = "disabled";
};
&cp1_i2c1 {
clock-frequency = <100000>;
status = "disabled";
};
&cp1_rtc {
status = "disabled";
};
&cp1_ethernet {
status = "okay";
};
&cp1_eth0 {
status = "okay";
phy-mode = "10gbase-r";
phys = <&cp1_comphy4 0>;
local-mac-address = [ae 00 00 00 ff 03];
sfp = <&sfp_cp1_eth0>;
managed = "in-band-status";
};
&cp1_eth1 {
status = "okay";
phy = <&ge_phy4>;
phy-mode = "sgmii";
local-mac-address = [ae 00 00 00 ff 04];
phys = <&cp1_comphy3 1>;
};
&cp1_eth2 {
status = "okay";
phy-mode = "sgmii";
local-mac-address = [ae 00 00 00 ff 05];
phys = <&cp1_comphy5 2>;
phy = <&ge_phy5>;
};
&cp1_pinctrl {
cp1_sfpplus_led_pins: sfpplus-led-pins {
marvell,pins = "mpp6", "mpp7", "mpp8", "mpp10", "mpp14", "mpp31";
marvell,function = "gpio";
};
};
&cp1_uart0 {
status = "disabled";
};
&cp1_comphy2 {
cp1_usbh0_con: connector {
compatible = "usb-a-connector";
phy-supply = <&v_5v0_usb3_hst_vbus>;
};
};
&cp1_usb3_0 {
phys = <&cp1_comphy2 0>;
phy-names = "cp1-usb3h0-comphy";
status = "okay";
};
&cp1_mdio {
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
ge_phy4: ethernet-phy@1 {
reg = <1>;
};
ge_phy5: ethernet-phy@0 {
reg = <0>;
};
};
&cp1_pcie0 {
num-lanes = <2>;
phys = <&cp1_comphy0 0>, <&cp1_comphy1 0>;
phy-names = "cp1-pcie0-x2-lane0-phy", "cp1-pcie0-x2-lane1-phy";
status = "okay";
};

4
arch/arm64/boot/dts/marvell/armada-8040.dtsi
View File

@ -15,10 +15,6 @@ / {
"marvell,armada-ap806";
};
&smmu {
status = "okay";
};
&cp0_pcie0 {
iommu-map =
<0x0 &smmu 0x480 0x20>,

10
arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
View File

@ -275,7 +275,7 @@ CP11X_LABEL(thermal): thermal-sensor@70 {
};
};
CP11X_LABEL(usb3_0): usb3@500000 {
CP11X_LABEL(usb3_0): usb@500000 {
compatible = "marvell,armada-8k-xhci",
"generic-xhci";
reg = <0x500000 0x4000>;
@ -287,7 +287,7 @@ CP11X_LABEL(usb3_0): usb3@500000 {
status = "disabled";
};
CP11X_LABEL(usb3_1): usb3@510000 {
CP11X_LABEL(usb3_1): usb@510000 {
compatible = "marvell,armada-8k-xhci",
"generic-xhci";
reg = <0x510000 0x4000>;
@ -300,11 +300,9 @@ CP11X_LABEL(usb3_1): usb3@510000 {
};
CP11X_LABEL(sata0): sata@540000 {
compatible = "marvell,armada-8k-ahci",
"generic-ahci";
compatible = "marvell,armada-8k-ahci";
reg = <0x540000 0x30000>;
dma-coherent;
interrupts = <107 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&CP11X_LABEL(clk) 1 15>,
<&CP11X_LABEL(clk) 1 16>;
#address-cells = <1>;
@ -312,10 +310,12 @@ CP11X_LABEL(sata0): sata@540000 {
status = "disabled";
sata-port@0 {
interrupts = <109 IRQ_TYPE_LEVEL_HIGH>;
reg = <0>;
};
sata-port@1 {
interrupts = <107 IRQ_TYPE_LEVEL_HIGH>;
reg = <1>;
};
};