From patchwork Fri Jun 30 10:08:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varadarajan Narayanan X-Patchwork-Id: 9819069 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 EC92060224 for ; Fri, 30 Jun 2017 10:10:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DBE2C28479 for ; Fri, 30 Jun 2017 10:10:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0681285EA; Fri, 30 Jun 2017 10:10:27 +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 669A028479 for ; Fri, 30 Jun 2017 10:10:27 +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: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:In-Reply-To: References:List-Owner; bh=PXttIDh3pDKivmzFohbCXpsALjPSMVIag0lf+52AcHY=; b=YeP pn2q1gktD3vEEeLmPxmPcj6OLZ/eVMfBI0vAwsDqcCG0si4UUGQEgu51d01z+Pelwyipd6dqwpleY ce5dn1vqxf8bgyhSZskVITfUWE94aYTr3Gs7yxe8d2v+mh9JDJat4eOhMikC2eggz4Wmp7we/u3Ea 9C9L3GJhDWoxu+l486+lHhjNxN6I8yAVN3i8yBmPsT3zO79vEMPOAiW8/DK9kICVoXyB+JTCPIz5Q wRyMYYySEz6yE+h3XLuy4X9PI1SikM5u0pc6TSO+auj8KtFD2BpBRmR65zP1b9KmsaPZtumnokVNg njBHG9mTRa/mTY+iCb+s4Jt2Vrg8mfw==; 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 1dQssV-0000Xq-Dh; Fri, 30 Jun 2017 10:10:19 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dQsqr-00073x-Td for linux-arm-kernel@lists.infradead.org; Fri, 30 Jun 2017 10:08:40 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 7F39B609EF; Fri, 30 Jun 2017 10:08:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1498817295; bh=AOhn5SWDB89sONrj3fOdHVvJ56GNLfN8Sk42GWMeCtE=; h=From:To:Cc:Subject:Date:From; b=BM7qabJm/cDTk6d2NasRMdQAa28z+sb5GY764qJwT2mFraglx3c4ka/Bh9Ey9i0GV UDbOiur0uINdF82GjPd0Dd0TZl714L9SrXbSD3Y/RwiXw/NjHnK9cPQRbOounMhMxt BGT1c9au7k/HFkGTmghJ1mTqIua+jX70NvJDBPxo= Received: from varda-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: varada@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 7270D609EF; Fri, 30 Jun 2017 10:08:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1498817294; bh=AOhn5SWDB89sONrj3fOdHVvJ56GNLfN8Sk42GWMeCtE=; h=From:To:Cc:Subject:Date:From; b=GbzmMc9WaHaV3pjlqkTK/0iHdex67hH6Myafmv9Q3Mphu94myaBRQVQBK5GfrOjyP uAZXMAEGCOKQZiyGl9UuumnKFJBQ4yswBLg2ZcSB9XH+SdKug9VwW+RdAYKSsRYWQr zjTpHfBA1S+NtCOrpskoeHeIY1NS+1+RfWw+BSFk= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 7270D609EF Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=varada@codeaurora.org From: Varadarajan Narayanan To: andy.gross@linaro.org, david.brown@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] dts: ipq4019: Move xo and timer nodes to SoC dtsi Date: Fri, 30 Jun 2017 15:38:01 +0530 Message-Id: <1498817281-30608-1-git-send-email-varada@codeaurora.org> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170630_030838_132972_7BF0AB82 X-CRM114-Status: UNSURE ( 9.24 ) X-CRM114-Notice: Please train this message. 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: Varadarajan Narayanan 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 The node for xo and timer belong to the SoC DTS file. Else, new board DT files may not inherit these nodes. Signed-off-by: Varadarajan Narayanan --- arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 19 ------------------- arch/arm/boot/dts/qcom-ipq4019.dtsi | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi index b9457dd..b74c113 100644 --- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi @@ -20,26 +20,7 @@ model = "Qualcomm Technologies, Inc. IPQ4019/AP-DK01.1"; compatible = "qcom,ipq4019"; - clocks { - xo: xo { - compatible = "fixed-clock"; - clock-frequency = <48000000>; - #clock-cells = <0>; - }; - }; - soc { - - - timer { - compatible = "arm,armv7-timer"; - interrupts = <1 2 0xf08>, - <1 3 0xf08>, - <1 4 0xf08>, - <1 1 0xf08>; - clock-frequency = <48000000>; - }; - pinctrl@0x01000000 { serial_pins: serial_pinmux { mux { diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi index b7a24af..e8ab1e1 100644 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi @@ -96,6 +96,11 @@ clock-frequency = <32768>; #clock-cells = <0>; }; + xo: xo { + compatible = "fixed-clock"; + clock-frequency = <48000000>; + #clock-cells = <0>; + }; }; soc { @@ -104,6 +109,15 @@ ranges; compatible = "simple-bus"; + timer { + compatible = "arm,armv7-timer"; + interrupts = <1 2 0xf08>, + <1 3 0xf08>, + <1 4 0xf08>, + <1 1 0xf08>; + clock-frequency = <48000000>; + }; + intc: interrupt-controller@b000000 { compatible = "qcom,msm-qgic2"; interrupt-controller;