summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts4
-rw-r--r--arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts10
2 files changed, 9 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts
index 719efcaa81e9..f1d36ce65119 100644
--- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts
@@ -22,8 +22,8 @@
&iomuxc {
pinctrl-names = "default", "sleep";
- pinctrl-0 = <&pinctrl_hog_1>;
- pinctrl-1 = <&pinctrl_hog_1>;
+ pinctrl-0 = <&pinctrl_hog_1 &pinctrl_hog_headphone_det>;
+ pinctrl-1 = <&pinctrl_hog_1 &pinctrl_hog_sd2_vselect>;
};
&sai1 {
diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
index 13c0939b3e7d..5baa417f2d9a 100644
--- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
@@ -564,6 +564,7 @@
MX7D_PAD_SD2_CD_B__GPIO5_IO9 0x59
MX7D_PAD_SD2_WP__GPIO5_IO10 0x59
MX7D_PAD_SD2_RESET_B__GPIO5_IO11 0x59
+ MX7D_PAD_GPIO1_IO13__GPIO1_IO13 0x59
MX7D_PAD_ECSPI1_SCLK__GPIO4_IO16 0x59
MX7D_PAD_ECSPI1_MOSI__GPIO4_IO17 0x59
@@ -576,6 +577,12 @@
>;
};
+ pinctrl_hog_headphone_det: hoggrp_headphone_det {
+ fsl,pins = <
+ MX7D_PAD_GPIO1_IO12__GPIO1_IO12 0x59
+ >;
+ };
+
pinctrl_i2c1_1: i2c1grp-1 {
fsl,pins = <
MX7D_PAD_I2C1_SDA__I2C1_SDA 0x4000007f
@@ -670,9 +677,6 @@
MX7D_PAD_SAI1_RX_SYNC__SAI1_RX_SYNC 0x1f
MX7D_PAD_SAI1_RX_DATA__SAI1_RX_DATA0 0x1f
MX7D_PAD_SAI1_TX_DATA__SAI1_TX_DATA0 0
-
- MX7D_PAD_GPIO1_IO12__GPIO1_IO12 0x59
- MX7D_PAD_GPIO1_IO13__GPIO1_IO13 0x59
>;
};