mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 15:49:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'mvebu-dt64-5.7-1' of git://git.infradead.org/linux-mvebu into arm/dt

Browse Source 
mvebu dt64 for 5.7 (part 1)

Improve network support on two Armada 8040 based board:
Clearfog GT 8 and Macchiatobin.

Add ethernet alias on Espressobin for U-Boot support.

Fix various dt compilation issue or warning.

* tag 'mvebu-dt64-5.7-1' of git://git.infradead.org/linux-mvebu:
  arm64: dts: marvell: Fix cpu compatible for AP807-quad
  arm64: dts: marvell: fix non-existed cpu referrence in armada-ap806-dual.dtsi
  arm64: dts: marvell: build ESPRESSObin variants
  arm64: dts: marvell: espressobin: indicate dts version
  arm64: dts: marvell: espressobin: add ethernet alias
  arm64: dts: mcbin: support 2W SFP modules
  arm64: dts: clearfog-gt-8k: set gigabit PHY reset deassert delay

Link: https://lore.kernel.org/r/87h7yqx7w2.fsf@FE-laptop
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2020-03-25 21:49:11 +01:00
parent c661d66ca1 d136d2588b
commit 19a71cf494
9 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,9 @@
# Mvebu SoC Family
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-v7.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin-v7-emmc.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-turris-mox.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-uDPU.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-db.dtb

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

@@ -11,6 +11,8 @@
* Schematic available at http://espressobin.net/wp-content/uploads/2017/08/ESPRESSObin_V5_Schematics.pdf
*/
/dts-v1/;
#include "armada-3720-espressobin.dtsi"
/ {

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

@@ -11,6 +11,8 @@
* Schematic available at http://wiki.espressobin.net/tiki-download_file.php?fileId=200
*/
/dts-v1/;
#include "armada-3720-espressobin.dtsi"
/ {

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

@@ -11,6 +11,8 @@
* Schematic available at http://wiki.espressobin.net/tiki-download_file.php?fileId=200
*/
/dts-v1/;
#include "armada-3720-espressobin.dtsi"
/ {

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

@@ -7,12 +7,16 @@
*
*/
/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include "armada-372x.dtsi"
/ {
aliases {
ethernet0 = &eth0;
serial0 = &uart0;
serial1 = &uart1;
};
chosen {
stdout-path = "serial0:115200n8";
};

1
arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
View File

@@ -367,6 +367,7 @@ ge_phy: ethernet-phy@0 {
pinctrl-0 = <&cp0_copper_eth_phy_reset>;
reset-gpios = <&cp0_gpio2 11 GPIO_ACTIVE_LOW>;
reset-assert-us = <10000>;
reset-deassert-us = <10000>;
};
switch0: switch0@4 {

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

@@ -71,6 +71,7 @@ sfp_eth0: sfp-eth0 {
tx-fault-gpio = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&cp1_sfpp0_pins>;
maximum-power-milliwatt = <2000>;
};
sfp_eth1: sfp-eth1 {
@@ -83,6 +84,7 @@ sfp_eth1: sfp-eth1 {
tx-fault-gpio = <&cp0_gpio2 30 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&cp1_sfpp1_pins &cp0_sfpp1_pins>;
maximum-power-milliwatt = <2000>;
};
sfp_eth3: sfp-eth3 {
@@ -95,6 +97,7 @@ sfp_eth3: sfp-eth3 {
tx-fault-gpio = <&cp0_gpio2 19 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&cp0_sfp_1g_pins &cp1_sfp_1g_pins>;
maximum-power-milliwatt = <2000>;
};
};

5
arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
View File

@@ -53,4 +53,9 @@ l2: l2-cache {
cache-sets = <512>;
};
};
thermal-zones {
/delete-node/ ap-thermal-cpu2;
/delete-node/ ap-thermal-cpu3;
};
};

8
arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi
View File

@@ -17,7 +17,7 @@ cpus {
cpu0: cpu@0 {
device_type = "cpu";
compatible = "arm,cortex-a72", "arm,armv8";
compatible = "arm,cortex-a72";
reg = <0x000>;
enable-method = "psci";
#cooling-cells = <2>;
@@ -32,7 +32,7 @@ cpu0: cpu@0 {
};
cpu1: cpu@1 {
device_type = "cpu";
compatible = "arm,cortex-a72", "arm,armv8";
compatible = "arm,cortex-a72";
reg = <0x001>;
enable-method = "psci";
#cooling-cells = <2>;
@@ -47,7 +47,7 @@ cpu1: cpu@1 {
};
cpu2: cpu@100 {
device_type = "cpu";
compatible = "arm,cortex-a72", "arm,armv8";
compatible = "arm,cortex-a72";
reg = <0x100>;
enable-method = "psci";
#cooling-cells = <2>;
@@ -62,7 +62,7 @@ cpu2: cpu@100 {
};
cpu3: cpu@101 {
device_type = "cpu";
compatible = "arm,cortex-a72", "arm,armv8";
compatible = "arm,cortex-a72";
reg = <0x101>;
enable-method = "psci";
#cooling-cells = <2>;