Merge tag 'for-linus-4.9-rc4-ofs-1' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / i2c / busses / i2c-meson.c

diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c
index 76e28980904f0b166971ffa09688f4302f067c5b..2aa61bbbd307b9aead3730e137bbf5b95e29a366 100644 (file)
--- a/drivers/i2c/busses/i2c-meson.c
+++ b/drivers/i2c/busses/i2c-meson.c
@@ -453,7 +453,6 @@ static int meson_i2c_probe(struct platform_device *pdev)
 
        ret = i2c_add_adapter(&i2c->adap);
        if (ret < 0) {
-               dev_err(&pdev->dev, "can't register adapter\n");
                clk_unprepare(i2c->clk);
                return ret;
        }
@@ -473,6 +472,7 @@ static int meson_i2c_remove(struct platform_device *pdev)
 
 static const struct of_device_id meson_i2c_match[] = {
        { .compatible = "amlogic,meson6-i2c" },
+       { .compatible = "amlogic,meson-gxbb-i2c" },
        { },
 };
 MODULE_DEVICE_TABLE(of, meson_i2c_match);