[openwrt/openwrt] mediatek: dts: remove useless SPI cs-gpios property
LEDE Commits
lede-commits at lists.infradead.org
Sun Oct 19 15:29:02 PDT 2025
hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/21960898676263aaa16f1b581b293f38b580af40
commit 21960898676263aaa16f1b581b293f38b580af40
Author: Shiji Yang <yangshiji66 at outlook.com>
AuthorDate: Sun Aug 24 20:59:53 2025 +0800
mediatek: dts: remove useless SPI cs-gpios property
These devices only have one SPI peripheral. And the chip select pin is
directly controlled by the SPI host hardware. Hence we don't need to
assign empty GPIO phandle for them. This patch also adjust the reg
address of the SPI peripheral node to follow the cs-gpios changes.
Signed-off-by: Shiji Yang <yangshiji66 at outlook.com>
Link: https://github.com/openwrt/openwrt/pull/19845
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts | 5 ++---
target/linux/mediatek/dts/mt7981a-edgecore-eap111.dts | 1 -
target/linux/mediatek/dts/mt7981b-openwrt-one.dts | 5 ++---
target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-common.dtsi | 5 ++---
target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts | 9 +--------
.../files-6.12/arch/arm64/boot/dts/mediatek/mt7981-rfb.dts | 1 -
.../files-6.12/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi | 1 -
7 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts b/target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts
index 1cf13ff6a9..fa7856163b 100644
--- a/target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts
+++ b/target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts
@@ -126,18 +126,17 @@
&spi0 {
pinctrl-names = "default";
pinctrl-0 = <&spi0_flash_pins>;
- cs-gpios = <0>, <0>;
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
#address-cells = <1>;
#size-cells = <0>;
- spi_nand: spi_nand at 1 {
+ spi_nand: spi_nand at 0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-nand";
- reg = <1>;
+ reg = <0>;
spi-max-frequency = <52000000>;
spi-cal-enable;
diff --git a/target/linux/mediatek/dts/mt7981a-edgecore-eap111.dts b/target/linux/mediatek/dts/mt7981a-edgecore-eap111.dts
index 7844d11eb5..adfc3f5b09 100644
--- a/target/linux/mediatek/dts/mt7981a-edgecore-eap111.dts
+++ b/target/linux/mediatek/dts/mt7981a-edgecore-eap111.dts
@@ -76,7 +76,6 @@
&spi0 {
pinctrl-names = "default";
pinctrl-0 = <&spi0_flash_pins>;
- cs-gpios = <0>, <0>;
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
diff --git a/target/linux/mediatek/dts/mt7981b-openwrt-one.dts b/target/linux/mediatek/dts/mt7981b-openwrt-one.dts
index 5f54506b2c..302e6289b7 100644
--- a/target/linux/mediatek/dts/mt7981b-openwrt-one.dts
+++ b/target/linux/mediatek/dts/mt7981b-openwrt-one.dts
@@ -298,16 +298,15 @@
&spi0 {
pinctrl-names = "default";
pinctrl-0 = <&spi0_flash_pins>;
- cs-gpios = <0>, <0>;
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
- flash at 1 {
+ flash at 0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-nand";
- reg = <1>;
+ reg = <0>;
spi-max-frequency = <52000000>;
spi-cal-enable;
diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-common.dtsi b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-common.dtsi
index 2c7d1dc184..82abf5f3a5 100644
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-common.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-common.dtsi
@@ -161,16 +161,15 @@
&spi0 {
pinctrl-names = "default";
pinctrl-0 = <&spi_flash_pins>;
- cs-gpios = <0>, <0>;
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
- spi_nand: spi_nand at 1 {
+ spi_nand: spi_nand at 0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-nand";
- reg = <1>;
+ reg = <0>;
spi-max-frequency = <52000000>;
spi-tx-bus-width = <4>;
spi-rx-bus-width = <4>;
diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts b/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
index 0252ab7aba..97f498ba8c 100644
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
@@ -341,18 +341,11 @@
&spi0 {
pinctrl-names = "default";
pinctrl-0 = <&spi_flash_pins>;
- cs-gpios = <0>, <0>;
status = "okay";
flash at 0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <20000000>;
- };
-
- flash at 1 {
compatible = "spi-nand";
- reg = <1>;
+ reg = <0>;
mediatek,nmbm;
mediatek,bmt-max-ratio = <1>;
diff --git a/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7981-rfb.dts b/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7981-rfb.dts
index 28bcc155df..1551577624 100644
--- a/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7981-rfb.dts
+++ b/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7981-rfb.dts
@@ -120,7 +120,6 @@
&spi0 {
pinctrl-names = "default";
pinctrl-0 = <&spi0_flash_pins>;
- cs-gpios = <0>, <0>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
diff --git a/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi b/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
index c01f3dd0e4..1dfb64d456 100644
--- a/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
+++ b/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
@@ -283,7 +283,6 @@
&spi0 {
pinctrl-names = "default";
pinctrl-0 = <&spi_flash_pins>;
- cs-gpios = <0>, <0>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
More information about the lede-commits
mailing list