1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [edk2-platforms: PATCH v2] Marvell/Armada7k8k: Replace unused compatible string in ACPI UART node

Marcin Wojtas posted 1 patch 4 years, 10 months ago
Failed in applying to current master (apply log)
Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl    | 4 ++--
Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl    | 4 ++--
Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
[edk2-devel] [edk2-platforms: PATCH v2] Marvell/Armada7k8k: Replace unused compatible string in ACPI UART node
Posted by Marcin Wojtas 4 years, 10 months ago 
Linux FWTS test of the ARM SBSA compliance suite
fail on using unsupported _CID in UART node. Instead of
removing, replace _HID to unique one ("MRVL0001") and
match the driver via _CID ("HISI0031").

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
Changelog:
v1->v2
- Use "HISI0031" as _CID and change _HID to "MRVL0001"
- Reflect the change in the commit message 

 Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl    | 4 ++--
 Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl    | 4 ++--
 Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
index 90b191b..5bac76a 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
@@ -102,8 +102,8 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "ARMADA7K", 3)
 
         Device (COM1)
         {
-            Name (_HID, "HISI0031")                             // _HID: Hardware ID
-            Name (_CID, "8250dw")                               // _CID: Compatible ID
+            Name (_HID, "MRVL0001")                             // _HID: Hardware ID
+            Name (_CID, "HISI0031")                             // _CID: Compatible ID
             Name (_ADR, FixedPcdGet64(PcdSerialRegisterBase))   // _ADR: Address
             Name (_CRS, ResourceTemplate ()                     // _CRS: Current Resource Settings
             {
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
index 5c060a3..e373d46 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
@@ -146,8 +146,8 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "ARMADA8K", 3)
 
         Device (COM1)
         {
-            Name (_HID, "HISI0031")                             // _HID: Hardware ID
-            Name (_CID, "8250dw")                               // _CID: Compatible ID
+            Name (_HID, "MRVL0001")                             // _HID: Hardware ID
+            Name (_CID, "HISI0031")                             // _CID: Compatible ID
             Name (_ADR, FixedPcdGet64(PcdSerialRegisterBase))   // _ADR: Address
             Name (_CRS, ResourceTemplate ()                     // _CRS: Current Resource Settings
             {
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
index f7cffb9..7e9e361 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
@@ -145,8 +145,8 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "ARMADA8K", 3)
 
         Device (COM1)
         {
-            Name (_HID, "HISI0031")                             // _HID: Hardware ID
-            Name (_CID, "8250dw")                               // _CID: Compatible ID
+            Name (_HID, "MRVL0001")                             // _HID: Hardware ID
+            Name (_CID, "HISI0031")                             // _CID: Compatible ID
             Name (_ADR, FixedPcdGet64(PcdSerialRegisterBase))   // _ADR: Address
             Name (_CRS, ResourceTemplate ()                     // _CRS: Current Resource Settings
             {
-- 
2.7.4


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#42025): https://edk2.groups.io/g/devel/message/42025
Mute This Topic: https://groups.io/mt/31974500/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms: PATCH v2] Marvell/Armada7k8k: Replace unused compatible string in ACPI UART node
Posted by Ard Biesheuvel 4 years, 10 months ago 
On Fri, 7 Jun 2019 at 15:11, Marcin Wojtas <mw@semihalf.com> wrote:
>
> Linux FWTS test of the ARM SBSA compliance suite
> fail on using unsupported _CID in UART node. Instead of
> removing, replace _HID to unique one ("MRVL0001") and
> match the driver via _CID ("HISI0031").
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Pushed as 1098e7ec3ee9..52f5e8d1abdf

> ---
> Changelog:
> v1->v2
> - Use "HISI0031" as _CID and change _HID to "MRVL0001"
> - Reflect the change in the commit message
>
>  Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl    | 4 ++--
>  Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl    | 4 ++--
>  Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 4 ++--
>  3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
> index 90b191b..5bac76a 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
> @@ -102,8 +102,8 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "ARMADA7K", 3)
>
>          Device (COM1)
>          {
> -            Name (_HID, "HISI0031")                             // _HID: Hardware ID
> -            Name (_CID, "8250dw")                               // _CID: Compatible ID
> +            Name (_HID, "MRVL0001")                             // _HID: Hardware ID
> +            Name (_CID, "HISI0031")                             // _CID: Compatible ID
>              Name (_ADR, FixedPcdGet64(PcdSerialRegisterBase))   // _ADR: Address
>              Name (_CRS, ResourceTemplate ()                     // _CRS: Current Resource Settings
>              {
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
> index 5c060a3..e373d46 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
> @@ -146,8 +146,8 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "ARMADA8K", 3)
>
>          Device (COM1)
>          {
> -            Name (_HID, "HISI0031")                             // _HID: Hardware ID
> -            Name (_CID, "8250dw")                               // _CID: Compatible ID
> +            Name (_HID, "MRVL0001")                             // _HID: Hardware ID
> +            Name (_CID, "HISI0031")                             // _CID: Compatible ID
>              Name (_ADR, FixedPcdGet64(PcdSerialRegisterBase))   // _ADR: Address
>              Name (_CRS, ResourceTemplate ()                     // _CRS: Current Resource Settings
>              {
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> index f7cffb9..7e9e361 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> @@ -145,8 +145,8 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "ARMADA8K", 3)
>
>          Device (COM1)
>          {
> -            Name (_HID, "HISI0031")                             // _HID: Hardware ID
> -            Name (_CID, "8250dw")                               // _CID: Compatible ID
> +            Name (_HID, "MRVL0001")                             // _HID: Hardware ID
> +            Name (_CID, "HISI0031")                             // _CID: Compatible ID
>              Name (_ADR, FixedPcdGet64(PcdSerialRegisterBase))   // _ADR: Address
>              Name (_CRS, ResourceTemplate ()                     // _CRS: Current Resource Settings
>              {
> --
> 2.7.4
>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#42026): https://edk2.groups.io/g/devel/message/42026
Mute This Topic: https://groups.io/mt/31974500/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.