Skip to content

Commit 56c9d1a

Browse files
Marek Vasutlinusw
authored andcommitted
dt-bindings: pinctrl: fsl,imx6ul-pinctrl: Convert i.MX35/5x/6 to YAML
The IOMUXC controller description is almost identical on i.MX35/5x/6 SoCs, except for the configuration bits which differ across SoCs. Rename the fsl,imx6ul-pinctrl.yaml to fsl,imx35-pinctrl.yaml, fill in compatible strings for the other SoCs and fill in the various bits into desciption. This way, i.MX35/5x/6 series SoCs can all be converted to DT schema. Remove the old text DT bindings description. Reviewed-by: Rob Herring (Arm) <[email protected]> Signed-off-by: Marek Vasut <[email protected]> Link: https://lore.kernel.org/[email protected] Signed-off-by: Linus Walleij <[email protected]>
1 parent b509b5e commit 56c9d1a

10 files changed

+78
-330
lines changed

Documentation/devicetree/bindings/pinctrl/fsl,imx35-pinctrl.txt

Lines changed: 0 additions & 33 deletions
This file was deleted.

Documentation/devicetree/bindings/pinctrl/fsl,imx6ul-pinctrl.yaml renamed to Documentation/devicetree/bindings/pinctrl/fsl,imx35-pinctrl.yaml

Lines changed: 78 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/pinctrl/fsl,imx6ul-pinctrl.yaml#
4+
$id: http://devicetree.org/schemas/pinctrl/fsl,imx35-pinctrl.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Freescale IMX6UL IOMUX Controller
7+
title: Freescale IMX35/IMX5x/IMX6 IOMUX Controller
88

99
maintainers:
1010
- Dong Aisheng <[email protected]>
@@ -18,9 +18,21 @@ allOf:
1818

1919
properties:
2020
compatible:
21-
enum:
22-
- fsl,imx6ul-iomuxc
23-
- fsl,imx6ull-iomuxc-snvs
21+
oneOf:
22+
- enum:
23+
- fsl,imx35-iomuxc
24+
- fsl,imx51-iomuxc
25+
- fsl,imx53-iomuxc
26+
- fsl,imx6dl-iomuxc
27+
- fsl,imx6q-iomuxc
28+
- fsl,imx6sl-iomuxc
29+
- fsl,imx6sll-iomuxc
30+
- fsl,imx6sx-iomuxc
31+
- fsl,imx6ul-iomuxc
32+
- fsl,imx6ull-iomuxc-snvs
33+
- items:
34+
- const: fsl,imx50-iomuxc
35+
- const: fsl,imx53-iomuxc
2436

