From patchwork Fri Oct 2 13:34:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Palmer X-Patchwork-Id: 11813563 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EE32F139F for ; Fri, 2 Oct 2020 13:34:48 +0000 (UTC) Received: by mail.kernel.org (Postfix) id E92012220C; Fri, 2 Oct 2020 13:34:48 +0000 (UTC) Delivered-To: soc@kernel.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B556021D94 for ; Fri, 2 Oct 2020 13:34:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=0x0f.com header.i=@0x0f.com header.b="hkIromzM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B556021D94 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=0x0f.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=daniel@0x0f.com Received: by mail-pf1-f193.google.com with SMTP id n14so1242652pff.6 for ; Fri, 02 Oct 2020 06:34:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=0x0f.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JKpKxwAv2Imtn8Ftp+MYPUK+s23vQoh7oPpjdYyQeuo=; b=hkIromzMwcDSjGb6JR9UUzVG/W2jWLnpGoELrZB65Z4Z+Hy71DgshiMPPFMLHKerbN ZmOosGe3YbAwLjS70Pyx7zsgwPmnHkgDfNKcGpvEndBXFgHuFeMiSmyembr84OVShDpL tJSnV/8EMjtYgrgyYGDcgbyl4nOtBTClwoyzQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JKpKxwAv2Imtn8Ftp+MYPUK+s23vQoh7oPpjdYyQeuo=; b=s5J2gVyqju+ygh9+dMDO+H81CS4M/eAIW3d6VTJRbbtrWSnYU5za6oqlllR3v6qV38 Vz/zUak/6fAvPGvEdfYnkTSNJK89//3TdFW24jn8iEMaPl+ybkRd5flTLmlomhJeUcPf lJ4Z6XgbPBuf0fH3TFgwlMKAjxHOKbAlSzN8uDcrp/pQI5Wa12y/OM8+z35Nuwlsiqmm V5wi5UT1fMxoe3JUoc4ZWrs/PmbJjCRPAMFhUbtJS3g1DZZGe+kqb1S9jDtVFueEXJ14 eIHfTqzgkQ2BVgYI6yVyCxDSXbvKSh8n+QuLA+N0lv8aQSvMXCXNBmcLyV2d8aqAaq4E klDQ== X-Gm-Message-State: AOAM53087dSMsUMIiSx7vLszG+x2Re1cNko9rPspmZM7tJV2jc7Oyd8y tpJrLdARHoPVZUVh0dZHG29FYZQJlRP26g== X-Google-Smtp-Source: ABdhPJwe2HKjxkPmZshuORBLd8pQzKxWJi78FCue97WylE3s3oZXCGbYObpAUhgZJzS8ieKf1B+Sgg== X-Received: by 2002:a63:144d:: with SMTP id 13mr2218080pgu.153.1601645687731; Fri, 02 Oct 2020 06:34:47 -0700 (PDT) Received: from shiro.work (p1268123-ipngn200803sizuokaden.shizuoka.ocn.ne.jp. [118.13.124.123]) by smtp.googlemail.com with ESMTPSA id k14sm1708219pjd.45.2020.10.02.06.34.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 06:34:47 -0700 (PDT) From: Daniel Palmer List-Id: To: soc@kernel.org Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, mark-pk.tsai@mediatek.com, arnd@arndb.de, maz@kernel.org, Daniel Palmer Subject: [PATCH v2 5/5] ARM: mstar: Fix up the fallout from moving the dts/dtsi files Date: Fri, 2 Oct 2020 22:34:18 +0900 Message-Id: <20201002133418.2250277-6-daniel@0x0f.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201002133418.2250277-1-daniel@0x0f.com> References: <20201002133418.2250277-1-daniel@0x0f.com> MIME-Version: 1.0 Since the dtsi/dts files have been moved some includes are now broken so this fixes up the includes so the dtbs build again. Signed-off-by: Daniel Palmer --- arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts | 2 +- arch/arm/boot/dts/mstar-infinity-msc313.dtsi | 2 +- arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts | 2 +- arch/arm/boot/dts/mstar-infinity3-msc313e.dtsi | 2 +- arch/arm/boot/dts/mstar-infinity3.dtsi | 2 +- arch/arm/boot/dts/mstar-mercury5-ssc8336n-midrived08.dts | 2 +- arch/arm/boot/dts/mstar-mercury5-ssc8336n.dtsi | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts b/arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts index f24c5580d3e4..f9db2ff86f2d 100644 --- a/arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts +++ b/arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include "infinity-msc313.dtsi" +#include "mstar-infinity-msc313.dtsi" / { model = "BreadBee Crust"; diff --git a/arch/arm/boot/dts/mstar-infinity-msc313.dtsi b/arch/arm/boot/dts/mstar-infinity-msc313.dtsi index 42f2b5552c77..3499fde263be 100644 --- a/arch/arm/boot/dts/mstar-infinity-msc313.dtsi +++ b/arch/arm/boot/dts/mstar-infinity-msc313.dtsi @@ -4,7 +4,7 @@ * Author: Daniel Palmer */ -#include "infinity.dtsi" +#include "mstar-infinity.dtsi" / { memory@20000000 { diff --git a/arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts b/arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts index 1f93401c8530..f0eda80a95cc 100644 --- a/arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts +++ b/arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include "infinity3-msc313e.dtsi" +#include "mstar-infinity3-msc313e.dtsi" / { model = "BreadBee"; diff --git a/arch/arm/boot/dts/mstar-infinity3-msc313e.dtsi b/arch/arm/boot/dts/mstar-infinity3-msc313e.dtsi index 4e7239afd823..f581b6f89555 100644 --- a/arch/arm/boot/dts/mstar-infinity3-msc313e.dtsi +++ b/arch/arm/boot/dts/mstar-infinity3-msc313e.dtsi @@ -4,7 +4,7 @@ * Author: Daniel Palmer */ -#include "infinity3.dtsi" +#include "mstar-infinity3.dtsi" / { memory@20000000 { diff --git a/arch/arm/boot/dts/mstar-infinity3.dtsi b/arch/arm/boot/dts/mstar-infinity3.dtsi index 9b918c802654..9857e2a9934d 100644 --- a/arch/arm/boot/dts/mstar-infinity3.dtsi +++ b/arch/arm/boot/dts/mstar-infinity3.dtsi @@ -4,7 +4,7 @@ * Author: Daniel Palmer */ -#include "infinity.dtsi" +#include "mstar-infinity.dtsi" &imi { reg = <0xa0000000 0x20000>; diff --git a/arch/arm/boot/dts/mstar-mercury5-ssc8336n-midrived08.dts b/arch/arm/boot/dts/mstar-mercury5-ssc8336n-midrived08.dts index f24bd8cb8e60..7306b737d9c4 100644 --- a/arch/arm/boot/dts/mstar-mercury5-ssc8336n-midrived08.dts +++ b/arch/arm/boot/dts/mstar-mercury5-ssc8336n-midrived08.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include "mercury5-ssc8336n.dtsi" +#include "mstar-mercury5-ssc8336n.dtsi" / { model = "70mai Midrive D08"; diff --git a/arch/arm/boot/dts/mstar-mercury5-ssc8336n.dtsi b/arch/arm/boot/dts/mstar-mercury5-ssc8336n.dtsi index 7d4a4630c25c..3f5a4c029744 100644 --- a/arch/arm/boot/dts/mstar-mercury5-ssc8336n.dtsi +++ b/arch/arm/boot/dts/mstar-mercury5-ssc8336n.dtsi @@ -4,7 +4,7 @@ * Author: Daniel Palmer */ -#include "mercury5.dtsi" +#include "mstar-mercury5.dtsi" / { memory@20000000 {