From patchwork Fri Jan 18 22:52:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10771755 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BA27913B4 for ; Fri, 18 Jan 2019 22:53:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A951A308EA for ; Fri, 18 Jan 2019 22:53:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D9B830918; Fri, 18 Jan 2019 22:53:05 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 33E92308EA for ; Fri, 18 Jan 2019 22:53:05 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=j5fvqOZa1RrDfywJjsOz1vOBrR/A2HkcUjW8SVxnU2s=; b=tf3cE4R3ZFVl1X wNIG2p1OPBfSfGyf4ck6EjS8qUt0p0CFxFxBth90tDOedpoaCYiocQ1sh/eLgWpUI1j6tm3pZubD6 NOO2axvYijG17toUUxC1kOdX+r3Pa3HhzAMDfJisfiDPna8s2UbuLyqofwluVR/TF68SUxqIxJ2YD PfKOy0P+9xBy2vfkw772hz77DYeqeNmTc2XxeEptU68/yW074ynYIbE9zDjwn2iaMgdU/lf3zfVmB bG7cXcCc3SqIx5udg4iU5NPgY57T+dLPFNamX45cO9ipGgQP7Xrm7oajSg8wvNqxY00JaVVmfBlgJ wqsoYppRLVFUuqgWZA1Q==; 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 1gkd0Z-0000pR-Gh; Fri, 18 Jan 2019 22:53:03 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gkd0V-0000nc-FC; Fri, 18 Jan 2019 22:53:00 +0000 Received: by mail-wm1-x342.google.com with SMTP id y8so5916075wmi.4; Fri, 18 Jan 2019 14:52:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LV+y+UpHX9FeIZtZHWd/evuufcRscKJVbJ2RwwXxQPM=; b=pzZL7ZNt9u6bmL3/3BjOTXM3b2jHFnFqkUqqPUBOiQp/vy6sLqRmmzhTIn1SXuYqxl 2tkBC/X6AEwB5/ktBUfMoRFD9CYANBLWN2FLGPFeRzUa+4GsC+Aw6pwqyyrKFRXrtA5K SjiHnVyRodk6wleHwO5ygboxyUr/FhfTz1K6RB++av/vWXE3nUmPG0pnvo1yIp38zz7K YadipCLWhOQOc2evYad9scx46AhiJtcu2h7s3IYPCSUdU1YTP2yEE2rgEzpSarkiCqz9 YYG+G+3ANvzYTL9vX3jmZrhHaCXpISdGgWxDuMb/k6qTX8DDt/TvBpMVpXXV00rGy1hR F/sA== 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=LV+y+UpHX9FeIZtZHWd/evuufcRscKJVbJ2RwwXxQPM=; b=ny9KWZEt5PcwJAgD5el2c6nVgzQXG/7ZacBgzpwXbBlmS2Ez3fLxCZ2TeBFgL80uao 9lB9gkHpaAH5/ZZk3BsQ+iuRvAlV1Cxg2vKve/o++RBpg0vz7stx1VPjLfUGE8LSS+YO 1p2u5+GXQA5mqQgMoZChIo+HXSmDSLB9RXf+lg/fz/Zx2febfj7c9hh3qfQROFEzS7om Tcrtr33sSArvZXl9LHzKReuJGnG36GcWDvZt83DfcT1COlawLhMP6KZcKkUD/ezzMTXH 1+7vTfnu6DxiirwXxvO2AAwcXB5hpLf0ncQz5UUIcTPfL+6AGPcBbDAjWmdskIRaIxam dVAg== X-Gm-Message-State: AJcUukedv3VamsZ56Xjgw01P5nvIk0+q1y54KikUi1lWqbaSXFufnwFu Q+tYl8EgvkKFscE5TfM1IIhoX/Yi X-Google-Smtp-Source: ALg8bN6MmlJcNtUsMaN+yz3jO+4reckkyzHvE3QfUYFgBlWA5UvDA3cTPMgLNR5P2ZOhqA7hkhACag== X-Received: by 2002:a1c:2501:: with SMTP id l1mr17817293wml.102.1547851977684; Fri, 18 Jan 2019 14:52:57 -0800 (PST) Received: from blackbox.darklights.net (p200300DCD73A810039E290CB771389D7.dip0.t-ipconnect.de. [2003:dc:d73a:8100:39e2:90cb:7713:89d7]) by smtp.googlemail.com with ESMTPSA id x186sm51197352wmg.41.2019.01.18.14.52.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 14:52:56 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, khilman@baylibre.com Subject: [PATCH v2 1/7] ARM: dts: meson: switch the clock controller to the HHI register area Date: Fri, 18 Jan 2019 23:52:21 +0100 Message-Id: <20190118225227.6516-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118225227.6516-1-martin.blumenstingl@googlemail.com> References: <20190118225227.6516-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190118_145259_536444_9238F151 X-CRM114-Status: GOOD ( 11.54 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Martin Blumenstingl , linux-arm-kernel@lists.infradead.org, Neil Armstrong Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The clock controller on Meson8/Meson8m2 and Meson8b is part of a register region called "HHI". This register area contains more functionality than just a clock controller: - the clock controller - some reset controller bits - temperature sensor calibration data (on Meson8b and Meson8m2 only) - HDMI controller Allow access to this HHI register area as "system controller". Also migrate the Meson8 and Meson8b clock controllers to this new node. Signed-off-by: Martin Blumenstingl Acked-by: Neil Armstrong --- arch/arm/boot/dts/meson.dtsi | 7 +++++++ arch/arm/boot/dts/meson8.dtsi | 15 ++++++++------- arch/arm/boot/dts/meson8b.dtsi | 15 ++++++++------- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index 2ab74860d962..61486a7402f9 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -72,6 +72,13 @@ #size-cells = <1>; ranges = <0x0 0xc1100000 0x200000>; + hhi: system-controller@4000 { + compatible = "amlogic,meson-hhi-sysctrl", + "simple-mfd", + "syscon"; + reg = <0x4000 0x400>; + }; + assist: assist@7c00 { compatible = "amlogic,meson-mx-assist", "syscon"; reg = <0x7c00 0x200>; diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi index 83ed92dae892..829984be4ed8 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -327,13 +327,6 @@ }; &cbus { - clkc: clock-controller@4000 { - #clock-cells = <1>; - #reset-cells = <1>; - compatible = "amlogic,meson8-clkc"; - reg = <0x8000 0x4>, <0x4000 0x400>; - }; - reset: reset-controller@4404 { compatible = "amlogic,meson8b-reset"; reg = <0x4404 0x9c>; @@ -468,6 +461,14 @@ status = "okay"; }; +&hhi { + clkc: clock-controller { + compatible = "amlogic,meson8-clkc"; + #clock-cells = <1>; + #reset-cells = <1>; + }; +}; + &hwrng { compatible = "amlogic,meson8-rng", "amlogic,meson-rng"; clocks = <&clkc CLKID_RNG0>; diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi index 57c2a3678110..aa798259bf88 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -276,13 +276,6 @@ }; &cbus { - clkc: clock-controller@4000 { - #clock-cells = <1>; - #reset-cells = <1>; - compatible = "amlogic,meson8b-clkc"; - reg = <0x8000 0x4>, <0x4000 0x400>; - }; - reset: reset-controller@4404 { compatible = "amlogic,meson8b-reset"; reg = <0x4404 0x9c>; @@ -437,6 +430,14 @@ status = "okay"; }; +&hhi { + clkc: clock-controller { + compatible = "amlogic,meson8-clkc"; + #clock-cells = <1>; + #reset-cells = <1>; + }; +}; + &hwrng { compatible = "amlogic,meson8b-rng", "amlogic,meson-rng"; clocks = <&clkc CLKID_RNG0>;