ARM: u8540: Add Pinctrl Device Tree settings for uart0, uart2
Subsystems (2)
PATCH 1/2 ARM: u8540: Add Pinctrl Device Tree settings for uart0, uart2
From: Gabriel Fernandez <[email protected]>
This patch adds pinctrl device tree settings for uart0 and uart2 for ccu8540 board.
--- arch/arm/boot/dts/ccu8540-pinctrl.dtsi | 81 +++++++++++++++++++++++++ arch/arm/boot/dts/ccu8540.dts | 11 ++++ arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi | 95 ++++++++++++++++++++++++++++++ include/dt-bindings/pinctrl/nomadik.h | 36 +++++++++++ 4 files changed, 223 insertions(+) create mode 100644 arch/arm/boot/dts/ccu8540-pinctrl.dtsi create mode 100644 arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi create mode 100644 include/dt-bindings/pinctrl/nomadik.h
arch/arm/boot/dts/ccu8540-pinctrl.dtsi new file +81 -0
@@ -0,0 +1,81 @@ +/* + * Copyright 2012 ST-Ericsson + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ +#include "ste-nomadik-pinctrl.dtsi" + +/ { + soc { + pinctrl { + uart0 { + uart0_default_mux: uart0_mux { + default_mux { + ste,function = "u0"; + ste,pins = "u0_a_1"; + }; + }; + + uart0_default_mode: uart0_default { + default_cfg1 { + ste,pins = "GPIO0", "GPIO2"; + ste,config = <&in_pu>; + }; + + default_cfg2 { + ste,pins = "GPIO1", "GPIO3"; + ste,config = <&out_hi>; + }; + }; + + uart0_sleep_mode: uart0_sleep { + sleep_cfg1 { + ste,pins = "GPIO0", "GPIO2"; + ste,config = <&slpm_in_pu>; + }; + + sleep_cfg2 { + ste,pins = "GPIO1", "GPIO3"; + ste,config = <&slpm_out_hi>; + }; + }; + }; + + uart2 { + uart2_default_mode: uart2_default { + default_mux { + ste,function = "u2"; + ste,pins = "u2txrx_a_1"; + }; + + default_cfg1 { + ste,pins = "GPIO120"; + ste,config = <&in_pu>; + }; + + default_cfg2 { + ste,pins = "GPIO121"; + ste,config = <&out_hi>; + }; + }; + + uart2_sleep_mode: uart2_sleep { + sleep_cfg1 { + ste,pins = "GPIO120"; + ste,config = <&slpm_in_pu>; + }; + + sleep_cfg2 { + ste,pins = "GPIO121"; + ste,config = <&slpm_out_hi>; + }; + }; + }; + }; + }; +};
arch/arm/boot/dts/ccu8540.dts +11 -0
@@ -11,6 +11,7 @@ /dts-v1/; #include "dbx5x0.dtsi" +#include "ccu8540-pinctrl.dtsi" / { model = "ST-Ericsson U8540 platform with Device Tree";
@@ -21,12 +22,19 @@ }; soc { + pinctrl { + compatible = "stericsson,db8540-pinctrl"; + }; + prcmu@80157000 { reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x3000>; reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm"; }; uart@80120000 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&uart0_default_mux>, <&uart0_default_mode>; + pinctrl-1 = <&uart0_sleep_mode>; status = "okay"; };
@@ -35,6 +43,9 @@ }; uart@80007000 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&uart2_default_mode>; + pinctrl-1 = <&uart2_sleep_mode>; status = "okay"; }; };
arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi new file +95 -0
95 lines not on this page · raw message
include/dt-bindings/pinctrl/nomadik.h new file +36 -0
@@ -0,0 +1,36 @@ +/* +* nomadik.h +* +* Copyright (C) ST-Ericsson SA 2013 +* Author: Gabriel Fernandez <[email protected]> for ST-Ericsson. +* License terms: GNU General Public License (GPL), version 2 +*/ + +#define INPUT_NOPULL 0 +#define INPUT_PULLUP 1 +#define INPUT_PULLDOWN 2 + +#define OUTPUT_LOW 0 +#define OUTPUT_HIGH 1 +#define DIR_OUTPUT 2 + +#define SLPM_DISABLED 0 +#define SLPM_ENABLED 1 + +#define SLPM_INPUT_NOPULL 0 +#define SLPM_INPUT_PULLUP 1 +#define SLPM_INPUT_PULLDOWN 2 +#define SLPM_DIR_INPUT 3 + +#define SLPM_OUTPUT_LOW 0 +#define SLPM_OUTPUT_HIGH 1 +#define SLPM_DIR_OUTPUT 2 + +#define SLPM_WAKEUP_DISABLE 0 +#define SLPM_WAKEUP_ENABLE 1 + +#define GPIOMODE_DISABLED 0 +#define GPIOMODE_ENABLED 1 + +#define SLPM_PDIS_DISABLED 0 +#define SLPM_PDIS_ENABLED 1
Signature · 1 line
1.8.1.1
PATCH 2/2 ARM: u8540: DT: Set pinctrl mapping to i2c0,1,2,4 & 5
From: Gabriel Fernandez <[email protected]>
This patch configures pin map in device tree of i2c0, 1,2,4 & 5 for ccu8540 board.
--- arch/arm/boot/dts/ccu8540-pinctrl.dtsi | 115 +++++++++++++++++++++++++++++++++ arch/arm/boot/dts/ccu8540.dts | 34 ++++++++++ 2 files changed, 149 insertions(+)
arch/arm/boot/dts/ccu8540-pinctrl.dtsi +115 -0
@@ -76,6 +76,121 @@ }; }; }; + + i2c0 { + i2c0_default_mux: i2c_mux { + default_mux { + ste,function = "i2c0"; + ste,pins = "i2c0_a_1"; + }; + }; + + i2c0_default_mode: i2c_default { + default_cfg1 { + ste,pins = "GPIO147", "GPIO148"; + ste,config = <&in_pu>; + }; + }; + + i2c0_sleep_mode: i2c_sleep { + sleep_cfg1 { + ste,pins = "GPIO147", "GPIO148"; + ste,config = <&slpm_in_pu>; + }; + }; + }; + + i2c1 { + i2c1_default_mux: i2c_mux { + default_mux { + ste,function = "i2c1"; + ste,pins = "i2c1_b_2"; + }; + }; + + i2c1_default_mode: i2c_default { + default_cfg1 { + ste,pins = "GPIO16", "GPIO17"; + ste,config = <&in_pu>; + }; + }; + + i2c1_sleep_mode: i2c_sleep { + sleep_cfg1 { + ste,pins = "GPIO16", "GPIO17"; + ste,config = <&slpm_in_pu>; + }; + }; + }; + + i2c2 { + i2c2_default_mux: i2c_mux { + default_mux { + ste,function = "i2c2"; + ste,pins = "i2c2_b_2"; + }; + }; + + i2c2_default_mode: i2c_default { + default_cfg1 { + ste,pins = "GPIO10", "GPIO11"; + ste,config = <&in_pu>; + }; + }; + + i2c2_sleep_mode: i2c_sleep { + sleep_cfg1 { + ste,pins = "GPIO11", "GPIO11"; + ste,config = <&slpm_in_pu>; + }; + }; + }; + + i2c4 { + i2c4_default_mux: i2c_mux { + default_mux { + ste,function = "i2c4"; + ste,pins = "i2c4_b_2"; + }; + }; + + i2c4_default_mode: i2c_default { + default_cfg1 { + ste,pins = "GPIO122", "GPIO123"; + ste,config = <&in_pu>; + }; + }; + + i2c4_sleep_mode: i2c_sleep { + sleep_cfg1 { + ste,pins = "GPIO122", "GPIO123"; + ste,config = <&slpm_in_pu>; + }; + }; + }; + + i2c5 { + i2c5_default_mux: i2c_mux { + default_mux { + ste,function = "i2c5"; + ste,pins = "i2c5_c_2"; + }; + }; + + i2c5_default_mode: i2c_default { + default_cfg1 { + ste,pins = "GPIO118", "GPIO119"; + ste,config = <&in_pu>; + }; + }; + + i2c5_sleep_mode: i2c_sleep { + sleep_cfg1 { + ste,pins = "GPIO118", "GPIO119"; + ste,config = <&slpm_in_pu>; + }; + }; + }; }; }; };
arch/arm/boot/dts/ccu8540.dts +34 -0
@@ -48,5 +48,39 @@ pinctrl-1 = <&uart2_sleep_mode>; status = "okay"; }; + + i2c0: i2c@80004000 { + pinctrl-names = "default","sleep"; + pinctrl-0 = <&i2c0_default_mux>, <&i2c0_default_mode>; + pinctrl-1 = <&i2c0_sleep_mode>; + }; + + i2c1: i2c@80122000 { + pinctrl-names = "default","sleep"; + pinctrl-0 = <&i2c1_default_mux>, <&i2c1_default_mode>; + pinctrl-1 = <&i2c1_sleep_mode>; + }; + + i2c2: i2c@80128000 { + pinctrl-names = "default","sleep"; + pinctrl-0 = <&i2c2_default_mux>, <&i2c2_default_mode>; + pinctrl-1 = <&i2c2_sleep_mode>; + }; + + i2c3: i2c@80110000 { + status = "disabled"; + }; + + i2c4: i2c@8012a000 { + pinctrl-names = "default","sleep"; + pinctrl-0 = <&i2c4_default_mux>, <&i2c4_default_mode>; + pinctrl-1 = <&i2c4_sleep_mode>; + }; + + i2c5: i2c@80001000 { + pinctrl-names = "default","sleep"; + pinctrl-0 = <&i2c5_default_mux>, <&i2c5_default_mode>; + pinctrl-1 = <&i2c5_sleep_mode>; + }; }; };
Signature · 1 line
1.8.1.1
Re: [PATCH 2/2] ARM: u8540: DT: Set pinctrl mapping to i2c0,1,2,4 & 5
Quoted 6 lines · Gabriel Fernandez
From: Gabriel Fernandez <[email protected]>
This patch configures pin map in device tree of i2c0, 1,2,4 & 5 for ccu8540 board.
Signed-off-by Gabriel Fernandez <[email protected]>
Patch applied to my ux500-devicetree branch.
Yours,
Linus Walleij
Quoted 6 lines · Gabriel Fernandez
From: Gabriel Fernandez <[email protected]>
This patch adds pinctrl device tree settings for uart0 and uart2 for ccu8540 board.
Signed-off-by Gabriel Fernandez <[email protected]>
Patch applied to the ux500-devicetree branch in my tree, sorry for the delay!
Quoted 1 line
+++
b/include/dt-bindings/pinctrl/nomadik.h
I'll try to fix a patch using this for the old Nomadik as well.
Yours,
Linus Walleij