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: 157754 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp643844jaa; Thu, 7 Feb 2019 05:26:33 -0800 (PST) X-Google-Smtp-Source: AHgI3IYUTY63ZQAGrDwvPlyBd8PCnKB52MUm6vZyuEfwS1x8CV6PYbDGEx+AB8uJUXOHj6YUweFZ X-Received: by 2002:a62:4c5:: with SMTP id 188mr16314887pfe.130.1549545992997; Thu, 07 Feb 2019 05:26:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549545992; cv=none; d=google.com; s=arc-20160816; b=Sia4IxoB4WZSYFbXZZNiZQdvYgYDdrCtmYgXJEvISioHCP9BrMq/wmBHf5MjsxUJYp Ig/Y7hg9yecMI2pAdNXnAGANBupsKsF9dZt5xvqeMnanTXDzunj80rac0gFu/AnDuqU1 9qc9n3N3GclBPDkhlTEbxLWWRXhGdmjpXFpGulNLmdjoQu6bhb4eG2CshTNz4IkX/9Tt Shc4/lcaD/2Ovz1kwIrcifcbCOG4UPjDb1h7551Yl2WjYRy5M0r4FJO93wnTcmS+Ch9X efhe7nNxJad82LDkpVBFa8NuwsW22NY9bZtiDnLi8Xrnx4uH2cOAkq9UIrk7gktcrveD FRXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8XylRKB64rC0etlFc8MGnuHKrAg5r8/oAGOA99T2tC4=; b=duMHCdnHXZ+A0Y1e+q/wH/HKXoPsSn2Z7wVP26++NPjD3tf/GDMTE9ccVf5FYSaxcm +CdM4/7Lp1oWRLr+0lS+2zbpfZPLGmCYavHFeo/reZrNcvmVHwiBQh0gw/Q2Op2HN5H3 PsCmT/T0Hthkd4ar4br3HUr/sWkFhCQzR81Vb/qI+rpg1x5UNuwQgs5XgjRJXzxYBd2Z xTQv/xKiI9myYXAtij/6CyT8XL0tGnSPM4P72OXnB7l11QDbJO3KaGgqpHLtAbbDBltX brJczYF7fZd16S3RSsbir/MgHTr0a/7QhPkT7iowtLV255g70DMYauR6ybPHrhLzr2Kv lqCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=kMRtPItA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a23si1302558pls.384.2019.02.07.05.26.32; Thu, 07 Feb 2019 05:26:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=kMRtPItA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727139AbfBGN0b (ORCPT + 31 others); Thu, 7 Feb 2019 08:26:31 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:35591 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727045AbfBGN00 (ORCPT ); Thu, 7 Feb 2019 08:26:26 -0500 Received: by mail-wm1-f67.google.com with SMTP id t200so6750197wmt.0 for ; Thu, 07 Feb 2019 05:26:25 -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=fQ8S36oucZlqyG44T5EkYQ+Nh/EjHtMDjMcfI61lmrkKAY+jFJ1dOpFg9BqsXSkWIY vYuVV8Ns24KyCgzD51v8y9uUWYPdm+hIuakiP1AGB6EH/reNtPQRgxVZL/WhguRN7dI7 y2plW6aqnRr6Aa81Ld5hpPxBS94piuxTErTT6akqvExcUXe9H1u62iBqDHBzuZn1nZyV IGw46rn4WDGn+A0vYb0sJE59upot7uFXO/l4Xscz65wms+IwCEfldgOV7s581xvydn1F QFp1UIU6iVJ64dVDSzvqjtkRupRnjJwi+zX6kWqwmF0NTKMCehSBqPhUkAFHVtUTLXWS Mh9w== X-Gm-Message-State: AHQUAuaJH3MPPDCIrizmicELB2itrII8ro08txLP38QRGc7N57IXSboZ sbMl0QOiAR9aCkWMISKfC0j06g== 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 Cc: Jerome Brunet , linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.20.1 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: 157755 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp643935jaa; Thu, 7 Feb 2019 05:26:37 -0800 (PST) X-Google-Smtp-Source: AHgI3Ia1YOEqHsf9pU7pedrLEamKlbqy/ERzAv8QhZOff8Q1VNS7xxSdu4r6mB5yyMjgy4nmSv7w X-Received: by 2002:a62:a209:: with SMTP id m9mr16365728pff.218.1549545997362; Thu, 07 Feb 2019 05:26:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549545997; cv=none; d=google.com; s=arc-20160816; b=lW4Jxs3l/gxC5Kh53o98VEjNFOhfbvzsxr3j9WLudf7aPiz7956uNNigIs/GYRGCe+ xb9hYgc+jA8+mmgUH/H3TNIHqfbX4XrT2KlzFKKvJQsq+0KWSN9SfbOoK+UnAFc2eyZI 3xSazFmadC7dmXX3k4a3oBIg2FyO4QBID6iGOlxKIpVXj/jUfw9sfCCyntxSIxpNBQc5 aYCt3g4wvsd6mvT3Lh6hWzLnceYCk6HhP2PX4VRf0T7wIQ46Rv0fyGJq7nLZBdCr47wj ecGkf5v8YrhczERwWqHHcq0JZa+2aLvxOMp5IHb7AckD9mF7uA/so2he05fsiNusfyg6 M0mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=irDAtFzSD44qLeuz7xjCo1buACjRBJTzikViM/uGxI0=; b=sH8m/MU8PZtCAOr61AyhB0kN1hg5ikR0j8vr0AkNA3stjqL6d7MXXnfIbT0SCE0dTi tWr+kPdFnomtP2j4MOkXx4P3Q3g0h4zNc+3bM6ylmTf2xse3NSIPs0w2UftrOyJ6VKHH 4PwaN6PNf3POV3gUp45tOWMtG0utq0EYNlASfn/vurrPN/FTQA/y3W8zBoiCjCtmhGtf 9pfeQBdHkMspoHQv7+cdRQuksqz8zf3ZkFkRCtoQrT7BtrS7cP/eTDhnqvgTH8CDhdds gSG+bEBtK/qCOmn1J+TXUy2G9taUFcwf3VQZWIBpN7q+Cu6gBn7XAFX20ZEUVEK01nhT 4slQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=S5Da9fZB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a23si1302558pls.384.2019.02.07.05.26.36; Thu, 07 Feb 2019 05:26:37 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=S5Da9fZB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727082AbfBGN0a (ORCPT + 31 others); Thu, 7 Feb 2019 08:26:30 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:40621 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727057AbfBGN02 (ORCPT ); Thu, 7 Feb 2019 08:26:28 -0500 Received: by mail-wr1-f66.google.com with SMTP id q1so1550817wrp.7 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=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=pWhBO23oOOjryKhoPIc1ScHyM/jakSoOz6ThkCLSbkaPHTnGxusu9KECC9yGIWKCUL bEG94Jsg4bplYqF3+FDL2FVx9Pqk8Bbu8brOePb2gBQ5Y6oQZ/dYqMPRy0TXcK4oQE2y xQmcusz9wNobbkfYTqDPersUwGlvsAbTZ80KehUaqhWNsflznJBQkn87F7cvrLvyymVw PVmC4H30vh06w0lbKJLWzRX31Xg9kvB3swD5LxXsuMu2CM9PJ2GJ4e2/OvSJyLPyQn7u 7gWH+CkBet3OB38djWkH6rzOfPHZ2jVCOw8+Pan2RtageYvU6hZcTT5XOKB01CynBxBx bwPw== X-Gm-Message-State: AHQUAuaKVVt+PumR6gG4CTbPOb06obxUXQFd8Qd1yWO94G9TLlnC9RqV FWaktxKnCHlEwObhO0JCoM3qnA== 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 Cc: Jerome Brunet , linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Martin Blumenstingl 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.20.1 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"),