[Linaro-uefi,06/26] D02/ACPI: Use HISI0031 HID for uart on Hip05 soc

Message ID 1477538129-118465-5-git-send-email-heyi.guo@linaro.org
State Superseded
Headers show

Commit Message

gary guo Oct. 27, 2016, 3:15 a.m.
The UART on Hip05 soc is not 16550 compatible, use appropriate ACPI ID
for Hisi uart instead of APM one.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Com.asl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Leif Lindholm Nov. 5, 2016, 4:44 p.m. | #1
On Thu, Oct 27, 2016 at 11:15:09AM +0800, Heyi Guo wrote:
> The UART on Hip05 soc is not 16550 compatible, use appropriate ACPI ID
> for Hisi uart instead of APM one.
> 

Is this expected to keep working seemlessly?

Graeme, any further comments?

> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> ---
>  Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Com.asl | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Com.asl b/Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Com.asl
> index 43027e4..3bcc5fb 100644
> --- a/Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Com.asl
> +++ b/Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Com.asl
> @@ -18,13 +18,12 @@
>  
>  Scope(_SB)
>  {
> -  // UART 8250
>    Device(COM0) {
> -    Name(_HID, "APMC0D08") //Or AMD0020, trick to use dw8250 serial driver
> +    Name(_HID, "HISI0031") //it is not 16550 compatible
>      Name(_CID, "8250dw")
>      Name(_UID, Zero)
>      Name(_CRS, ResourceTemplate() {
> -      Memory32Fixed(ReadWrite, 0x80300000, 0x1000) //0x7FF80000, 0x1000
> +      Memory32Fixed(ReadWrite, 0x80300000, 0x1000)

This is unrelated cleanup.

>        Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive) { 349 }
>      })
>      Name (_DSD, Package () {
> -- 
> 1.9.1
>

Patch

diff --git a/Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Com.asl b/Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Com.asl
index 43027e4..3bcc5fb 100644
--- a/Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Com.asl
+++ b/Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Com.asl
@@ -18,13 +18,12 @@ 
 
 Scope(_SB)
 {
-  // UART 8250
   Device(COM0) {
-    Name(_HID, "APMC0D08") //Or AMD0020, trick to use dw8250 serial driver
+    Name(_HID, "HISI0031") //it is not 16550 compatible
     Name(_CID, "8250dw")
     Name(_UID, Zero)
     Name(_CRS, ResourceTemplate() {
-      Memory32Fixed(ReadWrite, 0x80300000, 0x1000) //0x7FF80000, 0x1000
+      Memory32Fixed(ReadWrite, 0x80300000, 0x1000)
       Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive) { 349 }
     })
     Name (_DSD, Package () {