Commit 213e51ca authored by Sascha Hauer's avatar Sascha Hauer Committed by Shawn Guo

ARM: dts: imx7: Add "LPSR" to LPSR iomux pin names

The i.MX7 has two iomux controllers. the iomuxc and the iomuxc_lpsr.
In a board dts we have to make sure that both controllers are supplied
with the correct pins. It's way too easy to do this wrong since only
a look into the reference manual can reveal which pins belong to which
controller. To make this clearer add "LPSR" to the pin names which
belong to the LPSR controller.
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent ccc59b0c
...@@ -596,29 +596,29 @@ &iomuxc_lpsr { ...@@ -596,29 +596,29 @@ &iomuxc_lpsr {
pinctrl_gpio_lpsr: gpio1-grp { pinctrl_gpio_lpsr: gpio1-grp {
fsl,pins = < fsl,pins = <
MX7D_PAD_GPIO1_IO01__GPIO1_IO1 0x59 MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1 0x59
MX7D_PAD_GPIO1_IO02__GPIO1_IO2 0x59 MX7D_PAD_LPSR_GPIO1_IO02__GPIO1_IO2 0x59
MX7D_PAD_GPIO1_IO03__GPIO1_IO3 0x59 MX7D_PAD_LPSR_GPIO1_IO03__GPIO1_IO3 0x59
>; >;
}; };
pinctrl_i2c1: i2c1-grp { pinctrl_i2c1: i2c1-grp {
fsl,pins = < fsl,pins = <
MX7D_PAD_GPIO1_IO05__I2C1_SDA 0x4000007f MX7D_PAD_LPSR_GPIO1_IO05__I2C1_SDA 0x4000007f
MX7D_PAD_GPIO1_IO04__I2C1_SCL 0x4000007f MX7D_PAD_LPSR_GPIO1_IO04__I2C1_SCL 0x4000007f
>; >;
}; };
pinctrl_cd_usdhc1: usdhc1-cd-grp { pinctrl_cd_usdhc1: usdhc1-cd-grp {
fsl,pins = < fsl,pins = <
MX7D_PAD_GPIO1_IO00__GPIO1_IO0 0x59 /* CD */ MX7D_PAD_LPSR_GPIO1_IO00__GPIO1_IO0 0x59 /* CD */
>; >;
}; };
pinctrl_uart1_ctrl2: uart1-ctrl2-grp { pinctrl_uart1_ctrl2: uart1-ctrl2-grp {
fsl,pins = < fsl,pins = <
MX7D_PAD_GPIO1_IO07__GPIO1_IO7 0x14 /* DSR */ MX7D_PAD_LPSR_GPIO1_IO07__GPIO1_IO7 0x14 /* DSR */
MX7D_PAD_GPIO1_IO06__GPIO1_IO6 0x14 /* RI */ MX7D_PAD_LPSR_GPIO1_IO06__GPIO1_IO6 0x14 /* RI */
>; >;
}; };
}; };
...@@ -281,7 +281,7 @@ MX7D_PAD_SD3_STROBE__SD3_STROBE 0x19 ...@@ -281,7 +281,7 @@ MX7D_PAD_SD3_STROBE__SD3_STROBE 0x19
&iomuxc_lpsr { &iomuxc_lpsr {
pinctrl_usbotg1: usbotg1grp { pinctrl_usbotg1: usbotg1grp {
fsl,pins = < fsl,pins = <
MX7D_PAD_GPIO1_IO05__GPIO1_IO5 0x14 /* OTG PWREN */ MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5 0x14 /* OTG PWREN */
>; >;
}; };
}; };
\ No newline at end of file
...@@ -712,33 +712,33 @@ &iomuxc_lpsr { ...@@ -712,33 +712,33 @@ &iomuxc_lpsr {
pinctrl_hog_2: hoggrp-2 { pinctrl_hog_2: hoggrp-2 {
fsl,pins = < fsl,pins = <
MX7D_PAD_GPIO1_IO02__GPIO1_IO2 0x7d MX7D_PAD_LPSR_GPIO1_IO02__GPIO1_IO2 0x7d
MX7D_PAD_GPIO1_IO03__CCM_CLKO2 0x7d MX7D_PAD_LPSR_GPIO1_IO03__CCM_CLKO2 0x7d
>; >;
}; };
pinctrl_backlight_j9: backlightj9grp { pinctrl_backlight_j9: backlightj9grp {
fsl,pins = < fsl,pins = <
MX7D_PAD_GPIO1_IO07__GPIO1_IO7 0x7d MX7D_PAD_LPSR_GPIO1_IO07__GPIO1_IO7 0x7d
>; >;
}; };
pinctrl_pwm1: pwm1grp { pinctrl_pwm1: pwm1grp {
fsl,pins = < fsl,pins = <
MX7D_PAD_GPIO1_IO01__PWM1_OUT 0x7d MX7D_PAD_LPSR_GPIO1_IO01__PWM1_OUT 0x7d
>; >;
}; };
pinctrl_usbotg1: usbotg1grp { pinctrl_usbotg1: usbotg1grp {
fsl,pins = < fsl,pins = <
MX7D_PAD_GPIO1_IO04__USB_OTG1_OC 0x7d MX7D_PAD_LPSR_GPIO1_IO04__USB_OTG1_OC 0x7d
MX7D_PAD_GPIO1_IO05__GPIO1_IO5 0x14 MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5 0x14
>; >;
}; };
pinctrl_wdog1: wdog1grp { pinctrl_wdog1: wdog1grp {
fsl,pins = < fsl,pins = <
MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_B 0x75 MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_B 0x75
>; >;
}; };
}; };
This diff is collapsed.
...@@ -635,13 +635,13 @@ MX7D_PAD_SD3_STROBE__SD3_STROBE 0x1b ...@@ -635,13 +635,13 @@ MX7D_PAD_SD3_STROBE__SD3_STROBE 0x1b
&iomuxc_lpsr { &iomuxc_lpsr {
pinctrl_wdog: wdoggrp { pinctrl_wdog: wdoggrp {
fsl,pins = < fsl,pins = <
MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_B 0x74 MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_B 0x74
>; >;
}; };
pinctrl_pwm1: pwm1grp { pinctrl_pwm1: pwm1grp {
fsl,pins = < fsl,pins = <
MX7D_PAD_GPIO1_IO01__PWM1_OUT 0x110b0 MX7D_PAD_LPSR_GPIO1_IO01__PWM1_OUT 0x110b0
>; >;
}; };
}; };
...@@ -442,7 +442,7 @@ MX7D_PAD_SD3_RESET_B__SD3_RESET_B 0x1b ...@@ -442,7 +442,7 @@ MX7D_PAD_SD3_RESET_B__SD3_RESET_B 0x1b
&iomuxc_lpsr { &iomuxc_lpsr {
pinctrl_wdog: wdoggrp { pinctrl_wdog: wdoggrp {
fsl,pins = < fsl,pins = <
MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_B 0x74 MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_B 0x74
>; >;
}; };
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment