From b132179c897bb1444dce7963cca6ae246499a972 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Tue, 16 Feb 2021 23:00:28 +0800 Subject: [PATCH] ramips: remove obsolete mx25l25635f compatible hack (#6380) The kernel bump to 5.4 has removed the mx25l25635f hack, and the mx25l25635f compatible is no longer required. Signed-off-by: DENG Qingfang Co-authored-by: DENG Qingfang --- target/linux/ramips/dts/mt7620a_youku_yk1.dts | 3 ++- target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts | 8 +++++--- target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a_youku_yk1.dts b/target/linux/ramips/dts/mt7620a_youku_yk1.dts index f14b70d40..0ed08744a 100644 --- a/target/linux/ramips/dts/mt7620a_youku_yk1.dts +++ b/target/linux/ramips/dts/mt7620a_youku_yk1.dts @@ -73,9 +73,10 @@ status = "okay"; flash@0 { - compatible = "mx25l25635f", "jedec,spi-nor"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; + broken-flash-reset; m25p,fast-read; partitions { diff --git a/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts b/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts index 180e8fb45..28f833e50 100644 --- a/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts +++ b/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; + #include "mt7621.dtsi" #include @@ -42,12 +43,12 @@ compatible = "gpio-leds"; led_run: run { - label = "blue:run"; + label = "gl-mt1300:blue:run"; gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; }; system { - label = "white:system"; + label = "gl-mt1300:white:system"; gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; }; }; @@ -65,9 +66,10 @@ status = "okay"; flash@0 { - compatible = "mx25l25635f", "jedec,spi-nor"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <80000000>; + broken-flash-reset; m25p,fast-read; partitions { diff --git a/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts b/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts index 6292762ea..42fa602a7 100644 --- a/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts +++ b/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts @@ -51,9 +51,10 @@ status = "okay"; flash@0 { - compatible = "mx25l25635f", "jedec,spi-nor"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; + broken-flash-reset; partitions { compatible = "fixed-partitions";