kernel: update 3.14 to 3.14.18

[openwrt/svn-archive/archive.git] / target / linux / ipq806x / patches / 0094-ARM-dts-qcom-Add-initial-APQ8064-SoC-and-IFC6410-boa.patch

diff --git a/target/linux/ipq806x/patches/0094-ARM-dts-qcom-Add-initial-APQ8064-SoC-and-IFC6410-boa.patch b/target/linux/ipq806x/patches/0094-ARM-dts-qcom-Add-initial-APQ8064-SoC-and-IFC6410-boa.patch
index 848cbc7834ac3956776e366f29fff9c961e48487..fb2910b74987eddaaa62adad3b7e159621e0ce7b 100644 (file)
--- a/target/linux/ipq806x/patches/0094-ARM-dts-qcom-Add-initial-APQ8064-SoC-and-IFC6410-boa.patch
+++ b/target/linux/ipq806x/patches/0094-ARM-dts-qcom-Add-initial-APQ8064-SoC-and-IFC6410-boa.patch
@@ -20,11 +20,9 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org>
  create mode 100644 arch/arm/boot/dts/qcom-apq8064-v2.0.dtsi
  create mode 100644 arch/arm/boot/dts/qcom-apq8064.dtsi
 
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 4a89023..ee3dfea 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -231,9 +231,11 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
+@@ -231,9 +231,11 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420
        dra7-evm.dtb
  dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
  dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
@@ -39,9 +37,6 @@ index 4a89023..ee3dfea 100644
  dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
        ste-hrefprev60-stuib.dtb \
        ste-hrefprev60-tvk.dtb \
-diff --git a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
-new file mode 100644
-index 0000000..7c2441d
 --- /dev/null
 +++ b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
 @@ -0,0 +1,16 @@
@@ -61,16 +56,10 @@ index 0000000..7c2441d
 +              };
 +      };
 +};
-diff --git a/arch/arm/boot/dts/qcom-apq8064-v2.0.dtsi b/arch/arm/boot/dts/qcom-apq8064-v2.0.dtsi
-new file mode 100644
-index 0000000..935c394
 --- /dev/null
 +++ b/arch/arm/boot/dts/qcom-apq8064-v2.0.dtsi
 @@ -0,0 +1 @@
 +#include "qcom-apq8064.dtsi"
-diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
-new file mode 100644
-index 0000000..92bf793
 --- /dev/null
 +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
 @@ -0,0 +1,170 @@
@@ -244,8 +233,6 @@ index 0000000..92bf793
 +              };
 +      };
 +};
-diff --git a/arch/arm/mach-qcom/board.c b/arch/arm/mach-qcom/board.c
-index bae617e..350fa8d 100644
 --- a/arch/arm/mach-qcom/board.c
 +++ b/arch/arm/mach-qcom/board.c
 @@ -15,9 +15,10 @@
@@ -260,6 +247,3 @@ index bae617e..350fa8d 100644
        NULL
  };
  
--- 
-1.7.10.4
-