kernel: update 3.14 to 3.14.18

[openwrt/openwrt.git] / target / linux / ipq806x / patches / 0001-ARM-dts-msm-split-out-msm8660-and-msm8960-soc-into-d.patch

diff --git a/target/linux/ipq806x/patches/0001-ARM-dts-msm-split-out-msm8660-and-msm8960-soc-into-d.patch b/target/linux/ipq806x/patches/0001-ARM-dts-msm-split-out-msm8660-and-msm8960-soc-into-d.patch
index 52d4cf313eee2c1da07cb30637cf7070768a5913..97c89b219a9e56b7922edaacb8692ce0604fc5b4 100644 (file)
--- a/target/linux/ipq806x/patches/0001-ARM-dts-msm-split-out-msm8660-and-msm8960-soc-into-d.patch
+++ b/target/linux/ipq806x/patches/0001-ARM-dts-msm-split-out-msm8660-and-msm8960-soc-into-d.patch
@@ -18,8 +18,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org>
  create mode 100644 arch/arm/boot/dts/qcom-msm8660.dtsi
  create mode 100644 arch/arm/boot/dts/qcom-msm8960.dtsi
 
-diff --git a/arch/arm/boot/dts/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom-msm8660-surf.dts
-index 68a72f5..169bad9 100644
 --- a/arch/arm/boot/dts/qcom-msm8660-surf.dts
 +++ b/arch/arm/boot/dts/qcom-msm8660-surf.dts
 @@ -1,63 +1,6 @@
@@ -87,9 +85,6 @@ index 68a72f5..169bad9 100644
 -              qcom,controller-type = "pmic-arbiter";
 -      };
  };
-diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi
-new file mode 100644
-index 0000000..69d6c4e
 --- /dev/null
 +++ b/arch/arm/boot/dts/qcom-msm8660.dtsi
 @@ -0,0 +1,63 @@
@@ -156,8 +151,6 @@ index 0000000..69d6c4e
 +              qcom,controller-type = "pmic-arbiter";
 +      };
 +};
-diff --git a/arch/arm/boot/dts/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
-index 7c30de4..a58fb88 100644
 --- a/arch/arm/boot/dts/qcom-msm8960-cdp.dts
 +++ b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
 @@ -1,70 +1,6 @@
@@ -232,9 +225,6 @@ index 7c30de4..a58fb88 100644
 -              qcom,controller-type = "pmic-arbiter";
 -      };
  };
-diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi
-new file mode 100644
-index 0000000..ff00282
 --- /dev/null
 +++ b/arch/arm/boot/dts/qcom-msm8960.dtsi
 @@ -0,0 +1,70 @@
@@ -308,6 +298,3 @@ index 0000000..ff00282
 +              qcom,controller-type = "pmic-arbiter";
 +      };
 +};
--- 
-1.7.10.4
-