arm64: dts: ti: k3-am64: Enable SPI nodes at the board level

SPI nodes defined in the top-level AM64x SoC dtsi files are incomplete
and will not be functional unless they are extended with pinmux
information.

As the pinmux is only known at the board integration level, these
nodes should only be enabled when provided with this information.

Disable the SPI nodes in the dtsi files and only enable the ones that
are actually pinned out on a given board.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Bryan Brattlof <bb@ti.com>
Acked-by: Vignesh Raghavendra <vigneshr@ti.com>
Link: https://lore.kernel.org/r/20221017192532.23825-4-afd@ti.com

diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
index fdcacf78f4a64913dc61c9eade0e79d50527ad37..375078ca4fdde94c2b638c7d8920fe9a4ba82e20 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
@@ -370,6 +370,7 @@
                clocks = <&k3_clks 141 0>;
                dmas = <&main_pktdma 0xc300 0>, <&main_pktdma 0x4300 0>;
                dma-names = "tx0", "rx0";
+               status = "disabled";
        };
 
        main_spi1: spi@20110000 {
@@ -380,6 +381,7 @@
                #size-cells = <0>;
                power-domains = <&k3_pds 142 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 142 0>;
+               status = "disabled";
        };
 
        main_spi2: spi@20120000 {
@@ -390,6 +392,7 @@
                #size-cells = <0>;
                power-domains = <&k3_pds 143 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 143 0>;
+               status = "disabled";
        };
 
        main_spi3: spi@20130000 {
@@ -400,6 +403,7 @@
                #size-cells = <0>;
                power-domains = <&k3_pds 144 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 144 0>;
+               status = "disabled";
        };
 
        main_spi4: spi@20140000 {
@@ -410,6 +414,7 @@
                #size-cells = <0>;
                power-domains = <&k3_pds 145 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 145 0>;
+               status = "disabled";
        };
 
        main_gpio_intr: interrupt-controller@a00000 {

diff --git a/arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi
index 5ce8ceb3779d8ae46e786090d47447c552b713ab..38ddf0b3b8a0c5400c1fa6ef5080b87a42a5fa67 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi
@@ -60,6 +60,7 @@
                #size-cells = <0>;
                power-domains = <&k3_pds 147 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 147 0>;
+               status = "disabled";
        };
 
        mcu_spi1: spi@4b10000 {
@@ -70,6 +71,7 @@
                #size-cells = <0>;
                power-domains = <&k3_pds 148 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 148 0>;
+               status = "disabled";
        };
 
        mcu_gpio_intr: interrupt-controller@4210000 {

diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
index 3903e907244ea2b06f889f2268bcc7076617af41..12d971c3bc3a0e8bc89667187dea16374a29633b 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
@@ -379,15 +379,8 @@
        status = "reserved";
 };
 
-&mcu_spi0 {
-       status = "disabled";
-};
-
-&mcu_spi1 {
-       status = "disabled";
-};
-
 &main_spi0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_spi0_pins_default>;
        ti,pindir-d0-out-d1-in;

diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
index 56763d839e05ac3e71663a3137acc32172db0461..1a116593a771f9515ee44c027874a33afe6fcdba 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
@@ -375,14 +375,6 @@
        };
 };
 
-&mcu_spi0 {
-       status = "disabled";
-};
-
-&mcu_spi1 {
-       status = "disabled";
-};
-
 /* mcu_gpio0 is reserved for mcu firmware usage */
 &mcu_gpio0 {
        status = "reserved";