mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Neil Armstrong <narmstrong@baylibre.com>
To: khilman@baylibre.com
Cc: Jerome Brunet <jbrunet@baylibre.com>,
	linux-amlogic@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Neil Armstrong <narmstrong@baylibre.com>
Subject: [PATCH 3/9] arm64: dts: meson: g12a: add pinctrl support controllers
Date: Thu,  7 Mar 2019 16:13:35 +0100	[thread overview]
Message-ID: <20190307151342.7381-4-narmstrong@baylibre.com> (raw)
In-Reply-To: <20190307151342.7381-1-narmstrong@baylibre.com>

From: Jerome Brunet <jbrunet@baylibre.com>

Add the peripheral and always-on pinctrl controllers to the g12a soc.

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

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
index f2fc0f654150..c141cc7f6b09 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
@@ -91,6 +91,28 @@
 				#address-cells = <2>;
 				#size-cells = <2>;
 				ranges = <0x0 0x0 0x0 0x34400 0x0 0x400>;
+
+				periphs_pinctrl: pinctrl@40 {
+					compatible = "amlogic,meson-g12a-periphs-pinctrl";
+					#address-cells = <2>;
+					#size-cells = <2>;
+					ranges;
+
+					gpio: bank@40 {
+						reg = <0x0 0x40  0x0 0x4c>,
+						      <0x0 0xe8  0x0 0x18>,
+						      <0x0 0x120 0x0 0x18>,
+						      <0x0 0x2c0 0x0 0x40>,
+						      <0x0 0x340 0x0 0x1c>;
+						reg-names = "gpio",
+							    "pull",
+							    "pull-enable",
+							    "mux",
+							    "ds";
+						gpio-controller;
+						#gpio-cells = <2>;
+						gpio-ranges = <&periphs_pinctrl 0 0 86>;
+					};
 			};
 
 			hiu: bus@3c000 {
@@ -137,6 +159,25 @@
 					clocks = <&xtal>, <&clkc CLKID_CLK81>;
 					clock-names = "xtal", "mpeg-clk";
 				};
+
+				ao_pinctrl: pinctrl@14 {
+					compatible = "amlogic,meson-g12a-aobus-pinctrl";
+					#address-cells = <2>;
+					#size-cells = <2>;
+					ranges;
+
+					gpio_ao: bank@14 {
+						reg = <0x0 0x14 0x0 0x8>,
+						      <0x0 0x1c 0x0 0x8>,
+						      <0x0 0x24 0x0 0x14>;
+						reg-names = "mux",
+							    "ds",
+							    "gpio";
+						gpio-controller;
+						#gpio-cells = <2>;
+						gpio-ranges = <&ao_pinctrl 0 0 15>;
+					};
+				};
 			};
 
 			sec_AO: ao-secure@140 {
-- 
2.20.1


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

Thread overview: 27+ 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 ` Neil Armstrong [this message]
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 ` [PATCH 6/9] arm64: dts: meson: g12a: Add UART A, B & C nodes and pins Neil Armstrong
2019-03-12 21:02   ` 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

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-4-narmstrong@baylibre.com \
    --to=narmstrong@baylibre.com \
    --cc=jbrunet@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®