From d59158550bcb97f867a2c92fa061afac813fb456 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Fri, 7 Sep 2018 23:37:18 +0800 Subject: [PATCH] remove bcm53xx i2c patch --- package/lean/default-settings/Makefile | 2 +- .../files/zzz-default-settings | 2 +- ...1x-Fix-i2c-controller-interrupt-type.patch | 24 ------------------- ...ct-JEDEC-incompatible-w25q128-using-.patch | 2 +- 4 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 target/linux/bcm53xx/patches-4.14/037-v4.18-0008-ARM-dts-BCM5301x-Fix-i2c-controller-interrupt-type.patch diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index c52254329..965ee8a48 100644 --- a/package/lean/default-settings/Makefile +++ b/package/lean/default-settings/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=default-settings PKG_VERSION:=1.0 -PKG_RELEASE:=48 +PKG_RELEASE:=49 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings index 7376811b3..6cb7d1dcf 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -57,7 +57,7 @@ sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh wifi up sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release -echo "DISTRIB_REVISION='R8.1 By Lean'" >> /etc/openwrt_release +echo "DISTRIB_REVISION='R8.1.1 By Lean'" >> /etc/openwrt_release sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release diff --git a/target/linux/bcm53xx/patches-4.14/037-v4.18-0008-ARM-dts-BCM5301x-Fix-i2c-controller-interrupt-type.patch b/target/linux/bcm53xx/patches-4.14/037-v4.18-0008-ARM-dts-BCM5301x-Fix-i2c-controller-interrupt-type.patch deleted file mode 100644 index 6f062866c..000000000 --- a/target/linux/bcm53xx/patches-4.14/037-v4.18-0008-ARM-dts-BCM5301x-Fix-i2c-controller-interrupt-type.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a0a8338e905734518ab9b10b06e7fd0201228f8b Mon Sep 17 00:00:00 2001 -From: Florian Fainelli -Date: Mon, 11 Jun 2018 15:53:40 -0700 -Subject: [PATCH] ARM: dts: BCM5301x: Fix i2c controller interrupt type - -The i2c controller should be using IRQ_TYPE_LEVEL_HIGH, fix that. - -Fixes: bb097e3e0045 ("ARM: dts: BCM5301X: Add I2C support to the DT") -Signed-off-by: Florian Fainelli ---- - arch/arm/boot/dts/bcm5301x.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/arm/boot/dts/bcm5301x.dtsi -+++ b/arch/arm/boot/dts/bcm5301x.dtsi -@@ -365,7 +365,7 @@ - i2c0: i2c@18009000 { - compatible = "brcm,iproc-i2c"; - reg = <0x18009000 0x50>; -- interrupts = ; -+ interrupts = ; - #address-cells = <1>; - #size-cells = <0>; - clock-frequency = <100000>; diff --git a/target/linux/bcm53xx/patches-4.14/400-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch b/target/linux/bcm53xx/patches-4.14/400-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch index 8eb70b4e5..832e0d1fe 100644 --- a/target/linux/bcm53xx/patches-4.14/400-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch +++ b/target/linux/bcm53xx/patches-4.14/400-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch @@ -13,7 +13,7 @@ Signed-off-by: Rafał Miłecki --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1209,6 +1209,18 @@ static const struct flash_info *spi_nor_ +@@ -1210,6 +1210,18 @@ static const struct flash_info *spi_nor_ } dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n", id[0], id[1], id[2]);