diff --git a/3rdparty/arm-trusted-firmware b/3rdparty/arm-trusted-firmware
index e4f51eee91..bfd925139f 160000
--- a/3rdparty/arm-trusted-firmware
+++ b/3rdparty/arm-trusted-firmware
@@ -1 +1 @@
-Subproject commit e4f51eee91187e980f5e0e436c65f325fc35c94b
+Subproject commit bfd925139fdbc2e87979849907b34843aa326994
diff --git a/src/mainboard/google/gru/board.h b/src/mainboard/google/gru/board.h
index 382c462dfa..7880cca70d 100644
--- a/src/mainboard/google/gru/board.h
+++ b/src/mainboard/google/gru/board.h
@@ -25,6 +25,9 @@
 #define GPIO_POWEROFF	GPIO(1, A, 6)
 #define GPIO_RESET	GPIO(0, B, 3)
 #define GPIO_WP		GPIO(1, C, 2)
+#define GPIO_P15V_EN	GPIO(0, B, 2)
+#define GPIO_P30V_EN	GPIO(0, B, 4)
+#define GPIO_P18V_AUDIO_PWREN	GPIO(0, A, 2)
 
 void setup_chromeos_gpios(void);
 
diff --git a/src/mainboard/google/gru/mainboard.c b/src/mainboard/google/gru/mainboard.c
index 8359ca49dc..1812a2ab41 100644
--- a/src/mainboard/google/gru/mainboard.c
+++ b/src/mainboard/google/gru/mainboard.c
@@ -43,6 +43,49 @@ static void configure_emmc(void)
 	rkclk_configure_emmc();
 }
 
+static void register_gpio_suspend(void)
+{
+	/*
+	 * These three GPIO params are used to shut down the 1.5V, 1.8V and
+	 * 3.3V power rails, which need to be shut down ordered by voltage,
+	 * with highest voltage first.
+	 * Since register_bl31() appends to the front of the list, we need to
+	 * register them backwards, with 1.5V coming first.
+	 */
+	static struct bl31_gpio_param param_p15_en = {
+		.h = {
+			.type = PARAM_SUSPEND_GPIO,
+		},
+		.gpio = {
+			.polarity = BL31_GPIO_LEVEL_LOW,
+		},
+	};
+	param_p15_en.gpio.index = GET_GPIO_NUM(GPIO_P15V_EN);
+	register_bl31_param(&param_p15_en.h);
+
+	static struct bl31_gpio_param param_p18_audio_en = {
+		.h = {
+			.type = PARAM_SUSPEND_GPIO,
+		},
+		.gpio = {
+			.polarity = BL31_GPIO_LEVEL_LOW,
+		},
+	};
+	param_p18_audio_en.gpio.index = GET_GPIO_NUM(GPIO_P18V_AUDIO_PWREN);
+	register_bl31_param(&param_p18_audio_en.h);
+
+	static struct bl31_gpio_param param_p30_en = {
+		.h = {
+			.type = PARAM_SUSPEND_GPIO,
+		},
+		.gpio = {
+			.polarity = BL31_GPIO_LEVEL_LOW,
+		},
+	};
+	param_p30_en.gpio.index = GET_GPIO_NUM(GPIO_P30V_EN);
+	register_bl31_param(&param_p30_en.h);
+}
+
 static void register_reset_to_bl31(void)
 {
 	static struct bl31_gpio_param param_reset = {
@@ -184,6 +227,7 @@ static void mainboard_init(device_t dev)
 	setup_usb();
 	register_reset_to_bl31();
 	register_poweroff_to_bl31();
+	register_gpio_suspend();
 }
 
 static void enable_backlight_booster(void)