2537
reg:
2638
maxItems: 1
@@ -39,9 +51,9 @@ patternProperties:
3951
each entry consists of 6 integers and represents the mux and config
4052
setting for one pin. The first 5 integers <mux_reg conf_reg input_reg
4153
mux_val input_val> are specified using a PIN_FUNC_ID macro, which can
42-
be found in <arch/arm/boot/dts/imx6ul-pinfunc.h>. The last integer
54+
be found in <arch/arm/boot/dts/nxp/imx/imx*-pinfunc.h>. The last integer
4355
CONFIG is the pad setting value like pull-up on this pin. Please
44-
refer to i.MX6UL Reference Manual for detailed CONFIG settings.
56+
refer to matching i.MX Reference Manual for detailed CONFIG settings.
4557
$ref: /schemas/types.yaml#/definitions/uint32-matrix
4658
items:
4759
items:
@@ -56,7 +68,41 @@ patternProperties:
5668
- description: |
5769
"input_val" indicates the select input value to be applied.
5870
- description: |
59-
"pad_setting" indicates the pad configuration value to be applied:
71+
"pad_setting" indicates the pad configuration value to be applied.
72+
Common i.MX35
73+
PAD_CTL_DRIVE_VOLAGAGE_18 (1 << 13)
74+
PAD_CTL_DRIVE_VOLAGAGE_33 (0 << 13)
75+
PAD_CTL_HYS (1 << 8)
76+
PAD_CTL_PKE (1 << 7)
77+
PAD_CTL_PUE (1 << 6)
78+
PAD_CTL_PUS_100K_DOWN (0 << 4)
79+
PAD_CTL_PUS_47K_UP (1 << 4)
80+
PAD_CTL_PUS_100K_UP (2 << 4)
81+
PAD_CTL_PUS_22K_UP (3 << 4)
82+
PAD_CTL_ODE_CMOS (0 << 3)
83+
PAD_CTL_ODE_OPENDRAIN (1 << 3)
84+
PAD_CTL_DSE_NOMINAL (0 << 1)
85+
PAD_CTL_DSE_HIGH (1 << 1)
86+
PAD_CTL_DSE_MAX (2 << 1)
87+
PAD_CTL_SRE_FAST (1 << 0)
88+
PAD_CTL_SRE_SLOW (0 << 0)
89+
Common i.MX50/i.MX51/i.MX53 bits
90+
PAD_CTL_HVE (1 << 13)
91+
PAD_CTL_HYS (1 << 8)
92+
PAD_CTL_PKE (1 << 7)
93+
PAD_CTL_PUE (1 << 6)
94+
PAD_CTL_PUS_100K_DOWN (0 << 4)
95+
PAD_CTL_PUS_47K_UP (1 << 4)
96+
PAD_CTL_PUS_100K_UP (2 << 4)
97+
PAD_CTL_PUS_22K_UP (3 << 4)
98+
PAD_CTL_ODE (1 << 3)
99+
PAD_CTL_DSE_LOW (0 << 1)
100+
PAD_CTL_DSE_MED (1 << 1)
101+
PAD_CTL_DSE_HIGH (2 << 1)
102+
PAD_CTL_DSE_MAX (3 << 1)
103+
PAD_CTL_SRE_FAST (1 << 0)
104+
PAD_CTL_SRE_SLOW (0 << 0)
105+
Common i.MX6 bits
60106
PAD_CTL_HYS (1 << 16)
61107
PAD_CTL_PUS_100K_DOWN (0 << 14)
62108
PAD_CTL_PUS_47K_UP (1 << 14)
@@ -69,15 +115,26 @@ patternProperties:
69115
PAD_CTL_SPEED_MED (1 << 6)
70116
PAD_CTL_SPEED_HIGH (3 << 6)
71117
PAD_CTL_DSE_DISABLE (0 << 3)
118+
PAD_CTL_SRE_FAST (1 << 0)
119+
PAD_CTL_SRE_SLOW (0 << 0)
120+
i.MX6SL/MX6SLL specific bits
121+
PAD_CTL_LVE (1 << 22) (MX6SL/SLL only)
122+
i.MX6SLL/i.MX6SX/i.MX6UL/i.MX6ULL specific bits
72123
PAD_CTL_DSE_260ohm (1 << 3)
73124
PAD_CTL_DSE_130ohm (2 << 3)
74125
PAD_CTL_DSE_87ohm (3 << 3)
75126
PAD_CTL_DSE_65ohm (4 << 3)
76127
PAD_CTL_DSE_52ohm (5 << 3)
77128
PAD_CTL_DSE_43ohm (6 << 3)
78129
PAD_CTL_DSE_37ohm (7 << 3)
79-
PAD_CTL_SRE_FAST (1 << 0)
80-
PAD_CTL_SRE_SLOW (0 << 0)
130+
i.MX6DL/i.MX6Q/i.MX6SL specific bits
131+
PAD_CTL_DSE_240ohm (1 << 3)
132+
PAD_CTL_DSE_120ohm (2 << 3)
133+
PAD_CTL_DSE_80ohm (3 << 3)
134+
PAD_CTL_DSE_60ohm (4 << 3)
135+
PAD_CTL_DSE_48ohm (5 << 3)
136+
PAD_CTL_DSE_40ohm (6 << 3)
137+
PAD_CTL_DSE_34ohm (7 << 3)
81138
82139
required:
83140
- fsl,pins
@@ -114,3 +171,14 @@ examples:
114171
>;
115172
};
116173
};
174+
- |
175+
iomuxc_mx6q: pinctrl@20e0000 {
176+
compatible = "fsl,imx6q-iomuxc";
177+
reg = <0x20e0000 0x4000>;
178+
179+
pinctrl_uart4: uart4grp {
180+
fsl,pins =
181+
<0x288 0x658 0x000 0x3 0x0 0x140>,
182+
<0x28c 0x65c 0x938 0x3 0x3 0x140>;
183+
};
184+
};

Documentation/devicetree/bindings/pinctrl/fsl,imx50-pinctrl.txt

Lines changed: 0 additions & 32 deletions
This file was deleted.

Documentation/devicetree/bindings/pinctrl/fsl,imx51-pinctrl.txt

Lines changed: 0 additions & 32 deletions
This file was deleted.

Documentation/devicetree/bindings/pinctrl/fsl,imx53-pinctrl.txt

Lines changed: 0 additions & 32 deletions
This file was deleted.

Documentation/devicetree/bindings/pinctrl/fsl,imx6dl-pinctrl.txt

Lines changed: 0 additions & 38 deletions
This file was deleted.

Documentation/devicetree/bindings/pinctrl/fsl,imx6q-pinctrl.txt

Lines changed: 0 additions & 38 deletions
This file was deleted.

Documentation/devicetree/bindings/pinctrl/fsl,imx6sl-pinctrl.txt

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)