arm64: dts: qcom: sm8250: add pinctrl for SPI using GPIO as a CS

GENI SPI controller shows several issues if it manages the CS on its own
(see 37dd4b777942 ("arm64: dts: qcom: sc7180: Provide pinconf for SPI to
use GPIO for CS")) for the details. Provide pinctrl entries for SPI
controllers using the same CS pin but in GPIO mode.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20210210133458.1201066-4-dmitry.baryshkov@linaro.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index 39d50d0..9fe1d39 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -2948,6 +2948,11 @@
                                function = "qup0";
                        };
 
+                       qup_spi0_cs_gpio: qup-spi0-cs-gpio {
+                               pins = "gpio31";
+                               function = "gpio";
+                       };
+
                        qup_spi0_data_clk: qup-spi0-data-clk {
                                pins = "gpio28", "gpio29",
                                       "gpio30";
@@ -2959,6 +2964,11 @@
                                function = "qup1";
                        };
 
+                       qup_spi1_cs_gpio: qup-spi1-cs-gpio {
+                               pins = "gpio7";
+                               function = "gpio";
+                       };
+
                        qup_spi1_data_clk: qup-spi1-data-clk {
                                pins = "gpio4", "gpio5",
                                       "gpio6";
@@ -2970,6 +2980,11 @@
                                function = "qup2";
                        };
 
+                       qup_spi2_cs_gpio: qup-spi2-cs-gpio {
+                               pins = "gpio118";
+                               function = "gpio";
+                       };
+
                        qup_spi2_data_clk: qup-spi2-data-clk {
                                pins = "gpio115", "gpio116",
                                       "gpio117";
@@ -2981,6 +2996,11 @@
                                function = "qup3";
                        };
 
+                       qup_spi3_cs_gpio: qup-spi3-cs-gpio {
+                               pins = "gpio122";
+                               function = "gpio";
+                       };
+
                        qup_spi3_data_clk: qup-spi3-data-clk {
                                pins = "gpio119", "gpio120",
                                       "gpio121";
@@ -2992,6 +3012,11 @@
                                function = "qup4";
                        };
 
+                       qup_spi4_cs_gpio: qup-spi4-cs-gpio {
+                               pins = "gpio11";
+                               function = "gpio";
+                       };
+
                        qup_spi4_data_clk: qup-spi4-data-clk {
                                pins = "gpio8", "gpio9",
                                       "gpio10";
@@ -3003,6 +3028,11 @@
                                function = "qup5";
                        };
 
+                       qup_spi5_cs_gpio: qup-spi5-cs-gpio {
+                               pins = "gpio15";
+                               function = "gpio";
+                       };
+
                        qup_spi5_data_clk: qup-spi5-data-clk {
                                pins = "gpio12", "gpio13",
                                       "gpio14";
@@ -3014,6 +3044,11 @@
                                function = "qup6";
                        };
 
+                       qup_spi6_cs_gpio: qup-spi6-cs-gpio {
+                               pins = "gpio19";
+                               function = "gpio";
+                       };
+
                        qup_spi6_data_clk: qup-spi6-data-clk {
                                pins = "gpio16", "gpio17",
                                       "gpio18";
@@ -3025,6 +3060,11 @@
                                function = "qup7";
                        };
 
+                       qup_spi7_cs_gpio: qup-spi7-cs-gpio {
+                               pins = "gpio23";
+                               function = "gpio";
+                       };
+
                        qup_spi7_data_clk: qup-spi7-data-clk {
                                pins = "gpio20", "gpio21",
                                       "gpio22";
@@ -3036,6 +3076,11 @@
                                function = "qup8";
                        };
 
+                       qup_spi8_cs_gpio: qup-spi8-cs-gpio {
+                               pins = "gpio27";
+                               function = "gpio";
+                       };
+
                        qup_spi8_data_clk: qup-spi8-data-clk {
                                pins = "gpio24", "gpio25",
                                       "gpio26";
@@ -3047,6 +3092,11 @@
                                function = "qup9";
                        };
 
+                       qup_spi9_cs_gpio: qup-spi9-cs-gpio {
+                               pins = "gpio128";
+                               function = "gpio";
+                       };
+
                        qup_spi9_data_clk: qup-spi9-data-clk {
                                pins = "gpio125", "gpio126",
                                       "gpio127";
@@ -3058,6 +3108,11 @@
                                function = "qup10";
                        };
 
+                       qup_spi10_cs_gpio: qup-spi10-cs-gpio {
+                               pins = "gpio132";
+                               function = "gpio";
+                       };
+
                        qup_spi10_data_clk: qup-spi10-data-clk {
                                pins = "gpio129", "gpio130",
                                       "gpio131";
@@ -3069,6 +3124,11 @@
                                function = "qup11";
                        };
 
+                       qup_spi11_cs_gpio: qup-spi11-cs-gpio {
+                               pins = "gpio63";
+                               function = "gpio";
+                       };
+
                        qup_spi11_data_clk: qup-spi11-data-clk {
                                pins = "gpio60", "gpio61",
                                       "gpio62";
@@ -3080,6 +3140,11 @@
                                function = "qup12";
                        };
 
+                       qup_spi12_cs_gpio: qup-spi12-cs-gpio {
+                               pins = "gpio35";
+                               function = "gpio";
+                       };
+
                        qup_spi12_data_clk: qup-spi12-data-clk {
                                pins = "gpio32", "gpio33",
                                       "gpio34";
@@ -3091,6 +3156,11 @@
                                function = "qup13";
                        };
 
+                       qup_spi13_cs_gpio: qup-spi13-cs-gpio {
+                               pins = "gpio39";
+                               function = "gpio";
+                       };
+
                        qup_spi13_data_clk: qup-spi13-data-clk {
                                pins = "gpio36", "gpio37",
                                       "gpio38";
@@ -3102,6 +3172,11 @@
                                function = "qup14";
                        };
 
+                       qup_spi14_cs_gpio: qup-spi14-cs-gpio {
+                               pins = "gpio43";
+                               function = "gpio";
+                       };
+
                        qup_spi14_data_clk: qup-spi14-data-clk {
                                pins = "gpio40", "gpio41",
                                       "gpio42";
@@ -3113,6 +3188,11 @@
                                function = "qup15";
                        };
 
+                       qup_spi15_cs_gpio: qup-spi15-cs-gpio {
+                               pins = "gpio47";
+                               function = "gpio";
+                       };
+
                        qup_spi15_data_clk: qup-spi15-data-clk {
                                pins = "gpio44", "gpio45",
                                       "gpio46";
@@ -3124,6 +3204,11 @@
                                function = "qup16";
                        };
 
+                       qup_spi16_cs_gpio: qup-spi16-cs-gpio {
+                               pins = "gpio51";
+                               function = "gpio";
+                       };
+
                        qup_spi16_data_clk: qup-spi16-data-clk {
                                pins = "gpio48", "gpio49",
                                       "gpio50";
@@ -3135,6 +3220,11 @@
                                function = "qup17";
                        };
 
+                       qup_spi17_cs_gpio: qup-spi17-cs-gpio {
+                               pins = "gpio55";
+                               function = "gpio";
+                       };
+
                        qup_spi17_data_clk: qup-spi17-data-clk {
                                pins = "gpio52", "gpio53",
                                       "gpio54";
@@ -3146,6 +3236,11 @@
                                function = "qup18";
                        };
 
+                       qup_spi18_cs_gpio: qup-spi18-cs-gpio {
+                               pins = "gpio59";
+                               function = "gpio";
+                       };
+
                        qup_spi18_data_clk: qup-spi18-data-clk {
                                pins = "gpio56", "gpio57",
                                       "gpio58";
@@ -3157,6 +3252,11 @@
                                function = "qup19";
                        };
 
+                       qup_spi19_cs_gpio: qup-spi19-cs-gpio {
+                               pins = "gpio3";
+                               function = "gpio";
+                       };
+
                        qup_spi19_data_clk: qup-spi19-data-clk {
                                pins = "gpio0", "gpio1",
                                       "gpio2";