i2c: Remove Netlogic XLP variant

Netlogic XLP was removed in commit 95b8a5e0111a ("MIPS: Remove NETLOGIC
support"). With those gone, the single platform left to support is
Cavium ThunderX2. Remove the Netlogic variant and DT support.

For simplicity, the existing kconfig name is retained.

Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by George Cherian <gcherian@marvell.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index dce3928..e9dd164 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -1170,11 +1170,11 @@ config I2C_XLR
          will be called i2c-xlr.
 
 config I2C_XLP9XX
-       tristate "XLP9XX I2C support"
-       depends on CPU_XLP || ARCH_THUNDER2 || COMPILE_TEST
+       tristate "Cavium ThunderX2 I2C support"
+       depends on ARCH_THUNDER2 || COMPILE_TEST
        help
          This driver enables support for the on-chip I2C interface of
-         the Broadcom XLP9xx/XLP5xx MIPS and Vulcan ARM64 processors.
+         the Cavium ThunderX2 processors. (Originally on Netlogic XLP SoCs.)
 
          This driver can also be built as a module.  If so, the module will
          be called i2c-xlp9xx.

diff --git a/drivers/i2c/busses/i2c-xlp9xx.c b/drivers/i2c/busses/i2c-xlp9xx.c
index 6d24dc3..4e3b11c 100644 (file)
--- a/drivers/i2c/busses/i2c-xlp9xx.c
+++ b/drivers/i2c/busses/i2c-xlp9xx.c
@@ -572,12 +572,6 @@ static int xlp9xx_i2c_remove(struct platform_device *pdev)
        return 0;
 }
 
-static const struct of_device_id xlp9xx_i2c_of_match[] = {
-       { .compatible = "netlogic,xlp980-i2c", },
-       { /* sentinel */ },
-};
-MODULE_DEVICE_TABLE(of, xlp9xx_i2c_of_match);
-
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id xlp9xx_i2c_acpi_ids[] = {
        {"BRCM9007", 0},
@@ -592,7 +586,6 @@ static struct platform_driver xlp9xx_i2c_driver = {
        .remove = xlp9xx_i2c_remove,
        .driver = {
                .name = "xlp9xx-i2c",
-               .of_match_table = xlp9xx_i2c_of_match,
                .acpi_match_table = ACPI_PTR(xlp9xx_i2c_acpi_ids),
        },
 };