diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index 5f5e5630f..2644bc015 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -150,6 +150,7 @@ gl-mt750) ;; gl-mt300n-v2) set_wifi_led "$boardname:red:wlan" + ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x1" ;; hc5661|\ hc5661a) diff --git a/target/linux/ramips/dts/GL-MT300N-V2.dts b/target/linux/ramips/dts/GL-MT300N-V2.dts index 48c43baef..ba5a595b1 100644 --- a/target/linux/ramips/dts/GL-MT300N-V2.dts +++ b/target/linux/ramips/dts/GL-MT300N-V2.dts @@ -35,7 +35,7 @@ }; wan { - label = "gl-mt300n-v2:blue:wan"; + label = "gl-mt300n-v2:green:wan"; gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ramips/patches-4.14/999-fix-m25p-shutdown.patch b/target/linux/ramips/patches-4.14/999-fix-m25p-shutdown.patch deleted file mode 100644 index 0b825d61e..000000000 --- a/target/linux/ramips/patches-4.14/999-fix-m25p-shutdown.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c -index 24e1ea3..b1ff69a 100644 ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -313,6 +313,21 @@ static int m25p_remove(struct spi_device *spi) - return mtd_device_unregister(&flash->spi_nor.mtd); - } - -+static void m25p_shutdown(struct spi_device *spi) -+{ -+ struct m25p *flash = spi_get_drvdata(spi); -+ -+ if ((&flash->spi_nor)->addr_width > 3) { -+ printk(KERN_INFO "m25p80: exit 4-byte address mode\n"); -+ flash->command[0] = SPINOR_OP_EX4B; // exit 4-byte address mode: 0xe9 -+ spi_write(flash->spi, flash->command, 1); -+ flash->command[0] = 0x66; // enable reset -+ spi_write(flash->spi, flash->command, 1); -+ flash->command[0] = 0x99; // reset -+ spi_write(flash->spi, flash->command, 1); -+ } -+} -+ - /* - * Do NOT add to this array without reading the following: - * -@@ -387,6 +402,7 @@ static struct spi_driver m25p80_driver = { - .id_table = m25p_ids, - .probe = m25p_probe, - .remove = m25p_remove, -+ .shutdown = m25p_shutdown, - - /* REVISIT: many of these chips have deep power-down modes, which - * should clearly be entered on suspend() to minimize power use.