[PATCH 0/2] arm64: dts: meson: g12a: enable pinctrl

[PATCH 0/2] arm64: dts: meson: g12a: enable pinctrl

[Jerome Brunet]

This patchset enables pinctrl on the g12a and adds the necessary
pinctrl settings to the u200 uart

Kevin, please note that this patchset depends on the:
* dts bus fixup: [0]
* pinctrl region fixes [1].

[0]: https://lkml.kernel.org/r/20190116165236.8330-1-jbrunet@baylibre.com
[1]: https://lkml.kernel.org/r/20190117102315.1833-1-jbrunet@baylibre.com

Cheers.

Jerome Brunet (2):
  arm64: dts: meson: g12a: add pinctrl support controllers
  arm64: dts: meson: g12a: add uart_ao_a pinctrl

 .../boot/dts/amlogic/meson-g12a-u200.dts      |  2 +
 arch/arm64/boot/dts/amlogic/meson-g12a.dtsi   | 67 +++++++++++++++++++
 2 files changed, 69 insertions(+)

-- 
2.20.1


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

[PATCH 1/2] arm64: dts: meson: g12a: add pinctrl support controllers

[Jerome Brunet]

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

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

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
index 2aea5ba62fee..39ad2bbaa162 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
@@ -84,6 +84,29 @@
 			#address-cells = <2>;
 			#size-cells = <2>;
 			ranges = <0x0 0x0 0x0 0xff634400 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>;
+				};
+
+			};
 		};
 
 		hiu: bus@ff63c000 {
@@ -94,6 +117,32 @@
 			ranges = <0x0 0x0 0x0 0xff63c000 0x0 0x1400>;
 		};
 
+		rti: bus@ff800000 {
+			compatible = "simple-bus";
+			reg = <0x0 0xff800000 0x0 0x1000>;
+			#address-cells = <2>;
+			#size-cells = <2>;
+			ranges = <0x0 0x0 0x0 0xff800000 0x0 0x1000>;
+
+			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>;
+				};
+			};
+		};
+
 		uart_AO: serial@ff803000 {
 			compatible = "amlogic,meson-gx-uart",
 				     "amlogic,meson-ao-uart";
-- 
2.20.1


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

[PATCH 2/2] arm64: dts: meson: g12a: add uart_ao_a pinctrl

[Jerome Brunet]

Add the always on UART pinctrl setting to the g12a soc DT and
use it for the u200 reference design

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
 .../arm64/boot/dts/amlogic/meson-g12a-u200.dts |  2 ++
 arch/arm64/boot/dts/amlogic/meson-g12a.dtsi    | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
index c44dbdddf2cf..f2afd0bf3e28 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
@@ -25,5 +25,7 @@
 
 &uart_AO {
 	status = "okay";
+	pinctrl-0 = <&uart_ao_a_pins>;
+	pinctrl-names = "default";
 };
 
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
index 39ad2bbaa162..bd24de947a5b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
@@ -140,6 +140,24 @@
 					gpio-controller;
 					#gpio-cells = <2>;
 				};
+
+				uart_ao_a_pins: uart_a_ao {
+					mux {
+						groups = "uart_ao_a_tx",
+							 "uart_ao_a_rx";
+						function = "uart_ao_a";
+						bias-disable;
+					};
+				};
+
+				uart_ao_a_cts_rts_pins: uart_ao_a_cts_rts {
+					mux {
+						groups = "uart_ao_a_cts",
+							 "uart_ao_a_rts";
+						function = "uart_ao_a";
+						bias-disable;
+					};
+				};
 			};
 		};
 
-- 
2.20.1


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

Re: [PATCH 0/2] arm64: dts: meson: g12a: enable pinctrl

[Jerome Brunet]

On Thu, 2019-01-17 at 11:31 +0100, Jerome Brunet wrote:
> This patchset enables pinctrl on the g12a and adds the necessary
> pinctrl settings to the u200 uart
> 
> Kevin, please note that this patchset depends on the:
> * dts bus fixup: [0]
> * pinctrl region fixes [1].
> 
> [0]: https://lkml.kernel.org/r/20190116165236.8330-1-jbrunet@baylibre.com
> [1]: https://lkml.kernel.org/r/20190117102315.1833-1-jbrunet@baylibre.com
> 
> Cheers.

Hi Kevin,

Please ignore this series. It is missing gpio-ranges.
I'll add it in the v2

> 
> Jerome Brunet (2):
>   arm64: dts: meson: g12a: add pinctrl support controllers
>   arm64: dts: meson: g12a: add uart_ao_a pinctrl
> 
>  .../boot/dts/amlogic/meson-g12a-u200.dts      |  2 +
>  arch/arm64/boot/dts/amlogic/meson-g12a.dtsi   | 67 +++++++++++++++++++
>  2 files changed, 69 insertions(+)
> 



_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic