Merge branch 'audio-display-ti-linux-3.12.y' of git://git.ti.com/~darrene/ti-lin…

…ux-kernel/audio-display-linux-feature-tree into ti-linux-3.12.y TI-Feature: audio-display TI-Tree: git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree.git TI-Branch: audio-display-ti-linux-3.12.y * 'audio-display-ti-linux-3.12.y' of git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree: arm: dts: am437x-gp-evm: Add "sleep" state for lcd arm: dts: am43x-epos-evm: Add "sleep" state for lcd OMAPDSS: dpi: adopt pinctrl support Signed-off-by: Dan Murphy <DMurphy@ti.com>

Merge branch 'audio-display-ti-linux-3.12.y' of git://git.ti.com/~darrene/ti-lin…
…ux-kernel/audio-display-linux-feature-tree into ti-linux-3.12.y TI-Feature: audio-display TI-Tree: git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree.git TI-Branch: audio-display-ti-linux-3.12.y * 'audio-display-ti-linux-3.12.y' of git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree: arm: dts: am437x-gp-evm: Add "sleep" state for lcd arm: dts: am43x-epos-evm: Add "sleep" state for lcd OMAPDSS: dpi: adopt pinctrl support Signed-off-by: Dan Murphy <DMurphy@ti.com>
Dan Murphy
2 parents 85414e8ce8 2cee7c8b25
Showing 3 changed files Side-by-side Diff
arch/arm/boot/dts/am437x-gp-evm.dts
arch/arm/boot/dts/am43x-epos-evm.dts
drivers/video/omap2/dss/dpi.c
@@ -113,7 +113,7 @@
  
 &am43xx_pinmux {
 	pinctrl-names = "default";
-	pinctrl-0 = <&dss_pinctrl &clkout2_pin &ddr3_vtt_toggle_default>;
+	pinctrl-0 = <&clkout2_pin &ddr3_vtt_toggle_default>;
  
 	cpsw_default: cpsw_default {
 		pinctrl-single,pins = <
@@ -225,7 +225,7 @@
 		>;
 	};
  
-	dss_pinctrl: dss_pinctrl {
+	dss_pinctrl_default: dss_pinctrl_default {
 		pinctrl-single,pins = <
 			0x020 (PIN_OUTPUT_PULLUP | MUX_MODE1) /*gpmc ad 8 -> DSS DATA 23 */
 			0x024 (PIN_OUTPUT_PULLUP | MUX_MODE1)
@@ -259,6 +259,40 @@
 		>;
 	};
  
+	dss_pinctrl_sleep: dss_pinctrl_sleep {
+		pinctrl-single,pins = <
+			0x020 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE2)
+			0x024 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE2)
+			0x028 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE2)
+			0x02C (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE2)
+			0x030 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE2)
+			0x034 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE2)
+			0x038 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE2)
+			0x03C (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE2)
+			0x0A0 (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0A4 (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0A8 (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0AC (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0B0 (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0B4 (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0B8 (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0BC (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x0C0 (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x0C4 (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0C8 (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x0CC (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x0D0 (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0D4 (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0D8 (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x0DC (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x0E0 (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x0E4 (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x0E8 (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0EC (DS0_FORCE_OFF_MODE | DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x238 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+		>;
+	};
+
 	ecap0_pins: backlight_pins {
 		pinctrl-single,pins = <
 			0x164 0x0       /* eCAP0_in_PWM0_out.eCAP0_in_PWM0_out MODE0 */
@@ -520,8 +554,9 @@
 };
  
 &dpi {
-	pinctrl-names = "default";
-	pinctrl-0 = <&dss_pinctrl>;
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&dss_pinctrl_default>;
+	pinctrl-1 = <&dss_pinctrl_sleep>;
 };
  
 &mac {
@@ -160,7 +160,7 @@
  
 &am43xx_pinmux {
 	pinctrl-names = "default";
-	pinctrl-0 = <&dss_pinctrl &clkout2_pin>;
+	pinctrl-0 = <&clkout2_pin>;
  
 	cpsw_default: cpsw_default {
 		pinctrl-single,pins = <
@@ -306,7 +306,7 @@
 		>;
 	};
  
-	dss_pinctrl: dss_pinctrl {
+	dss_pinctrl_default: dss_pinctrl_default {
 		pinctrl-single,pins = <
 			0x020 (PIN_OUTPUT_PULLUP | MUX_MODE1) /*gpmc ad 8 -> DSS DATA 23 */
 			0x024 (PIN_OUTPUT_PULLUP | MUX_MODE1)
@@ -340,6 +340,40 @@
 		>;
 	};
  
+	dss_pinctrl_sleep: dss_pinctrl_sleep {
+		pinctrl-single,pins = <
+			0x020 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE2)
+			0x024 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE2)
+			0x028 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE2)
+			0x02C (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE2)
+			0x030 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE0)
+			0x034 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE0)
+			0x038 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE0)
+			0x03C (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE0)
+			0x0A0 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0A4 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0A8 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0AC (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0B0 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0B4 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0B8 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0BC (DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x0C0 (DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x0C4 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0C8 (DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x0CC (DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x0D0 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0D4 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0D8 (DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x0DC (DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x0E0 (DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x0E4 (DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x0E8 (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+			0x0EC (DS0_PULL_UP_DOWN_EN | PULL_DISABLE | INPUT_EN | MUX_MODE7)
+			0x08C (DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7)
+		>;
+	};
+
 	qspi1_default: qspi1_default {
 		pinctrl-single,pins = <
 			0x7c (PIN_INPUT_PULLUP | MUX_MODE3)
@@ -519,8 +553,9 @@
 };
  
 &dpi {
-	pinctrl-names = "default";
-	pinctrl-0 = <&dss_pinctrl>;
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&dss_pinctrl_default>;
+	pinctrl-1 = <&dss_pinctrl_sleep>;
 };
  
 &qspi {
@@ -353,6 +353,8 @@
  
 	mutex_lock(&dpi.lock);
  
+	pinctrl_pm_select_default_state(&dpi.pdev->dev);
+
 	if (dss_has_feature(FEAT_DPI_USES_VDDS_DSI) && !dpi.vdds_dsi_reg) {
 		DSSERR("no VDSS_DSI regulator\n");
 		r = -ENODEV;
@@ -421,6 +423,7 @@
 err_reg_enable:
 err_no_out_mgr:
 err_no_reg:
+	pinctrl_pm_select_sleep_state(&dpi.pdev->dev);
 	mutex_unlock(&dpi.lock);
 	return r;
 }
@@ -443,6 +446,8 @@
  
 	if (dss_has_feature(FEAT_DPI_USES_VDDS_DSI))
 		regulator_disable(dpi.vdds_dsi_reg);
+
+	pinctrl_pm_select_sleep_state(&dpi.pdev->dev);
  
 	mutex_unlock(&dpi.lock);
 }
...	...	@@ -113,7 +113,7 @@
113	113
114	114	&am43xx_pinmux {
115	115	pinctrl-names = "default";
116		- pinctrl-0 = <&dss_pinctrl &clkout2_pin &ddr3_vtt_toggle_default>;
	116	+ pinctrl-0 = <&clkout2_pin &ddr3_vtt_toggle_default>;
117	117
118	118	cpsw_default: cpsw_default {
119	119	pinctrl-single,pins = <
...	...	@@ -225,7 +225,7 @@
225	225	>;
226	226	};
227	227
228		- dss_pinctrl: dss_pinctrl {
	228	+ dss_pinctrl_default: dss_pinctrl_default {
229	229	pinctrl-single,pins = <
230	230	0x020 (PIN_OUTPUT_PULLUP \| MUX_MODE1) /gpmc ad 8 -> DSS DATA 23 /
231	231	0x024 (PIN_OUTPUT_PULLUP \| MUX_MODE1)
...	...	@@ -259,6 +259,40 @@
259	259	>;
260	260	};
261	261
	262	+ dss_pinctrl_sleep: dss_pinctrl_sleep {
	263	+ pinctrl-single,pins = <
	264	+ 0x020 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE2)
	265	+ 0x024 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE2)
	266	+ 0x028 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE2)
	267	+ 0x02C (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE2)
	268	+ 0x030 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE2)
	269	+ 0x034 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE2)
	270	+ 0x038 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE2)
	271	+ 0x03C (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE2)
	272	+ 0x0A0 (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	273	+ 0x0A4 (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	274	+ 0x0A8 (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	275	+ 0x0AC (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	276	+ 0x0B0 (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	277	+ 0x0B4 (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	278	+ 0x0B8 (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	279	+ 0x0BC (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	280	+ 0x0C0 (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	281	+ 0x0C4 (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	282	+ 0x0C8 (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	283	+ 0x0CC (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	284	+ 0x0D0 (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	285	+ 0x0D4 (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	286	+ 0x0D8 (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	287	+ 0x0DC (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	288	+ 0x0E0 (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	289	+ 0x0E4 (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	290	+ 0x0E8 (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	291	+ 0x0EC (DS0_FORCE_OFF_MODE \| DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	292	+ 0x238 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	293	+ >;
	294	+ };
	295	+
262	296	ecap0_pins: backlight_pins {
263	297	pinctrl-single,pins = <
264	298	0x164 0x0 /* eCAP0_in_PWM0_out.eCAP0_in_PWM0_out MODE0 */
...	...	@@ -520,8 +554,9 @@
520	554	};
521	555
522	556	&dpi {
523		- pinctrl-names = "default";
524		- pinctrl-0 = <&dss_pinctrl>;
	557	+ pinctrl-names = "default", "sleep";
	558	+ pinctrl-0 = <&dss_pinctrl_default>;
	559	+ pinctrl-1 = <&dss_pinctrl_sleep>;
525	560	};
526	561
527	562	&mac {
...	...	@@ -160,7 +160,7 @@
160	160
161	161	&am43xx_pinmux {
162	162	pinctrl-names = "default";
163		- pinctrl-0 = <&dss_pinctrl &clkout2_pin>;
	163	+ pinctrl-0 = <&clkout2_pin>;
164	164
165	165	cpsw_default: cpsw_default {
166	166	pinctrl-single,pins = <
...	...	@@ -306,7 +306,7 @@
306	306	>;
307	307	};
308	308
309		- dss_pinctrl: dss_pinctrl {
	309	+ dss_pinctrl_default: dss_pinctrl_default {
310	310	pinctrl-single,pins = <
311	311	0x020 (PIN_OUTPUT_PULLUP \| MUX_MODE1) /gpmc ad 8 -> DSS DATA 23 /
312	312	0x024 (PIN_OUTPUT_PULLUP \| MUX_MODE1)
...	...	@@ -340,6 +340,40 @@
340	340	>;
341	341	};
342	342
	343	+ dss_pinctrl_sleep: dss_pinctrl_sleep {
	344	+ pinctrl-single,pins = <
	345	+ 0x020 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE2)
	346	+ 0x024 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE2)
	347	+ 0x028 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE2)
	348	+ 0x02C (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE2)
	349	+ 0x030 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE0)
	350	+ 0x034 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE0)
	351	+ 0x038 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE0)
	352	+ 0x03C (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE0)
	353	+ 0x0A0 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	354	+ 0x0A4 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	355	+ 0x0A8 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	356	+ 0x0AC (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	357	+ 0x0B0 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	358	+ 0x0B4 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	359	+ 0x0B8 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	360	+ 0x0BC (DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	361	+ 0x0C0 (DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	362	+ 0x0C4 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	363	+ 0x0C8 (DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	364	+ 0x0CC (DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	365	+ 0x0D0 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	366	+ 0x0D4 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	367	+ 0x0D8 (DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	368	+ 0x0DC (DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	369	+ 0x0E0 (DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	370	+ 0x0E4 (DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	371	+ 0x0E8 (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	372	+ 0x0EC (DS0_PULL_UP_DOWN_EN \| PULL_DISABLE \| INPUT_EN \| MUX_MODE7)
	373	+ 0x08C (DS0_PULL_UP_DOWN_EN \| INPUT_EN \| MUX_MODE7)
	374	+ >;
	375	+ };
	376	+
343	377	qspi1_default: qspi1_default {
344	378	pinctrl-single,pins = <
345	379	0x7c (PIN_INPUT_PULLUP \| MUX_MODE3)
...	...	@@ -519,8 +553,9 @@
519	553	};
520	554
521	555	&dpi {
522		- pinctrl-names = "default";
523		- pinctrl-0 = <&dss_pinctrl>;
	556	+ pinctrl-names = "default", "sleep";
	557	+ pinctrl-0 = <&dss_pinctrl_default>;
	558	+ pinctrl-1 = <&dss_pinctrl_sleep>;
524	559	};
525	560
526	561	&qspi {
...	...	@@ -353,6 +353,8 @@
353	353
354	354	mutex_lock(&dpi.lock);
355	355
	356	+ pinctrl_pm_select_default_state(&dpi.pdev->dev);
	357	+
356	358	if (dss_has_feature(FEAT_DPI_USES_VDDS_DSI) && !dpi.vdds_dsi_reg) {
357	359	DSSERR("no VDSS_DSI regulator\n");
358	360	r = -ENODEV;
...	...	@@ -421,6 +423,7 @@
421	423	err_reg_enable:
422	424	err_no_out_mgr:
423	425	err_no_reg:
	426	+ pinctrl_pm_select_sleep_state(&dpi.pdev->dev);
424	427	mutex_unlock(&dpi.lock);
425	428	return r;
426	429	}
...	...	@@ -443,6 +446,8 @@
443	446
444	447	if (dss_has_feature(FEAT_DPI_USES_VDDS_DSI))
445	448	regulator_disable(dpi.vdds_dsi_reg);
	449	+
	450	+ pinctrl_pm_select_sleep_state(&dpi.pdev->dev);
446	451
447	452	mutex_unlock(&dpi.lock);
448	453	}