diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
index edac3945d236..798550d9cdf0 100644
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@ -355,7 +355,14 @@ static int bcm2835_gpio_get(struct gpio_chip *chip, unsigned offset)
 static int bcm2835_gpio_direction_output(struct gpio_chip *chip,
 		unsigned offset, int value)
 {
-	return pinctrl_gpio_direction_output(chip->base + offset);
+	struct bcm2835_pinctrl *pc = dev_get_drvdata(chip->dev);
+	int ret;
+
+	ret = pinctrl_gpio_direction_output(chip->base + offset);
+	if (ret >= 0)
+		bcm2835_gpio_set_bit(pc, value ? GPSET0 : GPCLR0, offset);
+
+	return ret;
 }
 
 static void bcm2835_gpio_set(struct gpio_chip *chip, unsigned offset, int value)