2015-08-03 17:25:29

by Alban

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

Signed-off-by: Alban Bedel <[email protected]>
---
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


2015-08-03 18:23:46

by Ralf Baechle

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

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

Acked-by: Ralf Baechle <[email protected]>

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

2015-08-04 08:48:06

by Philipp Zabel

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

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 <[email protected]>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