Skip to content

Commit df80530

Browse files
committed
dt-bindings: pinctrl: samsung: stop using bindings header with constants
The bindings header with pin controller register values is being deprecated and DTS already switched to a DTS-local header. Do not reference the bindings header in schema and replace the defines with raw values. Signed-off-by: Krzysztof Kozlowski <[email protected]> Reviewed-by: Rob Herring <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 152a81a commit df80530

File tree

2 files changed

+27
-37
lines changed

2 files changed

+27
-37
lines changed

Documentation/devicetree/bindings/pinctrl/samsung,pinctrl-pins-cfg.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ description: |
2020
The values used for config properties should be derived from the hardware
2121
manual and these values are programmed as-is into the pin pull up/down and
2222
driver strength register of the pin-controller.
23-
See also include/dt-bindings/pinctrl/samsung.h with useful constants.
2423
2524
See also Documentation/devicetree/bindings/pinctrl/samsung,pinctrl.yaml for
2625
additional information and example.

Documentation/devicetree/bindings/pinctrl/samsung,pinctrl.yaml

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ description: |
1515
This is a part of device tree bindings for Samsung S3C/S5P/Exynos SoC pin
1616
controller.
1717
18-
Pin group settings (like drive strength, pull up/down) are available as
19-
macros in include/dt-bindings/pinctrl/samsung.h.
20-
2118
All the pin controller nodes should be represented in the aliases node using
2219
the following format 'pinctrl{n}' where n is a unique number for the alias.
2320
@@ -138,8 +135,6 @@ additionalProperties: false
138135

139136
examples:
140137
- |
141-
#include <dt-bindings/pinctrl/samsung.h>
142-
143138
pinctrl@7f008000 {
144139
compatible = "samsung,s3c64xx-pinctrl";
145140
reg = <0x7f008000 0x1000>;
@@ -166,16 +161,15 @@ examples:
166161
167162
uart0-data-pins {
168163
samsung,pins = "gpa-0", "gpa-1";
169-
samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
170-
samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
164+
samsung,pin-function = <2>;
165+
samsung,pin-pud = <0>;
171166
};
172167
173168
// ...
174169
};
175170
176171
- |
177172
#include <dt-bindings/interrupt-controller/arm-gic.h>
178-
#include <dt-bindings/pinctrl/samsung.h>
179173
180174
pinctrl@11400000 {
181175
compatible = "samsung,exynos4210-pinctrl";
@@ -197,24 +191,24 @@ examples:
197191
198192
uart0-data-pins {
199193
samsung,pins = "gpa0-0", "gpa0-1";
200-
samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
201-
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
202-
samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
194+
samsung,pin-function = <2>;
195+
samsung,pin-pud = <0>;
196+
samsung,pin-drv = <0>;
203197
};
204198
205199
// ...
206200
207201
sleep0: sleep-state {
208202
gpa0-0-pin {
209203
samsung,pins = "gpa0-0";
210-
samsung,pin-con-pdn = <EXYNOS_PIN_PDN_INPUT>;
211-
samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_NONE>;
204+
samsung,pin-con-pdn = <2>;
205+
samsung,pin-pud-pdn = <0>;
212206
};
213207
214208
gpa0-1-pin {
215209
samsung,pins = "gpa0-1";
216-
samsung,pin-con-pdn = <EXYNOS_PIN_PDN_OUT0>;
217-
samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_NONE>;
210+
samsung,pin-con-pdn = <0>;
211+
samsung,pin-pud-pdn = <0>;
218212
};
219213
220214
// ...
@@ -223,7 +217,6 @@ examples:
223217
224218
- |
225219
#include <dt-bindings/interrupt-controller/arm-gic.h>
226-
#include <dt-bindings/pinctrl/samsung.h>
227220
228221
pinctrl@11000000 {
229222
compatible = "samsung,exynos4210-pinctrl";
@@ -272,43 +265,42 @@ examples:
272265
273266
sd0-clk-pins {
274267
samsung,pins = "gpk0-0";
275-
samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
276-
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
277-
samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
268+
samsung,pin-function = <2>;
269+
samsung,pin-pud = <0>;
270+
samsung,pin-drv = <3>;
278271
};
279272
280273
sd4-bus-width8-pins {
281274
part-1-pins {
282275
samsung,pins = "gpk0-3", "gpk0-4",
283276
"gpk0-5", "gpk0-6";
284-
samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
285-
samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
286-
samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
277+
samsung,pin-function = <3>;
278+
samsung,pin-pud = <3>;
279+
samsung,pin-drv = <3>;
287280
};
288281
289282
part-2-pins {
290283
samsung,pins = "gpk1-3", "gpk1-4",
291284
"gpk1-5", "gpk1-6";
292-
samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
293-
samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
294-
samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
285+
samsung,pin-function = <4>;
286+
samsung,pin-pud = <3>;
287+
samsung,pin-drv = <3>;
295288
};
296289
};
297290
298291
// ...
299292
300293
otg-gp-pins {
301294
samsung,pins = "gpx3-3";
302-
samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
303-
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
304-
samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
295+
samsung,pin-function = <1>;
296+
samsung,pin-pud = <0>;
297+
samsung,pin-drv = <0>;
305298
samsung,pin-val = <0>;
306299
};
307300
};
308301
309302
- |
310303
#include <dt-bindings/interrupt-controller/arm-gic.h>
311-
#include <dt-bindings/pinctrl/samsung.h>
312304
313305
pinctrl@10580000 {
314306
compatible = "samsung,exynos5433-pinctrl";
@@ -352,9 +344,9 @@ examples:
352344
initial_alive: initial-state {
353345
gpa0-0-pin {
354346
samsung,pins = "gpa0-0";
355-
samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
356-
samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
357-
samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;
347+
samsung,pin-function = <0>;
348+
samsung,pin-pud = <1>;
349+
samsung,pin-drv = <0>;
358350
};
359351
360352
// ...
@@ -363,7 +355,6 @@ examples:
363355
364356
- |
365357
#include <dt-bindings/interrupt-controller/arm-gic.h>
366-
#include <dt-bindings/pinctrl/samsung.h>
367358
368359
pinctrl@114b0000 {
369360
compatible = "samsung,exynos5433-pinctrl";
@@ -384,9 +375,9 @@ examples:
384375
i2s0-bus-pins {
385376
samsung,pins = "gpz0-0", "gpz0-1", "gpz0-2", "gpz0-3",
386377
"gpz0-4", "gpz0-5", "gpz0-6";
387-
samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
388-
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
389-
samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;
378+
samsung,pin-function = <2>;
379+
samsung,pin-pud = <0>;
380+
samsung,pin-drv = <0>;
390381
};
391382
392383
// ...

0 commit comments

Comments
 (0)