From 4d3cb7459f2efaa93a1a33b00d9a1455be695d93 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 24 Aug 2021 02:49:45 +0800 Subject: [PATCH] Revert "ath79: csac: sync with upstream source" This reverts commit a4f8dde6e9358fede87072b384953fe94ebc892c. Signed-off-by: Tianling Shen --- target/linux/ath79/dts/qca9563_xwrt_csac.dts | 12 ------------ target/linux/ath79/image/generic.mk | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/target/linux/ath79/dts/qca9563_xwrt_csac.dts b/target/linux/ath79/dts/qca9563_xwrt_csac.dts index 1aef53e924..648895879f 100644 --- a/target/linux/ath79/dts/qca9563_xwrt_csac.dts +++ b/target/linux/ath79/dts/qca9563_xwrt_csac.dts @@ -168,8 +168,6 @@ ð0 { status = "okay"; mtd-mac-address = <&art 0x0>; - nvmem-cells = <&macaddr_art_0>; - nvmem-cell-names = "mac-address"; pll-data = <0x03000101 0x00000101 0x00001919>; @@ -181,13 +179,3 @@ status = "okay"; mtd-cal-data = <&art 0x1000>; }; - -&art { - compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; - - macaddr_art_0: macaddr@0 { - reg = <0x0 0x6>; - }; -}; diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 5b01434fd6..62d1f5df66 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -2232,7 +2232,7 @@ define Device/xwrt_csac KERNEL_SIZE := 1472k IMAGE_SIZE := 16000k IMAGES += factory-10.bin factory-05.bin - IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 14528k | append-kernel | append-metadata | check-size + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 14528k | append-kernel | append-metadata | check-size $$$$(IMAGE_SIZE) IMAGE/factory-10.bin := $$(IMAGE/sysupgrade.bin) | xwrt_csac10-factory $(1) IMAGE/factory-05.bin := $$(IMAGE/sysupgrade.bin) | xwrt_csac05-factory $(1) DEVICE_PACKAGES := kmod-leds-reset kmod-ath10k-ct ath10k-firmware-qca9888-ct kmod-usb-core kmod-usb2