UPSTREAM: spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver
authorCaesar Wang <wxt@rock-chips.com>
Thu, 19 May 2016 23:56:21 +0000 (07:56 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Thu, 16 Jun 2016 13:12:09 +0000 (21:12 +0800)
In gerenal, the "rockchip,rockchip-spi" string will match the dts
that's great in spi driver. After all the most of rockchip SoCs ar
same spi controller.

Then, we should keep the old style to match the dts various.

Change-Id: Ib6e7b6e778e875f644a832a6c02d94bca8d60b48
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
(cherry picked from git.kernel.org next/linux-next.git master
 commit aa29ea3df27dbba19ef59023d0f7330f2fdc58ae)

drivers/spi/spi-rockchip.c

index bfeb0d4c7ee0ec923d3906b847c5be4250c7e02f..c8c1ada0989d36fb99cde4ba2ccd484dd8351e84 100644 (file)
@@ -881,9 +881,12 @@ static const struct dev_pm_ops rockchip_spi_pm = {
 };
 
 static const struct of_device_id rockchip_spi_dt_match[] = {
+       { .compatible = "rockchip,rk3036-spi", },
        { .compatible = "rockchip,rk3066-spi", },
        { .compatible = "rockchip,rk3188-spi", },
+       { .compatible = "rockchip,rk3228-spi", },
        { .compatible = "rockchip,rk3288-spi", },
+       { .compatible = "rockchip,rk3368-spi", },
        { .compatible = "rockchip,rk3399-spi", },
        { },
 };