linux-amlogic.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: khilman@baylibre.com (Kevin Hilman)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH 6/7] ARM64: dts: amlogic: gxbb: pinctrl: add/update UART
Date: Fri,  6 May 2016 07:21:25 -0700	[thread overview]
Message-ID: <1462544486-9516-7-git-send-email-khilman@baylibre.com> (raw)
In-Reply-To: <1462544486-9516-1-git-send-email-khilman@baylibre.com>

Add DT nodes for additional UARTs (UART B & C in EE domain) and add pins
for all EE domain UARTs.

Signed-off-by: Kevin Hilman <khilman@baylibre.com>
---
 .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts |  1 +
 arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi        | 42 +++++++++++++++++++++-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
index 41e1e669bc70..45778896bd3d 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -80,3 +80,4 @@
 	pinctrl-0 = <&uart_ao_a_pins>;
 	pinctrl-names = "default";
 };
+
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index 7b22b9d3b9d9..86c41b3798db 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -132,11 +132,27 @@
 
 			uart_A: serial at 84c0 {
 				compatible = "amlogic,meson-uart";
-				reg = <0x0 0x084c0 0x0 0x14>;
+				reg = <0x0 0x84c0 0x0 0x14>;
 				interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
 				clocks = <&xtal>;
 				status = "disabled";
 			};
+
+			uart_B: serial at 84dc {
+				compatible = "amlogic,meson-uart";
+				reg = <0x0 0x84dc 0x0 0x14>;
+				interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
+				clocks = <&xtal>;
+				status = "disabled";
+			};
+
+			uart_C: serial at 8700 {
+				compatible = "amlogic,meson-uart";
+				reg = <0x0 0x8700 0x0 0x14>;
+				interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
+				clocks = <&xtal>;
+				status = "disabled";
+			};
 		};
 
 		gic: interrupt-controller at c4301000 {
@@ -234,6 +250,30 @@
 						function = "sdcard";
 					};
 				};
+
+				uart_a_pins: uart_a {
+					mux {
+						groups = "uart_tx_a",
+						       "uart_rx_a";
+						function = "uart_a";
+					};
+				};
+
+				uart_b_pins: uart_b {
+					mux {
+						groups = "uart_tx_b",
+						       "uart_rx_b";
+						function = "uart_b";
+					};
+				};
+
+				uart_c_pins: uart_c {
+					mux {
+						groups = "uart_tx_c",
+						       "uart_rx_c";
+						function = "uart_c";
+					};
+				};
 			};
 		};
 
-- 
2.7.4

  parent reply	other threads:[~2016-05-06 14:21 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-06 14:21 [PATCH 0/7] pinctrl: meson: Add a bunch more pins Kevin Hilman
2016-05-06 14:21 ` [PATCH 1/7] pinctrl: amlogic: gxbb: add UART_AO_B, I2C Kevin Hilman
2016-05-06 14:21 ` [PATCH 2/7] pinctrl: amlogic: gxbb: add EMMC and SD pins Kevin Hilman
2016-05-06 14:21 ` [PATCH 3/7] pinctrl: amlogic: gxbb: add more UART pins Kevin Hilman
2016-05-06 14:21 ` [PATCH 4/7] pinctrl amlogic: gxbb: add ethernet pins Kevin Hilman
2016-05-06 14:21 ` [PATCH 5/7] ARM64: dts: amlogic: add pins for EMMC, SD Kevin Hilman
2016-05-06 14:21 ` Kevin Hilman [this message]
2016-05-06 14:21 ` [PATCH 7/7] ARM64: dts: amlogic: gxbb: add ethernet Kevin Hilman
2016-05-11  8:57 ` [PATCH 0/7] pinctrl: meson: Add a bunch more pins Linus Walleij
2016-05-11  9:18   ` Carlo Caione
2016-05-24  9:23 ` Linus Walleij
2016-05-24 16:14   ` Kevin Hilman
2016-05-24 18:29   ` Kevin Hilman
2016-05-24 21:45     ` Kevin Hilman
2016-05-26  9:28     ` Linus Walleij
2016-05-26 21:05       ` Kevin Hilman

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=1462544486-9516-7-git-send-email-khilman@baylibre.com \
    --to=khilman@baylibre.com \
    --cc=linus-amlogic@lists.infradead.org \
    /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).