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

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

[Antony Pavlov]

At the moment linux v4.7-rc2 has AR9331 device tree support.
This patchseries syncs barebox AR9331 device tree stuff
with linux v4.7-rc2.

Antony Pavlov (6):
  clk: ar933x: fix copyright header
  MIPS: ath79: dts: sync clk stuff with linux v4.7-rc2
  MIPS: ath79: dts: sync uart stuff with linux v4.7-rc2
  MIPS: ath79: dts: sync spi stuff with linux v4.7-rc2
  MIPS: ath79: dts: tplink-mr3020.dts: sync with linux v4.7-rc2
  MIPS: ath79: dts: use ar9331.dtsi from linux v4.7-rc2

 arch/mips/dts/ar9331.dtsi              | 44 ----------------------------------
 arch/mips/dts/black-swift.dts          | 22 ++++++++++-------
 arch/mips/dts/tplink-mr3020.dts        | 26 ++++++++++++--------
 drivers/clk/clk-ar933x.c               | 37 +++++++---------------------
 drivers/spi/ath79_spi.c                |  2 +-
 include/dt-bindings/clock/ar933x-clk.h | 22 -----------------
 6 files changed, 39 insertions(+), 114 deletions(-)
 delete mode 100644 arch/mips/dts/ar9331.dtsi
 delete mode 100644 include/dt-bindings/clock/ar933x-clk.h

Cc: Yegor Yefremov <yegorslists@googlemail.com>

-- 
2.7.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 1/6] clk: ar933x: fix copyright header

[Antony Pavlov]

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 drivers/clk/clk-ar933x.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/clk-ar933x.c b/drivers/clk/clk-ar933x.c
index 373f8cc..ffbd4df 100644
--- a/drivers/clk/clk-ar933x.c
+++ b/drivers/clk/clk-ar933x.c
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2013 Lucas Stach <l.stach@pengutronix.de>
+ * Copyright (C) 2014 Antony Pavlov <antonynpavlov@gmail.com>
  *
- * Based on the Linux Tegra clock code
+ * Based on the Linux ath79 clock code
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
-- 
2.7.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

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

[Antony Pavlov]

Please see these linux kernel ath79 commits:

    commit 1e6a3492e7bb12aa8ee26050ff6829c39ebaa152
    Author: Antony Pavlov <antonynpavlov@gmail.com>
    Date:   Thu Mar 17 06:34:17 2016 +0300

        MIPS: dts: qca: introduce AR9331 devicetree

    commit 5ae5c452e3361612cd8182eb8bdfecf0ebf42288
    Author: Antony Pavlov <antonynpavlov@gmail.com>
    Date:   Thu Mar 17 06:34:18 2016 +0300

        MIPS: ath79: update devicetree clock support for AR9331

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/mips/dts/ar9331.dtsi              | 20 +++++++++++++++-----
 arch/mips/dts/black-swift.dts          |  4 ++++
 arch/mips/dts/tplink-mr3020.dts        |  4 ++++
 drivers/clk/clk-ar933x.c               | 33 ++++++---------------------------
 include/dt-bindings/clock/ar933x-clk.h | 22 ----------------------
 5 files changed, 29 insertions(+), 54 deletions(-)

diff --git a/arch/mips/dts/ar9331.dtsi b/arch/mips/dts/ar9331.dtsi
index efc0531..4d43087 100644
--- a/arch/mips/dts/ar9331.dtsi
+++ b/arch/mips/dts/ar9331.dtsi
@@ -1,8 +1,13 @@
-#include <dt-bindings/clock/ar933x-clk.h>
+#include <dt-bindings/clock/ath79-clk.h>
 
 #include "skeleton.dtsi"
 
 / {
+	ref: ref {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+	};
+
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -13,7 +18,8 @@
 		serial0: serial@18020000 {
 			compatible = "qca,ar9330-uart";
 			reg = <0x18020000 0x14>;
-			clocks = <&ar9331_clk AR933X_CLK_UART>;
+			clocks = <&ref>;
+			clock-names = "uart";
 			status = "disabled";
 		};
 
@@ -27,9 +33,13 @@
 			status = "disabled";
 		};
 
