From patchwork Thu Feb 7 13:26:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10801217 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 9347113BF for ; Thu, 7 Feb 2019 13:26:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80AB11FF3E for ; Thu, 7 Feb 2019 13:26:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71E53205FB; Thu, 7 Feb 2019 13:26:45 +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_SIGNED, DKIM_VALID,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 194111FF3E for ; Thu, 7 Feb 2019 13:26:45 +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=u9eElse2sfbshw+j2a2+/UpJ+D5iSMB/57KZkguaz4g=; b=kAYQCCxAXnAu/h kRJAD4sEVGIueAZvH9tSIpaQdwDkjmmTlp9qowsgdaFWnhYljku8iS/MZgUX+yUKX4R0ykD4HOws1 rugqCAf76ycRGrymWsfrFK+t43vJkGJunbZOGXhMHjQkMYoB2dw6JkF0bW7/iXg8LVOu4Pd8fWifZ /WfCMrLMGiRmGnIdD97E2qU6mpNcigAm2Rc9PVXN+wN0KChR4513vOety7V+gZw9115WwZfVHBvhz GhIs2jcKwP0tfj3JGon3K9U3UwqbzwqNGt7MQUMUMETY63gB6zV4MMa+iOSJWOPWzAKtn2aQanIv9 KVfLgsvr4pPHNOMAtpHw==; 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 1grjhS-00008a-As; Thu, 07 Feb 2019 13:26:42 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1grjhC-0008Jy-Dr for linux-arm-kernel@lists.infradead.org; Thu, 07 Feb 2019 13:26:27 +0000 Received: by mail-wm1-x343.google.com with SMTP id y185so4375759wmd.1 for ; Thu, 07 Feb 2019 05:26:26 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=8XylRKB64rC0etlFc8MGnuHKrAg5r8/oAGOA99T2tC4=; b=kMRtPItAaBPkNvo3gAV2Y9er+9FSAnNPV+ICuvBPuMmMMV4POhRy7nveOWRwQZz5uM MnU4x1Q5o/XVzzv9OjHiEzS2NLR4bBrtEdEviWTkA8ubXKlzPsfj3HBT93Z3/ubzfybC sdm6rQJg5wUu1HnKVARHuXEy3WYZ9Ncd8L3GKADrpqD7GdzU8PUnStc4tywrEp0JKLRy oJD4Z2HWu4QaGCIBHKExQ9KlZXDt+Q6clRkZnv+3L++E1UR9kWxyijizFarutBgPvC6b fppEfZUsTXguscPeBeTo5U3Np5ME0zfJ0mFcP+xFYXY7DSc9W8v6UWSRSz+IVwDMGK1k FJpw== 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=8XylRKB64rC0etlFc8MGnuHKrAg5r8/oAGOA99T2tC4=; b=ocax9FYtrEzdiVFecEqNm/9Q24Lb3UAyEfqGPrbMmhU2jlpeB9AHqZc87amZXHKdHu W5FSbwV2BfLr+80DVDR5ZvzvHUyiaOPiJSIsDAQozPALaHc84JsfyknsPXjJb2t0F/UR ApV/CPhlbFTrEeOo4+jWyEc4jUyjmko9lqIBdwdB69idjEkv2ijmNXM+hduq5TA/J13C daxt/pr5FTcW0Ef3JrexXCfwdxsXkX4kQZf3upL5Vi/kIe4cFi8DVtuaqDEECO/pNDJL Ks77lO/tWBSoONar5oPck3Ba+frLfsWyZ3JnhqFB9XKjEtpTrI8A6crT5ukPtCoHSeQx EX0A== X-Gm-Message-State: AHQUAuaHINsmH4bu36+SMMvGvf/kkXUAW2VuVVnUoPXxI2y47B06Fsy9 wFfj1Ygv/ZUyoM6k46dX8HiHeg== X-Google-Smtp-Source: AHgI3IazHRtY/RT/wDeZ+hWjsf9AxYG8eJn5ILrK1Gs0DTZgAxISkZ90bOPieDKYv5UpyabnUNn8Og== X-Received: by 2002:a7b:c8d7:: with SMTP id f23mr7266686wml.121.1549545984743; Thu, 07 Feb 2019 05:26:24 -0800 (PST) Received: from boomer.lan (cag06-3-82-243-161-21.fbx.proxad.net. [82.243.161.21]) by smtp.googlemail.com with ESMTPSA id v22sm11061612wml.37.2019.02.07.05.26.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 05:26:23 -0800 (PST) From: Jerome Brunet To: Kevin Hilman Subject: [PATCH 1/2] arm64: dts: meson: g12a: fix clk_msr node Date: Thu, 7 Feb 2019 14:26:02 +0100 Message-Id: <20190207132603.694-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207132603.694-1-jbrunet@baylibre.com> References: <20190207132603.694-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190207_052626_485868_CC9437E8 X-CRM114-Status: GOOD ( 11.46 ) 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: linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet 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 clk-msr node should be in cbus. Fixes: eeca2cf15e05 ("arm64: dts: meson: g12a: add clk measure support") Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi index c9d53103a58b..05ea750b8c16 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -217,11 +217,11 @@ #address-cells = <2>; #size-cells = <2>; ranges = <0x0 0x0 0x0 0xffd00000 0x0 0x100000>; - }; - clk_msr: clock-measure@ffd18000 { - compatible = "amlogic,meson-g12a-clk-measure"; - reg = <0x0 0xffd18000 0x0 0x10>; + clk_msr: clock-measure@18000 { + compatible = "amlogic,meson-g12a-clk-measure"; + reg = <0x0 0x18000 0x0 0x10>; + }; }; }; From patchwork Thu Feb 7 13:26:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10801223 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 C951A6C2 for ; Thu, 7 Feb 2019 13:27:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B6EC01FF3E for ; Thu, 7 Feb 2019 13:27:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB16E27F4B; Thu, 7 Feb 2019 13:27: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_SIGNED, DKIM_VALID,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 57AB61FF3E for ; Thu, 7 Feb 2019 13:27: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=vfOuEx30RPVOuvwmR4k7oW4Q3Q6dkfNHw5/Tjl2Renw=; b=BMJFM8ZmmaJcck 77naKj4fIqJQiL/bgyaCuFabJ4xUWcIzBkJHpYoII9wI7tEHDbGoWZLwfnyLpGVp3s33OfKhSEw6g 9BeA3Zpsb9yvQjhIJXAqki2qEaRgBlQ/jl0aJkqXrAMBPF1C4v+gRjwIAxIMf+IRlY119447xEkoF T2c/NHhpnTqyl4QQSi+KSFxHGHcUM0y2I3oHeYV1YVZSS2u5S36AN9rpH0FeoHcJzZSF3aLUtoKAX zgVVdA618WnSOy1BdrZIi/B8oG0S0SQfSM4EWgNHUS7g0mPZfwfHde+is97xElqex9o/2G7IG+XwQ Lbr9HO6pov7dqneqqxcg==; 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 1grjhl-0000SN-RO; Thu, 07 Feb 2019 13:27:01 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1grjhD-0008Kb-KL for linux-arm-kernel@lists.infradead.org; Thu, 07 Feb 2019 13:26:31 +0000 Received: by mail-wr1-x441.google.com with SMTP id c8so4733748wrs.4 for ; Thu, 07 Feb 2019 05:26:27 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=irDAtFzSD44qLeuz7xjCo1buACjRBJTzikViM/uGxI0=; b=S5Da9fZBJtEVAWWpk+jta2WSGqpAaCJdGgrZTstXL7WFAb2jyq8mKFO41p2tZoHp7d jHxRFGxUHbmWUhrOXy80xupoIv1ONEALGDpqgyPhNbZAc7wpS/B40GqfLttcMqguAo72 a23fq+kqTsWDfAClOwNS73XURxWD1cJ7xbhCBpRjCZWw7XrxOzRtHsY+WSs3JVtvWU3k 7+D4uMk3IRvN25RuVMScTUnwxHTpT1XJQiwUwy+LYpqkZZ2uC94WLRBiqvMGhBvVv4cB A8cJMnI5lBAO9ZGgN/DDYKjEN1z0YZevqJuvpqJUpm2n4yLiIChMUy66fMDZpzzPIcZn 4sag== 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=irDAtFzSD44qLeuz7xjCo1buACjRBJTzikViM/uGxI0=; b=CbzQ+1Ks0/fx+j2ZCOABVvo1N8HGfRASIo1VDVgiHrRF8ZIGZZR5K4VayUIvWXVMKn hV1e/b8UJNhVn8tkYbyj4AD+o57zaNQFHZVzPmSaLbVSgYXdJ4qR52h10ovsqZGHYo5B +y47rzqo7izD83DY5VAFtFEctC+828HFSoZ9JyGNpHv3NibHz9u1KJ3twUgoHdwAAkn6 9+NlKbYBRyrfn5EkvLS3CSiyJIbG0iR6CGWZy1mU7ZgCU3dFP+eF7bD2pR822PIKbheg UhKzPENzGReJ5c045obMU/tCgCv6xj9+93Vk7Tblpi1ZY0OExqKWl8fYRVYvDArvv9At u4xQ== X-Gm-Message-State: AHQUAuYYmYkk8z3vVX56yxT2dAmcgZCf1BWqgRofNMadviSEOl9JNn4S Mm62i6ml4kLkg3R+TQOs0AUWdQ== X-Google-Smtp-Source: AHgI3Ib7ZCQFroZzzM/u4zeLJ/0xQRPB/GHYwz8CzjqiGhLq8Xhb8jSxRw/MQHEcZ1VgEmBPLTGRag== X-Received: by 2002:a5d:6b05:: with SMTP id v5mr3684072wrw.76.1549545986212; Thu, 07 Feb 2019 05:26:26 -0800 (PST) Received: from boomer.lan (cag06-3-82-243-161-21.fbx.proxad.net. [82.243.161.21]) by smtp.googlemail.com with ESMTPSA id v22sm11061612wml.37.2019.02.07.05.26.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 05:26:25 -0800 (PST) From: Jerome Brunet To: Kevin Hilman Subject: [PATCH 2/2] soc: amlogic: clk-measure: fix-up some clock definitions Date: Thu, 7 Feb 2019 14:26:03 +0100 Message-Id: <20190207132603.694-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207132603.694-1-jbrunet@baylibre.com> References: <20190207132603.694-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190207_052627_673047_A6FF4B03 X-CRM114-Status: GOOD ( 11.47 ) 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, Martin Blumenstingl , linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet 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 As pointed out in review, a few clock are not properly defined. Reported-by: Martin Blumenstingl Fixes: 2a4c63e080cd ("soc: amlogic: clk-measure: add axg and g12a support") Signed-off-by: Jerome Brunet --- drivers/soc/amlogic/meson-clk-measure.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/soc/amlogic/meson-clk-measure.c b/drivers/soc/amlogic/meson-clk-measure.c index 5570180b94a1..19d4cbc93a17 100644 --- a/drivers/soc/amlogic/meson-clk-measure.c +++ b/drivers/soc/amlogic/meson-clk-measure.c @@ -202,7 +202,7 @@ static struct meson_msr_id clk_msr_axg[CLK_MSR_MAX] = { CLK_MSR_ID(71, "audio_slv_sclk_a"), CLK_MSR_ID(72, "pwm_d"), CLK_MSR_ID(73, "pwm_c"), - CLK_MSR_ID(73, "wifi_beacon"), + CLK_MSR_ID(74, "wifi_beacon"), CLK_MSR_ID(75, "tdmin_lb_lrcl"), CLK_MSR_ID(76, "tdmin_lb_sclk"), CLK_MSR_ID(77, "rng_ring_osc_0"), @@ -268,6 +268,8 @@ static struct meson_msr_id clk_msr_g12a[CLK_MSR_MAX] = { CLK_MSR_ID(26, "sc_int"), CLK_MSR_ID(27, "in_mac"), CLK_MSR_ID(28, "sar_adc"), + CLK_MSR_ID(29, "pcie_inp"), + CLK_MSR_ID(30, "pcie_inn"), CLK_MSR_ID(31, "mpll_test_out"), CLK_MSR_ID(32, "vdec"), CLK_MSR_ID(33, "sys_cpu_ring_osc_1"), @@ -303,8 +305,8 @@ static struct meson_msr_id clk_msr_g12a[CLK_MSR_MAX] = { CLK_MSR_ID(65, "spicc_0"), CLK_MSR_ID(66, "vid_lock"), CLK_MSR_ID(67, "dsi_phy"), - CLK_MSR_ID(68, "hdcp22_skp"), - CLK_MSR_ID(69, "hdcp22_esm"), + CLK_MSR_ID(68, "hdcp22_esm"), + CLK_MSR_ID(69, "hdcp22_skp"), CLK_MSR_ID(70, "pwm_f"), CLK_MSR_ID(71, "pwm_e"), CLK_MSR_ID(72, "pwm_d"),