From f80af7bdb76f767a236eeb55b6ea210023180cd6 Mon Sep 17 00:00:00 2001
From: Michael Kaplan <m.kaplan@evva.com>
Date: Tue, 4 Feb 2020 16:14:48 +0100
Subject: [PATCH] overlays: fix sh1106-spi, ssd1306-spi and ssd1351-spi overlays

---
 .../arm/boot/dts/overlays/sh1106-spi-overlay.dts | 16 +++++++++-------
 .../boot/dts/overlays/ssd1306-spi-overlay.dts    | 16 +++++++++-------
 .../boot/dts/overlays/ssd1351-spi-overlay.dts    | 14 ++++++++------
 3 files changed, 26 insertions(+), 20 deletions(-)

--- a/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts
+++ b/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts
@@ -71,12 +71,14 @@
 	};
 
 	__overrides__ {
-		speed		= <&sh1106>,"spi-max-frequency:0";
-		rotate		= <&sh1106>,"rotate:0";
-		fps		= <&sh1106>,"fps:0";
-		debug		= <&sh1106>,"debug:0";
-		dc_pin		= <&sh1106>,"dc-gpios:4>";
-		reset_pin	= <&sh1106>,"reset-gpios:4>";
-		height		= <&sh1106>,"sinowealth,height:0>";
+		speed     = <&sh1106>,"spi-max-frequency:0";
+		rotate    = <&sh1106>,"rotate:0";
+		fps       = <&sh1106>,"fps:0";
+		debug     = <&sh1106>,"debug:0";
+		dc_pin    = <&sh1106>,"dc-gpios:4",
+		            <&sh1106_pins>,"brcm,pins:4;
+		reset_pin = <&sh1106>,"reset-gpios:4",
+		            <&sh1106_pins>,"brcm,pins:0;
+		height    = <&sh1106>,"sinowealth,height:0";
 	};
 };
--- a/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts
+++ b/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts
@@ -71,12 +71,14 @@
 	};
 
 	__overrides__ {
-		speed		= <&ssd1306>,"spi-max-frequency:0";
-		rotate		= <&ssd1306>,"rotate:0";
-		fps		= <&ssd1306>,"fps:0";
-		debug		= <&ssd1306>,"debug:0";
-		dc_pin		= <&ssd1306>,"dc-gpios:4>";
-		reset_pin	= <&ssd1306>,"reset-gpios:4>";
-		height		= <&ssd1306>,"solomon,height:0>";
+		speed     = <&ssd1306>,"spi-max-frequency:0";
+		rotate    = <&ssd1306>,"rotate:0";
+		fps       = <&ssd1306>,"fps:0";
+		debug     = <&ssd1306>,"debug:0";
+		dc_pin    = <&ssd1306>,"dc-gpios:4";
+		            <&ssd1306_pins>,"brcm,pins:4";
+		reset_pin = <&ssd1306>,"reset-gpios:4";
+		            <&ssd1306_pins>,"brcm,pins:0";
+		height    = <&ssd1306>,"solomon,height:0";
 	};
 };
--- a/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts
+++ b/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts
@@ -71,11 +71,13 @@
 	};
 
 	__overrides__ {
-		speed		= <&ssd1351>,"spi-max-frequency:0";
-		rotate		= <&ssd1351>,"rotate:0";
-		fps		= <&ssd1351>,"fps:0";
-		debug		= <&ssd1351>,"debug:0";
-		dc_pin		= <&ssd1351>,"dc-gpios:4>";
-		reset_pin	= <&ssd1351>,"reset-gpios:4>";
+		speed     = <&ssd1351>,"spi-max-frequency:0";
+		rotate    = <&ssd1351>,"rotate:0";
+		fps       = <&ssd1351>,"fps:0";
+		debug     = <&ssd1351>,"debug:0";
+		dc_pin    = <&ssd1351>,"dc-gpios:4",
+		            <&ssd1351_pins>,"brcm,pins:4";
+		reset_pin = <&ssd1351>,"reset-gpios:4";
+		            <&ssd1351_pins>,"brcm,pins:0";
 	};
 };