Message ID | 1505918938-52550-14-git-send-email-heyi.guo@linaro.org |
---|---|
State | New |
Headers | show |
Series | Update D03/D05 binary for edk2 update and bug fix. | expand |
On Wed, Sep 20, 2017 at 10:48:57PM +0800, Heyi Guo wrote: > From: Ming Huang <waip23@foxmail.com> > > 1. Disable I2C0 device avoiding access conflict in OS; > 2. Modify name of _HID for matching the string in OS driver; Please clarify for 2) that it refers to I2C2. Regards, Leif > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ming Huang <huangming23@huawei.com> > --- > .../Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl | 20 +------------------- > 1 file changed, 1 insertion(+), 19 deletions(-) > > diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl > index eb906ef..3cc60d1 100644 > --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl > +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl > @@ -18,26 +18,8 @@ > > Scope(_SB) > { > - Device(I2C0) { > - Name(_HID, "APMC0D0F") > - Name(_CID, "APMC0D0F") > - Name(_CRS, ResourceTemplate() { > - Memory32Fixed(ReadWrite, 0xd00e0000, 0x10000) > - Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive, 0, "\\_SB.MBI6") { 705 } > - }) > - Name (_DSD, Package () { > - ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), > - Package () { > - Package () {"clock-frequency", 100000}, > - Package () {"i2c-sda-falling-time-ns", 913}, > - Package () {"i2c-scl-falling-time-ns", 303}, > - Package () {"i2c-sda-hold-time-ns", 0x9c2}, > - } > - }) > - } > - > Device(I2C2) { > - Name(_HID, "APMC0D0F") > + Name(_HID, "HISI02A1") > Name(_CID, "APMC0D0F") > Name(_CRS, ResourceTemplate() { > Memory32Fixed(ReadWrite, 0xd0100000, 0x10000) > -- > 1.9.1 >
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl index eb906ef..3cc60d1 100644 --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl @@ -18,26 +18,8 @@ Scope(_SB) { - Device(I2C0) { - Name(_HID, "APMC0D0F") - Name(_CID, "APMC0D0F") - Name(_CRS, ResourceTemplate() { - Memory32Fixed(ReadWrite, 0xd00e0000, 0x10000) - Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive, 0, "\\_SB.MBI6") { 705 } - }) - Name (_DSD, Package () { - ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), - Package () { - Package () {"clock-frequency", 100000}, - Package () {"i2c-sda-falling-time-ns", 913}, - Package () {"i2c-scl-falling-time-ns", 303}, - Package () {"i2c-sda-hold-time-ns", 0x9c2}, - } - }) - } - Device(I2C2) { - Name(_HID, "APMC0D0F") + Name(_HID, "HISI02A1") Name(_CID, "APMC0D0F") Name(_CRS, ResourceTemplate() { Memory32Fixed(ReadWrite, 0xd0100000, 0x10000)