From f1772f47984aa1d690307a9b2e18abff5826d68f Mon Sep 17 00:00:00 2001 From: Antony Pavlov Date: Tue, 14 Jun 2016 01:15:05 +0300 Subject: [PATCH] MIPS: ath79: dts: sync spi stuff with linux v4.7-rc2 Signed-off-by: Antony Pavlov Signed-off-by: Sascha Hauer --- arch/mips/dts/ar9331.dtsi | 9 +++++++-- drivers/spi/ath79_spi.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/mips/dts/ar9331.dtsi b/arch/mips/dts/ar9331.dtsi index 05ef93f7b..6e20bc5bd 100644 --- a/arch/mips/dts/ar9331.dtsi +++ b/arch/mips/dts/ar9331.dtsi @@ -44,10 +44,15 @@ }; spi: spi@1f000000 { + compatible = "qca,ar7100-spi"; + reg = <0x1f000000 0x01000000>; + + clocks = <&pll ATH79_CLK_AHB>; + clock-names = "ahb"; + #address-cells = <1>; #size-cells = <0>; - compatible = "qca,ath79-spi"; - reg = <0x1f000000 0x01000000>; + status = "disabled"; }; }; diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c index 68b4c7c48..bb63d864a 100644 --- a/drivers/spi/ath79_spi.c +++ b/drivers/spi/ath79_spi.c @@ -289,7 +289,7 @@ static void ath79_spi_remove(struct device_d *dev) static __maybe_unused struct of_device_id ath79_spi_dt_ids[] = { { - .compatible = "qca,ath79-spi", + .compatible = "qca,ar7100-spi", }, { /* sentinel */