[PATCH 4/6] MIPS: ath79: dts: sync spi stuff with linux v4.7-rc2

Antony Pavlov antonynpavlov at gmail.com
Mon Jun 13 15:15:05 PDT 2016


Signed-off-by: Antony Pavlov <antonynpavlov at gmail.com>
---
 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 05ef93f..6e20bc5 100644
--- a/arch/mips/dts/ar9331.dtsi
+++ b/arch/mips/dts/ar9331.dtsi
@@ -44,10 +44,15 @@
 		};
 
 		spi: spi at 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 68b4c7c..bb63d86 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 */
-- 
2.7.0




More information about the barebox mailing list