diff options
author | Neil Armstrong <narmstrong@baylibre.com> | 2016-09-14 11:49:16 +0200 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2016-09-15 21:37:16 +0200 |
commit | d1050caea4f0a7abd72e5feb01ee175828a69fd4 (patch) | |
tree | afc3ec2b22d4024935d4ba7d6fd07a4719a9a1d0 | |
parent | 0b1c7716fd871eaa6cb4a9a1df5396302411255a (diff) | |
download | linux-stable-d1050caea4f0a7abd72e5feb01ee175828a69fd4.tar.gz linux-stable-d1050caea4f0a7abd72e5feb01ee175828a69fd4.tar.bz2 linux-stable-d1050caea4f0a7abd72e5feb01ee175828a69fd4.zip |
i2c: meson: add gxbb compatible string
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Acked-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
-rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-meson.txt | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-meson.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/i2c/i2c-meson.txt b/Documentation/devicetree/bindings/i2c/i2c-meson.txt index 682f9a6f766e..386357d1aab0 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-meson.txt +++ b/Documentation/devicetree/bindings/i2c/i2c-meson.txt @@ -1,7 +1,7 @@ Amlogic Meson I2C controller Required properties: - - compatible: must be "amlogic,meson6-i2c" + - compatible: must be "amlogic,meson6-i2c" or "amlogic,meson-gxbb-i2c" - reg: physical address and length of the device registers - interrupts: a single interrupt specifier - clocks: clock for the device diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c index 8570e6dbd0db..2aa61bbbd307 100644 --- a/drivers/i2c/busses/i2c-meson.c +++ b/drivers/i2c/busses/i2c-meson.c @@ -472,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); |