summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Yan <andy.yan@rock-chips.com>2017-08-14 16:34:22 +0800
committerTao Huang <huangtao@rock-chips.com>2018-09-30 14:46:30 +0800
commit716209b527649f111cefef35a69b40dd7199282b (patch)
treed4fcaabdf5c2572dafc7d0846d93a11b5991f079
parent9d0b8028e4120bb0effdd17a5695d5c21d43f14e (diff)
UPSTREAM: spi: rockchip: add compatible string for rv1108 spi
The spi on rv1108 is the same as other rockchip based socs, add compatible string for it. Signed-off-by: Andy Yan <andy.yan@rock-chips.com> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com> (cherry picked from commit 6b860e69e873be247d19174ab6b24d0b5741bf8c) Change-Id: Ia89f3d1392ae27ce36352d5601255a0aca9d1f8f
-rw-r--r--Documentation/devicetree/bindings/spi/spi-rockchip.txt1
-rw-r--r--drivers/spi/spi-rockchip.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/spi/spi-rockchip.txt b/Documentation/devicetree/bindings/spi/spi-rockchip.txt
index 1e278bacc101..c4ecc61f3632 100644
--- a/Documentation/devicetree/bindings/spi/spi-rockchip.txt
+++ b/Documentation/devicetree/bindings/spi/spi-rockchip.txt
@@ -7,6 +7,7 @@ Required Properties:
- compatible: should be one of the following.
"rockchip,px30-spi" for px30 SoCs.
+ "rockchip,rv1108-spi" for rv1108 SoCs.
"rockchip,rk3036-spi" for rk3036 SoCs.
"rockchip,rk3066-spi" for rk3066 SoCs.
"rockchip,rk3188-spi" for rk3188 SoCs.
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 94ce14e9d3f3..792d842e99e9 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -918,6 +918,7 @@ static const struct dev_pm_ops rockchip_spi_pm = {
static const struct of_device_id rockchip_spi_dt_match[] = {
{ .compatible = "rockchip,px30-spi", },
+ { .compatible = "rockchip,rv1108-spi", },
{ .compatible = "rockchip,rk3036-spi", },
{ .compatible = "rockchip,rk3066-spi", },
{ .compatible = "rockchip,rk3188-spi", },