Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1410496

Applied "spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver" to the spi tree

Show all headers | View raw

The patch

   spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver

has been applied to the spi tree at

   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From aa29ea3df27dbba19ef59023d0f7330f2fdc58ae Mon Sep 17 00:00:00 2001
From: Caesar Wang <wxt@rock-chips.com>
Date: Fri, 20 May 2016 07:56:21 +0800
Subject: [PATCH] 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.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 drivers/spi/spi-rockchip.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index cd89682065b9..bead5bfcbb0c 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -892,9 +892,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", },
 	{ },
 };
-- 
2.8.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/3] spi/rockchip: add rk3036/rk3228/rk3368 socs for spi document Caesar Wang <wxt@rock-chips.com> - 2016-05-19 17:50 +0200
  [PATCH 3/3] ARM: dts: rockchip: fixes the spi compatible for rk3036 Caesar Wang <wxt@rock-chips.com> - 2016-05-19 17:50 +0200
  [PATCH 2/3] spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver Caesar Wang <wxt@rock-chips.com> - 2016-05-19 17:50 +0200
    Applied "spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver" to the spi tree Mark Brown <broonie@kernel.org> - 2016-05-31 19:50 +0200
  Re: [PATCH 1/3] spi/rockchip: add rk3036/rk3228/rk3368 socs for spi document Heiko Stuebner <heiko@sntech.de> - 2016-05-19 18:00 +0200
    Re: [PATCH 1/3] spi/rockchip: add rk3036/rk3228/rk3368 socs for spi  document Caesar Wang <wxt@rock-chips.com> - 2016-05-19 18:20 +0200
      Re: [PATCH 1/3] spi/rockchip: add rk3036/rk3228/rk3368 socs for spi document Heiko Stuebner <heiko@sntech.de> - 2016-05-19 18:30 +0200

csiph-web