From patchwork Fri Dec 27 01:42:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kunihiko Hayashi X-Patchwork-Id: 182465 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp2407284ild; Thu, 26 Dec 2019 17:42:14 -0800 (PST) X-Google-Smtp-Source: APXvYqwEfh/3Zm7YGHzCEn6UpWVikZ1lIuDUqdpmDy8EZRNUGHN7z5x9ltbzLvQ/2Xyo6EQvocdW X-Received: by 2002:a9d:7315:: with SMTP id e21mr42565241otk.255.1577410933993; Thu, 26 Dec 2019 17:42:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577410933; cv=none; d=google.com; s=arc-20160816; b=hayahGU/eDrD/6noaehEyEJAe23weq6kOKjK++vZGkItGY75EOAvCLhq2iGqn08Xtb ytm4V/6Wr8SYpD1DP36AbN5owYC1bP5m7dhdqi29V7L96BSUoSINfnufAQL2jf9+JAX3 X91p1j4k0XUleBORjmmd9y6EJq2dPsaCwGXBA2vTzmZuIR6auxYoykGbFd7aHoajsvk3 q1NT7JPFSD5288vQ3X3Cq2GLxEZvYkj351MdyuPnqOMh/QSKEJWlOcEu5fl8DFEoIKt/ JhEt0i71q/aLTdk/6X/7+CNw9sgLYVVY/9otkSy85sfAq03svEtiFdfifMx6OgbTwjYj 6wtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=RmF2qUBkFHy4SpWciTpzRz2X/jX17EQbt+zteyBEFoc=; b=ygOcgpzFtU9I15CWaFcJ09+hsjM0n0T35XEZozk0sg5cgyt0IM7N+Sr+VOnU63tAaJ /YfxNetEPP0UEo9yo5o5CEDw1rAjayuQjeXVui7V4BdLho7lAgtXJRi3EUN0v+pqEW3Q AxVnlkQZrujFhzVanO9NrZzmg5+bAXXr9ednknCL2fAHtv8YcLHY/NoVeve+IDeDezZW NHtkS71iaz+F2Ypy6J6jaRoBLtc5B48l0DTaLzY2bILkrCpHENCoKyKcgUbt+08b2GZ9 Es+JEJwxe6IVpabwNcrDQooMCVxAfpcYSpj4s82J/GxeFIrouT2zENIba9X2KMX2BgQ1 +hdA== ARC-Authentication-Results: i=1; mx.google.com; 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 s1si11522142oic.234.2019.12.26.17.42.13; Thu, 26 Dec 2019 17:42:13 -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; 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 S1727028AbfL0BmM (ORCPT + 27 others); Thu, 26 Dec 2019 20:42:12 -0500 Received: from mx.socionext.com ([202.248.49.38]:5569 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726277AbfL0BmL (ORCPT ); Thu, 26 Dec 2019 20:42:11 -0500 Received: from unknown (HELO iyokan-ex.css.socionext.com) ([172.31.9.54]) by mx.socionext.com with ESMTP; 27 Dec 2019 10:42:09 +0900 Received: from mail.mfilter.local (m-filter-2 [10.213.24.62]) by iyokan-ex.css.socionext.com (Postfix) with ESMTP id ED167603AB; Fri, 27 Dec 2019 10:42:09 +0900 (JST) Received: from 172.31.9.51 (172.31.9.51) by m-FILTER with ESMTP; Fri, 27 Dec 2019 10:43:02 +0900 Received: from plum.e01.socionext.com (unknown [10.213.132.32]) by kinkan.css.socionext.com (Postfix) with ESMTP id 677131A01BB; Fri, 27 Dec 2019 10:42:09 +0900 (JST) From: Kunihiko Hayashi To: Michael Turquette , Stephen Boyd , Masahiro Yamada Cc: linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Masami Hiramatsu , Jassi Brar , Kunihiko Hayashi Subject: [PATCH v2] clk: uniphier: Add SCSSI clock gate for each channel Date: Fri, 27 Dec 2019 10:42:05 +0900 Message-Id: <1577410925-22021-1-git-send-email-hayashi.kunihiko@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org SCSSI has clock gates for each channel in the SoCs newer than Pro4, so this adds missing clock gates for channel 1, 2 and 3. And more, this moves MCSSI clock ID after SCSSI. Fixes: ff388ee36516 ("clk: uniphier: add clock frequency support for SPI") Signed-off-by: Kunihiko Hayashi Acked-by: Masahiro Yamada --- Changes since v1: - Add 'Fixes' and 'Acked-by' tags drivers/clk/uniphier/clk-uniphier-peri.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/clk/uniphier/clk-uniphier-peri.c b/drivers/clk/uniphier/clk-uniphier-peri.c index 9caa529..3e32db9 100644 --- a/drivers/clk/uniphier/clk-uniphier-peri.c +++ b/drivers/clk/uniphier/clk-uniphier-peri.c @@ -18,8 +18,8 @@ #define UNIPHIER_PERI_CLK_FI2C(idx, ch) \ UNIPHIER_CLK_GATE("i2c" #ch, (idx), "i2c", 0x24, 24 + (ch)) -#define UNIPHIER_PERI_CLK_SCSSI(idx) \ - UNIPHIER_CLK_GATE("scssi", (idx), "spi", 0x20, 17) +#define UNIPHIER_PERI_CLK_SCSSI(idx, ch) \ + UNIPHIER_CLK_GATE("scssi" #ch, (idx), "spi", 0x20, 17 + (ch)) #define UNIPHIER_PERI_CLK_MCSSI(idx) \ UNIPHIER_CLK_GATE("mcssi", (idx), "spi", 0x24, 14) @@ -35,7 +35,7 @@ const struct uniphier_clk_data uniphier_ld4_peri_clk_data[] = { UNIPHIER_PERI_CLK_I2C(6, 2), UNIPHIER_PERI_CLK_I2C(7, 3), UNIPHIER_PERI_CLK_I2C(8, 4), - UNIPHIER_PERI_CLK_SCSSI(11), + UNIPHIER_PERI_CLK_SCSSI(11, 0), { /* sentinel */ } }; @@ -51,7 +51,10 @@ const struct uniphier_clk_data uniphier_pro4_peri_clk_data[] = { UNIPHIER_PERI_CLK_FI2C(8, 4), UNIPHIER_PERI_CLK_FI2C(9, 5), UNIPHIER_PERI_CLK_FI2C(10, 6), - UNIPHIER_PERI_CLK_SCSSI(11), - UNIPHIER_PERI_CLK_MCSSI(12), + UNIPHIER_PERI_CLK_SCSSI(11, 0), + UNIPHIER_PERI_CLK_SCSSI(12, 1), + UNIPHIER_PERI_CLK_SCSSI(13, 2), + UNIPHIER_PERI_CLK_SCSSI(14, 3), + UNIPHIER_PERI_CLK_MCSSI(15), { /* sentinel */ } };