1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [platforms: PATCH] 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)
There is a newer version of this series
Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 60 ++++++++++++++++++++
1 file changed, 60 insertions(+)
[edk2-devel] [platforms: PATCH] 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>
---
 Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 60 ++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
index 7e9e361988..5f910fa814 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
@@ -86,6 +86,66 @@ 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  },
+                      Package () { "compatible", "marvell,armada-ap806-sdhci" },
+                }
+            })
+        }
+
+        Device (MMC1)
+        {
+            Name (_HID, "MRVL0002")     // _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 (#67570): https://edk2.groups.io/g/devel/message/67570
Mute This Topic: https://groups.io/mt/78247574/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [platforms: PATCH] SolidRun/Armada80x0McBin: Introduce SD/MMC ACPI description
Posted by Ard Biesheuvel 3 years, 5 months ago 
Hello Marcin,

On 11/14/20 10:21 AM, Marcin Wojtas wrote:
> 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>
> ---
>   Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 60 ++++++++++++++++++++
>   1 file changed, 60 insertions(+)
> 
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> index 7e9e361988..5f910fa814 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> @@ -86,6 +86,66 @@ 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  },
> +                      Package () { "compatible", "marvell,armada-ap806-sdhci" },

Please use either a dedicated ACPI _HID, or use PRP0001+compatible to 
match the device (and the former is strongly preferred).


> +                }
> +            })
> +        }
> +
> +        Device (MMC1)
> +        {
> +            Name (_HID, "MRVL0002")     // _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
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#67571): https://edk2.groups.io/g/devel/message/67571
Mute This Topic: https://groups.io/mt/78247574/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [platforms: PATCH] SolidRun/Armada80x0McBin: Introduce SD/MMC ACPI description
Posted by Marcin Wojtas 3 years, 5 months ago 
Hi Ard,


sob., 14 lis 2020 o 14:19 Ard Biesheuvel <ard.biesheuvel@arm.com> napisał(a):
>
> Hello Marcin,
>
> On 11/14/20 10:21 AM, Marcin Wojtas wrote:
> > 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>
> > ---
> >   Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 60 ++++++++++++++++++++
> >   1 file changed, 60 insertions(+)
> >
> > diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> > index 7e9e361988..5f910fa814 100644
> > --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> > +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> > @@ -86,6 +86,66 @@ 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  },
> > +                      Package () { "compatible", "marvell,armada-ap806-sdhci" },
>
> Please use either a dedicated ACPI _HID, or use PRP0001+compatible to
> match the device (and the former is strongly preferred).

I'll go with the dedicated _HID and differentiate the silicon variant
with acpi_match_data.

Thanks,
Marcin

>
>
> > +                }
> > +            })
> > +        }
> > +
> > +        Device (MMC1)
> > +        {
> > +            Name (_HID, "MRVL0002")     // _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
> >
>
>
>
> 
>
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#67678): https://edk2.groups.io/g/devel/message/67678
Mute This Topic: https://groups.io/mt/78247574/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.