From mboxrd@z Thu Jan 1 00:00:00 1970 From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth) Date: Sat, 26 Apr 2014 11:51:44 +0200 Subject: [PATCH v2 7/7] ARM: dts: berlin: add the pinctrl node and muxing setup for uarts In-Reply-To: <1398268276-9696-8-git-send-email-antoine.tenart@free-electrons.com> References: <1398268276-9696-1-git-send-email-antoine.tenart@free-electrons.com> <1398268276-9696-8-git-send-email-antoine.tenart@free-electrons.com> Message-ID: <535B81B0.8020302@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 04/23/2014 05:51 PM, Antoine T?nart wrote: > The uart0 pinmux configuration is in the dtsi because uart0 will always > use uart0-pmux to work, no other possibility. Same thing for uart1. > > Signed-off-by: Antoine T?nart > --- > arch/arm/boot/dts/berlin2.dtsi | 24 ++++++++++++++++++++++++ > arch/arm/boot/dts/berlin2cd.dtsi | 17 +++++++++++++++++ > arch/arm/boot/dts/berlin2q.dtsi | 24 ++++++++++++++++++++++++ > 3 files changed, 65 insertions(+) > > diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi > index 56a1af2f1052..9a13891c38a3 100644 > --- a/arch/arm/boot/dts/berlin2.dtsi > +++ b/arch/arm/boot/dts/berlin2.dtsi > @@ -176,6 +176,11 @@ > }; > }; > > + soc_pinctrl: pin-controller at ea0000 { > + compatible = "marvell,berlin2-soc-pinctrl"; > + reg = <0xea0000 0x4c>; > + }; > + > apb at fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -184,6 +189,21 @@ > ranges = <0 0xfc0000 0x10000>; > interrupt-parent = <&sic>; > > + sm_pinctrl: pin-controller at 0000 { > + compatible = "marvell,berlin2-sysmgr-pinctrl"; > + reg = <0x0000 0x44>; > + > + uart0_pmux: uart0-pmux { > + marvell,groups = "GSM4"; > + marvell,function = "uart0"; > + }; > + > + uart1_pmux: uart1-pmux { > + marvell,groups = "GSM5"; > + marvell,function = "uart1"; > + }; There is three uarts in BG2, we have the node already. Please add uart2_pmux: uart2-pmux { marvell,groups = "GSM3"; marvell,function = "uart2"; }; here and in the corresponding node: pinctrl-0 = <&uart2_pmux>; pinctrl-names = "default"; Sebastian > + }; > + > uart0: serial at 9000 { > compatible = "snps,dw-apb-uart"; > reg = <0x9000 0x100>; > @@ -191,6 +211,8 @@ > reg-io-width = <1>; > interrupts = <8>; > clocks = <&smclk>; > + pinctrl-0 = <&uart0_pmux>; > + pinctrl-names = "default"; > status = "disabled"; > }; > > @@ -201,6 +223,8 @@ > reg-io-width = <1>; > interrupts = <9>; > clocks = <&smclk>; > + pinctrl-0 = <&uart1_pmux>; > + pinctrl-names = "default"; > status = "disabled"; > }; > > diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi > index 094968c27533..a802d3fe5da6 100644 > --- a/arch/arm/boot/dts/berlin2cd.dtsi > +++ b/arch/arm/boot/dts/berlin2cd.dtsi > @@ -169,6 +169,11 @@ > }; > }; > > + soc_pinctrl: pin-controller at ae0000 { > + compatible = "marvell,berlin2cd-soc-pinctrl"; > + reg = <0xea0000 0x4c>; > + }; > + > apb at fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -177,6 +182,16 @@ > ranges = <0 0xfc0000 0x10000>; > interrupt-parent = <&sic>; > > + sm_pinctrl: pin-controller at 0000 { > + compatible = "marvell,berlin2cd-sysmgr-pinctrl"; > + reg = <0x0000 0x44>; > + > + uart0_pmux: uart0-pmux { > + marvell,groups = "G6"; > + marvell,function = "uart0"; > + }; > + }; > + > uart0: serial at 9000 { > compatible = "snps,dw-apb-uart"; > reg = <0x9000 0x100>; > @@ -184,6 +199,8 @@ > reg-io-width = <1>; > interrupts = <8>; > clocks = <&smclk>; > + pinctrl-0 = <&uart0_pmux>; > + pinctrl-names = "default"; > status = "disabled"; > }; > > diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi > index 07452a7483fa..734debbf072f 100644 > --- a/arch/arm/boot/dts/berlin2q.dtsi > +++ b/arch/arm/boot/dts/berlin2q.dtsi > @@ -183,6 +183,11 @@ > }; > }; > > + soc_pinctrl: pin-controller at ea0000 { > + compatible = "marvell,berlin2q-soc-pinctrl"; > + reg = <0xea0000 0x4c>; > + }; > + > apb at fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -198,6 +203,8 @@ > interrupts = <8>; > clocks = <&smclk>; > reg-shift = <2>; > + pinctrl-0 = <&uart0_pmux>; > + pinctrl-names = "default"; > status = "disabled"; > }; > > @@ -208,9 +215,26 @@ > interrupts = <9>; > clocks = <&smclk>; > reg-shift = <2>; > + pinctrl-0 = <&uart1_pmux>; > + pinctrl-names = "default"; > status = "disabled"; > }; > > + sm_pinctrl: pin-controller at d000 { > + compatible = "marvell,berlin2q-sysmgr-pinctrl"; > + reg = <0xd000 0x44>; > + > + uart0_pmux: uart0-pmux { > + marvell,groups = "GSM12"; > + marvell,function = "uart0"; > + }; > + > + uart1_pmux: uart1-pmux { > + marvell,groups = "GSM14"; > + marvell,function = "uart1"; > + }; > + }; > + > sic: interrupt-controller at e000 { > compatible = "snps,dw-apb-ictl"; > reg = <0xe000 0x30>; > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastian Hesselbarth Subject: Re: [PATCH v2 7/7] ARM: dts: berlin: add the pinctrl node and muxing setup for uarts Date: Sat, 26 Apr 2014 11:51:44 +0200 Message-ID: <535B81B0.8020302@gmail.com> References: <1398268276-9696-1-git-send-email-antoine.tenart@free-electrons.com> <1398268276-9696-8-git-send-email-antoine.tenart@free-electrons.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1398268276-9696-8-git-send-email-antoine.tenart@free-electrons.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: =?UTF-8?B?QW50b2luZSBUw6luYXJ0?= , linus.walleij@linaro.org Cc: zmxu@marvell.com, jszhang@marvell.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, alexandre.belloni@free-electrons.com, linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org T24gMDQvMjMvMjAxNCAwNTo1MSBQTSwgQW50b2luZSBUw6luYXJ0IHdyb3RlOgo+IFRoZSB1YXJ0 MCBwaW5tdXggY29uZmlndXJhdGlvbiBpcyBpbiB0aGUgZHRzaSBiZWNhdXNlIHVhcnQwIHdpbGwg YWx3YXlzCj4gdXNlIHVhcnQwLXBtdXggdG8gd29yaywgbm8gb3RoZXIgcG9zc2liaWxpdHkuIFNh bWUgdGhpbmcgZm9yIHVhcnQxLgo+IAo+IFNpZ25lZC1vZmYtYnk6IEFudG9pbmUgVMOpbmFydCA8 YW50b2luZS50ZW5hcnRAZnJlZS1lbGVjdHJvbnMuY29tPgo+IC0tLQo+ICBhcmNoL2FybS9ib290 L2R0cy9iZXJsaW4yLmR0c2kgICB8IDI0ICsrKysrKysrKysrKysrKysrKysrKysrKwo+ICBhcmNo L2FybS9ib290L2R0cy9iZXJsaW4yY2QuZHRzaSB8IDE3ICsrKysrKysrKysrKysrKysrCj4gIGFy Y2gvYXJtL2Jvb3QvZHRzL2JlcmxpbjJxLmR0c2kgIHwgMjQgKysrKysrKysrKysrKysrKysrKysr KysrCj4gIDMgZmlsZXMgY2hhbmdlZCwgNjUgaW5zZXJ0aW9ucygrKQo+IAo+IGRpZmYgLS1naXQg YS9hcmNoL2FybS9ib290L2R0cy9iZXJsaW4yLmR0c2kgYi9hcmNoL2FybS9ib290L2R0cy9iZXJs aW4yLmR0c2kKPiBpbmRleCA1NmExYWYyZjEwNTIuLjlhMTM4OTFjMzhhMyAxMDA2NDQKPiAtLS0g YS9hcmNoL2FybS9ib290L2R0cy9iZXJsaW4yLmR0c2kKPiArKysgYi9hcmNoL2FybS9ib290L2R0 cy9iZXJsaW4yLmR0c2kKPiBAQCAtMTc2LDYgKzE3NiwxMSBAQAo+ICAJCQl9Owo+ICAJCX07Cj4g IAo+ICsJCXNvY19waW5jdHJsOiBwaW4tY29udHJvbGxlckBlYTAwMDAgewo+ICsJCQljb21wYXRp YmxlID0gIm1hcnZlbGwsYmVybGluMi1zb2MtcGluY3RybCI7Cj4gKwkJCXJlZyA9IDwweGVhMDAw MCAweDRjPjsKPiArCQl9Owo+ICsKPiAgCQlhcGJAZmMwMDAwIHsKPiAgCQkJY29tcGF0aWJsZSA9 ICJzaW1wbGUtYnVzIjsKPiAgCQkJI2FkZHJlc3MtY2VsbHMgPSA8MT47Cj4gQEAgLTE4NCw2ICsx ODksMjEgQEAKPiAgCQkJcmFuZ2VzID0gPDAgMHhmYzAwMDAgMHgxMDAwMD47Cj4gIAkJCWludGVy cnVwdC1wYXJlbnQgPSA8JnNpYz47Cj4gIAo+ICsJCQlzbV9waW5jdHJsOiBwaW4tY29udHJvbGxl ckAwMDAwIHsKPiArCQkJCWNvbXBhdGlibGUgPSAibWFydmVsbCxiZXJsaW4yLXN5c21nci1waW5j dHJsIjsKPiArCQkJCXJlZyA9IDwweDAwMDAgMHg0ND47Cj4gKwo+ICsJCQkJdWFydDBfcG11eDog dWFydDAtcG11eCB7Cj4gKwkJCQkJbWFydmVsbCxncm91cHMgPSAiR1NNNCI7Cj4gKwkJCQkJbWFy dmVsbCxmdW5jdGlvbiA9ICJ1YXJ0MCI7Cj4gKwkJCQl9Owo+ICsKPiArCQkJCXVhcnQxX3BtdXg6 IHVhcnQxLXBtdXggewo+ICsJCQkJCW1hcnZlbGwsZ3JvdXBzID0gIkdTTTUiOwo+ICsJCQkJCW1h cnZlbGwsZnVuY3Rpb24gPSAidWFydDEiOwo+ICsJCQkJfTsKClRoZXJlIGlzIHRocmVlIHVhcnRz IGluIEJHMiwgd2UgaGF2ZSB0aGUgbm9kZSBhbHJlYWR5LiBQbGVhc2UgYWRkCgp1YXJ0Ml9wbXV4 OiB1YXJ0Mi1wbXV4IHsKCW1hcnZlbGwsZ3JvdXBzID0gIkdTTTMiOwoJbWFydmVsbCxmdW5jdGlv biA9ICJ1YXJ0MiI7Cn07CgpoZXJlIGFuZCBpbiB0aGUgY29ycmVzcG9uZGluZyBub2RlOgoKcGlu Y3RybC0wID0gPCZ1YXJ0Ml9wbXV4PjsKcGluY3RybC1uYW1lcyA9ICJkZWZhdWx0IjsKClNlYmFz dGlhbgoKPiArCQkJfTsKPiArCj4gIAkJCXVhcnQwOiBzZXJpYWxAOTAwMCB7Cj4gIAkJCQljb21w YXRpYmxlID0gInNucHMsZHctYXBiLXVhcnQiOwo+ICAJCQkJcmVnID0gPDB4OTAwMCAweDEwMD47 Cj4gQEAgLTE5MSw2ICsyMTEsOCBAQAo+ICAJCQkJcmVnLWlvLXdpZHRoID0gPDE+Owo+ICAJCQkJ aW50ZXJydXB0cyA9IDw4PjsKPiAgCQkJCWNsb2NrcyA9IDwmc21jbGs+Owo+ICsJCQkJcGluY3Ry bC0wID0gPCZ1YXJ0MF9wbXV4PjsKPiArCQkJCXBpbmN0cmwtbmFtZXMgPSAiZGVmYXVsdCI7Cj4g IAkJCQlzdGF0dXMgPSAiZGlzYWJsZWQiOwo+ICAJCQl9Owo+ICAKPiBAQCAtMjAxLDYgKzIyMyw4 IEBACj4gIAkJCQlyZWctaW8td2lkdGggPSA8MT47Cj4gIAkJCQlpbnRlcnJ1cHRzID0gPDk+Owo+ ICAJCQkJY2xvY2tzID0gPCZzbWNsaz47Cj4gKwkJCQlwaW5jdHJsLTAgPSA8JnVhcnQxX3BtdXg+ Owo+ICsJCQkJcGluY3RybC1uYW1lcyA9ICJkZWZhdWx0IjsKPiAgCQkJCXN0YXR1cyA9ICJkaXNh YmxlZCI7Cj4gIAkJCX07Cj4gIAo+IGRpZmYgLS1naXQgYS9hcmNoL2FybS9ib290L2R0cy9iZXJs aW4yY2QuZHRzaSBiL2FyY2gvYXJtL2Jvb3QvZHRzL2JlcmxpbjJjZC5kdHNpCj4gaW5kZXggMDk0 OTY4YzI3NTMzLi5hODAyZDNmZTVkYTYgMTAwNjQ0Cj4gLS0tIGEvYXJjaC9hcm0vYm9vdC9kdHMv YmVybGluMmNkLmR0c2kKPiArKysgYi9hcmNoL2FybS9ib290L2R0cy9iZXJsaW4yY2QuZHRzaQo+ IEBAIC0xNjksNiArMTY5LDExIEBACj4gIAkJCX07Cj4gIAkJfTsKPiAgCj4gKwkJc29jX3BpbmN0 cmw6IHBpbi1jb250cm9sbGVyQGFlMDAwMCB7Cj4gKwkJCWNvbXBhdGlibGUgPSAibWFydmVsbCxi ZXJsaW4yY2Qtc29jLXBpbmN0cmwiOwo+ICsJCQlyZWcgPSA8MHhlYTAwMDAgMHg0Yz47Cj4gKwkJ fTsKPiArCj4gIAkJYXBiQGZjMDAwMCB7Cj4gIAkJCWNvbXBhdGlibGUgPSAic2ltcGxlLWJ1cyI7 Cj4gIAkJCSNhZGRyZXNzLWNlbGxzID0gPDE+Owo+IEBAIC0xNzcsNiArMTgyLDE2IEBACj4gIAkJ CXJhbmdlcyA9IDwwIDB4ZmMwMDAwIDB4MTAwMDA+Owo+ICAJCQlpbnRlcnJ1cHQtcGFyZW50ID0g PCZzaWM+Owo+ICAKPiArCQkJc21fcGluY3RybDogcGluLWNvbnRyb2xsZXJAMDAwMCB7Cj4gKwkJ CQljb21wYXRpYmxlID0gIm1hcnZlbGwsYmVybGluMmNkLXN5c21nci1waW5jdHJsIjsKPiArCQkJ CXJlZyA9IDwweDAwMDAgMHg0ND47Cj4gKwo+ICsJCQkJdWFydDBfcG11eDogdWFydDAtcG11eCB7 Cj4gKwkJCQkJbWFydmVsbCxncm91cHMgPSAiRzYiOwo+ICsJCQkJCW1hcnZlbGwsZnVuY3Rpb24g PSAidWFydDAiOwo+ICsJCQkJfTsKPiArCQkJfTsKPiArCj4gIAkJCXVhcnQwOiBzZXJpYWxAOTAw MCB7Cj4gIAkJCQljb21wYXRpYmxlID0gInNucHMsZHctYXBiLXVhcnQiOwo+ICAJCQkJcmVnID0g PDB4OTAwMCAweDEwMD47Cj4gQEAgLTE4NCw2ICsxOTksOCBAQAo+ICAJCQkJcmVnLWlvLXdpZHRo ID0gPDE+Owo+ICAJCQkJaW50ZXJydXB0cyA9IDw4PjsKPiAgCQkJCWNsb2NrcyA9IDwmc21jbGs+ Owo+ICsJCQkJcGluY3RybC0wID0gPCZ1YXJ0MF9wbXV4PjsKPiArCQkJCXBpbmN0cmwtbmFtZXMg PSAiZGVmYXVsdCI7Cj4gIAkJCQlzdGF0dXMgPSAiZGlzYWJsZWQiOwo+ICAJCQl9Owo+ICAKPiBk aWZmIC0tZ2l0IGEvYXJjaC9hcm0vYm9vdC9kdHMvYmVybGluMnEuZHRzaSBiL2FyY2gvYXJtL2Jv b3QvZHRzL2JlcmxpbjJxLmR0c2kKPiBpbmRleCAwNzQ1MmE3NDgzZmEuLjczNGRlYmJmMDcyZiAx MDA2NDQKPiAtLS0gYS9hcmNoL2FybS9ib290L2R0cy9iZXJsaW4ycS5kdHNpCj4gKysrIGIvYXJj aC9hcm0vYm9vdC9kdHMvYmVybGluMnEuZHRzaQo+IEBAIC0xODMsNiArMTgzLDExIEBACj4gIAkJ CX07Cj4gIAkJfTsKPiAgCj4gKwkJc29jX3BpbmN0cmw6IHBpbi1jb250cm9sbGVyQGVhMDAwMCB7 Cj4gKwkJCWNvbXBhdGlibGUgPSAibWFydmVsbCxiZXJsaW4ycS1zb2MtcGluY3RybCI7Cj4gKwkJ CXJlZyA9IDwweGVhMDAwMCAweDRjPjsKPiArCQl9Owo+ICsKPiAgCQlhcGJAZmMwMDAwIHsKPiAg CQkJY29tcGF0aWJsZSA9ICJzaW1wbGUtYnVzIjsKPiAgCQkJI2FkZHJlc3MtY2VsbHMgPSA8MT47 Cj4gQEAgLTE5OCw2ICsyMDMsOCBAQAo+ICAJCQkJaW50ZXJydXB0cyA9IDw4PjsKPiAgCQkJCWNs b2NrcyA9IDwmc21jbGs+Owo+ICAJCQkJcmVnLXNoaWZ0ID0gPDI+Owo+ICsJCQkJcGluY3RybC0w ID0gPCZ1YXJ0MF9wbXV4PjsKPiArCQkJCXBpbmN0cmwtbmFtZXMgPSAiZGVmYXVsdCI7Cj4gIAkJ CQlzdGF0dXMgPSAiZGlzYWJsZWQiOwo+ICAJCQl9Owo+ICAKPiBAQCAtMjA4LDkgKzIxNSwyNiBA QAo+ICAJCQkJaW50ZXJydXB0cyA9IDw5PjsKPiAgCQkJCWNsb2NrcyA9IDwmc21jbGs+Owo+ICAJ CQkJcmVnLXNoaWZ0ID0gPDI+Owo+ICsJCQkJcGluY3RybC0wID0gPCZ1YXJ0MV9wbXV4PjsKPiAr CQkJCXBpbmN0cmwtbmFtZXMgPSAiZGVmYXVsdCI7Cj4gIAkJCQlzdGF0dXMgPSAiZGlzYWJsZWQi Owo+ICAJCQl9Owo+ICAKPiArCQkJc21fcGluY3RybDogcGluLWNvbnRyb2xsZXJAZDAwMCB7Cj4g KwkJCQljb21wYXRpYmxlID0gIm1hcnZlbGwsYmVybGluMnEtc3lzbWdyLXBpbmN0cmwiOwo+ICsJ CQkJcmVnID0gPDB4ZDAwMCAweDQ0PjsKPiArCj4gKwkJCQl1YXJ0MF9wbXV4OiB1YXJ0MC1wbXV4 IHsKPiArCQkJCQltYXJ2ZWxsLGdyb3VwcyA9ICJHU00xMiI7Cj4gKwkJCQkJbWFydmVsbCxmdW5j dGlvbiA9ICJ1YXJ0MCI7Cj4gKwkJCQl9Owo+ICsKPiArCQkJCXVhcnQxX3BtdXg6IHVhcnQxLXBt dXggewo+ICsJCQkJCW1hcnZlbGwsZ3JvdXBzID0gIkdTTTE0IjsKPiArCQkJCQltYXJ2ZWxsLGZ1 bmN0aW9uID0gInVhcnQxIjsKPiArCQkJCX07Cj4gKwkJCX07Cj4gKwo+ICAJCQlzaWM6IGludGVy cnVwdC1jb250cm9sbGVyQGUwMDAgewo+ICAJCQkJY29tcGF0aWJsZSA9ICJzbnBzLGR3LWFwYi1p Y3RsIjsKPiAgCQkJCXJlZyA9IDwweGUwMDAgMHgzMD47Cj4gCgoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxp c3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZy YWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751993AbaDZJvy (ORCPT ); Sat, 26 Apr 2014 05:51:54 -0400 Received: from mail-ee0-f45.google.com ([74.125.83.45]:50489 "EHLO mail-ee0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751680AbaDZJvu (ORCPT ); Sat, 26 Apr 2014 05:51:50 -0400 Message-ID: <535B81B0.8020302@gmail.com> Date: Sat, 26 Apr 2014 11:51:44 +0200 From: Sebastian Hesselbarth User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 To: =?UTF-8?B?QW50b2luZSBUw6luYXJ0?= , linus.walleij@linaro.org CC: alexandre.belloni@free-electrons.com, zmxu@marvell.com, jszhang@marvell.com, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 7/7] ARM: dts: berlin: add the pinctrl node and muxing setup for uarts References: <1398268276-9696-1-git-send-email-antoine.tenart@free-electrons.com> <1398268276-9696-8-git-send-email-antoine.tenart@free-electrons.com> In-Reply-To: <1398268276-9696-8-git-send-email-antoine.tenart@free-electrons.com> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 04/23/2014 05:51 PM, Antoine Ténart wrote: > The uart0 pinmux configuration is in the dtsi because uart0 will always > use uart0-pmux to work, no other possibility. Same thing for uart1. > > Signed-off-by: Antoine Ténart > --- > arch/arm/boot/dts/berlin2.dtsi | 24 ++++++++++++++++++++++++ > arch/arm/boot/dts/berlin2cd.dtsi | 17 +++++++++++++++++ > arch/arm/boot/dts/berlin2q.dtsi | 24 ++++++++++++++++++++++++ > 3 files changed, 65 insertions(+) > > diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi > index 56a1af2f1052..9a13891c38a3 100644 > --- a/arch/arm/boot/dts/berlin2.dtsi > +++ b/arch/arm/boot/dts/berlin2.dtsi > @@ -176,6 +176,11 @@ > }; > }; > > + soc_pinctrl: pin-controller@ea0000 { > + compatible = "marvell,berlin2-soc-pinctrl"; > + reg = <0xea0000 0x4c>; > + }; > + > apb@fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -184,6 +189,21 @@ > ranges = <0 0xfc0000 0x10000>; > interrupt-parent = <&sic>; > > + sm_pinctrl: pin-controller@0000 { > + compatible = "marvell,berlin2-sysmgr-pinctrl"; > + reg = <0x0000 0x44>; > + > + uart0_pmux: uart0-pmux { > + marvell,groups = "GSM4"; > + marvell,function = "uart0"; > + }; > + > + uart1_pmux: uart1-pmux { > + marvell,groups = "GSM5"; > + marvell,function = "uart1"; > + }; There is three uarts in BG2, we have the node already. Please add uart2_pmux: uart2-pmux { marvell,groups = "GSM3"; marvell,function = "uart2"; }; here and in the corresponding node: pinctrl-0 = <&uart2_pmux>; pinctrl-names = "default"; Sebastian > + }; > + > uart0: serial@9000 { > compatible = "snps,dw-apb-uart"; > reg = <0x9000 0x100>; > @@ -191,6 +211,8 @@ > reg-io-width = <1>; > interrupts = <8>; > clocks = <&smclk>; > + pinctrl-0 = <&uart0_pmux>; > + pinctrl-names = "default"; > status = "disabled"; > }; > > @@ -201,6 +223,8 @@ > reg-io-width = <1>; > interrupts = <9>; > clocks = <&smclk>; > + pinctrl-0 = <&uart1_pmux>; > + pinctrl-names = "default"; > status = "disabled"; > }; > > diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi > index 094968c27533..a802d3fe5da6 100644 > --- a/arch/arm/boot/dts/berlin2cd.dtsi > +++ b/arch/arm/boot/dts/berlin2cd.dtsi > @@ -169,6 +169,11 @@ > }; > }; > > + soc_pinctrl: pin-controller@ae0000 { > + compatible = "marvell,berlin2cd-soc-pinctrl"; > + reg = <0xea0000 0x4c>; > + }; > + > apb@fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -177,6 +182,16 @@ > ranges = <0 0xfc0000 0x10000>; > interrupt-parent = <&sic>; > > + sm_pinctrl: pin-controller@0000 { > + compatible = "marvell,berlin2cd-sysmgr-pinctrl"; > + reg = <0x0000 0x44>; > + > + uart0_pmux: uart0-pmux { > + marvell,groups = "G6"; > + marvell,function = "uart0"; > + }; > + }; > + > uart0: serial@9000 { > compatible = "snps,dw-apb-uart"; > reg = <0x9000 0x100>; > @@ -184,6 +199,8 @@ > reg-io-width = <1>; > interrupts = <8>; > clocks = <&smclk>; > + pinctrl-0 = <&uart0_pmux>; > + pinctrl-names = "default"; > status = "disabled"; > }; > > diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi > index 07452a7483fa..734debbf072f 100644 > --- a/arch/arm/boot/dts/berlin2q.dtsi > +++ b/arch/arm/boot/dts/berlin2q.dtsi > @@ -183,6 +183,11 @@ > }; > }; > > + soc_pinctrl: pin-controller@ea0000 { > + compatible = "marvell,berlin2q-soc-pinctrl"; > + reg = <0xea0000 0x4c>; > + }; > + > apb@fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -198,6 +203,8 @@ > interrupts = <8>; > clocks = <&smclk>; > reg-shift = <2>; > + pinctrl-0 = <&uart0_pmux>; > + pinctrl-names = "default"; > status = "disabled"; > }; > > @@ -208,9 +215,26 @@ > interrupts = <9>; > clocks = <&smclk>; > reg-shift = <2>; > + pinctrl-0 = <&uart1_pmux>; > + pinctrl-names = "default"; > status = "disabled"; > }; > > + sm_pinctrl: pin-controller@d000 { > + compatible = "marvell,berlin2q-sysmgr-pinctrl"; > + reg = <0xd000 0x44>; > + > + uart0_pmux: uart0-pmux { > + marvell,groups = "GSM12"; > + marvell,function = "uart0"; > + }; > + > + uart1_pmux: uart1-pmux { > + marvell,groups = "GSM14"; > + marvell,function = "uart1"; > + }; > + }; > + > sic: interrupt-controller@e000 { > compatible = "snps,dw-apb-ictl"; > reg = <0xe000 0x30>; >