1 files changed, 24 insertions, 3 deletions

diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c
index 1daf9c46df8e..d58fbf7f04e6 100644
--- a/drivers/acpi/acpi_apd.c
+++ b/drivers/acpi/acpi_apd.c
@@ -42,6 +42,7 @@ struct apd_private_data;
 struct apd_device_desc {
         unsigned int flags;
         unsigned int fixed_clk_rate;
+        struct property_entry *properties;
         int (*setup)(struct apd_private_data *pdata);
 };
 
@@ -71,22 +72,35 @@ static int acpi_apd_setup(struct apd_private_data *pdata)
 }
 
 #ifdef CONFIG_X86_AMD_PLATFORM_DEVICE
-static struct apd_device_desc cz_i2c_desc = {
+static const struct apd_device_desc cz_i2c_desc = {
         .setup = acpi_apd_setup,
         .fixed_clk_rate = 133000000,
 };
 
-static struct apd_device_desc cz_uart_desc = {
+static struct property_entry uart_properties[] = {
+        PROPERTY_ENTRY_U32("reg-io-width", 4),
+        PROPERTY_ENTRY_U32("reg-shift", 2),
+        PROPERTY_ENTRY_BOOL("snps,uart-16550-compatible"),
+        { },
+};
+
+static const struct apd_device_desc cz_uart_desc = {
         .setup = acpi_apd_setup,
         .fixed_clk_rate = 48000000,
+        .properties = uart_properties,
 };
 #endif
 
 #ifdef CONFIG_ARM64
-static struct apd_device_desc xgene_i2c_desc = {
+static const struct apd_device_desc xgene_i2c_desc = {
         .setup = acpi_apd_setup,
         .fixed_clk_rate = 100000000,
 };
+
+static const struct apd_device_desc vulcan_spi_desc = {
+        .setup = acpi_apd_setup,
+        .fixed_clk_rate = 133000000,
+};
 #endif
 
 #else
@@ -125,6 +139,12 @@ static int acpi_apd_create_device(struct acpi_device *adev,
                         goto err_out;
         }
 
+        if (dev_desc->properties) {
+                ret = device_add_properties(&adev->dev, dev_desc->properties);
+                if (ret)
+                        goto err_out;
+        }
+
         adev->driver_data = pdata;
         pdev = acpi_create_platform_device(adev);
         if (!IS_ERR_OR_NULL(pdev))
@@ -149,6 +169,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = {
 #endif
 #ifdef CONFIG_ARM64
         { "APMC0D0F", APD_ADDR(xgene_i2c_desc) },
+        { "BRCM900D", APD_ADDR(vulcan_spi_desc) },
 #endif
         { }
 };