Skip to content

Commit 9414d5b

Browse files
committed
dts: arm: nxp: use iopctl ip to replace iocon
Change pin register name from iocon to iopctl Delete pin type mask macro, there is no need to add these macros to adapt iocon IP structure. Signed-off-by: Lucien Zhao <[email protected]>
1 parent 3ffe4f3 commit 9414d5b

File tree

4 files changed

+10
-18
lines changed

4 files changed

+10
-18
lines changed

dts/arm/nxp/nxp_rt5xx_common.dtsi

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,12 @@
130130
#clock-cells = <1>;
131131
};
132132

133-
iocon: iocon@4000 {
134-
compatible = "nxp,lpc-iocon";
133+
iopctl0: iopctl@4000 {
134+
compatible = "nxp,iopctl";
135135
reg = <0x4000 0x1000>;
136+
status = "okay";
136137
pinctrl: pinctrl {
137-
compatible = "nxp,rt-iocon-pinctrl";
138+
compatible = "nxp,rt-iopctl-pinctrl";
138139
};
139140
};
140141

dts/arm/nxp/nxp_rt6xx_common.dtsi

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,12 @@
110110
#clock-cells = <1>;
111111
};
112112

113-
iocon: iocon@4000 {
114-
compatible = "nxp,lpc-iocon";
113+
iopctl0: iopctl@4000 {
114+
compatible = "nxp,iopctl";
115115
reg = <0x4000 0x1000>;
116+
status = "okay";
116117
pinctrl: pinctrl {
117-
compatible = "nxp,rt-iocon-pinctrl";
118+
compatible = "nxp,rt-iopctl-pinctrl";
118119
};
119120
};
120121

soc/nxp/imxrt/imxrt5xx/cm33/pinctrl_soc.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022, NXP
2+
* Copyright 2022,2024 NXP
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -31,11 +31,6 @@ typedef uint32_t pinctrl_soc_pin_t;
3131
IOPCTL_PIO_IIENA(DT_PROP(node_id, nxp_invert)) | /* invert input */ \
3232
IOPCTL_PIO_AMENA(DT_PROP(node_id, nxp_analog_mode))) /* analog multiplexor */
3333

34-
/* MCUX RT parts only have one pin type */
35-
#define Z_PINCTRL_IOCON_D_PIN_MASK (0xFFF)
36-
#define Z_PINCTRL_IOCON_A_PIN_MASK (0)
37-
#define Z_PINCTRL_IOCON_I_PIN_MASK (0)
38-
3934
#define Z_PINCTRL_STATE_PIN_INIT(group, pin_prop, idx) \
4035
DT_PROP_BY_IDX(group, pin_prop, idx) | Z_PINCTRL_IOPCTL_PINCFG(group),
4136

soc/nxp/imxrt/imxrt6xx/pinctrl_soc.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022, NXP
2+
* Copyright 2022,2024 NXP
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -31,11 +31,6 @@ typedef uint32_t pinctrl_soc_pin_t;
3131
IOPCTL_PIO_IIENA(DT_PROP(node_id, nxp_invert)) | /* invert input */ \
3232
IOPCTL_PIO_AMENA(DT_PROP(node_id, nxp_analog_mode))) /* analog multiplexor */
3333

34-
/* MCUX RT parts only have one pin type */
35-
#define Z_PINCTRL_IOCON_D_PIN_MASK (0xFFF)
36-
#define Z_PINCTRL_IOCON_A_PIN_MASK (0)
37-
#define Z_PINCTRL_IOCON_I_PIN_MASK (0)
38-
3934
#define Z_PINCTRL_STATE_PIN_INIT(group, pin_prop, idx) \
4035
DT_PROP_BY_IDX(group, pin_prop, idx) | Z_PINCTRL_IOPCTL_PINCFG(group),
4136

0 commit comments

Comments
 (0)