From: Andrew Jeffery <andrew@aj.id.au>
Date: Tue, 7 Nov 2017 07:30:32 +0000 (+1030)
Subject: ARM: dts: palmetto: Request mux as per strapping configuration
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=720ed06c0906212cbd585cf80602035d576f207d;p=openwrt%2Fstaging%2Fblogic.git

ARM: dts: palmetto: Request mux as per strapping configuration

Prevents the error:

 aspeed-smc 1e630000.spi: Error applying setting, reverse things back

The pinmux driver is only capable of modifying selected strapping bits
that make sense to change at runtime. The SPI strapping is not
currently defined modifiable, so "request" the mux as per how the board
is physically strapped.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
---

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
index b7d3d1825b93..c7084a819dc6 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
@@ -67,6 +67,9 @@
 
 &spi {
 	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_spi1debug_default>;
+
 	flash@0 {
 		status = "okay";
 		m25p,fast-read;