mediatek: refresh adtran nvmem patch main master
authorChuanhong Guo <gch981213@gmail.com>
Mon, 3 Feb 2025 10:00:25 +0000 (18:00 +0800)
committerChuanhong Guo <gch981213@gmail.com>
Mon, 3 Feb 2025 10:00:42 +0000 (18:00 +0800)
This patch fails to apply due to the recently introduced ascii
nvmem driver.
Manually refresh it.

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
target/linux/mediatek/patches-6.6/450-nvmem-add-layout-for-Adtran-devices.patch

index 496fc6c53f752eaa2767d7025529c04ef7f54564..e1852e5cd6848fa9d32953efcde7904047e6cb12 100644 (file)
@@ -46,11 +46,12 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        select CRC8
 --- a/drivers/nvmem/layouts/Makefile
 +++ b/drivers/nvmem/layouts/Makefile
-@@ -6,3 +6,4 @@
+@@ -6,4 +6,5 @@
  obj-$(CONFIG_NVMEM_LAYOUT_SL28_VPD) += sl28vpd.o
  obj-$(CONFIG_NVMEM_LAYOUT_ONIE_TLV) += onie-tlv.o
  obj-$(CONFIG_NVMEM_LAYOUT_U_BOOT_ENV) += u-boot-env.o
 +obj-$(CONFIG_NVMEM_LAYOUT_ADTRAN) += adtran.o
+ obj-$(CONFIG_NVMEM_LAYOUT_ASCII_ENV) += ascii-env.o
 --- /dev/null
 +++ b/drivers/nvmem/layouts/adtran.c
 @@ -0,0 +1,135 @@