* [PATCH 0/3] ARM: UniPhier: update DTS and MAINTAINERS @ 2015-07-25 7:23 ` Masahiro Yamada 0 siblings, 0 replies; 9+ messages in thread From: Masahiro Yamada @ 2015-07-25 7:23 UTC (permalink / raw) To: linux-arm-kernel Hi Arnd and Olof, The pinctrl drivers for UniPhier SoCs were accepted by Linus Walleij into the linux-pinctrl subsystem. Here is a small series I'd like you to merge into the ARM-SOC subsystem to use my pinctrl drivers. Masahiro Yamada (3): ARM: dts: UniPhier: add pinctrl device nodes ARM: dts: UniPhier: add UART and USB pinmux nodes MAINTAINERS: add entries for UniPhier device trees and drivers MAINTAINERS | 3 ++ arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 22 +++++++++ arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 20 ++++++++ arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 22 +++++++++ arch/arm/boot/dts/uniphier-pinctrl.dtsi | 85 ++++++++++++++++++++++++++++++++ 5 files changed, 152 insertions(+) create mode 100644 arch/arm/boot/dts/uniphier-pinctrl.dtsi -- 1.9.1 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 0/3] ARM: UniPhier: update DTS and MAINTAINERS @ 2015-07-25 7:23 ` Masahiro Yamada 0 siblings, 0 replies; 9+ messages in thread From: Masahiro Yamada @ 2015-07-25 7:23 UTC (permalink / raw) To: arm Cc: Masahiro Yamada, Russell King, Arnd Bergmann, Joe Perches, devicetree, Mauro Carvalho Chehab, Greg KH, Kumar Gala, linux-kernel, Ian Campbell, Rob Herring, Andrew Morton, Pawel Moll, Jiri Slaby, Mark Rutland, linux-arm-kernel Hi Arnd and Olof, The pinctrl drivers for UniPhier SoCs were accepted by Linus Walleij into the linux-pinctrl subsystem. Here is a small series I'd like you to merge into the ARM-SOC subsystem to use my pinctrl drivers. Masahiro Yamada (3): ARM: dts: UniPhier: add pinctrl device nodes ARM: dts: UniPhier: add UART and USB pinmux nodes MAINTAINERS: add entries for UniPhier device trees and drivers MAINTAINERS | 3 ++ arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 22 +++++++++ arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 20 ++++++++ arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 22 +++++++++ arch/arm/boot/dts/uniphier-pinctrl.dtsi | 85 ++++++++++++++++++++++++++++++++ 5 files changed, 152 insertions(+) create mode 100644 arch/arm/boot/dts/uniphier-pinctrl.dtsi -- 1.9.1 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/3] ARM: dts: UniPhier: add pinctrl device nodes 2015-07-25 7:23 ` Masahiro Yamada @ 2015-07-25 7:23 ` Masahiro Yamada -1 siblings, 0 replies; 9+ messages in thread From: Masahiro Yamada @ 2015-07-25 7:23 UTC (permalink / raw) To: linux-arm-kernel Add the pinctrol device nodes for UniPhier PH1-LD4, PH1-Pro4, and PH1-sLD8. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 6 ++++++ arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 6 ++++++ arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi b/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi index 600a473..518eab7 100644 --- a/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi +++ b/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi @@ -148,6 +148,12 @@ interrupts = <0 82 4>; }; + pinctrl: pinctrl at 5f801000 { + compatible = "socionext,ph1-ld4-pinctrl", + "syscon"; + reg = <0x5f801000 0xe00>; + }; + timer at 60000200 { compatible = "arm,cortex-a9-global-timer"; reg = <0x60000200 0x20>; diff --git a/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi b/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi index 4598bb2..789bd48 100644 --- a/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi +++ b/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi @@ -148,6 +148,12 @@ interrupts = <0 81 4>; }; + pinctrl: pinctrl at 5f801000 { + compatible = "socionext,ph1-pro4-pinctrl", + "syscon"; + reg = <0x5f801000 0xe00>; + }; + timer at 60000200 { compatible = "arm,cortex-a9-global-timer"; reg = <0x60000200 0x20>; diff --git a/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi b/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi index 3255157..8dff3c4 100644 --- a/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi +++ b/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi @@ -148,6 +148,12 @@ interrupts = <0 82 4>; }; + pinctrl: pinctrl at 5f801000 { + compatible = "socionext,ph1-sld8-pinctrl", + "syscon"; + reg = <0x5f801000 0xe00>; + }; + timer at 60000200 { compatible = "arm,cortex-a9-global-timer"; reg = <0x60000200 0x20>; -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 1/3] ARM: dts: UniPhier: add pinctrl device nodes @ 2015-07-25 7:23 ` Masahiro Yamada 0 siblings, 0 replies; 9+ messages in thread From: Masahiro Yamada @ 2015-07-25 7:23 UTC (permalink / raw) To: arm Cc: Masahiro Yamada, Russell King, devicetree, Kumar Gala, linux-kernel, Ian Campbell, Rob Herring, Pawel Moll, Mark Rutland, linux-arm-kernel Add the pinctrol device nodes for UniPhier PH1-LD4, PH1-Pro4, and PH1-sLD8. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 6 ++++++ arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 6 ++++++ arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi b/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi index 600a473..518eab7 100644 --- a/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi +++ b/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi @@ -148,6 +148,12 @@ interrupts = <0 82 4>; }; + pinctrl: pinctrl@5f801000 { + compatible = "socionext,ph1-ld4-pinctrl", + "syscon"; + reg = <0x5f801000 0xe00>; + }; + timer@60000200 { compatible = "arm,cortex-a9-global-timer"; reg = <0x60000200 0x20>; diff --git a/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi b/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi index 4598bb2..789bd48 100644 --- a/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi +++ b/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi @@ -148,6 +148,12 @@ interrupts = <0 81 4>; }; + pinctrl: pinctrl@5f801000 { + compatible = "socionext,ph1-pro4-pinctrl", + "syscon"; + reg = <0x5f801000 0xe00>; + }; + timer@60000200 { compatible = "arm,cortex-a9-global-timer"; reg = <0x60000200 0x20>; diff --git a/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi b/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi index 3255157..8dff3c4 100644 --- a/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi +++ b/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi @@ -148,6 +148,12 @@ interrupts = <0 82 4>; }; + pinctrl: pinctrl@5f801000 { + compatible = "socionext,ph1-sld8-pinctrl", + "syscon"; + reg = <0x5f801000 0xe00>; + }; + timer@60000200 { compatible = "arm,cortex-a9-global-timer"; reg = <0x60000200 0x20>; -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/3] ARM: dts: UniPhier: add UART and USB pinmux nodes 2015-07-25 7:23 ` Masahiro Yamada @ 2015-07-25 7:23 ` Masahiro Yamada -1 siblings, 0 replies; 9+ messages in thread From: Masahiro Yamada @ 2015-07-25 7:23 UTC (permalink / raw) To: linux-arm-kernel The DT nodes in uniphier-pinctrl.dtsi provide the default pinctrl settings that would be suitable for most boards. You can still override them in your board DTS file if necessary. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 16 ++++++ arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 14 ++++++ arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 16 ++++++ arch/arm/boot/dts/uniphier-pinctrl.dtsi | 85 ++++++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+) create mode 100644 arch/arm/boot/dts/uniphier-pinctrl.dtsi diff --git a/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi b/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi index 518eab7..4add90b 100644 --- a/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi +++ b/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi @@ -89,6 +89,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006800 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0>; interrupts = <0 33 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -98,6 +100,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006900 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1>; interrupts = <0 35 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -107,6 +111,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006a00 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart2>; interrupts = <0 37 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -116,6 +122,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006b00 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3>; interrupts = <0 29 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -131,6 +139,8 @@ compatible = "socionext,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a800100 0x100>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0>; interrupts = <0 80 4>; }; @@ -138,6 +148,8 @@ compatible = "socionext,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a810100 0x100>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb1>; interrupts = <0 81 4>; }; @@ -145,6 +157,8 @@ compatible = "socionext,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a820100 0x100>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2>; interrupts = <0 82 4>; }; @@ -177,3 +191,5 @@ }; }; }; + +/include/ "uniphier-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi b/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi index 789bd48..d0ca4c8 100644 --- a/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi +++ b/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi @@ -96,6 +96,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006800 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0>; interrupts = <0 33 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -105,6 +107,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006900 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1>; interrupts = <0 35 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -114,6 +118,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006a00 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart2>; interrupts = <0 37 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -123,6 +129,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006b00 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3>; interrupts = <0 29 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -138,6 +146,8 @@ compatible = "socionext,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a800100 0x100>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2>; interrupts = <0 80 4>; }; @@ -145,6 +155,8 @@ compatible = "socionext,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a810100 0x100>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb3>; interrupts = <0 81 4>; }; @@ -177,3 +189,5 @@ }; }; }; + +/include/ "uniphier-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi b/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi index 8dff3c4..3ead910 100644 --- a/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi +++ b/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi @@ -89,6 +89,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006800 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0>; interrupts = <0 33 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -98,6 +100,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006900 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1>; interrupts = <0 35 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -107,6 +111,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006a00 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart2>; interrupts = <0 37 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -116,6 +122,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006b00 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3>; interrupts = <0 29 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -131,6 +139,8 @@ compatible = "socionext,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a800100 0x100>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0>; interrupts = <0 80 4>; }; @@ -138,6 +148,8 @@ compatible = "socionext,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a810100 0x100>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb1>; interrupts = <0 81 4>; }; @@ -145,6 +157,8 @@ compatible = "socionext,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a820100 0x100>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2>; interrupts = <0 82 4>; }; @@ -177,3 +191,5 @@ }; }; }; + +/include/ "uniphier-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi new file mode 100644 index 0000000..1b5b4fe --- /dev/null +++ b/arch/arm/boot/dts/uniphier-pinctrl.dtsi @@ -0,0 +1,85 @@ +/* + * Device Tree Source for UniPhier SoCs default pinctrl settings + * + * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +&pinctrl { + pinctrl_uart0: uart0_grp { + groups = "uart0"; + function = "uart0"; + }; + + pinctrl_uart1: uart1_grp { + groups = "uart1"; + function = "uart1"; + }; + + pinctrl_uart2: uart2_grp { + groups = "uart2"; + function = "uart2"; + }; + + pinctrl_uart3: uart3_grp { + groups = "uart3"; + function = "uart3"; + }; + + pinctrl_usb0: usb0_grp { + groups = "usb0"; + function = "usb0"; + }; + + pinctrl_usb1: usb1_grp { + groups = "usb1"; + function = "usb1"; + }; + + pinctrl_usb2: usb2_grp { + groups = "usb2"; + function = "usb2"; + }; + + pinctrl_usb3: usb3_grp { + groups = "usb3"; + function = "usb3"; + }; +}; -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/3] ARM: dts: UniPhier: add UART and USB pinmux nodes @ 2015-07-25 7:23 ` Masahiro Yamada 0 siblings, 0 replies; 9+ messages in thread From: Masahiro Yamada @ 2015-07-25 7:23 UTC (permalink / raw) To: arm Cc: Masahiro Yamada, Russell King, devicetree, Kumar Gala, linux-kernel, Ian Campbell, Rob Herring, Pawel Moll, Mark Rutland, linux-arm-kernel The DT nodes in uniphier-pinctrl.dtsi provide the default pinctrl settings that would be suitable for most boards. You can still override them in your board DTS file if necessary. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 16 ++++++ arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 14 ++++++ arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 16 ++++++ arch/arm/boot/dts/uniphier-pinctrl.dtsi | 85 ++++++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+) create mode 100644 arch/arm/boot/dts/uniphier-pinctrl.dtsi diff --git a/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi b/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi index 518eab7..4add90b 100644 --- a/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi +++ b/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi @@ -89,6 +89,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006800 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0>; interrupts = <0 33 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -98,6 +100,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006900 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1>; interrupts = <0 35 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -107,6 +111,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006a00 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart2>; interrupts = <0 37 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -116,6 +122,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006b00 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3>; interrupts = <0 29 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -131,6 +139,8 @@ compatible = "socionext,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a800100 0x100>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0>; interrupts = <0 80 4>; }; @@ -138,6 +148,8 @@ compatible = "socionext,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a810100 0x100>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb1>; interrupts = <0 81 4>; }; @@ -145,6 +157,8 @@ compatible = "socionext,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a820100 0x100>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2>; interrupts = <0 82 4>; }; @@ -177,3 +191,5 @@ }; }; }; + +/include/ "uniphier-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi b/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi index 789bd48..d0ca4c8 100644 --- a/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi +++ b/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi @@ -96,6 +96,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006800 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0>; interrupts = <0 33 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -105,6 +107,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006900 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1>; interrupts = <0 35 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -114,6 +118,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006a00 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart2>; interrupts = <0 37 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -123,6 +129,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006b00 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3>; interrupts = <0 29 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -138,6 +146,8 @@ compatible = "socionext,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a800100 0x100>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2>; interrupts = <0 80 4>; }; @@ -145,6 +155,8 @@ compatible = "socionext,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a810100 0x100>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb3>; interrupts = <0 81 4>; }; @@ -177,3 +189,5 @@ }; }; }; + +/include/ "uniphier-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi b/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi index 8dff3c4..3ead910 100644 --- a/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi +++ b/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi @@ -89,6 +89,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006800 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0>; interrupts = <0 33 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -98,6 +100,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006900 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1>; interrupts = <0 35 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -107,6 +111,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006a00 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart2>; interrupts = <0 37 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -116,6 +122,8 @@ compatible = "socionext,uniphier-uart"; status = "disabled"; reg = <0x54006b00 0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3>; interrupts = <0 29 4>; clocks = <&uart_clk>; fifo-size = <64>; @@ -131,6 +139,8 @@ compatible = "socionext,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a800100 0x100>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0>; interrupts = <0 80 4>; }; @@ -138,6 +148,8 @@ compatible = "socionext,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a810100 0x100>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb1>; interrupts = <0 81 4>; }; @@ -145,6 +157,8 @@ compatible = "socionext,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a820100 0x100>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2>; interrupts = <0 82 4>; }; @@ -177,3 +191,5 @@ }; }; }; + +/include/ "uniphier-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi new file mode 100644 index 0000000..1b5b4fe --- /dev/null +++ b/arch/arm/boot/dts/uniphier-pinctrl.dtsi @@ -0,0 +1,85 @@ +/* + * Device Tree Source for UniPhier SoCs default pinctrl settings + * + * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +&pinctrl { + pinctrl_uart0: uart0_grp { + groups = "uart0"; + function = "uart0"; + }; + + pinctrl_uart1: uart1_grp { + groups = "uart1"; + function = "uart1"; + }; + + pinctrl_uart2: uart2_grp { + groups = "uart2"; + function = "uart2"; + }; + + pinctrl_uart3: uart3_grp { + groups = "uart3"; + function = "uart3"; + }; + + pinctrl_usb0: usb0_grp { + groups = "usb0"; + function = "usb0"; + }; + + pinctrl_usb1: usb1_grp { + groups = "usb1"; + function = "usb1"; + }; + + pinctrl_usb2: usb2_grp { + groups = "usb2"; + function = "usb2"; + }; + + pinctrl_usb3: usb3_grp { + groups = "usb3"; + function = "usb3"; + }; +}; -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] MAINTAINERS: add entries for UniPhier device trees and drivers 2015-07-25 7:23 ` Masahiro Yamada ` (2 preceding siblings ...) (?) @ 2015-07-25 7:23 ` Masahiro Yamada -1 siblings, 0 replies; 9+ messages in thread From: Masahiro Yamada @ 2015-07-25 7:23 UTC (permalink / raw) To: arm Cc: Masahiro Yamada, Arnd Bergmann, Jiri Slaby, Mauro Carvalho Chehab, Greg KH, linux-kernel, Joe Perches, Andrew Morton This clarifies the location of the files maintained by me. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- MAINTAINERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 2eb6272..1c93835 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1579,7 +1579,10 @@ ARM/UNIPHIER ARCHITECTURE M: Masahiro Yamada <yamada.masahiro@socionext.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained +F: arch/arm/boot/dts/uniphier* F: arch/arm/mach-uniphier/ +F: drivers/pinctrl/uniphier/ +F: drivers/tty/serial/8250/8250_uniphier.c N: uniphier ARM/Ux500 ARM ARCHITECTURE -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 0/3] ARM: UniPhier: update DTS and MAINTAINERS 2015-07-25 7:23 ` Masahiro Yamada @ 2015-07-27 12:55 ` Olof Johansson -1 siblings, 0 replies; 9+ messages in thread From: Olof Johansson @ 2015-07-27 12:55 UTC (permalink / raw) To: linux-arm-kernel On Sat, Jul 25, 2015 at 04:23:21PM +0900, Masahiro Yamada wrote: > Hi Arnd and Olof, > > The pinctrl drivers for UniPhier SoCs were accepted by Linus Walleij > into the linux-pinctrl subsystem. > > Here is a small series I'd like you to merge into the ARM-SOC subsystem > to use my pinctrl drivers. > Thanks, applied 1 and 2 to next/dt, the third I added to next/soc. -Olof ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/3] ARM: UniPhier: update DTS and MAINTAINERS @ 2015-07-27 12:55 ` Olof Johansson 0 siblings, 0 replies; 9+ messages in thread From: Olof Johansson @ 2015-07-27 12:55 UTC (permalink / raw) To: Masahiro Yamada Cc: arm, Russell King, Arnd Bergmann, Joe Perches, devicetree, Mauro Carvalho Chehab, Greg KH, Kumar Gala, linux-kernel, Ian Campbell, Rob Herring, Andrew Morton, Pawel Moll, Jiri Slaby, Mark Rutland, linux-arm-kernel On Sat, Jul 25, 2015 at 04:23:21PM +0900, Masahiro Yamada wrote: > Hi Arnd and Olof, > > The pinctrl drivers for UniPhier SoCs were accepted by Linus Walleij > into the linux-pinctrl subsystem. > > Here is a small series I'd like you to merge into the ARM-SOC subsystem > to use my pinctrl drivers. > Thanks, applied 1 and 2 to next/dt, the third I added to next/soc. -Olof ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-07-27 12:55 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-07-25 7:23 [PATCH 0/3] ARM: UniPhier: update DTS and MAINTAINERS Masahiro Yamada 2015-07-25 7:23 ` Masahiro Yamada 2015-07-25 7:23 ` [PATCH 1/3] ARM: dts: UniPhier: add pinctrl device nodes Masahiro Yamada 2015-07-25 7:23 ` Masahiro Yamada 2015-07-25 7:23 ` [PATCH 2/3] ARM: dts: UniPhier: add UART and USB pinmux nodes Masahiro Yamada 2015-07-25 7:23 ` Masahiro Yamada 2015-07-25 7:23 ` [PATCH 3/3] MAINTAINERS: add entries for UniPhier device trees and drivers Masahiro Yamada 2015-07-27 12:55 ` [PATCH 0/3] ARM: UniPhier: update DTS and MAINTAINERS Olof Johansson 2015-07-27 12:55 ` Olof Johansson
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.