diff --git a/chip/g/idle.c b/chip/g/idle.c
index a3501973de..f2bd6fe3bd 100644
--- a/chip/g/idle.c
+++ b/chip/g/idle.c
@@ -128,8 +128,10 @@ static void prepare_to_sleep(void)
 		GREG32(PMU, PWRDN_SCRATCH17) =
 			GREG32(PMU, PWRDN_SCRATCH17) + 1;
 
+#ifndef CONFIG_NO_PINHOLD
 		/* Latch the pinmux values */
 		GREG32(PINMUX, HOLD) = 1;
+#endif
 
 		/* Clamp the USB pins and shut the PHY down. We have to do this
 		 * in three separate steps, or Bad Things happen. */
diff --git a/include/config.h b/include/config.h
index 5ba4205cf2..038b8cf75f 100644
--- a/include/config.h
+++ b/include/config.h
@@ -1730,6 +1730,9 @@
 /* Support memory protection unit (MPU) */
 #undef CONFIG_MPU
 
+/* Do not try hold I/O pins at frozen level during deep sleep */
+#undef CONFIG_NO_PINHOLD
+
 /* Support one-wire interface */
 #undef CONFIG_ONEWIRE