devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Álvaro Fernández Rojas" <noltari@gmail.com>
To: linux-mips@linux-mips.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, f.fainelli@gmail.com,
	jogo@openwrt.org, cernekee@gmail.com, simon@fire.lp0.eu
Cc: "Álvaro Fernández Rojas" <noltari@gmail.com>
Subject: [PATCH 3/3] MIPS: BMIPS: improve BCM6368 device tree
Date: Sun,  3 Apr 2016 14:13:05 +0200	[thread overview]
Message-ID: <1459685585-11747-3-git-send-email-noltari@gmail.com> (raw)
In-Reply-To: <1459685585-11747-1-git-send-email-noltari@gmail.com>

- Remove unneeded leds0 alias.
- Switch to bcm6345-l1-intc interrupt controller.
- Use interrupt-controller instead of periph_intc.
- Add uart1 node.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 arch/mips/boot/dts/brcm/bcm6368.dtsi | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/arch/mips/boot/dts/brcm/bcm6368.dtsi b/arch/mips/boot/dts/brcm/bcm6368.dtsi
index 1f6b9b5..75aba97 100644
--- a/arch/mips/boot/dts/brcm/bcm6368.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm6368.dtsi
@@ -32,8 +32,8 @@
 	};
 
 	aliases {
-		leds0 = &leds0;
 		uart0 = &uart0;
+		uart1 = &uart1;
 	};
 
 	cpu_intc: cpu_intc {
@@ -64,16 +64,16 @@
 			mask = <0x1>;
 		};
 
-		periph_intc: periph_intc@10000020 {
-			compatible = "brcm,bcm3380-l2-intc";
-			reg = <0x10000024 0x4 0x1000002c 0x4>,
-			      <0x10000020 0x4 0x10000028 0x4>;
+		periph_intc: interrupt-controller@10000020 {
+			compatible = "brcm,bcm6345-l1-intc";
+			reg = <0x10000020 0x10>,
+			      <0x10000030 0x10>;
 
 			interrupt-controller;
 			#interrupt-cells = <1>;
 
 			interrupt-parent = <&cpu_intc>;
-			interrupts = <2>;
+			interrupts = <2>, <3>;
 		};
 
 		leds0: led-controller@100000d0 {
@@ -93,6 +93,15 @@
 			status = "disabled";
 		};
 
+		uart1: serial@10000120 {
+			compatible = "brcm,bcm6345-uart";
+			reg = <0x10000120 0x18>;
+			interrupt-parent = <&periph_intc>;
+			interrupts = <3>;
+			clocks = <&periph_clk>;
+			status = "disabled";
+		};
+
 		ehci0: usb@10001500 {
 			compatible = "brcm,bcm6368-ehci", "generic-ehci";
 			reg = <0x10001500 0x100>;
-- 
2.1.4

  parent reply	other threads:[~2016-04-03 12:13 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-03 12:13 [PATCH 1/3] MIPS: BMIPS: improve BCM6328 device tree Álvaro Fernández Rojas
2016-04-03 12:13 ` [PATCH 2/3] MIPS: BMIPS: improve BCM6358 " Álvaro Fernández Rojas
     [not found]   ` <1459685585-11747-2-git-send-email-noltari-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-04-03 23:10     ` Ralf Baechle
2016-04-04  8:13       ` Álvaro Fernández Rojas
2016-04-03 12:13 ` Álvaro Fernández Rojas [this message]
     [not found] ` <1459685585-11747-1-git-send-email-noltari-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-04-09 10:57   ` [PATCH 1/2] MIPS: BMIPS: improve BCM6328 " Álvaro Fernández Rojas
2016-04-09 10:57     ` [PATCH 2/2] MIPS: BMIPS: improve BCM6368 " Álvaro Fernández Rojas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1459685585-11747-3-git-send-email-noltari@gmail.com \
    --to=noltari@gmail.com \
    --cc=cernekee@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=f.fainelli@gmail.com \
    --cc=jogo@openwrt.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@linux-mips.org \
    --cc=simon@fire.lp0.eu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).