From 9ea49eb2d5e3a03a7ac2e2767dc3f943b6df234a Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 1 Sep 2020 12:28:07 +0000 Subject: mx8: follow pad macro changes The prefix to the pad macros changed in 5.4.24_2.1.0. Follow that. Related-to: ELB-2943 Signed-off-by: Max Krummenacher --- overlays/apalis-imx8qm_atmel-mxt_overlay.dts | 4 ++-- overlays/apalis-imx8x_ad7879_overlay.dts | 2 +- overlays/apalis-imx8x_atmel-mxt_overlay.dts | 4 ++-- overlays/colibri-imx8x_ad7879_overlay.dts | 2 +- overlays/colibri-imx8x_atmel-mxt_overlay.dts | 4 ++-- overlays/colibri-imx8x_dsihdmi_overlay.dts | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/overlays/apalis-imx8qm_atmel-mxt_overlay.dts b/overlays/apalis-imx8qm_atmel-mxt_overlay.dts index 7a5679c..8320e70 100644 --- a/overlays/apalis-imx8qm_atmel-mxt_overlay.dts +++ b/overlays/apalis-imx8qm_atmel-mxt_overlay.dts @@ -33,8 +33,8 @@ /* Apalis GPIO5+6 */ pinctrl_touch: touchgrp { fsl,pins = < - SC_P_FLEXCAN2_RX_LSIO_GPIO4_IO01 0x06000021 - SC_P_FLEXCAN2_TX_LSIO_GPIO4_IO02 0x06000021 + IMX8QM_FLEXCAN2_RX_LSIO_GPIO4_IO01 0x06000021 + IMX8QM_FLEXCAN2_TX_LSIO_GPIO4_IO02 0x06000021 >; }; }; diff --git a/overlays/apalis-imx8x_ad7879_overlay.dts b/overlays/apalis-imx8x_ad7879_overlay.dts index 50022a9..4d497cc 100644 --- a/overlays/apalis-imx8x_ad7879_overlay.dts +++ b/overlays/apalis-imx8x_ad7879_overlay.dts @@ -38,7 +38,7 @@ /* On-module touch pen-down interrupt */ pinctrl_ad7879_int: ad7879-int { fsl,pins = < - SC_P_MIPI_CSI0_I2C0_SCL_LSIO_GPIO3_IO05 0x21 + IMX8QXP_MIPI_CSI0_I2C0_SCL_LSIO_GPIO3_IO05 0x21 >; }; }; diff --git a/overlays/apalis-imx8x_atmel-mxt_overlay.dts b/overlays/apalis-imx8x_atmel-mxt_overlay.dts index f14dfe8..dcab09e 100644 --- a/overlays/apalis-imx8x_atmel-mxt_overlay.dts +++ b/overlays/apalis-imx8x_atmel-mxt_overlay.dts @@ -33,8 +33,8 @@ /* Apalis GPIO5+6 */ pinctrl_touch: touchgrp { fsl,pins = < - SC_P_QSPI0B_SCLK_LSIO_GPIO3_IO17 0x21 /* MXM3 11 */ - SC_P_QSPI0B_DATA0_LSIO_GPIO3_IO18 0x21 /* MXM3 13 */ + IMX8QXP_QSPI0B_SCLK_LSIO_GPIO3_IO17 0x21 /* MXM3 11 */ + IMX8QXP_QSPI0B_DATA0_LSIO_GPIO3_IO18 0x21 /* MXM3 13 */ >; }; }; diff --git a/overlays/colibri-imx8x_ad7879_overlay.dts b/overlays/colibri-imx8x_ad7879_overlay.dts index dadbdba..ab4db27 100644 --- a/overlays/colibri-imx8x_ad7879_overlay.dts +++ b/overlays/colibri-imx8x_ad7879_overlay.dts @@ -38,7 +38,7 @@ /* On-module touch pen-down interrupt */ pinctrl_ad7879_int: ad7879-int { fsl,pins = < - SC_P_MIPI_CSI0_I2C0_SCL_LSIO_GPIO3_IO05 0x21 + IMX8QXP_MIPI_CSI0_I2C0_SCL_LSIO_GPIO3_IO05 0x21 >; }; }; diff --git a/overlays/colibri-imx8x_atmel-mxt_overlay.dts b/overlays/colibri-imx8x_atmel-mxt_overlay.dts index 56dd229..1b1fe57 100644 --- a/overlays/colibri-imx8x_atmel-mxt_overlay.dts +++ b/overlays/colibri-imx8x_atmel-mxt_overlay.dts @@ -32,8 +32,8 @@ colibri-imx8qxp { pinctrl_mxt_ts: mxt-ts { fsl,pins = < - SC_P_QSPI0B_DATA2_LSIO_GPIO3_IO20 0x20 /* SODIMM 107 */ - SC_P_QSPI0B_SS1_B_LSIO_GPIO3_IO24 0x20 /* SODIMM 106 */ + IMX8QXP_QSPI0B_DATA2_LSIO_GPIO3_IO20 0x20 /* SODIMM 107 */ + IMX8QXP_QSPI0B_SS1_B_LSIO_GPIO3_IO24 0x20 /* SODIMM 106 */ >; }; }; diff --git a/overlays/colibri-imx8x_dsihdmi_overlay.dts b/overlays/colibri-imx8x_dsihdmi_overlay.dts index 5e80855..b055b07 100644 --- a/overlays/colibri-imx8x_dsihdmi_overlay.dts +++ b/overlays/colibri-imx8x_dsihdmi_overlay.dts @@ -63,7 +63,7 @@ /* DSI/LVDS Hot Plug Detect on FFC (X2) */ pinctrl_gpio_hpd: gpio-hpd { fsl,pins = < - SC_P_MIPI_DSI1_GPIO0_00_LSIO_GPIO1_IO31 0x20 /* SODIMM 138 */ + IMX8QXP_MIPI_DSI1_GPIO0_00_LSIO_GPIO1_IO31 0x20 /* SODIMM 138 */ >; }; }; -- cgit v1.2.3