riscv: dts: canaan: Disable I/O devices unless used

It is considered good practice to disable on-SoC devices providing
external I/O in the SoC-specific .dtsi, and enable them explicitly in
the board-specific DTS files when actually wired-up and used.

Hence:
  - Set the status of I/O devices in k210.dtsi to "disabled",
  - Override the status of used I/O devices in board-specific DTS files
    to "okay",
  - Drop unneeded status overrides in board DTS-specific files for the
    always-enabled pin controller.

On e.g. MAiXBiT, this gets rid of an error message when probing the
unused slave-only spi2 controller:

    dw_spi_mmio 50240000.spi: error -22: problem registering spi host
    dw_spi_mmio 50240000.spi: probe with driver dw_spi_mmio failed with error -22

which is seen since commit 98d75b9ef282f6b9 ("spi: dw: Drop default
number of CS setting").

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>

diff --git a/arch/riscv/boot/dts/canaan/canaan_kd233.dts b/arch/riscv/boot/dts/canaan/canaan_kd233.dts
index 8cbef8daaec1097b12ea92eee04d95dbd3fa260a..a7d753b6fdfd136670c28f89972cfe1ac068a0af 100644 (file)
--- a/arch/riscv/boot/dts/canaan/canaan_kd233.dts
+++ b/arch/riscv/boot/dts/canaan/canaan_kd233.dts
@@ -50,7 +50,6 @@
 &fpioa {
        pinctrl-0 = <&jtag_pinctrl>;
        pinctrl-names = "default";
-       status = "okay";
 
        jtag_pinctrl: jtag-pinmux {
                pinmux = <K210_FPIOA(0, K210_PCF_JTAG_TCLK)>,
@@ -122,6 +121,7 @@
        #sound-dai-cells = <1>;
        pinctrl-0 = <&i2s0_pinctrl>;
        pinctrl-names = "default";
+       status = "okay";
 };
 
 &spi0 {
@@ -129,6 +129,7 @@
        pinctrl-names = "default";
        num-cs = <1>;
        cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
+       status = "okay";
 
        panel@0 {
                compatible = "canaan,kd233-tft", "ilitek,ili9341";

diff --git a/arch/riscv/boot/dts/canaan/k210.dtsi b/arch/riscv/boot/dts/canaan/k210.dtsi
index febdff79c13cc5fca52014c6f038e53a5a8d941d..4f5d40fa1e77c6246aedc7bda8e51143b2d06409 100644 (file)
--- a/arch/riscv/boot/dts/canaan/k210.dtsi
+++ b/arch/riscv/boot/dts/canaan/k210.dtsi
@@ -130,6 +130,7 @@
                        reg = <0x38000000 0x1000>;
                        interrupts = <33>;
                        clocks = <&sysclk K210_CLK_CPU>;
+                       status = "disabled";
                };
 
                gpio0: gpio-controller@38001000 {
@@ -145,6 +146,7 @@
                                     <62>, <63>, <64>, <65>;
                        gpio-controller;
                        ngpios = <32>;
+                       status = "disabled";
                };
 
                dmac0: dma-controller@50000000 {
@@ -180,6 +182,7 @@
                                         <&sysclk K210_CLK_GPIO>;
                                clock-names = "bus", "db";
                                resets = <&sysrst K210_RST_GPIO>;
+                               status = "disabled";
 
                                gpio1_0: gpio-port@0 {
                                        #gpio-cells = <2>;
@@ -207,6 +210,7 @@
                                dsr-override;
                                cts-override;
                                ri-override;
+                               status = "disabled";
                        };
 
                        uart2: serial@50220000 {
@@ -223,6 +227,7 @@
                                dsr-override;
                                cts-override;
                                ri-override;
+                               status = "disabled";
                        };
 
                        uart3: serial@50230000 {
@@ -239,6 +244,7 @@
                                dsr-override;
                                cts-override;
                                ri-override;
+                               status = "disabled";
                        };
 
                        spi2: spi@50240000 {
@@ -252,6 +258,7 @@
                                         <&sysclk K210_CLK_APB0>;
                                clock-names = "ssi_clk", "pclk";
                                resets = <&sysrst K210_RST_SPI2>;
+                               status = "disabled";
                        };
 
                        i2s0: i2s@50250000 {
@@ -261,6 +268,7 @@
                                clocks = <&sysclk K210_CLK_I2S0>;
                                clock-names = "i2sclk";
                                resets = <&sysrst K210_RST_I2S0>;
+                               status = "disabled";
                        };
 
                        i2s1: i2s@50260000 {
@@ -270,6 +278,7 @@
                                clocks = <&sysclk K210_CLK_I2S1>;
                                clock-names = "i2sclk";
                                resets = <&sysrst K210_RST_I2S1>;
+                               status = "disabled";
                        };
 
                        i2s2: i2s@50270000 {
@@ -279,6 +288,7 @@
                                clocks = <&sysclk K210_CLK_I2S2>;
                                clock-names = "i2sclk";
                                resets = <&sysrst K210_RST_I2S2>;
+                               status = "disabled";
                        };
 
                        i2c0: i2c@50280000 {
@@ -289,6 +299,7 @@
                                         <&sysclk K210_CLK_APB0>;
                                clock-names = "ref", "pclk";
                                resets = <&sysrst K210_RST_I2C0>;
+                               status = "disabled";
                        };
 
                        i2c1: i2c@50290000 {
@@ -299,6 +310,7 @@
                                         <&sysclk K210_CLK_APB0>;
                                clock-names = "ref", "pclk";
                                resets = <&sysrst K210_RST_I2C1>;
+                               status = "disabled";
                        };
 
                        i2c2: i2c@502a0000 {
@@ -309,6 +321,7 @@
                                         <&sysclk K210_CLK_APB0>;
                                clock-names = "ref", "pclk";
                                resets = <&sysrst K210_RST_I2C2>;
+                               status = "disabled";
                        };
 
                        fpioa: pinmux@502b0000 {
@@ -457,6 +470,7 @@
                                reset-names = "spi";
                                num-cs = <4>;
                                reg-io-width = <4>;
+                               status = "disabled";
                        };
 
                        spi1: spi@53000000 {
@@ -472,6 +486,7 @@
                                reset-names = "spi";
                                num-cs = <4>;
                                reg-io-width = <4>;
+                               status = "disabled";
                        };
 
                        spi3: spi@54000000 {
@@ -488,6 +503,7 @@
 
                                num-cs = <4>;
                                reg-io-width = <4>;
+                               status = "disabled";
                        };
                };
        };

diff --git a/arch/riscv/boot/dts/canaan/k210_generic.dts b/arch/riscv/boot/dts/canaan/k210_generic.dts
index 36b4ba9cc556bc3f29764c268d813f1efc89869f..5734cc03753b1a061004af8320c8b212e22eddcb 100644 (file)
--- a/arch/riscv/boot/dts/canaan/k210_generic.dts
+++ b/arch/riscv/boot/dts/canaan/k210_generic.dts
@@ -28,7 +28,6 @@
 &fpioa {
        pinctrl-0 = <&jtag_pins>;
        pinctrl-names = "default";
-       status = "okay";
 
        jtag_pins: jtag-pinmux {
                pinmux = <K210_FPIOA(0, K210_PCF_JTAG_TCLK)>,

diff --git a/arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts b/arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts
index e5a77672fc65bc47333c8c0bf8c428edf83eeba1..2ab376d609d2592d19300c26b1dc8bc8a7f1e404 100644 (file)
--- a/arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts
+++ b/arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts
@@ -62,7 +62,6 @@
 &fpioa {
        pinctrl-names = "default";
        pinctrl-0 = <&jtag_pinctrl>;
-       status = "okay";
 
        jtag_pinctrl: jtag-pinmux {
                pinmux = <K210_FPIOA(0, K210_PCF_JTAG_TCLK)>,
@@ -160,6 +159,7 @@
        #sound-dai-cells = <1>;
        pinctrl-0 = <&i2s0_pinctrl>;
        pinctrl-names = "default";
+       status = "okay";
 };
 
 &i2c1 {
@@ -174,6 +174,7 @@
        pinctrl-names = "default";
        num-cs = <1>;
        cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
+       status = "okay";
 
        panel@0 {
                compatible = "sitronix,st7789v";
@@ -203,6 +204,8 @@
 };
 
 &spi3 {
+       status = "okay";
+
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;

diff --git a/arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts b/arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts
index 04c2bf227b1c69adb5985846f3adde76dd955ec9..d98e20775c0736393a0c771e0e650a0e486a05cb 100644 (file)
--- a/arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts
+++ b/arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts
@@ -67,7 +67,6 @@
 &fpioa {
        pinctrl-0 = <&jtag_pinctrl>;
        pinctrl-names = "default";
-       status = "okay";
 
        jtag_pinctrl: jtag-pinmux {
                pinmux = <K210_FPIOA(0, K210_PCF_JTAG_TCLK)>,
@@ -163,6 +162,7 @@
        #sound-dai-cells = <1>;
        pinctrl-0 = <&i2s0_pinctrl>;
        pinctrl-names = "default";
+       status = "okay";
 };
 
 &i2c1 {
@@ -177,6 +177,7 @@
        pinctrl-names = "default";
        num-cs = <1>;
        cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
+       status = "okay";
 
        panel@0 {
                compatible = "sitronix,st7789v";

diff --git a/arch/riscv/boot/dts/canaan/sipeed_maix_go.dts b/arch/riscv/boot/dts/canaan/sipeed_maix_go.dts
index f9f6cc136bc3d98a97a548be6e29af79e0a93f53..79ecd549700a006e0f014f0e11ff34abfddd5489 100644 (file)
--- a/arch/riscv/boot/dts/canaan/sipeed_maix_go.dts
+++ b/arch/riscv/boot/dts/canaan/sipeed_maix_go.dts
@@ -73,7 +73,6 @@
 &fpioa {
        pinctrl-0 = <&jtag_pinctrl>;
        pinctrl-names = "default";
-       status = "okay";
 
        jtag_pinctrl: jtag-pinmux {
                pinmux = <K210_FPIOA(0, K210_PCF_JTAG_TCLK)>,
@@ -171,6 +170,7 @@
        #sound-dai-cells = <1>;
        pinctrl-0 = <&i2s0_pinctrl>;
        pinctrl-names = "default";
+       status = "okay";
 };
 
 &i2c1 {
@@ -185,6 +185,7 @@
        pinctrl-names = "default";
        num-cs = <1>;
        cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
+       status = "okay";
 
        panel@0 {
                compatible = "sitronix,st7789v";
@@ -213,6 +214,8 @@
 };
 
 &spi3 {
+       status = "okay";
+
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;

diff --git a/arch/riscv/boot/dts/canaan/sipeed_maixduino.dts b/arch/riscv/boot/dts/canaan/sipeed_maixduino.dts
index e90188bfb70bd8a42aefd2f70d8a2fdcf95d79c7..019c03ae51f6c485af82041c27f4e53a3ecea346 100644 (file)
--- a/arch/riscv/boot/dts/canaan/sipeed_maixduino.dts
+++ b/arch/riscv/boot/dts/canaan/sipeed_maixduino.dts
@@ -43,8 +43,6 @@
 };
 
 &fpioa {
-       status = "okay";
-
        uarths_pinctrl: uarths-pinmux {
                pinmux = <K210_FPIOA(4, K210_PCF_UARTHS_RX)>, /* Header "0" */
                         <K210_FPIOA(5, K210_PCF_UARTHS_TX)>; /* Header "1" */
@@ -136,6 +134,7 @@
        #sound-dai-cells = <1>;
        pinctrl-0 = <&i2s0_pinctrl>;
        pinctrl-names = "default";
+       status = "okay";
 };
 
 &i2c1 {
@@ -150,6 +149,7 @@
        pinctrl-names = "default";
        num-cs = <1>;
        cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
+       status = "okay";
 
        panel@0 {
                compatible = "sitronix,st7789v";
@@ -178,6 +178,8 @@
 };
 
 &spi3 {
+       status = "okay";
+
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;