ipq806x: move 020-add-ap148-bootargs.patch in patches-3.18

Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
SVN-Revision: 45209

diff --git a/target/linux/ipq806x/patches-3.18/020-add-ap148-bootargs.patch b/target/linux/ipq806x/patches-3.18/020-add-ap148-bootargs.patch
new file mode 100644 (file)
index 0000000..a61481e
--- /dev/null
+++ b/target/linux/ipq806x/patches-3.18/020-add-ap148-bootargs.patch
@@ -0,0 +1,46 @@
+--- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
++++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
+@@ -14,6 +14,14 @@
+               };
+       };
+ 
++      alias {
++              serial0 = &uart4;
++      };
++
++      chosen {
++              linux,stdout-path = "serial0:115200n8";
++      };
++
+       soc {
+               pinmux@800000 {
+                       i2c4_pins: i2c4_pinmux {
+--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
++++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
+@@ -140,7 +140,7 @@
+                       ranges;
+                       status = "disabled";
+ 
+-                      serial@12490000 {
++                      uart2: serial@12490000 {
+                               compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
+                               reg = <0x12490000 0x1000>,
+                                     <0x12480000 0x1000>;
+@@ -175,7 +175,7 @@
+                       ranges;
+                       status = "disabled";
+ 
+-                      serial@16340000 {
++                      uart4: serial@16340000 {
+                               compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
+                               reg = <0x16340000 0x1000>,
+                                     <0x16300000 0x1000>;
+@@ -209,7 +209,7 @@
+                       ranges;
+                       status = "disabled";
+ 
+-                      serial@1a240000 {
++                      uart5: serial@1a240000 {
+                               compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
+                               reg = <0x1a240000 0x1000>,
+                                     <0x1a200000 0x1000>;

diff --git a/target/linux/ipq806x/patches/020-add-ap148-bootargs.patch b/target/linux/ipq806x/patches/020-add-ap148-bootargs.patch
deleted file mode 100644 (file)
index a61481e..0000000
--- a/target/linux/ipq806x/patches/020-add-ap148-bootargs.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
-+++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
-@@ -14,6 +14,14 @@
-               };
-       };
- 
-+      alias {
-+              serial0 = &uart4;
-+      };
-+
-+      chosen {
-+              linux,stdout-path = "serial0:115200n8";
-+      };
-+
-       soc {
-               pinmux@800000 {
-                       i2c4_pins: i2c4_pinmux {
---- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-@@ -140,7 +140,7 @@
-                       ranges;
-                       status = "disabled";
- 
--                      serial@12490000 {
-+                      uart2: serial@12490000 {
-                               compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
-                               reg = <0x12490000 0x1000>,
-                                     <0x12480000 0x1000>;
-@@ -175,7 +175,7 @@
-                       ranges;
-                       status = "disabled";
- 
--                      serial@16340000 {
-+                      uart4: serial@16340000 {
-                               compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
-                               reg = <0x16340000 0x1000>,
-                                     <0x16300000 0x1000>;
-@@ -209,7 +209,7 @@
-                       ranges;
-                       status = "disabled";
- 
--                      serial@1a240000 {
-+                      uart5: serial@1a240000 {
-                               compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
-                               reg = <0x1a240000 0x1000>,
-                                     <0x1a200000 0x1000>;