From patchwork Wed Jul 19 17:05:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Branden X-Patchwork-Id: 9852903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 88506602C8 for ; Wed, 19 Jul 2017 17:48:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86738286BE for ; Wed, 19 Jul 2017 17:48:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B2A2286C5; Wed, 19 Jul 2017 17:48:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CF69D286BE for ; Wed, 19 Jul 2017 17:48:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=P5jmO6cC3oKVlx+i84uRXlhow1jOarHmxPtAHAGIfq0=; b=M0zUZvTiZ+2whQvuLxDHeDGwX0 24RVRLtB6P1ntZO5uJ/NWqAKgCMgXEWBB7HAfVrLnTKPtSaAA2Oc+w7tII/9Z9uTnDDpRpM/6eXv8 wP9xOwq0K+0//EzxRSw2g6nc4H50Xi6/9hnXVXf7Duho/KEaakf3WCC5EKHJPstEPuFN89MNgAbtU soBYQuipwTBzA5zs9yg44J125Gu+4QOzURLu0JaTkYNd4GCVONdf7zzJ8W2sZlj2LPvnAn3TjsQM+ z4t3EouE9j61xqnR4VdiODcbFljHNk6dmCFGn5RHavfcI2b0xIDT7vrNir195m0JZbB5nwUQbkdsM H4xKWrqA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dXt54-00004z-At; Wed, 19 Jul 2017 17:48:14 +0000 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dXsQr-0000Nj-MC for linux-arm-kernel@lists.infradead.org; Wed, 19 Jul 2017 17:06:50 +0000 Received: by mail-wm0-x234.google.com with SMTP id k69so4499815wmc.1 for ; Wed, 19 Jul 2017 10:06:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YO6i59OLglTuqULPBHZgADFAdHr9QbyulXIqTnD5ksc=; b=gL+ZKNrBGJzK+klCT1v6VeY7rjSXVL5EgA6lRjgtc0WiU1vpBvDs201aW0g3vesxEo Mz/hzNcQUYTiZnQmBvyeupgsAeNJMe+sglLdM69FyG1ZlhnsLZ9gftOcuHPLkzqgB8nX Vo9ecLScIh2JlVkIDx3J45pwpEUXhlJRnvz7A= 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; bh=YO6i59OLglTuqULPBHZgADFAdHr9QbyulXIqTnD5ksc=; b=ac+UfS+DJ7fq9OdRFevIwbmpPn1XsZUQEfmmifwCnY1hgW/TcIG/Aj7lsq4w3IdwXU dN4aU5yWoYsxdWiHzTk3DjDSijldPTRtUU8xproAjg9ZGnQEpJIvcOmDvV6gPBxG56vA CqzcPpwPZPFSYhb51BJRtYi+rjq1Shc1DP9BT8umh/8UPM+bUI9JeZxS2Ktf81M7VqaT RCTb8wFHFm2wuF+ZqNnE/jGhnInRPbSbYsgXz3hjQAuJlfeoZ2l4gJlJWiuJZN3SgPip 1Hq/l3RsGiaJ1MWW8YsshiXCZ27hNzpjkQcbusqMY5RuTbQvLxj1Pb0OZAo6ivhV2CvT NShw== X-Gm-Message-State: AIVw110TGEIZCvne52KiU3TxB/UyNjfSh6h0QXETZIbuIBHnZ8JIH33l ggtckMEU8ncHj0EQ X-Received: by 10.28.127.83 with SMTP id a80mr443609wmd.153.1500483979620; Wed, 19 Jul 2017 10:06:19 -0700 (PDT) Received: from lbrmn-lnxub113.ric.broadcom.com ([192.19.224.250]) by smtp.gmail.com with ESMTPSA id n205sm330644wmf.21.2017.07.19.10.06.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Jul 2017 10:06:18 -0700 (PDT) From: Scott Branden To: Rob Herring , Mark Rutland , Catalin Marinas , Will Deacon , Florian Fainelli , Eric Anholt , Stefan Wahren Subject: [PATCH 2/2] arm64: dts: move rpi into rpi directory Date: Wed, 19 Jul 2017 10:05:50 -0700 Message-Id: <1500483950-9217-3-git-send-email-scott.branden@broadcom.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1500483950-9217-1-git-send-email-scott.branden@broadcom.com> References: <1500483950-9217-1-git-send-email-scott.branden@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170719_100642_804250_0101E738 X-CRM114-Status: GOOD ( 14.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Scott Branden , linux-kernel@vger.kernel.org, BCM Kernel Feedback , linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Place rpi into its own subdirectory. This helps as the number of Broadcom boards grow and we can separate them per SoC. Signed-off-by: Scott Branden --- arch/arm64/boot/dts/broadcom/Makefile | 3 +-- arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi | 1 - arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi | 1 - arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi | 1 - arch/arm64/boot/dts/broadcom/bcm283x.dtsi | 1 - arch/arm64/boot/dts/broadcom/rpi/Makefile | 5 +++++ arch/arm64/boot/dts/broadcom/rpi/bcm2835-rpi.dtsi | 1 + arch/arm64/boot/dts/broadcom/{ => rpi}/bcm2837-rpi-3-b.dts | 0 arch/arm64/boot/dts/broadcom/{ => rpi}/bcm2837.dtsi | 0 arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-smsc9514.dtsi | 1 + arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-usb-host.dtsi | 1 + arch/arm64/boot/dts/broadcom/rpi/bcm283x.dtsi | 1 + 12 files changed, 10 insertions(+), 6 deletions(-) delete mode 120000 arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x.dtsi create mode 100644 arch/arm64/boot/dts/broadcom/rpi/Makefile create mode 120000 arch/arm64/boot/dts/broadcom/rpi/bcm2835-rpi.dtsi rename arch/arm64/boot/dts/broadcom/{ => rpi}/bcm2837-rpi-3-b.dts (100%) rename arch/arm64/boot/dts/broadcom/{ => rpi}/bcm2837.dtsi (100%) create mode 120000 arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-smsc9514.dtsi create mode 120000 arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-usb-host.dtsi create mode 120000 arch/arm64/boot/dts/broadcom/rpi/bcm283x.dtsi diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile index 3eaef38..1708ff5 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile @@ -1,6 +1,5 @@ -dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb - dts-dirs += northstar2 +dts-dirs += rpi dts-dirs += stingray always := $(dtb-y) subdir-y := $(dts-dirs) diff --git a/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi b/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi deleted file mode 120000 index 3937b77..0000000 --- a/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi +++ /dev/null @@ -1 +0,0 @@ -../../../../arm/boot/dts/bcm2835-rpi.dtsi \ No newline at end of file diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi deleted file mode 120000 index dca7c05..0000000 --- a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi +++ /dev/null @@ -1 +0,0 @@ -../../../../arm/boot/dts/bcm283x-rpi-smsc9514.dtsi \ No newline at end of file diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi deleted file mode 120000 index cbeebe3..0000000 --- a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi +++ /dev/null @@ -1 +0,0 @@ -../../../../arm/boot/dts/bcm283x-rpi-usb-host.dtsi \ No newline at end of file diff --git a/arch/arm64/boot/dts/broadcom/bcm283x.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x.dtsi deleted file mode 120000 index 5f54e4c..0000000 --- a/arch/arm64/boot/dts/broadcom/bcm283x.dtsi +++ /dev/null @@ -1 +0,0 @@ -../../../../arm/boot/dts/bcm283x.dtsi \ No newline at end of file diff --git a/arch/arm64/boot/dts/broadcom/rpi/Makefile b/arch/arm64/boot/dts/broadcom/rpi/Makefile new file mode 100644 index 0000000..d1a5606 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/rpi/Makefile @@ -0,0 +1,5 @@ +dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb + +always := $(dtb-y) +subdir-y := $(dts-dirs) +clean-files := *.dtb diff --git a/arch/arm64/boot/dts/broadcom/rpi/bcm2835-rpi.dtsi b/arch/arm64/boot/dts/broadcom/rpi/bcm2835-rpi.dtsi new file mode 120000 index 0000000..06e5aa0 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/rpi/bcm2835-rpi.dtsi @@ -0,0 +1 @@ +../../../../../arm/boot/dts/bcm2835-rpi.dtsi \ No newline at end of file diff --git a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/rpi/bcm2837-rpi-3-b.dts similarity index 100% rename from arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts rename to arch/arm64/boot/dts/broadcom/rpi/bcm2837-rpi-3-b.dts diff --git a/arch/arm64/boot/dts/broadcom/bcm2837.dtsi b/arch/arm64/boot/dts/broadcom/rpi/bcm2837.dtsi similarity index 100% rename from arch/arm64/boot/dts/broadcom/bcm2837.dtsi rename to arch/arm64/boot/dts/broadcom/rpi/bcm2837.dtsi diff --git a/arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-smsc9514.dtsi b/arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-smsc9514.dtsi new file mode 120000 index 0000000..3eff817 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-smsc9514.dtsi @@ -0,0 +1 @@ +../../../../../arm/boot/dts/bcm283x-rpi-smsc9514.dtsi \ No newline at end of file diff --git a/arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-usb-host.dtsi b/arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-usb-host.dtsi new file mode 120000 index 0000000..2102a8c --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-usb-host.dtsi @@ -0,0 +1 @@ +../../../../../arm/boot/dts/bcm283x-rpi-usb-host.dtsi \ No newline at end of file diff --git a/arch/arm64/boot/dts/broadcom/rpi/bcm283x.dtsi b/arch/arm64/boot/dts/broadcom/rpi/bcm283x.dtsi new file mode 120000 index 0000000..db7e86c --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/rpi/bcm283x.dtsi @@ -0,0 +1 @@ +../../../../../arm/boot/dts/bcm283x.dtsi \ No newline at end of file