From patchwork Wed Jul 4 16:54:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 141078 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1013116ljj; Wed, 4 Jul 2018 09:55:41 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe0yPpG9UtBaa+F7IghoKrOemkE4k79byp5oBGiKIqAxNQF+sip68jaF2yCIs4dDPk6i12k X-Received: by 2002:a17:902:d807:: with SMTP id a7-v6mr2812180plz.214.1530723341764; Wed, 04 Jul 2018 09:55:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530723341; cv=none; d=google.com; s=arc-20160816; b=cXJw/mvwYP9lherYm3gjetNIiYeEur3/M8UPP/r8QHAU39IkJ5Y5FcbqLuAGnIw4Aw kHZAoCPDRUbK626anIAtyN2gol9kZZTKt3WFvJQ/8HTLF600PY0e7xqoKwwLew74zzhm wquq1TrswRA+DPtwEeDKZYALR5AiH32UkK1FpqnZqhUQvO/EAx2p01fUmkCsP6BxUJro QnF8WS2SWYg8fQNRcBPOichUU7n9QIBCiButZLUyEZinorD1XoEK25hXLBC8Io5kf+6n TentkEBSbRqavqP+GcbhrsLjCQjMnC8q1EucD6KN4Py00LkrVycUCcEiLF7OwGb1oVjD gerA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=PvOudz6RyIskSJn6PgLe79Ph0X6+vNBqQoUnWH/mtIo=; b=olKuhdHGVkQMpYRBWj83BbrU/7Qmd1F92NJx42GSSQByHb6gL2TganoLapFw905wEN UbTXgu12syHAPzq+6B/5fiSMfmOjVyyJKx8/a+EobpLP3dDCKPVnKyGvjAf0/xrRalG8 W7K1BDcGURg1KRaSDOOeJYrAFtTGxK64PcM0U+lTiqJFNAWMCLtlZEB1YKQUY8t5FMGg CiOpobIWoTRhgZn4vZBLApGj09n16OByRvK8BunQWb5hFLpZpYC2FXJeOE80giAORxYo znJomFvzhqYWkZbfPe9VjR0TvCAs96pobCrtP6g146V07Ax5Evdn5rPidmLC5cyudotq LNag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=hNzyrZ2N; 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 p14-v6si3836232pgd.342.2018.07.04.09.55.41; Wed, 04 Jul 2018 09:55:41 -0700 (PDT) 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=hNzyrZ2N; 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 S1753167AbeGDQzj (ORCPT + 31 others); Wed, 4 Jul 2018 12:55:39 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:52528 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752899AbeGDQzI (ORCPT ); Wed, 4 Jul 2018 12:55:08 -0400 Received: by mail-wm0-f67.google.com with SMTP id w16-v6so6928684wmc.2 for ; Wed, 04 Jul 2018 09:55:07 -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=PvOudz6RyIskSJn6PgLe79Ph0X6+vNBqQoUnWH/mtIo=; b=hNzyrZ2NfoHgzWz+LMdC8LhydMUimXfDODOg6p/yjPhkb5f1GWIXcpc4VAttlTJZQB opVtW50hoLRXHm1OdUf/+gbx1Z0u73DrMHfzPAkpQKy94Fq4aXhoMJMoMWbL/a65dxK0 VSx/89i+RcNRCXQDl2llQFqHKBvWofe0FHl3u+YucQcxpi8s64xsYkzrOMYk1Tc39jkK JkI6+CHgEcJunlyty0Qd6P2k8D9FSGuCaERHWqYMdLyKCIfVi638xpCF4j4tStOSHKDM nEOOCzFuRMCNICrRKQOZl89Wqy/XPsQZddkdPU1SOoN3UvyEe+2Uookn7kKWKMA76/g9 h5dw== 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=PvOudz6RyIskSJn6PgLe79Ph0X6+vNBqQoUnWH/mtIo=; b=Sa9uNVbh/hITykrTDt9/TT5tQlIjNkyzL8f/juBUUmIBJ9e5QCSi5Cx52yT29qJ9X9 ydMU9hCXdKXE6BSSiEKxFFmi6K2aeejbnuy0eoQRhVtNuNS3+5kA+PI5HjJzmoYkmoIT HnMMHNxtCfuxZ0BSpHs1YwJzbTJadDSrnK87b6ewgOX7xFUnTlWDvCme+oK/GOT9me8s 3ayUWY5NqX7z9eigSSIU5kPs45Ocg+S4HANLWrWarZ+fvsLwPlm6omIA5CdEnGjAteYA VqG5lUAIdLYpQiLjnQ5B5NFNaDCvgGiYAFjUG6axVe+BPttNvrY4xa4pNyjU1/0IEDB6 fdvA== X-Gm-Message-State: APt69E1Wg63jeYOS3TcHqI9Qv5ZvFq7xUwHhQUiNIyrWxnw5lzvzVmR2 GERkMhrQ4EbhVp89U2gY/wpchw== X-Received: by 2002:a1c:ec06:: with SMTP id k6-v6mr2223557wmh.39.1530723307289; Wed, 04 Jul 2018 09:55:07 -0700 (PDT) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id d102-v6sm7927618wma.10.2018.07.04.09.55.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Jul 2018 09:55:06 -0700 (PDT) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman , Carlo Caione Cc: Jerome Brunet , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] clk: meson: gxbb: remove HHI_GEN_CLK_CTNL duplicate definition Date: Wed, 4 Jul 2018 18:54:56 +0200 Message-Id: <20180704165458.24149-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180704165458.24149-1-jbrunet@baylibre.com> References: <20180704165458.24149-1-jbrunet@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org HHI_GEN_CLK_CTNL is defined twice, just remove the duplicate definition Fixes: 738f66d3211d ("clk: gxbb: add AmLogic GXBB clk controller driver") Signed-off-by: Jerome Brunet --- drivers/clk/meson/gxbb.h | 1 - 1 file changed, 1 deletion(-) -- 2.14.4 Acked-by: Martin Blumenstingl diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h index ec1a812bf1fd..df6c21d368c6 100644 --- a/drivers/clk/meson/gxbb.h +++ b/drivers/clk/meson/gxbb.h @@ -66,7 +66,6 @@ #define HHI_USB_CLK_CNTL 0x220 /* 0x88 offset in data sheet */ #define HHI_32K_CLK_CNTL 0x224 /* 0x89 offset in data sheet */ #define HHI_GEN_CLK_CNTL 0x228 /* 0x8a offset in data sheet */ -#define HHI_GEN_CLK_CNTL 0x228 /* 0x8a offset in data sheet */ #define HHI_PCM_CLK_CNTL 0x258 /* 0x96 offset in data sheet */ #define HHI_NAND_CLK_CNTL 0x25C /* 0x97 offset in data sheet */ From patchwork Wed Jul 4 16:54:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 141079 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1013231ljj; Wed, 4 Jul 2018 09:55:51 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdmKo860rVyauLrzvf2d5BR6GPF9NOez3hxb1hylVAgZXlNHXVmqJJ2gbbsm4Bobduj4exW X-Received: by 2002:a62:8389:: with SMTP id h131-v6mr2248562pfe.105.1530723351345; Wed, 04 Jul 2018 09:55:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530723351; cv=none; d=google.com; s=arc-20160816; b=U03dzAmULLhRgs/HQcrvOBrxsOEzYd4VvjX+sJca4kcWQ7zGqsIG0srUohNUeLfCvp giXkumPb1T4Nt1thCASI3tm7e4kR+X6Qhu7qsiEND0HLNjGFVW+g8JzJvkO2m1424duH LY0z/3iGsTuSwoR5bm+rQFtKksJYtFr/xnOyij9gRpMDhtSfby8JogszS8HOUfmimZsL BR4Qm49AhLTo00W5jD1dO+EvFrHs+LrBQ/kHao4SVp00Ue4jp0kCZWFClY3/ii+w4Cn0 OYhC2dJVOwQyNN48Z8qiwI9GgSGr6bpwT6ZrHlJEcgZ9BoOaXTCmSyfPMg2nhAoiO0EK UW0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=HDdOqSEbNpclYPD6AB/VNLXO2qcH9uV0htvvC9tQXp0=; b=aszQRxNUHxZ4DZUkqTWz02tu2uYQH5od1oBuGkS0MvQACTkiohsfvy8aVHrQCaluvF YNN5T3nlEuYZKmbj94+FpMqoNNo0dQ+P7Av2Wo6LI4sDh4Ol6NDAphxvsO/fkW4cVFJW MNhzWmq+hAFLet6qofg9hxt6EvzUDdl67e3AZqHroNjmjX303G6GUQUnW0wdfRMstsRE Ne+3zzxjdOQYz+5u6TrPoTLpJHRMQvhE2rOGHXLkpHmOwt1J5QsaTjBUnVFohUYhZPUT DM3RS0kg7zfWx33GNj1MzEHl2vqboJmZv9FJQwhTIanCh6hvnbUft5a/ht02RoFlN5zD CoIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=E8Wnd8iJ; 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 n6-v6si3888324pgt.268.2018.07.04.09.55.51; Wed, 04 Jul 2018 09:55:51 -0700 (PDT) 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=E8Wnd8iJ; 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 S1753134AbeGDQzi (ORCPT + 31 others); Wed, 4 Jul 2018 12:55:38 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:54525 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752277AbeGDQzJ (ORCPT ); Wed, 4 Jul 2018 12:55:09 -0400 Received: by mail-wm0-f53.google.com with SMTP id i139-v6so6924085wmf.4 for ; Wed, 04 Jul 2018 09:55:08 -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=HDdOqSEbNpclYPD6AB/VNLXO2qcH9uV0htvvC9tQXp0=; b=E8Wnd8iJ9wuOzBdNMMSgJ8iX+x4gfaN+jr2JBFnRmdTcwkl8FMGFoGPc17JxrFDk4s +bHBG3Birnc7bh9TwyKoc3zqim80A1IIfHRAVupunaZBSltUKnu+mBEn0BLtYn5XwMPj Yb+/vGPOU17fsHTFBqD3dyKPFSh+fLn37Vg1t+vZ0h4fyQK9xRnl2gFDo3q0L1RwEn76 K8lWaQcyg3nKdjsmj/werxgKiqWd+B97JYTce/4LSz7EFIDY6ZScysXda+I/gPgRovyV NOSh78B24aA0U7PCCawAHwCV8hLqr7akuPrqqkFzEbCWdqwY5yIrXtH00PwOw1I6iwQE cwqg== 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=HDdOqSEbNpclYPD6AB/VNLXO2qcH9uV0htvvC9tQXp0=; b=Rxcu/ErCsCQUY86PC24OYJs5xSNzYhJ+5eEguufgh0EQgRzaQpurGayZcxxW2ZKIlC NwxojOTR0+jRVRpQSUsTIUmwpSStiacENad2+G1i9lXH0cnDmTrnYOtIaRUCx9Ku0EkQ xJBsPBWfRl2YqzdiZXKkeXFLStpzmclTN7s+An5KOutPRT8H5MOuSImaWv+I/Bo/jap5 sH9gg0l+JFnGo8Z/v7S5GSi3hEPQWrMsNiiFm3PyUyhenSgJXHoe0dE66J1YS0N/5Pfh l5ej8fq6nmv3YgeZ8gX+Bgct6Q3+PHIX8heiDr7dqNuBP3GONZ1peAaWkEIW1QO2qAZ3 uD+A== X-Gm-Message-State: APt69E2zdpJ96WN/qQ+7AUNalcz0TCQegA/gbNLOk64Wn726Y9xZNHkq mvcvYVb9+B2nSrU9muDQ9kMXTg== X-Received: by 2002:a1c:694f:: with SMTP id e76-v6mr2030898wmc.132.1530723308365; Wed, 04 Jul 2018 09:55:08 -0700 (PDT) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id d102-v6sm7927618wma.10.2018.07.04.09.55.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Jul 2018 09:55:07 -0700 (PDT) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman , Carlo Caione Cc: Jerome Brunet , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] clk: meson: expose GEN_CLK clkid Date: Wed, 4 Jul 2018 18:54:57 +0200 Message-Id: <20180704165458.24149-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180704165458.24149-1-jbrunet@baylibre.com> References: <20180704165458.24149-1-jbrunet@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Expose GEN_CLK clock id Signed-off-by: Jerome Brunet --- include/dt-bindings/clock/axg-clkc.h | 1 + include/dt-bindings/clock/gxbb-clkc.h | 1 + 2 files changed, 2 insertions(+) -- 2.14.4 diff --git a/include/dt-bindings/clock/axg-clkc.h b/include/dt-bindings/clock/axg-clkc.h index 70371228b7e0..fd1f938c38d1 100644 --- a/include/dt-bindings/clock/axg-clkc.h +++ b/include/dt-bindings/clock/axg-clkc.h @@ -71,5 +71,6 @@ #define CLKID_PCIE_CML_EN0 79 #define CLKID_PCIE_CML_EN1 80 #define CLKID_MIPI_ENABLE 81 +#define CLKID_GEN_CLK 84 #endif /* __AXG_CLKC_H */ diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h index 7a892be90549..3979d48c025f 100644 --- a/include/dt-bindings/clock/gxbb-clkc.h +++ b/include/dt-bindings/clock/gxbb-clkc.h @@ -127,5 +127,6 @@ #define CLKID_VAPB 140 #define CLKID_VDEC_1 153 #define CLKID_VDEC_HEVC 156 +#define CLKID_GEN_CLK 159 #endif /* __GXBB_CLKC_H */ From patchwork Wed Jul 4 16:54:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 141077 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1012876ljj; Wed, 4 Jul 2018 09:55:22 -0700 (PDT) X-Google-Smtp-Source: AAOMgpetUBg68Kc/umcLRAt6kS5cWRiiBfnvEAXrx4Hpcku72zaSa7cX6Rrfk0OKQjYXETitn0gV X-Received: by 2002:a17:902:7898:: with SMTP id q24-v6mr2834323pll.254.1530723322633; Wed, 04 Jul 2018 09:55:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530723322; cv=none; d=google.com; s=arc-20160816; b=jslAchaCVtlwDtkXncIbTywV2p00VAJP2CAsyoXI6A5U0HR+rLFOPH6yxgPhICyWXR 1nect0lOrpkE4fUHzpbuusZWbVhqUmDwZmC9jUeSxvOAXQaRbNKoGxpAgQt+uvxA1pvi TwfLG5VRhRsGqa5jVq06cJ7dKE1VbNYyMonbPWW4IfVVPum8TU80px+cuBMUjXIjq/sp 9wAXmY80h9FtWKw+Ee+GdjsHSqLWjj4Fre0YrAO1CGIqMqLEIT5uv8AoN/fxRdePwgBr YV3sSu1y2zvrjC+Lac4CghgBTQjWzrZODHTK5kC4Pw+lJcnZzO3ielcGlzx6yyS8/bI+ zzhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=phQ+mD7Ece/Td0/fL3hsVghmD5A3V/u3TAcjZhSuiCM=; b=TD2wwOGhYN4iWaQyOsQfjSSoxzJ933KqM941DgUGpdVH1w3BrR0MY0hXJOwvHzcZ3u 9lyRBUAeB6y97zYkelkmLMOpVaOzqEbD8IU5fP5kZ3MIxiT0pSN0I18JdrqGZrdjIMpK 7RgMNICctykotbimIdQAnJsG4GwdSd5bR3wH52kwNXgSyxzZLjsTmN5Pm3891/oLF7P7 UakSzaOwsk/WSGL39fFxcChCTCOTXQFA2oTetFthHmcJ+zWfwmtelvBTrFDu684qihpq x/Be+mhAKPHyI9zENQVePTo7Ns7x/u8+VhSb2lYcwvwRIy13Y67sPMKG179W67gREguZ IkXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=Xw6fDXVv; 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 h1-v6si4063785pll.416.2018.07.04.09.55.22; Wed, 04 Jul 2018 09:55:22 -0700 (PDT) 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=Xw6fDXVv; 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 S1753038AbeGDQzV (ORCPT + 31 others); Wed, 4 Jul 2018 12:55:21 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:55414 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752533AbeGDQzK (ORCPT ); Wed, 4 Jul 2018 12:55:10 -0400 Received: by mail-wm0-f68.google.com with SMTP id v16-v6so6964878wmv.5 for ; Wed, 04 Jul 2018 09:55:10 -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=phQ+mD7Ece/Td0/fL3hsVghmD5A3V/u3TAcjZhSuiCM=; b=Xw6fDXVv30I9eSqiGhjN/kxNHxYc0lPDjtNaFJHSCTSL1dnOZHtPvHiS3NSjA8jNVZ b1e9p63QSENCfs420uuNg1KFt+IhDtZFbFfqo2q2G1wLwkn+qceqxQIlIwP7s+U6fqik 88EEUEOXaKdgYQbiAxSBOysLKYxOXEePHZc3qNmPNzVZvy11xPd72uKy9IWuItiXu/zC SRo09JacJVUZi3E3C1iJJkVpikGH8VlfVUZWIxp5g0OhetsvntPtUP4p+t7V0EPcR2w4 aAxgYC8sPSMkRobNhvSFeM/iERulE8cWiaPjPOmekhS8GHwsG7GhV+gZ/GK9vj31qXKM CMpA== 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=phQ+mD7Ece/Td0/fL3hsVghmD5A3V/u3TAcjZhSuiCM=; b=uJa1OkLyQ6dHjf/TQWFkjO78UWJo+zYD7bdn63GaTtMUX2GSc/PexS5Ywuqfubj9Mb EPGC1EwmdBmmlSDl2nx1Yrtp7ssbTb/dydGT9GkcdjlEwnrg2otUvh5NqaguduAIFvHC XtUx2Fb+Z85nNh/D04VtoLSRU7ToL2dVpR5vwenz75pk8KjpzCZWf20zWWTrnkeyHEXZ y6USZTGNV7n4OVEYLHZ3N21mmcXd7gcPHSMIm8VJMneg+tnhMvvsP/o6LMdMbj3tNjzl C+6ABTAvGXkigk7vZSUQJ+pthepsOpSZMuhQal8F0IUfEvS8fbax0hi7ITUybiDfyoIA jAvQ== X-Gm-Message-State: APt69E1XCD68VdCD3YC2+Tvuv7PTRHFsgFklTH3sY7hsFSKzK9MeTiz4 Ne3XZ5L9AEyS/DyrVfQFy0HW8w== X-Received: by 2002:adf:d842:: with SMTP id k2-v6mr2141777wrl.26.1530723309309; Wed, 04 Jul 2018 09:55:09 -0700 (PDT) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id d102-v6sm7927618wma.10.2018.07.04.09.55.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Jul 2018 09:55:08 -0700 (PDT) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman , Carlo Caione Cc: Jerome Brunet , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] clk: meson: add gen_clk Date: Wed, 4 Jul 2018 18:54:58 +0200 Message-Id: <20180704165458.24149-4-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180704165458.24149-1-jbrunet@baylibre.com> References: <20180704165458.24149-1-jbrunet@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org GEN_CLK is able to route several internal clocks to one of the SoC pads. In the future, even more clocks could be made accessible using cts_msr_clk - the clock measure block. Signed-off-by: Jerome Brunet --- drivers/clk/meson/axg.c | 64 +++++++++++++++++++++++++++++++++++++++++++++- drivers/clk/meson/axg.h | 4 ++- drivers/clk/meson/gxbb.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/meson/gxbb.h | 4 ++- 4 files changed, 135 insertions(+), 3 deletions(-) -- 2.14.4 diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c index 2d458092884a..00ce62ad6416 100644 --- a/drivers/clk/meson/axg.c +++ b/drivers/clk/meson/axg.c @@ -909,6 +909,63 @@ static struct clk_regmap axg_sd_emmc_c_clk0 = { }, }; +static u32 mux_table_gen_clk[] = { 0, 4, 5, 6, 7, 8, + 9, 10, 11, 13, 14, }; +static const char * const gen_clk_parent_names[] = { + "xtal", "hifi_pll", "mpll0", "mpll1", "mpll2", "mpll3", + "fclk_div4", "fclk_div3", "fclk_div5", "fclk_div7", "gp0_pll", +}; + +static struct clk_regmap axg_gen_clk_sel = { + .data = &(struct clk_regmap_mux_data){ + .offset = HHI_GEN_CLK_CNTL, + .mask = 0xf, + .shift = 12, + .table = mux_table_gen_clk, + }, + .hw.init = &(struct clk_init_data){ + .name = "gen_clk_sel", + .ops = &clk_regmap_mux_ops, + /* + * bits 15:12 selects from 14 possible parents: + * xtal, [rtc_oscin_i], [sys_cpu_div16], [ddr_dpll_pt], + * hifi_pll, mpll0, mpll1, mpll2, mpll3, fdiv4, + * fdiv3, fdiv5, [cts_msr_clk], fdiv7, gp0_pll + */ + .parent_names = gen_clk_parent_names, + .num_parents = ARRAY_SIZE(gen_clk_parent_names), + }, +}; + +static struct clk_regmap axg_gen_clk_div = { + .data = &(struct clk_regmap_div_data){ + .offset = HHI_GEN_CLK_CNTL, + .shift = 0, + .width = 11, + }, + .hw.init = &(struct clk_init_data){ + .name = "gen_clk_div", + .ops = &clk_regmap_divider_ops, + .parent_names = (const char *[]){ "gen_clk_sel" }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + }, +}; + +static struct clk_regmap axg_gen_clk = { + .data = &(struct clk_regmap_gate_data){ + .offset = HHI_GEN_CLK_CNTL, + .bit_idx = 7, + }, + .hw.init = &(struct clk_init_data){ + .name = "gen_clk", + .ops = &clk_regmap_gate_ops, + .parent_names = (const char *[]){ "gen_clk_div" }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + }, +}; + /* Everything Else (EE) domain gates */ static MESON_GATE(axg_ddr, HHI_GCLK_MPEG0, 0); static MESON_GATE(axg_audio_locker, HHI_GCLK_MPEG0, 2); @@ -1047,7 +1104,9 @@ static struct clk_hw_onecell_data axg_hw_onecell_data = { [CLKID_PCIE_CML_EN0] = &axg_pcie_cml_en0.hw, [CLKID_PCIE_CML_EN1] = &axg_pcie_cml_en1.hw, [CLKID_MIPI_ENABLE] = &axg_mipi_enable.hw, - + [CLKID_GEN_CLK_SEL] = &axg_gen_clk_sel.hw, + [CLKID_GEN_CLK_DIV] = &axg_gen_clk_div.hw, + [CLKID_GEN_CLK] = &axg_gen_clk.hw, [NR_CLKS] = NULL, }, .num = NR_CLKS, @@ -1132,6 +1191,9 @@ static struct clk_regmap *const axg_clk_regmaps[] = { &axg_pcie_cml_en0, &axg_pcie_cml_en1, &axg_mipi_enable, + &axg_gen_clk_sel, + &axg_gen_clk_div, + &axg_gen_clk, }; static const struct of_device_id clkc_match_table[] = { diff --git a/drivers/clk/meson/axg.h b/drivers/clk/meson/axg.h index 6e55ebd6c77d..1d04144a1b2c 100644 --- a/drivers/clk/meson/axg.h +++ b/drivers/clk/meson/axg.h @@ -131,8 +131,10 @@ #define CLKID_PCIE_PLL 76 #define CLKID_PCIE_MUX 77 #define CLKID_PCIE_REF 78 +#define CLKID_GEN_CLK_SEL 82 +#define CLKID_GEN_CLK_DIV 83 -#define NR_CLKS 82 +#define NR_CLKS 85 /* include the CLKIDs that have been made part of the DT binding */ #include diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index 894a6adaa17a..86d3ae58e84c 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -1624,6 +1624,63 @@ static struct clk_regmap gxbb_vdec_hevc = { }, }; +static u32 mux_table_gen_clk[] = { 0, 4, 5, 6, 7, 8, + 9, 10, 11, 13, 14, }; +static const char * const gen_clk_parent_names[] = { + "xtal", "vdec_1", "vdec_hevc", "mpll0", "mpll1", "mpll2", + "fclk_div4", "fclk_div3", "fclk_div5", "fclk_div7", "gp0_pll", +}; + +static struct clk_regmap gxbb_gen_clk_sel = { + .data = &(struct clk_regmap_mux_data){ + .offset = HHI_GEN_CLK_CNTL, + .mask = 0xf, + .shift = 12, + .table = mux_table_gen_clk, + }, + .hw.init = &(struct clk_init_data){ + .name = "gen_clk_sel", + .ops = &clk_regmap_mux_ops, + /* + * bits 15:12 selects from 14 possible parents: + * xtal, [rtc_oscin_i], [sys_cpu_div16], [ddr_dpll_pt], + * vid_pll, vid2_pll (hevc), mpll0, mpll1, mpll2, fdiv4, + * fdiv3, fdiv5, [cts_msr_clk], fdiv7, gp0_pll + */ + .parent_names = gen_clk_parent_names, + .num_parents = ARRAY_SIZE(gen_clk_parent_names), + }, +}; + +static struct clk_regmap gxbb_gen_clk_div = { + .data = &(struct clk_regmap_div_data){ + .offset = HHI_GEN_CLK_CNTL, + .shift = 0, + .width = 11, + }, + .hw.init = &(struct clk_init_data){ + .name = "gen_clk_div", + .ops = &clk_regmap_divider_ops, + .parent_names = (const char *[]){ "gen_clk_sel" }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + }, +}; + +static struct clk_regmap gxbb_gen_clk = { + .data = &(struct clk_regmap_gate_data){ + .offset = HHI_GEN_CLK_CNTL, + .bit_idx = 7, + }, + .hw.init = &(struct clk_init_data){ + .name = "gen_clk", + .ops = &clk_regmap_gate_ops, + .parent_names = (const char *[]){ "gen_clk_div" }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + }, +}; + /* Everything Else (EE) domain gates */ static MESON_GATE(gxbb_ddr, HHI_GCLK_MPEG0, 0); static MESON_GATE(gxbb_dos, HHI_GCLK_MPEG0, 1); @@ -1873,6 +1930,9 @@ static struct clk_hw_onecell_data gxbb_hw_onecell_data = { [CLKID_VDEC_HEVC_SEL] = &gxbb_vdec_hevc_sel.hw, [CLKID_VDEC_HEVC_DIV] = &gxbb_vdec_hevc_div.hw, [CLKID_VDEC_HEVC] = &gxbb_vdec_hevc.hw, + [CLKID_GEN_CLK_SEL] = &gxbb_gen_clk_sel.hw, + [CLKID_GEN_CLK_DIV] = &gxbb_gen_clk_div.hw, + [CLKID_GEN_CLK] = &gxbb_gen_clk.hw, [NR_CLKS] = NULL, }, .num = NR_CLKS, @@ -2035,6 +2095,9 @@ static struct clk_hw_onecell_data gxl_hw_onecell_data = { [CLKID_VDEC_HEVC_SEL] = &gxbb_vdec_hevc_sel.hw, [CLKID_VDEC_HEVC_DIV] = &gxbb_vdec_hevc_div.hw, [CLKID_VDEC_HEVC] = &gxbb_vdec_hevc.hw, + [CLKID_GEN_CLK_SEL] = &gxbb_gen_clk_sel.hw, + [CLKID_GEN_CLK_DIV] = &gxbb_gen_clk_div.hw, + [CLKID_GEN_CLK] = &gxbb_gen_clk.hw, [NR_CLKS] = NULL, }, .num = NR_CLKS, @@ -2199,6 +2262,9 @@ static struct clk_regmap *const gx_clk_regmaps[] = { &gxbb_vdec_hevc_sel, &gxbb_vdec_hevc_div, &gxbb_vdec_hevc, + &gxbb_gen_clk_sel, + &gxbb_gen_clk_div, + &gxbb_gen_clk, }; struct clkc_data { diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h index df6c21d368c6..20dfb1daf5b8 100644 --- a/drivers/clk/meson/gxbb.h +++ b/drivers/clk/meson/gxbb.h @@ -157,8 +157,10 @@ #define CLKID_VDEC_1_DIV 152 #define CLKID_VDEC_HEVC_SEL 154 #define CLKID_VDEC_HEVC_DIV 155 +#define CLKID_GEN_CLK_SEL 157 +#define CLKID_GEN_CLK_DIV 158 -#define NR_CLKS 157 +#define NR_CLKS 160 /* include the CLKIDs that have been made part of the DT binding */ #include