diff options
| author | Lotus Xu <xuxiaohan@bytedance.com> | 2021-09-22 13:25:57 +0300 |
|---|---|---|
| committer | lotus xu <xuxiaohan@bytedance.com> | 2021-09-24 04:57:41 +0300 |
| commit | 98f38d4c8d94db6fe6156e87bbe37b2c0cf64f4d (patch) | |
| tree | 3bae3cbd943a5576ea27e209a0fd49e244f1bd0b | |
| parent | 7d0f84a633d674313354852ddbecf888c8e47226 (diff) | |
| download | openbmc-98f38d4c8d94db6fe6156e87bbe37b2c0cf64f4d.tar.xz | |
bytedance: g220a: linux: Fix patch confict
Remove ipmb patch that is upstreamed
Fix uart patch conflict
Tested: Build ok
Signed-off-by: Lotus Xu <xuxiaohan@bytedance.com>
Change-Id: I3749aafb5957e1fda4d31ef44fb2b6b956baa94a
3 files changed, 12 insertions, 43 deletions
diff --git a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0001-bytedance-g220a-Enable-ipmb.patch b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0001-bytedance-g220a-Enable-ipmb.patch deleted file mode 100644 index de9f2a350..000000000 --- a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0001-bytedance-g220a-Enable-ipmb.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0604e82e69c673c3ce75fa1d856a54ab10611015 Mon Sep 17 00:00:00 2001 -From: Lotus Xu <xuxiaohan@bytrdance.com> -Date: Wed, 21 Oct 2020 12:42:45 +0800 -Subject: [PATCH] bytedance: g220a:Enable ipmb - -Signed-off-by: Lotus Xu <xuxiaohan@bytrdance.com> ---- - arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts b/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts -index b66854fa9ade..124b885b03ec 100644 ---- a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts -+++ b/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts -@@ -453,7 +453,11 @@ channel_3_3: i2c@3 { - - &i2c4 { - status = "okay"; -- -+ ipmb0@10 { -+ compatible = "ipmb-dev"; -+ reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>; -+ i2c-protocol; -+ }; - }; - - &i2c5 { --- -2.25.1 - diff --git a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0004-ARM-dts-aspeed-Add-uart-routing-node.patch b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0004-ARM-dts-aspeed-Add-uart-routing-node.patch index 645a09385..79fbb7469 100644 --- a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0004-ARM-dts-aspeed-Add-uart-routing-node.patch +++ b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0004-ARM-dts-aspeed-Add-uart-routing-node.patch @@ -1,7 +1,7 @@ -From c12fc8a0f748358f76ff5a883a390301f86f079f Mon Sep 17 00:00:00 2001 +From 120b607efb7b4dbc86add041decf3253b8b5e1fe Mon Sep 17 00:00:00 2001 From: John Wang <wangzhiqiang.bj@bytedance.com> Date: Wed, 30 Sep 2020 12:41:30 +0800 -Subject: [PATCH 4/5] ARM: dts: aspeed: Add uart-routing node +Subject: [PATCH] ARM: dts: aspeed: Add uart-routing node Signed-off-by: John Wang <wangzhiqiang.bj@bytedance.com> --- @@ -10,12 +10,12 @@ Signed-off-by: John Wang <wangzhiqiang.bj@bytedance.com> 2 files changed, 12 insertions(+) diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi -index 19288495f41a..de9a8fd3933f 100644 +index 73ca1ec6fc24..39d128c0545b 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi -@@ -522,6 +522,12 @@ sio_regs: regs { - compatible = "aspeed,bmc-misc"; - }; +@@ -503,6 +503,12 @@ ibt: ibt@140 { + interrupts = <8>; + status = "disabled"; }; + + uart_routing: uart_routing@9c { @@ -25,12 +25,12 @@ index 19288495f41a..de9a8fd3933f 100644 + }; }; - peci: bus@1e78b000 { + uart2: serial@1e78d000 { diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi -index 97ca743363d7..9938b8f224f6 100644 +index ee171b3364fa..aac382367109 100644 --- a/arch/arm/boot/dts/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed-g6.dtsi -@@ -311,6 +311,12 @@ pinctrl: pinctrl { +@@ -317,6 +317,12 @@ pinctrl: pinctrl { compatible = "aspeed,ast2600-pinctrl"; }; @@ -40,9 +40,9 @@ index 97ca743363d7..9938b8f224f6 100644 + status = "disabled"; + }; + - smp-memram@180 { - compatible = "aspeed,ast2600-smpmem"; - reg = <0x180 0x40>; + silicon-id@14 { + compatible = "aspeed,ast2600-silicon-id", "aspeed,silicon-id"; + reg = <0x14 0x4 0x5b0 0x8>; -- 2.25.1 diff --git a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend index 3189e509d..bcbe7ce6c 100644 --- a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -4,5 +4,4 @@ SRC_URI:append:g220a = " file://g220a.cfg \ file://0003-misc-aspeed-Add-Aspeed-UART-routing-control-driver.patch \ file://0004-ARM-dts-aspeed-Add-uart-routing-node.patch \ file://0005-ARM-dts-aspeed-Enable-g220a-uart-route.patch \ - file://0001-bytedance-g220a-Enable-ipmb.patch \ " |