summaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/patches-4.4
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2016-08-24 01:35:22 +0200
committerJo-Philipp Wich <jo@mein.io>2016-08-24 02:30:35 +0200
commit00e8571f2bf24a9ee38f84b8494c1d653ffdeffe (patch)
tree1ca6b97673a4e952d29df91b6faaca4c666bcca6 /target/linux/ipq806x/patches-4.4
parent212c6bd781c2df9b1edcddc7278c9a6fecae44a4 (diff)
downloadmaster-31e0f0ae-00e8571f2bf24a9ee38f84b8494c1d653ffdeffe.tar.gz
master-31e0f0ae-00e8571f2bf24a9ee38f84b8494c1d653ffdeffe.tar.bz2
master-31e0f0ae-00e8571f2bf24a9ee38f84b8494c1d653ffdeffe.zip
ipq806x: rename R7800 device tree file, merge R7500v2 dts addition
The R7800 is an IPQ8065, so rename its dts file to reflect that fact. Also fold the R7500v2 dts addition into the existing 800-devicetree.patch. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'target/linux/ipq806x/patches-4.4')
-rw-r--r--target/linux/ipq806x/patches-4.4/800-devicetree.patch5
-rw-r--r--target/linux/ipq806x/patches-4.4/801-ARM-dts-qcom-add-Netgear-X4-R7500v2-dts-to-Makefile.patch10
2 files changed, 3 insertions, 12 deletions
diff --git a/target/linux/ipq806x/patches-4.4/800-devicetree.patch b/target/linux/ipq806x/patches-4.4/800-devicetree.patch
index 39f59d36c8..85f253429b 100644
--- a/target/linux/ipq806x/patches-4.4/800-devicetree.patch
+++ b/target/linux/ipq806x/patches-4.4/800-devicetree.patch
@@ -12,7 +12,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -506,7 +506,12 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -506,7 +506,13 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-apq8084-ifc6540.dtb \
qcom-apq8084-mtp.dtb \
qcom-ipq8064-ap148.dtb \
@@ -21,7 +21,8 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
qcom-ipq8064-db149.dtb \
+ qcom-ipq8064-ea8500.dtb \
+ qcom-ipq8064-r7500.dtb \
-+ qcom-ipq8064-r7800.dtb \
++ qcom-ipq8064-r7500v2.dtb \
++ qcom-ipq8065-r7800.dtb \
qcom-msm8660-surf.dtb \
qcom-msm8960-cdp.dtb \
qcom-msm8974-sony-xperia-honami.dtb
diff --git a/target/linux/ipq806x/patches-4.4/801-ARM-dts-qcom-add-Netgear-X4-R7500v2-dts-to-Makefile.patch b/target/linux/ipq806x/patches-4.4/801-ARM-dts-qcom-add-Netgear-X4-R7500v2-dts-to-Makefile.patch
deleted file mode 100644
index 57e76d224f..0000000000
--- a/target/linux/ipq806x/patches-4.4/801-ARM-dts-qcom-add-Netgear-X4-R7500v2-dts-to-Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -511,6 +511,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \
- qcom-ipq8064-db149.dtb \
- qcom-ipq8064-ea8500.dtb \
- qcom-ipq8064-r7500.dtb \
-+ qcom-ipq8064-r7500v2.dtb \
- qcom-ipq8064-r7800.dtb \
- qcom-msm8660-surf.dtb \
- qcom-msm8960-cdp.dtb \