diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:45:20 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-10 01:15:05 +0300 |
commit | 82dbc15a05125a812c140a3c8cff81c366482229 (patch) | |
tree | 9c8f1ad262a2e281f20340cf8646aca6f8596044 /meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0034-arm-dts-aspeed-Swap-the-mac-nodes-numbering.patch | |
parent | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (diff) | |
download | openbmc-82dbc15a05125a812c140a3c8cff81c366482229.tar.xz |
Update to internal 0.26
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0034-arm-dts-aspeed-Swap-the-mac-nodes-numbering.patch')
-rw-r--r-- | meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0034-arm-dts-aspeed-Swap-the-mac-nodes-numbering.patch | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0034-arm-dts-aspeed-Swap-the-mac-nodes-numbering.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0034-arm-dts-aspeed-Swap-the-mac-nodes-numbering.patch deleted file mode 100644 index 2f0fd3a31..000000000 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0034-arm-dts-aspeed-Swap-the-mac-nodes-numbering.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 65c8090f2b418892aee9f239729fa417bd508a00 Mon Sep 17 00:00:00 2001 -From: Jae Hyun Yoo <jae.hyun.yoo@intel.com> -Date: Wed, 3 Oct 2018 10:17:58 -0700 -Subject: [PATCH] arm: dts: aspeed: Swap the mac nodes numbering - -This patch swaps the numbering of mac0 and mac1 to make a dedicated -nic get assigned the first ethernet device number. - -Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> ---- - arch/arm/boot/dts/aspeed-g4.dtsi | 16 ++++++++-------- - arch/arm/boot/dts/aspeed-g5.dtsi | 16 ++++++++-------- - 2 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi -index a70bee24d058..054d97229626 100644 ---- a/arch/arm/boot/dts/aspeed-g4.dtsi -+++ b/arch/arm/boot/dts/aspeed-g4.dtsi -@@ -120,14 +120,6 @@ - reg = <0x1e6c2000 0x80>; - }; - -- mac0: ethernet@1e660000 { -- compatible = "aspeed,ast2400-mac", "faraday,ftgmac100"; -- reg = <0x1e660000 0x180>; -- interrupts = <2>; -- clocks = <&syscon ASPEED_CLK_GATE_MAC1CLK>; -- status = "disabled"; -- }; -- - mac1: ethernet@1e680000 { - compatible = "aspeed,ast2400-mac", "faraday,ftgmac100"; - reg = <0x1e680000 0x180>; -@@ -136,6 +128,14 @@ - status = "disabled"; - }; - -+ mac0: ethernet@1e660000 { -+ compatible = "aspeed,ast2400-mac", "faraday,ftgmac100"; -+ reg = <0x1e660000 0x180>; -+ interrupts = <2>; -+ clocks = <&syscon ASPEED_CLK_GATE_MAC1CLK>; -+ status = "disabled"; -+ }; -+ - ehci0: usb@1e6a1000 { - compatible = "aspeed,ast2400-ehci", "generic-ehci"; - reg = <0x1e6a1000 0x100>; -diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi -index 797013debaa7..27ed188296a1 100644 ---- a/arch/arm/boot/dts/aspeed-g5.dtsi -+++ b/arch/arm/boot/dts/aspeed-g5.dtsi -@@ -148,14 +148,6 @@ - reg = <0x1e6c2000 0x80>; - }; - -- mac0: ethernet@1e660000 { -- compatible = "aspeed,ast2500-mac", "faraday,ftgmac100"; -- reg = <0x1e660000 0x180>; -- interrupts = <2>; -- clocks = <&syscon ASPEED_CLK_GATE_MAC1CLK>; -- status = "disabled"; -- }; -- - mac1: ethernet@1e680000 { - compatible = "aspeed,ast2500-mac", "faraday,ftgmac100"; - reg = <0x1e680000 0x180>; -@@ -164,6 +156,14 @@ - status = "disabled"; - }; - -+ mac0: ethernet@1e660000 { -+ compatible = "aspeed,ast2500-mac", "faraday,ftgmac100"; -+ reg = <0x1e660000 0x180>; -+ interrupts = <2>; -+ clocks = <&syscon ASPEED_CLK_GATE_MAC1CLK>; -+ status = "disabled"; -+ }; -+ - ehci0: usb@1e6a1000 { - compatible = "aspeed,ast2500-ehci", "generic-ehci"; - reg = <0x1e6a1000 0x100>; --- -2.7.4 - |