diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
index 05f9f10b1bbe0d..073ccaf472e4a1 100644
--- a/arch/arm/boot/dts/overlays/Makefile
+++ b/arch/arm/boot/dts/overlays/Makefile
@@ -265,6 +265,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
 	spi0-1cs.dtbo \
 	spi0-1cs-inverted.dtbo \
 	spi0-2cs.dtbo \
+	spi0-6cs.dtbo \
 	spi1-1cs.dtbo \
 	spi1-2cs.dtbo \
 	spi1-3cs.dtbo \
diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
index 34cdaada82a204..04d64429975b49 100644
--- a/arch/arm/boot/dts/overlays/README
+++ b/arch/arm/boot/dts/overlays/README
@@ -4716,6 +4716,19 @@ Params: cs0_pin                 GPIO pin for CS0 (default 8)
                                 it for other uses.
 
 
+Name:   spi0-6cs
+Info:   Change the CS pins for SPI0
+Load:   dtoverlay=spi0-6cs,<param>=<val>
+Params: cs0_pin                 GPIO pin for CS0 (default 8)
+        cs1_pin                 GPIO pin for CS1 (default 13)
+        cs2_pin                 GPIO pin for CS1 (default 16)
+        cs3_pin                 GPIO pin for CS1 (default 17)
+        cs4_pin                 GPIO pin for CS1 (default 18)
+        cs5_pin                 GPIO pin for CS1 (default 19)
+        no_miso                 Don't claim and use the MISO pin (9), freeing
+                                it for other uses.
+
+
 Name:   spi0-cs
 Info:   This overlay has been renamed spi0-2cs, keeping spi0-cs as an
         alias for backwards compatibility.
diff --git a/arch/arm/boot/dts/overlays/spi0-6cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-6cs-overlay.dts
new file mode 100644
index 00000000000000..16e2dc9f2bd3e6
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/spi0-6cs-overlay.dts
@@ -0,0 +1,79 @@
+/dts-v1/;
+/plugin/;
+
+
+/ {
+	compatible = "brcm,bcm2835";
+
+	fragment@0 {
+		target = <&spi0_cs_pins>;
+		frag0: __overlay__ {
+			brcm,pins = <8 13 16 17 18 19>;
+		};
+	};
+
+	fragment@1 {
+		target = <&spi0>;
+		frag1: __overlay__ {
+			cs-gpios = <&gpio 8 1>, <&gpio 13 1>, <&gpio 16 1>, <&gpio 17 1>, <&gpio 18 1>, <&gpio 19 1>;
+			status = "okay";
+		};
+	};
+
+	fragment@2 {
+		target = <&spi0_pins>;
+		__dormant__ {
+			brcm,pins = <9 10 11>;
+		};
+	};
+
+	fragment@3 {
+		target = <&spi0>;
+		frag3: __overlay__ {
+			spidev2: spidev@2 {
+				compatible = "spidev";
+				reg = <2>;	/* CE2 */
+				#address-cells = <1>;
+				#size-cells = <0>;
+				spi-max-frequency = <125000000>;
+			};
+			spidev3: spidev@3 {
+				compatible = "spidev";
+				reg = <3>;	/* CE3 */
+				#address-cells = <1>;
+				#size-cells = <0>;
+				spi-max-frequency = <125000000>;
+			};
+			spidev4: spidev@4 {
+				compatible = "spidev";
+				reg = <4>;	/* CE4 */
+				#address-cells = <1>;
+				#size-cells = <0>;
+				spi-max-frequency = <125000000>;
+			};
+			spidev5: spidev@5 {
+				compatible = "spidev";
+				reg = <5>;	/* CE5 */
+				#address-cells = <1>;
+				#size-cells = <0>;
+				spi-max-frequency = <125000000>;
+			};
+		};
+	};
+
+	__overrides__ {
+		cs0_pin = <&frag0>,"brcm,pins:0",
+				<&frag1>,"cs-gpios:4";
+		cs1_pin = <&frag0>,"brcm,pins:4",
+				<&frag1>,"cs-gpios:16";
+		cs2_pin = <&frag0>,"brcm,pins:8",
+				<&frag1>,"cs-gpios:28";
+		cs3_pin = <&frag0>,"brcm,pins:12",
+				<&frag1>,"cs-gpios:40";
+		cs4_pin = <&frag0>,"brcm,pins:16",
+				<&frag1>,"cs-gpios:52";
+		cs5_pin = <&frag0>,"brcm,pins:20",
+				<&frag1>,"cs-gpios:64";
+		no_miso = <0>,"=2";
+	};
+};