diff options
author | Antoine Tenart <antoine.tenart@free-electrons.com> | 2014-05-18 14:15:57 -0400 |
---|---|---|
committer | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2014-05-19 17:02:31 -0400 |
commit | 50cc24ffcdbce9d0904a4ed89ae14fdf76522de5 (patch) | |
tree | 8e585a12f2e279e6f1c376da05cbb4931a429b8c /arch/arm/boot/dts/berlin2.dtsi | |
parent | e9673a752897c2127e5aefd4663016bca817a0fe (diff) |
ARM: dts: berlin: add the pinctrl node and muxing setup for uarts
Add pinctrl bindings and system control nodes to what we currently know
about Berlin SoCs. Where available, also set default pinctrl property
for uarts, when there is only one pinmux option for it.
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Diffstat (limited to 'arch/arm/boot/dts/berlin2.dtsi')
-rw-r--r-- | arch/arm/boot/dts/berlin2.dtsi | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi index 591d4b8c1c2b..2477dac4d643 100644 --- a/arch/arm/boot/dts/berlin2.dtsi +++ b/arch/arm/boot/dts/berlin2.dtsi | |||
@@ -296,6 +296,8 @@ | |||
296 | reg-io-width = <1>; | 296 | reg-io-width = <1>; |
297 | interrupts = <8>; | 297 | interrupts = <8>; |
298 | clocks = <&refclk>; | 298 | clocks = <&refclk>; |
299 | pinctrl-0 = <&uart0_pmux>; | ||
300 | pinctrl-names = "default"; | ||
299 | status = "disabled"; | 301 | status = "disabled"; |
300 | }; | 302 | }; |
301 | 303 | ||
@@ -306,6 +308,8 @@ | |||
306 | reg-io-width = <1>; | 308 | reg-io-width = <1>; |
307 | interrupts = <9>; | 309 | interrupts = <9>; |
308 | clocks = <&refclk>; | 310 | clocks = <&refclk>; |
311 | pinctrl-0 = <&uart1_pmux>; | ||
312 | pinctrl-names = "default"; | ||
309 | status = "disabled"; | 313 | status = "disabled"; |
310 | }; | 314 | }; |
311 | 315 | ||
@@ -316,9 +320,31 @@ | |||
316 | reg-io-width = <1>; | 320 | reg-io-width = <1>; |
317 | interrupts = <10>; | 321 | interrupts = <10>; |
318 | clocks = <&refclk>; | 322 | clocks = <&refclk>; |
323 | pinctrl-0 = <&uart2_pmux>; | ||
324 | pinctrl-names = "default"; | ||
319 | status = "disabled"; | 325 | status = "disabled"; |
320 | }; | 326 | }; |
321 | 327 | ||
328 | sysctrl: system-controller@d000 { | ||
329 | compatible = "marvell,berlin2-system-ctrl"; | ||
330 | reg = <0xd000 0x100>; | ||
331 | |||
332 | uart0_pmux: uart0-pmux { | ||
333 | groups = "GSM4"; | ||
334 | function = "uart0"; | ||
335 | }; | ||
336 | |||
337 | uart1_pmux: uart1-pmux { | ||
338 | groups = "GSM5"; | ||
339 | function = "uart1"; | ||
340 | }; | ||
341 | |||
342 | uart2_pmux: uart2-pmux { | ||
343 | groups = "GSM3"; | ||
344 | function = "uart2"; | ||
345 | }; | ||
346 | }; | ||
347 | |||
322 | sic: interrupt-controller@e000 { | 348 | sic: interrupt-controller@e000 { |
323 | compatible = "snps,dw-apb-ictl"; | 349 | compatible = "snps,dw-apb-ictl"; |
324 | reg = <0xe000 0x400>; | 350 | reg = <0xe000 0x400>; |