mediatek: cleanup Huasifei WH3000 / WH3000 Pro dts

WH3000 / WH3000 Pro button:
- These routers has no switch button, it's a regular button
  `linux,input-type = <EV_SW>;` removed

WH3000 Pro NAND:
- Add spi-nand calibration
- Align image size with vendor U-Boot partition layout:
  `nmbm0:1024k(bl2),512k(u-boot-env),2048k(factory),2048k(fip),231936k(ubi)`
- Remove redundant options from firmware build recipe
- Remove redundant `spi_nand:` label from DTS

Signed-off-by: Fil Dunsky <filipp.dunsky@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/23227
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/target/linux/mediatek/dts/mt7981b-huasifei-wh3000-pro-nand.dts b/target/linux/mediatek/dts/mt7981b-huasifei-wh3000-pro-nand.dts
index ed4f4661c103ca3a81486d23bb357e51ba57178e..087914562968673fdfb9ee73138b8f48d88ab97d 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-huasifei-wh3000-pro-nand.dts
+++ b/target/linux/mediatek/dts/mt7981b-huasifei-wh3000-pro-nand.dts
@@ -12,7 +12,7 @@
 &spi0 {
        status = "okay";
 
-       spi_nand: flash@0 {
+       spi_nand@0 {
                compatible = "spi-nand";
                reg = <0>;
 
@@ -20,6 +20,13 @@
                spi-tx-bus-width = <4>;
                spi-rx-bus-width = <4>;
 
+               spi-cal-enable;
+               spi-cal-mode = "read-data";
+               spi-cal-datalen = <7>;
+               spi-cal-data = /bits/ 8 <0x53 0x50 0x49 0x4e 0x41 0x4e 0x44>;
+               spi-cal-addrlen = <5>;
+               spi-cal-addr = /bits/ 32 <0x0 0x0 0x0 0x0 0x0>;
+
                mediatek,nmbm;
                mediatek,bmt-max-ratio = <1>;
                mediatek,bmt-max-reserved-blocks = <64>;

diff --git a/target/linux/mediatek/dts/mt7981b-huasifei-wh3000-pro.dtsi b/target/linux/mediatek/dts/mt7981b-huasifei-wh3000-pro.dtsi
index a00e9f6c9b90792e42e86942953068bba265681e..bfd884d3b3966f8d5b5bd18377257562bad433ac 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-huasifei-wh3000-pro.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-huasifei-wh3000-pro.dtsi
@@ -43,7 +43,6 @@
                mode {
                        label = "mode";
                        linux,code = <BTN_0>;
-                       linux,input-type = <EV_SW>;
                        gpios = <&pio 0 GPIO_ACTIVE_LOW>;
                        debounce-interval = <60>;
                };

diff --git a/target/linux/mediatek/dts/mt7981b-huasifei-wh3000.dts b/target/linux/mediatek/dts/mt7981b-huasifei-wh3000.dts
index 4c1bae087c9c0a5eb8abe971d3be56ef0a2375b2..1ad7095193285ddd302952765934fada65368bf1 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-huasifei-wh3000.dts
+++ b/target/linux/mediatek/dts/mt7981b-huasifei-wh3000.dts
@@ -29,7 +29,6 @@
                button-mode {
                        label = "mode";
                        linux,code = <BTN_0>;
-                       linux,input-type = <EV_SW>;
                        gpios = <&pio 0 GPIO_ACTIVE_LOW>;
                        debounce-interval = <60>;
                };

diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk
index ad93ccf17079dac046fe63761b8033dbfe306edc..b3eba574a3c744aabf7387fe901845b44b2b1ce7 100644 (file)
--- a/target/linux/mediatek/image/filogic.mk
+++ b/target/linux/mediatek/image/filogic.mk
@@ -1941,11 +1941,7 @@ define Device/huasifei_wh3000-pro-nand
   DEVICE_VARIANT := NAND
   DEVICE_DTS := mt7981b-huasifei-wh3000-pro-nand
   DEVICE_DTS_DIR := ../dts
-  UBINIZE_OPTS := -E 5
-  BLOCKSIZE := 128k
-  PAGESIZE := 2048
-  IMAGE_SIZE := 229376k
-  KERNEL_IN_UBI := 1
+  IMAGE_SIZE := 231936k
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware \
        kmod-usb3 kmod-hwmon-pwmfan