Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next

[mirror_ubuntu-bionic-kernel.git] / drivers / acpi / acpi_apd.c

diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c
index 89e74d0a6c331a0c0f1215880d3f712597671de1..17a1eb14847ad6540dab29708aaaa528395c2eb1 100644 (file)
--- a/drivers/acpi/acpi_apd.c
+++ b/drivers/acpi/acpi_apd.c
@@ -77,6 +77,11 @@ static const struct apd_device_desc cz_i2c_desc = {
        .fixed_clk_rate = 133000000,
 };
 
+static const struct apd_device_desc wt_i2c_desc = {
+       .setup = acpi_apd_setup,
+       .fixed_clk_rate = 150000000,
+};
+
 static struct property_entry uart_properties[] = {
        PROPERTY_ENTRY_U32("reg-io-width", 4),
        PROPERTY_ENTRY_U32("reg-shift", 2),
@@ -156,7 +161,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = {
        /* Generic apd devices */
 #ifdef CONFIG_X86_AMD_PLATFORM_DEVICE
        { "AMD0010", APD_ADDR(cz_i2c_desc) },
-       { "AMDI0010", APD_ADDR(cz_i2c_desc) },
+       { "AMDI0010", APD_ADDR(wt_i2c_desc) },
        { "AMD0020", APD_ADDR(cz_uart_desc) },
        { "AMDI0020", APD_ADDR(cz_uart_desc) },
        { "AMD0030", },