arm64: dts: hikey960: pinctrl: Fix spi2/spi3 pinconf

Only the pinmux was selected, not the pinconf, leading to spi issues.
Increase drive strength so that max speed (25Mhz) can be achieved.

Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
index 253cc34..c39b789 100644 (file)
--- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
@@ -974,7 +974,7 @@
                        clocks = <&crg_ctrl HI3660_CLK_GATE_SPI2>;
                        clock-names = "apb_pclk";
                        pinctrl-names = "default";
-                       pinctrl-0 = <&spi2_pmx_func>;
+                       pinctrl-0 = <&spi2_pmx_func &spi2_cfg_func>;
                        num-cs = <1>;
                        cs-gpios = <&gpio27 2 0>;
                        status = "disabled";
@@ -989,7 +989,7 @@
                        clocks = <&crg_ctrl HI3660_CLK_GATE_SPI3>;
                        clock-names = "apb_pclk";
                        pinctrl-names = "default";
-                       pinctrl-0 = <&spi3_pmx_func>;
+                       pinctrl-0 = <&spi3_pmx_func &spi3_cfg_func>;
                        num-cs = <1>;
                        cs-gpios = <&gpio18 5 0>;
                        status = "disabled";

diff --git a/arch/arm64/boot/dts/hisilicon/hikey960-pinctrl.dtsi b/arch/arm64/boot/dts/hisilicon/hikey960-pinctrl.dtsi
index d11efc8..920a311 100644 (file)
--- a/arch/arm64/boot/dts/hisilicon/hikey960-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hikey960-pinctrl.dtsi
@@ -717,7 +717,7 @@
                        spi3_cfg_func: spi3_cfg_func {
                                pinctrl-single,pins = <
                                        0x008 0x0 /* SPI3_CLK */
-                                       0x0 /* SPI3_DI */
+                                       0x00c 0x0 /* SPI3_DI */
                                        0x010 0x0 /* SPI3_DO */
                                        0x014 0x0 /* SPI3_CS0_N */
                                >;
@@ -734,7 +734,7 @@
                                        PULL_UP
                                >;
                                pinctrl-single,drive-strength = <
-                                       DRIVE7_02MA DRIVE6_MASK
+                                       DRIVE7_06MA DRIVE6_MASK
                                >;
                        };
                };
@@ -1031,7 +1031,7 @@
                                        PULL_UP
                                >;
                                pinctrl-single,drive-strength = <
-                                       DRIVE7_02MA DRIVE6_MASK
+                                       DRIVE7_06MA DRIVE6_MASK
                                >;
                        };