From patchwork Mon Mar 30 23:45:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 11466497 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B7A02912 for ; Mon, 30 Mar 2020 23:46:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 95C1020774 for ; Mon, 30 Mar 2020 23:46:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b="iRUVjpwz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729373AbgC3Xpx (ORCPT ); Mon, 30 Mar 2020 19:45:53 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:45679 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728901AbgC3Xpv (ORCPT ); Mon, 30 Mar 2020 19:45:51 -0400 Received: by mail-wr1-f65.google.com with SMTP id t7so23731636wrw.12; Mon, 30 Mar 2020 16:45:49 -0700 (PDT) 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=DxK6o0d762Zl57HAnhWXL/U279uSuVK4xM7r8LkbtfU=; b=iRUVjpwzhUgZWdAu9OhKc2QrrebME/a6PvPbBtwpO/QXWfNUP1cSPkUM8V1DPCppIt Z0CsUnSr4EEZfJad+Btd6XHnDBMRP0GI8ZTpVMapuFzv5XRwEEIU8okXXnQAIoQdKHTN duUcuETE1GDEw9Nn502Kkhi6wH0qt1RwFhCwRHDtTc2gzJjwnJmkea/Da0961UmhzFgA y5f4Cf0DpkYBQ38YboNqsrC+1nAJHojyvjbzoPmKhCsSj+NICy/l0vSgyNMCc4jI/k1b UR59ucu7S1ftnBnyzj5iz64c7qaPFhta83VUfxkG3KsUDL1Qyot2jVqBY8ubtcm7/kwD yAKw== 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=DxK6o0d762Zl57HAnhWXL/U279uSuVK4xM7r8LkbtfU=; b=YlRZUURfuNwrMwgGirfhFrIGrzj+TQiWXeIJCxOGj26RBERerqtYAaF0Scx612pFtB TSz6q9Vx0fpS36K8w/eZvWuJyqadHG+UYgrUE4jDfKT9JX5t3sP1hRPXznNRhpShkpnZ bB761td5mk/TTdmXzGAqCgmYqLm1icLalPu5dCxYazEqsxDNbBKU15ZRsBcIsPo3KkIm tTq5afK/Fa4jyMiUJWIHAUKQ3ZqiFl9UtiknipEgaRCADQeumieGHeUo7L8btV7l8VH8 VTDl9dIRVNrjlgdOA+9Q7qQN1MuoNoo0wyli5rp8fWn7Sn3MqqVNcmzyQWgP46Lr8TGd Xqdw== X-Gm-Message-State: ANhLgQ1mx828oC8VxIUCF06Lowe6WH4NNNPUd0ZYJ7yC165OWH8T2tZr FT1YQboutyBp9GbE7kHIyVO9qKL1 X-Google-Smtp-Source: ADFU+vviGdVjMK+SeAP3YtjOZuI2rOV6Ly+eqgrfC2ttV2VBMynT39e3PrONu63IHkoumJXpawRGWA== X-Received: by 2002:a5d:4d07:: with SMTP id z7mr17767249wrt.92.1585611948819; Mon, 30 Mar 2020 16:45:48 -0700 (PDT) Received: from localhost.localdomain (p200300F13710ED00428D5CFFFEB99DB8.dip0.t-ipconnect.de. [2003:f1:3710:ed00:428d:5cff:feb9:9db8]) by smtp.googlemail.com with ESMTPSA id v186sm1392953wme.24.2020.03.30.16.45.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2020 16:45:48 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, jbrunet@baylibre.com, narmstrong@baylibre.com Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Martin Blumenstingl Subject: [PATCH 1/2] clk: meson8b: export the HDMI system clock Date: Tue, 31 Mar 2020 01:45:34 +0200 Message-Id: <20200330234535.3327513-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200330234535.3327513-1-martin.blumenstingl@googlemail.com> References: <20200330234535.3327513-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org Export the HDMI system clock (used by the HDMI transmitter) so it can be used in the dt-bindings. Signed-off-by: Martin Blumenstingl Acked-by: Rob Herring --- drivers/clk/meson/meson8b.h | 1 - include/dt-bindings/clock/meson8b-clkc.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/meson/meson8b.h b/drivers/clk/meson/meson8b.h index c889fbeec30f..94ce3ef0c1d5 100644 --- a/drivers/clk/meson/meson8b.h +++ b/drivers/clk/meson/meson8b.h @@ -146,7 +146,6 @@ #define CLKID_CTS_VDAC0 171 #define CLKID_HDMI_SYS_SEL 172 #define CLKID_HDMI_SYS_DIV 173 -#define CLKID_HDMI_SYS 174 #define CLKID_MALI_0_SEL 175 #define CLKID_MALI_0_DIV 176 #define CLKID_MALI_0 177 diff --git a/include/dt-bindings/clock/meson8b-clkc.h b/include/dt-bindings/clock/meson8b-clkc.h index 68862aaf977e..4c5965ae1df4 100644 --- a/include/dt-bindings/clock/meson8b-clkc.h +++ b/include/dt-bindings/clock/meson8b-clkc.h @@ -107,6 +107,7 @@ #define CLKID_PERIPH 126 #define CLKID_AXI 128 #define CLKID_L2_DRAM 130 +#define CLKID_HDMI_SYS 174 #define CLKID_VPU 190 #define CLKID_VDEC_1 196 #define CLKID_VDEC_HCODEC 199 From patchwork Mon Mar 30 23:45:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 11466495 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5217514B4 for ; Mon, 30 Mar 2020 23:46:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 309C420774 for ; Mon, 30 Mar 2020 23:46:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b="U4dAz5Jv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729404AbgC3Xpx (ORCPT ); Mon, 30 Mar 2020 19:45:53 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:54984 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729358AbgC3Xpv (ORCPT ); Mon, 30 Mar 2020 19:45:51 -0400 Received: by mail-wm1-f67.google.com with SMTP id c81so629518wmd.4; Mon, 30 Mar 2020 16:45:50 -0700 (PDT) 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=5uzSi9/VYcTraEBB9HY7h/rXS2xZdLMR03bizri5gj4=; b=U4dAz5JvC5Fm0PIcTcWwiVNghqf0QdYuFyDYQm3OPsDtjHrCfMpE46Qo7orMdSK05Y P5DXJy38lM1lC7YIgMPBGH16GG5xBtNDRcaO6VhqWdmxtggajwky/+qcHKKF6NYHg00G W9dFPn3vX5HJ5BC7X8j9SbXwS6bz5LpzRR4vsM7CdR1Yyyr61PXhKsAsfJFGgRFavQaF EZ9CIwME/Ja3sdR3Y3OZLi5gA0KPfwcKI1DMz0CqjqajGHI5/TQsHPOpEJQX0P7FH1xD 51fdQHUq+OFjP3ufeY+q8KJZYGaed/SA62fyiiORqKhq8vCQbVrEpKBxkAZ4+oEyOazH ZXnQ== 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=5uzSi9/VYcTraEBB9HY7h/rXS2xZdLMR03bizri5gj4=; b=WxaEkxFQCTKSdfaJCXGIdjxg1OqNswcnvlTjAsAxmRLvHDc8QiYfx4IV1f8TS0PMly at9uXGcLepjUtouOiRudcQkj7cR76x7DyjlfLQ+ABRNeQcIm5FrKWp86AamHy730hJjA V+xmpS1A5NRKT6tISUbsRzK7wCC1JZQxa/wUyfhZVDA/a/Po2XNyOVZEMD+GaV6OvD2z iqZdIoGzFY2/yoq7dEO79Apgtqu4PadA1ImWz20XM1a5vGBlYEzgpNgH9e6lKXBPI7P/ mK7KYPsmFGzkS/n7MDSstI/8yOsU+2FUZJfXZgrlpLrcFdwAdI166GVyN6fuwca2EHjS iwqg== X-Gm-Message-State: ANhLgQ1FVaA9sqAZfQkaRtX7HPl7NPsqaIPmrvyy24x8Z7aUuc2o0EDv SGJxbLesKAp9Is5PefTb6G4= X-Google-Smtp-Source: ADFU+vvtXm6WQtlMFz5iqFRMXzrlv57Bxn7PrxUOdXCnqT1tXpKTo5A1T4R+dQC9PFDeLc8AG/pT8Q== X-Received: by 2002:a1c:2484:: with SMTP id k126mr575356wmk.52.1585611949773; Mon, 30 Mar 2020 16:45:49 -0700 (PDT) Received: from localhost.localdomain (p200300F13710ED00428D5CFFFEB99DB8.dip0.t-ipconnect.de. [2003:f1:3710:ed00:428d:5cff:feb9:9db8]) by smtp.googlemail.com with ESMTPSA id v186sm1392953wme.24.2020.03.30.16.45.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2020 16:45:49 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, jbrunet@baylibre.com, narmstrong@baylibre.com Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Martin Blumenstingl Subject: [PATCH 2/2] clk: meson: meson8b: make the hdmi_sys clock tree mutable Date: Tue, 31 Mar 2020 01:45:35 +0200 Message-Id: <20200330234535.3327513-3-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200330234535.3327513-1-martin.blumenstingl@googlemail.com> References: <20200330234535.3327513-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org The HDMI TX controller requires the hdmi_sys clock to be enabled. Allow changing the whole clock tree now that we know that one of our drivers requires this. Signed-off-by: Martin Blumenstingl --- drivers/clk/meson/meson8b.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c index 34a70c4b4899..7c55c695cbae 100644 --- a/drivers/clk/meson/meson8b.c +++ b/drivers/clk/meson/meson8b.c @@ -1725,7 +1725,7 @@ static struct clk_regmap meson8b_hdmi_sys_sel = { }, .hw.init = &(struct clk_init_data){ .name = "hdmi_sys_sel", - .ops = &clk_regmap_mux_ro_ops, + .ops = &clk_regmap_mux_ops, /* FIXME: all other parents are unknown */ .parent_data = &(const struct clk_parent_data) { .fw_name = "xtal", @@ -1745,7 +1745,7 @@ static struct clk_regmap meson8b_hdmi_sys_div = { }, .hw.init = &(struct clk_init_data){ .name = "hdmi_sys_div", - .ops = &clk_regmap_divider_ro_ops, + .ops = &clk_regmap_divider_ops, .parent_hws = (const struct clk_hw *[]) { &meson8b_hdmi_sys_sel.hw }, @@ -1761,7 +1761,7 @@ static struct clk_regmap meson8b_hdmi_sys = { }, .hw.init = &(struct clk_init_data) { .name = "hdmi_sys", - .ops = &clk_regmap_gate_ro_ops, + .ops = &clk_regmap_gate_ops, .parent_hws = (const struct clk_hw *[]) { &meson8b_hdmi_sys_div.hw },