From: Caesar Wang Date: Thu, 19 May 2016 23:56:21 +0000 (+0800) Subject: UPSTREAM: spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver X-Git-Tag: firefly_0821_release~2435 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=da2473108edd63095da687ab8466d507f99d9f08;p=firefly-linux-kernel-4.4.55.git UPSTREAM: spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver 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 Signed-off-by: Mark Brown (cherry picked from git.kernel.org next/linux-next.git master commit aa29ea3df27dbba19ef59023d0f7330f2fdc58ae) --- diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index bfeb0d4c7ee0..c8c1ada0989d 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -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", }, { }, };