[edk2-devel] [platforms: PATCH v2] SolidRun/Armada80x0McBin: Introduce SD/MMC ACPI description

Marcin Wojtas posted 1 patch 3 years, 5 months ago
Failed in applying to current master (apply log)
Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 59 ++++++++++++++++++++
1 file changed, 59 insertions(+)
[edk2-devel] [platforms: PATCH v2] SolidRun/Armada80x0McBin: Introduce SD/MMC ACPI description
Posted by Marcin Wojtas 3 years, 5 months ago
This patch adds a new description of the board's SD/MMC
interfaces in DSDT table that can work with the newly
introduced support in Linux.
Remaining Armada7k8k / CN913x platforms will follow
after this binding is accepted.

Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
Changelog:
v1->v2
* Drop 'compatible' property from MMC0 node
* Use dedicated _HID for each variant

 Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 59 ++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
index 7e9e361988..9e771afc98 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
@@ -86,6 +86,65 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "ARMADA8K", 3)
             })
         }
 
+        Device (MMC0)
+        {
+            Name (_HID, "MRVL0002")     // _HID: Hardware ID
+            Name (_UID, 0x00)           // _UID: Unique ID
+            Name (_CCA, 0x01)           // _CCA: Cache Coherency Attribute
+
+            Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
+            {
+                Memory32Fixed (ReadWrite,
+                    0xF06E0000,         // Address Base (MMIO)
+                    0x00000300,         // Address Length
+                    )
+                Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+                {
+                  48
+                }
+            })
+            Name (_DSD, Package () {
+                ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+                Package () {
+                      Package () { "clock-frequency", 400000000 },
+                      Package () { "bus-width", 8 },
+                      Package () { "marvell,xenon-phy-slow-mode", 0x1 },
+                      Package () { "no-1-8-v", 0x1 },
+                      Package () { "no-sd", 0x1 },
+                      Package () { "no-sdio", 0x1  },
+                      Package () { "non-removable", 0x1  },
+                }
+            })
+        }
+
+        Device (MMC1)
+        {
+            Name (_HID, "MRVL0004")     // _HID: Hardware ID
+            Name (_UID, 0x01)           // _UID: Unique ID
+            Name (_CCA, 0x01)           // _CCA: Cache Coherency Attribute
+
+            Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
+            {
+                Memory32Fixed (ReadWrite,
+                    0xF2780000,         // Address Base (MMIO)
+                    0x00000300,         // Address Length
+                    )
+                Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+                {
+                  CP_GIC_SPI_CP0_SDMMC
+                }
+            })
+            Name (_DSD, Package () {
+                ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+                Package () {
+                      Package () { "clock-frequency", 400000000 },
+                      Package () { "bus-width", 4 },
+                      Package () { "broken-cd", 0x1 },
+                      Package () { "no-1-8-v", 0x1 },
+                }
+            })
+        }
+
         Device (XHC0)
         {
             Name (_HID, "PNP0D10")      // _HID: Hardware ID
-- 
2.29.0



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#67738): https://edk2.groups.io/g/devel/message/67738
Mute This Topic: https://groups.io/mt/78381837/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [platforms: PATCH v2] SolidRun/Armada80x0McBin: Introduce SD/MMC ACPI description
Posted by Marcin Wojtas 3 years, 4 months ago
Hi,

pt., 20 lis 2020 o 04:11 Marcin Wojtas <mw@semihalf.com> napisał(a):
>
> This patch adds a new description of the board's SD/MMC
> interfaces in DSDT table that can work with the newly
> introduced support in Linux.
> Remaining Armada7k8k / CN913x platforms will follow
> after this binding is accepted.
>
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
> Changelog:
> v1->v2
> * Drop 'compatible' property from MMC0 node
> * Use dedicated _HID for each variant
>
>  Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 59 ++++++++++++++++++++
>  1 file changed, 59 insertions(+)
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> index 7e9e361988..9e771afc98 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> @@ -86,6 +86,65 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "ARMADA8K", 3)
>              })
>          }
>
> +        Device (MMC0)
> +        {
> +            Name (_HID, "MRVL0002")     // _HID: Hardware ID
> +            Name (_UID, 0x00)           // _UID: Unique ID
> +            Name (_CCA, 0x01)           // _CCA: Cache Coherency Attribute
> +
> +            Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
> +            {
> +                Memory32Fixed (ReadWrite,
> +                    0xF06E0000,         // Address Base (MMIO)
> +                    0x00000300,         // Address Length
> +                    )
> +                Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
> +                {
> +                  48
> +                }
> +            })
> +            Name (_DSD, Package () {
> +                ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> +                Package () {
> +                      Package () { "clock-frequency", 400000000 },
> +                      Package () { "bus-width", 8 },
> +                      Package () { "marvell,xenon-phy-slow-mode", 0x1 },
> +                      Package () { "no-1-8-v", 0x1 },
> +                      Package () { "no-sd", 0x1 },
> +                      Package () { "no-sdio", 0x1  },
> +                      Package () { "non-removable", 0x1  },
> +                }
> +            })
> +        }
> +
> +        Device (MMC1)
> +        {
> +            Name (_HID, "MRVL0004")     // _HID: Hardware ID
> +            Name (_UID, 0x01)           // _UID: Unique ID
> +            Name (_CCA, 0x01)           // _CCA: Cache Coherency Attribute
> +
> +            Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
> +            {
> +                Memory32Fixed (ReadWrite,
> +                    0xF2780000,         // Address Base (MMIO)
> +                    0x00000300,         // Address Length
> +                    )
> +                Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
> +                {
> +                  CP_GIC_SPI_CP0_SDMMC
> +                }
> +            })
> +            Name (_DSD, Package () {
> +                ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> +                Package () {
> +                      Package () { "clock-frequency", 400000000 },
> +                      Package () { "bus-width", 4 },
> +                      Package () { "broken-cd", 0x1 },
> +                      Package () { "no-1-8-v", 0x1 },
> +                }
> +            })
> +        }
> +
>          Device (XHC0)
>          {
>              Name (_HID, "PNP0D10")      // _HID: Hardware ID
> --
> 2.29.0
>

The Linux part got merged. Do you have any more comments/remarks to this patch?

Best regards,
Marcin


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#69169): https://edk2.groups.io/g/devel/message/69169
Mute This Topic: https://groups.io/mt/78381837/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [platforms: PATCH v2] SolidRun/Armada80x0McBin: Introduce SD/MMC ACPI description
Posted by Ard Biesheuvel 3 years, 3 months ago
On 12/18/20 2:46 AM, Marcin Wojtas wrote:
> Hi,
> 
> pt., 20 lis 2020 o 04:11 Marcin Wojtas <mw@semihalf.com> napisał(a):
>>
>> This patch adds a new description of the board's SD/MMC
>> interfaces in DSDT table that can work with the newly
>> introduced support in Linux.
>> Remaining Armada7k8k / CN913x platforms will follow
>> after this binding is accepted.
>>
>> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>> ---
>> Changelog:
>> v1->v2
>> * Drop 'compatible' property from MMC0 node
>> * Use dedicated _HID for each variant
>>
>>  Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 59 ++++++++++++++++++++
>>  1 file changed, 59 insertions(+)
>>
>> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
>> index 7e9e361988..9e771afc98 100644
>> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
>> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
>> @@ -86,6 +86,65 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "ARMADA8K", 3)
>>              })
>>          }
>>
>> +        Device (MMC0)
>> +        {
>> +            Name (_HID, "MRVL0002")     // _HID: Hardware ID
>> +            Name (_UID, 0x00)           // _UID: Unique ID
>> +            Name (_CCA, 0x01)           // _CCA: Cache Coherency Attribute
>> +
>> +            Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
>> +            {
>> +                Memory32Fixed (ReadWrite,
>> +                    0xF06E0000,         // Address Base (MMIO)
>> +                    0x00000300,         // Address Length
>> +                    )
>> +                Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
>> +                {
>> +                  48
>> +                }
>> +            })
>> +            Name (_DSD, Package () {
>> +                ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
>> +                Package () {
>> +                      Package () { "clock-frequency", 400000000 },
>> +                      Package () { "bus-width", 8 },
>> +                      Package () { "marvell,xenon-phy-slow-mode", 0x1 },
>> +                      Package () { "no-1-8-v", 0x1 },
>> +                      Package () { "no-sd", 0x1 },
>> +                      Package () { "no-sdio", 0x1  },
>> +                      Package () { "non-removable", 0x1  },
>> +                }
>> +            })
>> +        }
>> +
>> +        Device (MMC1)
>> +        {
>> +            Name (_HID, "MRVL0004")     // _HID: Hardware ID
>> +            Name (_UID, 0x01)           // _UID: Unique ID
>> +            Name (_CCA, 0x01)           // _CCA: Cache Coherency Attribute
>> +
>> +            Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
>> +            {
>> +                Memory32Fixed (ReadWrite,
>> +                    0xF2780000,         // Address Base (MMIO)
>> +                    0x00000300,         // Address Length
>> +                    )
>> +                Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
>> +                {
>> +                  CP_GIC_SPI_CP0_SDMMC
>> +                }
>> +            })
>> +            Name (_DSD, Package () {
>> +                ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
>> +                Package () {
>> +                      Package () { "clock-frequency", 400000000 },
>> +                      Package () { "bus-width", 4 },
>> +                      Package () { "broken-cd", 0x1 },
>> +                      Package () { "no-1-8-v", 0x1 },
>> +                }
>> +            })
>> +        }
>> +
>>          Device (XHC0)
>>          {
>>              Name (_HID, "PNP0D10")      // _HID: Hardware ID
>> --
>> 2.29.0
>>
> 
> The Linux part got merged. Do you have any more comments/remarks to this patch?
> 
> 

Thanks Marcin

Pushed as 794979b1ee14..862428aa3f5e

-- 
Ard.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#69612): https://edk2.groups.io/g/devel/message/69612
Mute This Topic: https://groups.io/mt/78381837/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-