[PATCH 1/3] devicetree: Add bindings for the ATH79 reset controller

[PATCH 1/3] devicetree: Add bindings for the ATH79 reset controller

[Alban Bedel]

Signed-off-by: Alban Bedel <albeu@free.fr>
---
 .../devicetree/bindings/reset/ath79-reset.txt        | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/reset/ath79-reset.txt

diff --git a/Documentation/devicetree/bindings/reset/ath79-reset.txt b/Documentation/devicetree/bindings/reset/ath79-reset.txt
new file mode 100644
index 0000000..4c56330
--- /dev/null
+++ b/Documentation/devicetree/bindings/reset/ath79-reset.txt
@@ -0,0 +1,20 @@
+Binding for Qualcomm Atheros AR7xxx/AR9XXX reset controller
+
+Please also refer to reset.txt in this directory for common reset
+controller binding usage.
+
+Required Properties:
+- compatible: has to be "qca,<soctype>-reset", "qca,ar7100-reset"
+              as fallback
+- reg: Base address and size of the controllers memory area
+- #reset-cells : Specifies the number of cells needed to encode reset
+                 line, should be 1
+
+Example:
+
+	reset-controller@1806001c {
+		compatible = "qca,ar9132-reset", "qca,ar7100-reset";
+		reg = <0x1806001c 0x4>;
+
+		#reset-cells = <1>;
+	};
-- 
2.0.0

[PATCH 3/3] MIPS: ath79: Add the reset controller to the AR9132 dtsi

[Alban Bedel]

Signed-off-by: Alban Bedel <albeu@free.fr>
---
 arch/mips/boot/dts/qca/ar9132.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/mips/boot/dts/qca/ar9132.dtsi b/arch/mips/boot/dts/qca/ar9132.dtsi
index 4759cff..fb7734e 100644
--- a/arch/mips/boot/dts/qca/ar9132.dtsi
+++ b/arch/mips/boot/dts/qca/ar9132.dtsi
@@ -115,6 +115,14 @@
 				interrupt-controller;
 				#interrupt-cells = <1>;
 			};
+
+			rst: reset-controller@1806001c {
+				compatible = "qca,ar9132-reset",
+						"qca,ar7100-reset";
+				reg = <0x1806001c 0x4>;
+
+				#reset-cells = <1>;
+			};
 		};
 
 		spi@1f000000 {
-- 
2.0.0

Re: [PATCH 3/3] MIPS: ath79: Add the reset controller to the AR9132 dtsi

[Ralf Baechle]

On Mon, Aug 03, 2015 at 07:23:53PM +0200, Alban Bedel wrote:

Acked-by: Ralf Baechle <ralf@linux-mips.org>

Philipp,

Feel free to take this through the reset tree.  Or I can carry this in
the MIPS tree which is probably better for testing.  Just lemme know.

  Ralf

Re: [PATCH 3/3] MIPS: ath79: Add the reset controller to the AR9132 dtsi

[Philipp Zabel]

Am Montag, den 03.08.2015, 20:23 +0200 schrieb Ralf Baechle:
> On Mon, Aug 03, 2015 at 07:23:53PM +0200, Alban Bedel wrote:
> 
> Acked-by: Ralf Baechle <ralf@linux-mips.org>t
> 
> Philipp,
> 
> Feel free to take this through the reset tree.  Or I can carry this in
> the MIPS tree which is probably better for testing.  Just lemme know.
> 
>   Ralf

How about I put this on a branch for you to pull? That way I can already
resolve the (trivial) merge conflict in drivers/reset/Makefile

    git://git.pengutronix.de/git/pza/linux.git reset/ath79

regards
Philipp