-		ar9331_clk: clock {
-			compatible = "qca,ar933x-clk";
-			reg = <0x18050000 0x48>;
+		pll: pll-controller@18050000 {
+			compatible = "qca,ar9330-pll";
+			reg = <0x18050000 0x100>;
+
+			clocks = <&ref>;
+			clock-names = "ref";
+
 			#clock-cells = <1>;
 		};
 
diff --git a/arch/mips/dts/black-swift.dts b/arch/mips/dts/black-swift.dts
index d19c381..aa0aeae 100644
--- a/arch/mips/dts/black-swift.dts
+++ b/arch/mips/dts/black-swift.dts
@@ -37,6 +37,10 @@
 	};
 };
 
+&ref {
+	clock-frequency = <25000000>;
+};
+
 &serial0 {
 	status = "okay";
 };
diff --git a/arch/mips/dts/tplink-mr3020.dts b/arch/mips/dts/tplink-mr3020.dts
index 804d290..a315713 100644
--- a/arch/mips/dts/tplink-mr3020.dts
+++ b/arch/mips/dts/tplink-mr3020.dts
@@ -44,6 +44,10 @@
 	};
 };
 
+&ref {
+	clock-frequency = <25000000>;
+};
+
 &serial0 {
 	status = "okay";
 };
diff --git a/drivers/clk/clk-ar933x.c b/drivers/clk/clk-ar933x.c
index ffbd4df..f5cfd39 100644
--- a/drivers/clk/clk-ar933x.c
+++ b/drivers/clk/clk-ar933x.c
@@ -24,9 +24,9 @@
 #include <linux/err.h>
 
 #include <mach/ath79.h>
-#include <dt-bindings/clock/ar933x-clk.h>
+#include <dt-bindings/clock/ath79-clk.h>
 
