From patchwork Tue May 26 21:27:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Olivari X-Patchwork-Id: 476750 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 77C6B1402A2 for ; Wed, 27 May 2015 07:30:57 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 8550728BC37; Tue, 26 May 2015 23:27:25 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 7CEE5280ADB for ; Tue, 26 May 2015 23:26:55 +0200 (CEST) X-policyd-weight: using cached result; rate:hard: -7.6 Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 26 May 2015 23:26:41 +0200 (CEST) Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 438B3140745; Tue, 26 May 2015 21:28:07 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id 23383140740; Tue, 26 May 2015 21:28:07 +0000 (UTC) Received: from mathieu-linux.qualcomm.com (qf-scl1nat.qualcomm.com [207.114.132.30]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mathieu@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 7C9DA14073B; Tue, 26 May 2015 21:28:05 +0000 (UTC) From: Mathieu Olivari To: nbd@openwrt.org, blogic@openwrt.org, kaloz@openwrt.org Date: Tue, 26 May 2015 14:27:52 -0700 Message-Id: <1432675677-8806-2-git-send-email-mathieu@codeaurora.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1432675677-8806-1-git-send-email-mathieu@codeaurora.org> References: <1432675677-8806-1-git-send-email-mathieu@codeaurora.org> X-Virus-Scanned: ClamAV using ClamSMTP Cc: openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [PATCH 1/6] ipq806x: move arm-gic include into pcie patch X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" This include is necessary starting at the PCIe patch, which has a lower number. So in order to keep the patches consistent, we'll move the arm-gic include in the first patch who needs it. Signed-off-by: Mathieu Olivari --- .../112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch | 3 ++- target/linux/ipq806x/patches-3.18/700-add-gmac-dts-suport.patch | 8 -------- .../112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch | 3 ++- target/linux/ipq806x/patches-4.0/700-add-gmac-dts-suport.patch | 8 -------- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/target/linux/ipq806x/patches-3.18/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch b/target/linux/ipq806x/patches-3.18/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch index 3c1ae61..7bee560 100644 --- a/target/linux/ipq806x/patches-3.18/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch +++ b/target/linux/ipq806x/patches-3.18/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch @@ -121,11 +121,12 @@ Signed-off-by: Mathieu Olivari #address-cells = <1>; --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi -@@ -3,6 +3,7 @@ +@@ -3,6 +3,8 @@ #include "skeleton.dtsi" #include #include +#include ++#include / { model = "Qualcomm IPQ8064"; diff --git a/target/linux/ipq806x/patches-3.18/700-add-gmac-dts-suport.patch b/target/linux/ipq806x/patches-3.18/700-add-gmac-dts-suport.patch index f0c511a..3c81f88 100644 --- a/target/linux/ipq806x/patches-3.18/700-add-gmac-dts-suport.patch +++ b/target/linux/ipq806x/patches-3.18/700-add-gmac-dts-suport.patch @@ -119,14 +119,6 @@ }; --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - - / { - model = "Qualcomm IPQ8064"; @@ -637,5 +638,42 @@ dr_mode = "host"; }; diff --git a/target/linux/ipq806x/patches-4.0/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch b/target/linux/ipq806x/patches-4.0/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch index 9009575..ad0a740 100644 --- a/target/linux/ipq806x/patches-4.0/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch +++ b/target/linux/ipq806x/patches-4.0/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch @@ -121,11 +121,12 @@ Signed-off-by: Mathieu Olivari #address-cells = <1>; --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi -@@ -3,6 +3,7 @@ +@@ -3,6 +3,8 @@ #include "skeleton.dtsi" #include #include +#include ++#include / { model = "Qualcomm IPQ8064"; diff --git a/target/linux/ipq806x/patches-4.0/700-add-gmac-dts-suport.patch b/target/linux/ipq806x/patches-4.0/700-add-gmac-dts-suport.patch index 7b628a7..b5a3f19 100644 --- a/target/linux/ipq806x/patches-4.0/700-add-gmac-dts-suport.patch +++ b/target/linux/ipq806x/patches-4.0/700-add-gmac-dts-suport.patch @@ -119,14 +119,6 @@ }; --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - - / { - model = "Qualcomm IPQ8064"; @@ -539,5 +540,42 @@ status = "disabled";