mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Neil Armstrong <narmstrong@baylibre.com>
To: khilman@baylibre.com
Cc: Neil Armstrong <narmstrong@baylibre.com>,
	linux-amlogic@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 6/9] arm64: dts: meson: g12a: Add UART A, B & C nodes and pins
Date: Thu,  7 Mar 2019 16:13:38 +0100	[thread overview]
Message-ID: <20190307151342.7381-7-narmstrong@baylibre.com> (raw)
In-Reply-To: <20190307151342.7381-1-narmstrong@baylibre.com>

This patch adds the 2 UART nodes in the EE power domain with the corresponding
pinctrl nodes.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 82 +++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
index 2a700bb45d04..50e2cd36e08b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
@@ -113,6 +113,61 @@
 						#gpio-cells = <2>;
 						gpio-ranges = <&periphs_pinctrl 0 0 86>;
 					};
+
+					uart_a_pins: uart_a {
+						mux {
+							groups = "uart_a_tx",
+								 "uart_a_rx";
+							function = "uart_a";
+							bias-disable;
+						};
+					};
+
+					uart_a_cts_rts_pins: uart_a_cts_rts {
+						mux {
+							groups = "uart_a_cts",
+								 "uart_a_rts";
+							function = "uart_a";
+							bias-disable;
+						};
+					};
+
+					uart_ao_a_c_pins: uart_ao_a_c {
+						mux {
+							groups = "uart_ao_a_rx_c",
+								 "uart_ao_a_tx_c";
+							function = "uart_ao_a_c";
+							bias-disable;
+						};
+					};
+
+					uart_b_pins: uart_b {
+						mux {
+							groups = "uart_b_tx",
+								 "uart_b_rx";
+							function = "uart_b";
+							bias-disable;
+						};
+					};
+
+					uart_c_pins: uart_c {
+						mux {
+							groups = "uart_c_tx",
+								 "uart_c_rx";
+							function = "uart_c";
+							bias-disable;
+						};
+					};
+
+					uart_c_cts_rts_pins: uart_c_cts_rts {
+						mux {
+							groups = "uart_c_cts",
+								 "uart_c_rts";
+							function = "uart_c";
+							bias-disable;
+						};
+					};
+				};
 			};
 
 			hiu: bus@3c000 {
@@ -256,6 +311,33 @@
 				compatible = "amlogic,meson-g12a-clk-measure";
 				reg = <0x0 0x18000 0x0 0x10>;
 			};
+
+			uart_C: serial@22000 {
+				compatible = "amlogic,meson-gx-uart";
+				reg = <0x0 0x22000 0x0 0x18>;
+				interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
+				clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>;
+				clock-names = "xtal", "pclk", "baud";
+				status = "disabled";
+			};
+
+			uart_B: serial@23000 {
+				compatible = "amlogic,meson-gx-uart";
+				reg = <0x0 0x23000 0x0 0x18>;
+				interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
+				clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>;
+				clock-names = "xtal", "pclk", "baud";
+				status = "disabled";
+			};
+
+			uart_A: serial@24000 {
+				compatible = "amlogic,meson-gx-uart";
+				reg = <0x0 0x24000 0x0 0x18>;
+				interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
+				clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;
+				clock-names = "xtal", "pclk", "baud";
+				status = "disabled";
+			};
 		};
 	};
 
-- 
2.20.1


  parent reply	other threads:[~2019-03-07 15:14 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-07 15:13 [PATCH 0/9] arm64: dts: g12a: Add peripherals Neil Armstrong
2019-03-07 15:13 ` [PATCH 1/9] arm64: dts: meson: g12a: Add AO Clock + Reset Controller support Neil Armstrong
2019-03-15 21:07   ` Martin Blumenstingl
2019-03-16 14:26     ` Neil Armstrong
2019-03-07 15:13 ` [PATCH 2/9] arm64: dts: meson: g12a: Add AO Secure node Neil Armstrong
2019-03-15 21:09   ` Martin Blumenstingl
2019-03-07 15:13 ` [PATCH 3/9] arm64: dts: meson: g12a: add pinctrl support controllers Neil Armstrong
2019-03-07 15:13 ` [PATCH 4/9] arm64: dts: meson: g12a: add uart_ao_a pinctrl Neil Armstrong
2019-03-11  9:13   ` Neil Armstrong
2019-03-12 21:15     ` Kevin Hilman
2019-03-13  9:52       ` Neil Armstrong
2019-03-07 15:13 ` [PATCH 5/9] arm64: dts: meson: g12a: add reset controller Neil Armstrong
2019-03-15 21:31   ` Martin Blumenstingl
2019-03-16 14:31     ` Neil Armstrong
2019-03-16 22:09       ` Martin Blumenstingl
2019-03-07 15:13 ` Neil Armstrong [this message]
2019-03-12 21:02   ` [PATCH 6/9] arm64: dts: meson: g12a: Add UART A, B & C nodes and pins Kevin Hilman
2019-03-15 21:24   ` Martin Blumenstingl
2019-03-16 14:35     ` Neil Armstrong
2019-03-16 22:14       ` Martin Blumenstingl
2019-03-17 10:42         ` Neil Armstrong
2019-03-07 15:13 ` [PATCH 7/9] arm64: dts: meson: g12a: Add SAR ADC node Neil Armstrong
2019-03-15 21:16   ` Martin Blumenstingl
2019-03-07 15:13 ` [PATCH 8/9] arm64: dts: meson: g12a: Add G12A USB nodes Neil Armstrong
2019-03-15 21:40   ` Martin Blumenstingl
2019-03-16 14:37     ` Neil Armstrong
2019-03-07 15:13 ` [PATCH 9/9] arm64: dts: meson: g12a: Add mali-g31 gpu node Neil Armstrong
     [not found] <draft-7hd0mvu7pp.fsf@baylibre.com>
2019-03-12 21:11 ` [PATCH 6/9] arm64: dts: meson: g12a: Add UART A, B & C nodes and pins 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=20190307151342.7381-7-narmstrong@baylibre.com \
    --to=narmstrong@baylibre.com \
    --cc=khilman@baylibre.com \
    --cc=linux-amlogic@lists.infradead.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.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

all inboxes | Powered by JetHome®