-static struct clk *clks[AR933X_CLK_END];
+static struct clk *clks[ATH79_CLK_END];
 static struct clk_onecell_data clk_data;
 
 struct clk_ar933x {
@@ -100,39 +100,19 @@ static struct clk *clk_ar933x(const char *name, const char *parent,
 	return &f->clk;
 }
 
-static void ar933x_ref_clk_init(void __iomem *base)
-{
-	u32 t;
-	unsigned long ref_rate;
-
-	t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
-	if (t & AR933X_BOOTSTRAP_REF_CLK_40)
-		ref_rate = (40 * 1000 * 1000);
-	else
-		ref_rate = (25 * 1000 * 1000);
-
-	clks[AR933X_CLK_REF] = clk_fixed("ref", ref_rate);
-}
-
 static void ar933x_pll_init(void __iomem *base)
 {
-	clks[AR933X_CLK_UART] = clk_fixed_factor("uart", "ref", 1, 1,
-			CLK_SET_RATE_PARENT);
-
-	clks[AR933X_CLK_CPU] = clk_ar933x("cpu", "ref", base,
+	clks[ATH79_CLK_CPU] = clk_ar933x("cpu", "ref", base,
 		AR933X_PLL_CLOCK_CTRL_CPU_DIV_SHIFT,
 		AR933X_PLL_CLOCK_CTRL_CPU_DIV_MASK);
 
-	clks[AR933X_CLK_DDR] = clk_ar933x("ddr", "ref", base,
+	clks[ATH79_CLK_DDR] = clk_ar933x("ddr", "ref", base,
 		AR933X_PLL_CLOCK_CTRL_DDR_DIV_SHIFT,
 		AR933X_PLL_CLOCK_CTRL_DDR_DIV_MASK);
 
-	clks[AR933X_CLK_AHB] = clk_ar933x("ahb", "ref", base,
+	clks[ATH79_CLK_AHB] = clk_ar933x("ahb", "ref", base,
 		AR933X_PLL_CLOCK_CTRL_AHB_DIV_SHIFT,
 		AR933X_PLL_CLOCK_CTRL_AHB_DIV_MASK);
-
-	clks[AR933X_CLK_WDT] = clk_fixed_factor("wdt", "ahb", 1, 1,
-			CLK_SET_RATE_PARENT);
 }
 
 static int ar933x_clk_probe(struct device_d *dev)
@@ -145,7 +125,6 @@ static int ar933x_clk_probe(struct device_d *dev)
 		return PTR_ERR(iores);
 	base = IOMEM(iores->start);
 
-	ar933x_ref_clk_init(base);
 	ar933x_pll_init(base);
 
 	clk_data.clks = clks;
@@ -158,7 +137,7 @@ static int ar933x_clk_probe(struct device_d *dev)
 
 static __maybe_unused struct of_device_id ar933x_clk_dt_ids[] = {
 	{
-		.compatible = "qca,ar933x-clk",
+		.compatible = "qca,ar9330-pll",
 	}, {
 		/* sentinel */
 	}
diff --git a/include/dt-bindings/clock/ar933x-clk.h b/include/dt-bindings/clock/ar933x-clk.h
deleted file mode 100644
index f048930..0000000
--- a/include/dt-bindings/clock/ar933x-clk.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2014 Antony Pavlov <antonynpavlov@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-
-#ifndef __DT_BINDINGS_AR933X_CLK_H
-#define __DT_BINDINGS_AR933X_CLK_H
-
-#define AR933X_CLK_REF		0
-#define AR933X_CLK_UART		1
-#define AR933X_CLK_CPU		2
-#define AR933X_CLK_DDR		3
-#define AR933X_CLK_AHB		4
-#define AR933X_CLK_WDT		5
-
-#define AR933X_CLK_END		6
-
-#endif /* __DT_BINDINGS_AR933X_CLK_H */
-- 
2.7.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

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

[Antony Pavlov]

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/mips/dts/ar9331.dtsi       | 2 +-
 arch/mips/dts/black-swift.dts   | 2 +-
 arch/mips/dts/tplink-mr3020.dts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/mips/dts/ar9331.dtsi b/arch/mips/dts/ar9331.dtsi
index 4d43087..05ef93f 100644
--- a/arch/mips/dts/ar9331.dtsi
+++ b/arch/mips/dts/ar9331.dtsi
@@ -15,7 +15,7 @@
 		device_type = "soc";
 		ranges;
 
-		serial0: serial@18020000 {
+		uart: uart@18020000 {
 			compatible = "qca,ar9330-uart";
 			reg = <0x18020000 0x14>;
 			clocks = <&ref>;
diff --git a/arch/mips/dts/black-swift.dts b/arch/mips/dts/black-swift.dts
index aa0aeae..6be228d 100644
--- a/arch/mips/dts/black-swift.dts
+++ b/arch/mips/dts/black-swift.dts
@@ -41,7 +41,7 @@
 	clock-frequency = <25000000>;
 };
 
-&serial0 {
+&uart {
 	status = "okay";
 };
 
diff --git a/arch/mips/dts/tplink-mr3020.dts b/arch/mips/dts/tplink-mr3020.dts
index a315713..f6799f1 100644
--- a/arch/mips/dts/tplink-mr3020.dts
+++ b/arch/mips/dts/tplink-mr3020.dts
@@ -48,7 +48,7 @@
 	clock-frequency = <25000000>;
 };
 
-&serial0 {
+&uart {
 	status = "okay";
 };
 
-- 
2.7.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

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

[Antony Pavlov]

Signed-off-by: Antony Pavlov <antonynpavlov@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@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


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 5/6] MIPS: ath79: dts: tplink-mr3020.dts: sync with linux v4.7-rc2

[Antony Pavlov]

Also sync black-swift.dts with tplink-mr3020.dts.

And also see this linux kernel commit:

    commit 2c3694d2e6ead3964aafb31e4e529de219ced92b
    Author: Antony Pavlov <antonynpavlov@gmail.com>
    Date:   Thu Mar 17 06:34:19 2016 +0300

        MIPS: ath79: add initial support for TP-LINK MR3020

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/mips/dts/black-swift.dts   | 16 +++++++++-------
 arch/mips/dts/tplink-mr3020.dts | 20 +++++++++++---------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/arch/mips/dts/black-swift.dts b/arch/mips/dts/black-swift.dts
index 6be228d..51e805a 100644
--- a/arch/mips/dts/black-swift.dts
+++ b/arch/mips/dts/black-swift.dts
@@ -1,21 +1,23 @@
 /dts-v1/;
 
-#include "ar9331.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
+#include "ar9331.dtsi"
+
 / {
 	model = "Black Swift";
 	compatible = "smartlx,black-swift";
 
-	memory {
-		reg = <0x00000000 0x4000000>;
-	};
-
 	aliases {
 		spiflash = &spiflash;
 	};
 
+	memory@0 {
+		device_type = "memory";
+		reg = <0x00000000 0x4000000>;
+	};
+
 	buttons {
 		compatible = "gpio-keys";
 
@@ -54,10 +56,10 @@
 	status = "okay";
 
 	/* Winbond W25Q128FV SPI flash */
-	spiflash: m25p80@0 {
+	spiflash: w25q128@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "m25p80";
+		compatible = "winbond,w25q128", "jedec,spi-nor";
 		spi-max-frequency = <104000000>;
 		reg = <0>;
 	};
diff --git a/arch/mips/dts/tplink-mr3020.dts b/arch/mips/dts/tplink-mr3020.dts
index f6799f1..a9c3f11 100644
--- a/arch/mips/dts/tplink-mr3020.dts
+++ b/arch/mips/dts/tplink-mr3020.dts
@@ -1,20 +1,22 @@
 /dts-v1/;
 
-#include "ar9331.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 
-/ {
-	model = "TP-LINK MR3020";
-	compatible = "tplink,mr3020";
+#include "ar9331.dtsi"
 
-	memory {
-		reg = <0x00000000 0x2000000>;
-	};
+/ {
+	model = "TP-Link TL-MR3020";
+	compatible = "tplink,tl-mr3020";
 
 	aliases {
 		spiflash = &spiflash;
 	};
 
+	memory@0 {
+		device_type = "memory";
+		reg = <0x00000000 0x2000000>;
+	};
+
 	leds {
 		compatible = "gpio-leds";
 
@@ -61,10 +63,10 @@
 	status = "okay";
 
 	/* Spansion S25FL032PIF SPI flash */
-	spiflash: m25p80@0 {
+	spiflash: s25sl032p@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "m25p80";
+		compatible = "spansion,s25sl032p", "jedec,spi-nor";
 		spi-max-frequency = <104000000>;
 		reg = <0>;
 	};
-- 
2.7.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 6/6] MIPS: ath79: dts: use ar9331.dtsi from linux v4.7-rc2

[Antony Pavlov]

Nowadays we have AR9331 devicetree from linux v4.7-rc2
in the file dts/src/mips/qca/ar9331.dtsi.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/mips/dts/ar9331.dtsi       | 59 -----------------------------------------
 arch/mips/dts/black-swift.dts   |  2 +-
 arch/mips/dts/tplink-mr3020.dts |  2 +-
 3 files changed, 2 insertions(+), 61 deletions(-)

diff --git a/arch/mips/dts/ar9331.dtsi b/arch/mips/dts/ar9331.dtsi
deleted file mode 100644
index 6e20bc5..0000000
--- a/arch/mips/dts/ar9331.dtsi
+++ /dev/null
@@ -1,59 +0,0 @@
-#include <dt-bindings/clock/ath79-clk.h>
-
-#include "skeleton.dtsi"
-
-/ {
-	ref: ref {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-	};
-
-	soc {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "simple-bus";
-		device_type = "soc";
-		ranges;
-
-		uart: uart@18020000 {
-			compatible = "qca,ar9330-uart";
-			reg = <0x18020000 0x14>;
-			clocks = <&ref>;
-			clock-names = "uart";
-			status = "disabled";
-		};
-
-		gpio: gpio@18040000 {
-			compatible = "qca,ar7100-gpio";
-			gpio-controller;
-			reg = <0x18040000 0x100>;
-			#gpio-cells = <2>;
-
-			ngpios = <30>;
-			status = "disabled";
-		};
-
-		pll: pll-controller@18050000 {
-			compatible = "qca,ar9330-pll";
-			reg = <0x18050000 0x100>;
-
-			clocks = <&ref>;
-			clock-names = "ref";
-
-			#clock-cells = <1>;
-		};
-
-		spi: spi@1f000000 {
-			compatible = "qca,ar7100-spi";
-			reg = <0x1f000000 0x01000000>;
-
-			clocks = <&pll ATH79_CLK_AHB>;
-			clock-names = "ahb";
-
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			status = "disabled";
-		};
-	};
-};
diff --git a/arch/mips/dts/black-swift.dts b/arch/mips/dts/black-swift.dts
index 51e805a..af817db 100644
--- a/arch/mips/dts/black-swift.dts
+++ b/arch/mips/dts/black-swift.dts
@@ -3,7 +3,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "ar9331.dtsi"
+#include <mips/qca/ar9331.dtsi>
 
 / {
 	model = "Black Swift";
diff --git a/arch/mips/dts/tplink-mr3020.dts b/arch/mips/dts/tplink-mr3020.dts
index a9c3f11..831fab8 100644
--- a/arch/mips/dts/tplink-mr3020.dts
+++ b/arch/mips/dts/tplink-mr3020.dts
@@ -2,7 +2,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 
-#include "ar9331.dtsi"
+#include <mips/qca/ar9331.dtsi>
 
 / {
 	model = "TP-Link TL-MR3020";
-- 
2.7.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

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

[Sascha Hauer]

On Tue, Jun 14, 2016 at 01:15:01AM +0300, Antony Pavlov wrote:
> At the moment linux v4.7-rc2 has AR9331 device tree support.
> This patchseries syncs barebox AR9331 device tree stuff
> with linux v4.7-rc2.
> 
> Antony Pavlov (6):
>   clk: ar933x: fix copyright header
>   MIPS: ath79: dts: sync clk stuff with linux v4.7-rc2
>   MIPS: ath79: dts: sync uart stuff with linux v4.7-rc2
>   MIPS: ath79: dts: sync spi stuff with linux v4.7-rc2
>   MIPS: ath79: dts: tplink-mr3020.dts: sync with linux v4.7-rc2
>   MIPS: ath79: dts: use ar9331.dtsi from linux v4.7-rc2

Applied, thanks

Sascha

> 
>  arch/mips/dts/ar9331.dtsi              | 44 ----------------------------------
>  arch/mips/dts/black-swift.dts          | 22 ++++++++++-------
>  arch/mips/dts/tplink-mr3020.dts        | 26 ++++++++++++--------
>  drivers/clk/clk-ar933x.c               | 37 +++++++---------------------
>  drivers/spi/ath79_spi.c                |  2 +-
>  include/dt-bindings/clock/ar933x-clk.h | 22 -----------------
>  6 files changed, 39 insertions(+), 114 deletions(-)
>  delete mode 100644 arch/mips/dts/ar9331.dtsi
>  delete mode 100644 include/dt-bindings/clock/ar933x-clk.h
> 
> Cc: Yegor Yefremov <yegorslists@googlemail.com>
> 
> -- 
> 2.7.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox