From patchwork Sun Oct 2 02:38:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy McNicoll X-Patchwork-Id: 9359547 X-Patchwork-Delegate: agross@codeaurora.org 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 19D5C6075E for ; Sun, 2 Oct 2016 02:39:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 054F528C5F for ; Sun, 2 Oct 2016 02:39:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE04828C68; Sun, 2 Oct 2016 02:39:22 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6FC2628C5F for ; Sun, 2 Oct 2016 02:39:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752265AbcJBCjV (ORCPT ); Sat, 1 Oct 2016 22:39:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40834 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752082AbcJBCjN (ORCPT ); Sat, 1 Oct 2016 22:39:13 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E9FE6155E3; Sun, 2 Oct 2016 02:39:12 +0000 (UTC) Received: from mini-rhel.redhat.com (ovpn-116-88.phx2.redhat.com [10.3.116.88]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u922cwZV018910; Sat, 1 Oct 2016 22:39:12 -0400 From: Jeremy McNicoll To: robh+dt@kernel.org, andy.gross@linaro.org, sboyd@codeaurora.org, arnd@arndb.de, bjorn.andersson@linaro.org, git@kchr.de Cc: jeremymc@redhat.com, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, devicetree@vger.kernel.org Subject: [RFC V2 PATCH 10/12] arm64: dts: msm8994 issolate non standard bootloader/LK entries Date: Sat, 1 Oct 2016 19:38:37 -0700 Message-Id: <1475375919-618-11-git-send-email-jmcnicol@redhat.com> In-Reply-To: <1475375919-618-1-git-send-email-jmcnicol@redhat.com> References: <1475375919-618-1-git-send-email-jmcnicol@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Sun, 02 Oct 2016 02:39:13 +0000 (UTC) Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These non standard DT entries need to be cast aside as to not pollute the main device tree bindings. Without these essential DT items the bootloader/LK will not pass control over to the kernel and thus never boot. Signed-off-by: Jeremy McNicoll --- .../arm64/boot/dts/qcom/msm8994-angler-rev-101.dts | 1 - arch/arm64/boot/dts/qcom/msm8994.dtsi | 3 +-- .../boot/dts/qcom/nexus6p_bootloader_bits.dtsi | 24 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/nexus6p_bootloader_bits.dtsi diff --git a/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts index 5cff29f..a0fb9c3 100644 --- a/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts +++ b/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts @@ -18,7 +18,6 @@ / { model = "HUAWEI MSM8994 ANGLER rev-1.01"; compatible = "qcom,msm8994"; - qcom,board-id= <8026 0>; }; / { diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi index c95cb73..7fdda23 100644 --- a/arch/arm64/boot/dts/qcom/msm8994.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi @@ -15,12 +15,11 @@ #include #include +#include "nexus6p_bootloader_bits.dtsi" / { model = "Qualcomm Technologies, Inc. MSM 8994"; compatible = "qcom,msm8994"; - qcom,msm-id = <207 0x0>; - qcom,pmic-id = <0x10009 0x1000A 0x0 0x0>; interrupt-parent = <&intc>; #address-cells = <2>; diff --git a/arch/arm64/boot/dts/qcom/nexus6p_bootloader_bits.dtsi b/arch/arm64/boot/dts/qcom/nexus6p_bootloader_bits.dtsi new file mode 100644 index 0000000..c40618d --- /dev/null +++ b/arch/arm64/boot/dts/qcom/nexus6p_bootloader_bits.dtsi @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2016, Red Hat Inc. + * Author: Jeremy McNicoll + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* WARNING: This file and associated DTS nodes are non-standard + and their use should be avoided. If this code is referenced + in any way you put yourself at great risk of catching Bubonic + plague. */ + +/ { + qcom,board-id = <8026 0>; + qcom,msm-id = <257 0>; + qcom,pmic-id = <0x10009 0x1000A 0x0 0x0>; +};