Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / drivers / acpi / acpi_apd.c

diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c
index d0aad06b38720555a7da9138d5bc7f307100ca43..1daf9c46df8e4b60cf7d128cc2487617bdbe08c7 100644 (file)
--- a/drivers/acpi/acpi_apd.c
+++ b/drivers/acpi/acpi_apd.c
@@ -62,8 +62,7 @@ static int acpi_apd_setup(struct apd_private_data *pdata)
        if (dev_desc->fixed_clk_rate) {
                clk = clk_register_fixed_rate(&pdata->adev->dev,
                                        dev_name(&pdata->adev->dev),
-                                       NULL, CLK_IS_ROOT,
-                                       dev_desc->fixed_clk_rate);
+                                       NULL, 0, dev_desc->fixed_clk_rate);
                clk_register_clkdev(clk, NULL, dev_name(&pdata->adev->dev));
                pdata->clk = clk;
        }
@@ -145,6 +144,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = {
        { "AMD0010", APD_ADDR(cz_i2c_desc) },
        { "AMDI0010", APD_ADDR(cz_i2c_desc) },
        { "AMD0020", APD_ADDR(cz_uart_desc) },
+       { "AMDI0020", APD_ADDR(cz_uart_desc) },
        { "AMD0030", },
 #endif
 #ifdef CONFIG_ARM64