From c52fc6a6a3f0a2a8fe8e44ca2b339ff66f24fcc3 Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Tue, 2 Feb 2021 16:04:45 +0800 Subject: [PATCH] ramips: remove obsolete mx25l25635f compatible hack The kernel bump to 5.4 has removed the mx25l25635f hack, and the mx25l25635f compatible is no longer required. Signed-off-by: DENG Qingfang Signed-off-by: CN_SZTL --- target/linux/ramips/dts/mt7620a_youku_yk1.dts | 3 ++- target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a_youku_yk1.dts b/target/linux/ramips/dts/mt7620a_youku_yk1.dts index 86e2031aa6..21514f3e33 100644 --- a/target/linux/ramips/dts/mt7620a_youku_yk1.dts +++ b/target/linux/ramips/dts/mt7620a_youku_yk1.dts @@ -67,9 +67,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_ubnt_unifi-nanohd.dts b/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts index 4ba5f6a428..4604de531d 100644 --- a/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts +++ b/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts @@ -50,9 +50,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";