From patchwork Thu Mar 15 11:55:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10284365 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 4FF47602BD for ; Thu, 15 Mar 2018 11:58:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35C9D2873A for ; Thu, 15 Mar 2018 11:58:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 281EC287A8; Thu, 15 Mar 2018 11:58:32 +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=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 A7D9A2873A for ; Thu, 15 Mar 2018 11:58:31 +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=npxcjL9mm82drhW/lBV0Yks6uZNPZzl7F9Z5xIlTRXw=; b=ZnJTwIOPsVn1C1GkJnWLFCXJni MVXc6j/rMcEhOxOfTtz8qMPl0fWxFeCOaKqVGnNRUGuVK5ziBBhia1nI+hQlhnU7aVwR+9M4YIGTP qHwoB0gNSSbx+Jd44FQFp2iXZPbBlPXe2NKAvWCDvaGTqWc7aeFR/3L3D/mnltsJVnHbL8idIZSC6 G0zEvGL/bVv2hHBwHaOUx8LvBHJZEb8YbwoQkTtRmrR3b6C8OEpk2wWAPJjf7gaby65KtHHiN9VUB wRtGU+KsBk9YeY6ZJNXpvsoEsl5GRxiNwrH/EW8W77d5uY9tVckE4+zCjAxBRUKjce7J0uobfWkoy bvkCKYew==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ewRWZ-0004gZ-Bd; Thu, 15 Mar 2018 11:58:23 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ewRUG-0003Qz-SW for linux-arm-kernel@lists.infradead.org; Thu, 15 Mar 2018 11:56:05 +0000 Received: by mail-wm0-x242.google.com with SMTP id a20so22783092wmd.1 for ; Thu, 15 Mar 2018 04:55:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6jHTQALv084jqzn0sdG5UMTERp/CjdOXt0ugYg5DERk=; b=MjC9Psr1QcC/tpANQdCqwAcoAimyCJZWjl85d4PUyQSPAghyu4FdyamlhdllbaTh7z zxibQFnsUyUmvQPFWuHrcjhT0YMW8y4kmjOEBb4RBSAhG36m6qnGEl0y7lboj1oTbRPx LpctQ37OqW3LzJwygIz2JvC+5qmdLzlE4yNPM+9kOAWl/gC4c5U/89eEi0Pj7K1DPaOH gT/2VpaUxWpT2grw0IvKeKLdZ70DycQHXWerYZ9Z6zSoNjPsUmTay1RN/kkLjCUJEi8D tu3Wz5DgziP3Vlx96y5ljuqJSB635omzUx6qkIZX02A98ZdM0lU28nQeyIIoabWK5Laz /xdg== 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=6jHTQALv084jqzn0sdG5UMTERp/CjdOXt0ugYg5DERk=; b=WK/Iyi+8nNp528c9DGR2ERb5lEoxTRm4deMsskMZwXXgzuCMruXSAIAdZULL+d1xyw ej1ehL3Bk0+2x0q5bYGN0N0GF3jwRH5y2bINEzhKpX/8odWvYXX7pb+ph6rxQLY+CL/U dFOjIuaamNsCnkqsMNV4nn5n5WkrFGeBpYzAv9OCqZCF/lMgZ+8lU+lWYrVoTfPCyATD EKdUGJnLOsDqJHMVmvHYxU1wJQXEQu6kQEkNFTQskZPJct5x0kS433l9uSV2xV+aQppq +aQMP1lh2780qiTnW5Oz5x653+scV7jFQdGUuAatUyFDNha4/ghqw7qMQJ3OlSsvEkMa hZNg== X-Gm-Message-State: AElRT7FMnk2kKysHDIQd+EpxAtcK1i6TidOiErvxFyZcl80Dfj3gTz3p 1WcSU7I0hQo4oTtJDVDGS/pGNQ== X-Google-Smtp-Source: AG47ELtzNmze9tZcrEotauV7efSCf/XeebVUy/W8rmFzjFn+M/G2S+Orp2U2oqF0u1lAlaKeaY0q6w== X-Received: by 10.28.13.67 with SMTP id 64mr4224409wmn.5.1521114953379; Thu, 15 Mar 2018 04:55:53 -0700 (PDT) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id e18sm4483318wmc.21.2018.03.15.04.55.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Mar 2018 04:55:50 -0700 (PDT) From: Jerome Brunet To: Kevin Hilman , Carlo Caione , Neil Armstrong Subject: [PATCH 2/4] ARM64: dts: meson-gx: sysctrl is the parent of the clock controller Date: Thu, 15 Mar 2018 12:55:43 +0100 Message-Id: <20180315115545.1884-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180315115545.1884-1-jbrunet@baylibre.com> References: <20180315115545.1884-1-jbrunet@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180315_045601_064742_185FE2E9 X-CRM114-Status: GOOD ( 13.09 ) 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, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet 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 parent of the meson-gx clock controller should be the hhi system controller, not the HIU bus. This way, the HHI register region can be used safely by multiple drivers Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 5 ++--- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index cac72acb85b1..a48d2b821a49 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -304,11 +304,10 @@ clock-names = "isfr", "iahb", "venci"; }; -&hiubus { - clkc: clock-controller@0 { +&sysctrl { + clkc: clock-controller { compatible = "amlogic,gxbb-clkc"; #clock-cells = <1>; - reg = <0x0 0x0 0x0 0x3db>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index e1a39cbed8c9..6b7dfa2d48e4 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -206,11 +206,10 @@ clock-names = "isfr", "iahb", "venci"; }; -&hiubus { - clkc: clock-controller@0 { +&sysctrl { + clkc: clock-controller { compatible = "amlogic,gxl-clkc", "amlogic,gxbb-clkc"; #clock-cells = <1>; - reg = <0x0 0x0 0x0 0x3db>; }; };