From patchwork Fri Nov 29 04:19:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kunihiko Hayashi X-Patchwork-Id: 180472 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp986511ile; Thu, 28 Nov 2019 20:19:34 -0800 (PST) X-Google-Smtp-Source: APXvYqzOZ65e/dVMYjImQGfPFg1tWGgQ3nxQ4MY7HEtWKEbpOl9vQc/OeL+Uv6TjftG7aMJ+JFB5 X-Received: by 2002:a17:906:4899:: with SMTP id v25mr57960084ejq.235.1575001174348; Thu, 28 Nov 2019 20:19:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575001174; cv=none; d=google.com; s=arc-20160816; b=R5oT59HfctrVEquccOS+GfHg7Iap6ToHQ+kVnVB/1AIvKm8RpDJ32yquvuHSqQ3P4t LGMoydetQA3I89rvTsLFP02KhK/e0jwBLUKwNSdrtAqLXm8902/5ab653ydUFPbSRFeD I5jDVBO49AqsZw8JJTL82jjqFqCvwcGMU6zkvNVlYil7ZxLBqIi6v1rCywXVxqLvC59B vBXHTUrNC8T5UjfRZlvPkR36pK5u3FS+sxvWH5iJnLjA3Yw7Rk7ZrGvvpaH1hgyxe9PS 85meavCCCKh/QZUoaTuXqueqcfFVLM+YGyLNlFJwc7MgWcPw6768FyoOFaqV/XRwMZG5 DgFw== 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=zDnwpV2rP9Tu/MhEZAHp/zoYil2lxAkiGFE1vNtIb+c=; b=Fwqtc5aeX7zKLDUTlgk4Jwboji6XszEge3OTIjX1VqpL/DVOs9OCjHthKAzd/kHEnU hfum/tqrc9HLqT2fP+9pRbI6XkIXPyGdtT+7GosyXw5TOLUQ/l900pnqqzrumINBUox8 JWdugi4Z5Konlfml1y3x8NibufBChXqJaZ54JLC2hFOdogG6w5St8ikkz+I62i4Eu764 MDqZVCC8uePtnIOAdDrk8aylJCwyVW4KPmWC7IeSYJk42+voUf3qco+ATnZWpwSrGhhY /cxBG4S++g8bMoR81b9iQ7AcoWCfiYsqwOn2yD7WGZaOLkloh0MqYVxadDNBYVSQJolT zWmg== 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 w12si14913911eda.292.2019.11.28.20.19.34; Thu, 28 Nov 2019 20:19:34 -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 S1727007AbfK2ETX (ORCPT + 27 others); Thu, 28 Nov 2019 23:19:23 -0500 Received: from mx.socionext.com ([202.248.49.38]:23360 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726764AbfK2ETX (ORCPT ); Thu, 28 Nov 2019 23:19:23 -0500 Received: from unknown (HELO kinkan-ex.css.socionext.com) ([172.31.9.52]) by mx.socionext.com with ESMTP; 29 Nov 2019 13:19:21 +0900 Received: from mail.mfilter.local (m-filter-2 [10.213.24.62]) by kinkan-ex.css.socionext.com (Postfix) with ESMTP id D39F0180D62; Fri, 29 Nov 2019 13:19:21 +0900 (JST) Received: from 172.31.9.51 (172.31.9.51) by m-FILTER with ESMTP; Fri, 29 Nov 2019 13:19:50 +0900 Received: from plum.e01.socionext.com (unknown [10.213.132.32]) by kinkan.css.socionext.com (Postfix) with ESMTP id 4F89A1A0006; Fri, 29 Nov 2019 13:19:21 +0900 (JST) From: Kunihiko Hayashi To: Philipp Zabel , Masahiro Yamada Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Masami Hiramatsu , Jassi Brar , Kunihiko Hayashi Subject: [PATCH] reset: uniphier: Add SCSSI reset control for each channel Date: Fri, 29 Nov 2019 13:19:19 +0900 Message-Id: <1575001159-19648-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 reset controls for each channel in the SoCs newer than Pro4, so this adds missing reset controls for channel 1, 2 and 3. And more, this moves MCSSI reset ID after SCSSI. Signed-off-by: Kunihiko Hayashi --- drivers/reset/reset-uniphier.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- 2.7.4 Acked-by: Masahiro Yamada diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c index 74e589f..279e535 100644 --- a/drivers/reset/reset-uniphier.c +++ b/drivers/reset/reset-uniphier.c @@ -193,8 +193,8 @@ static const struct uniphier_reset_data uniphier_pro5_sd_reset_data[] = { #define UNIPHIER_PERI_RESET_FI2C(id, ch) \ UNIPHIER_RESETX((id), 0x114, 24 + (ch)) -#define UNIPHIER_PERI_RESET_SCSSI(id) \ - UNIPHIER_RESETX((id), 0x110, 17) +#define UNIPHIER_PERI_RESET_SCSSI(id, ch) \ + UNIPHIER_RESETX((id), 0x110, 17 + (ch)) #define UNIPHIER_PERI_RESET_MCSSI(id) \ UNIPHIER_RESETX((id), 0x114, 14) @@ -209,7 +209,7 @@ static const struct uniphier_reset_data uniphier_ld4_peri_reset_data[] = { UNIPHIER_PERI_RESET_I2C(6, 2), UNIPHIER_PERI_RESET_I2C(7, 3), UNIPHIER_PERI_RESET_I2C(8, 4), - UNIPHIER_PERI_RESET_SCSSI(11), + UNIPHIER_PERI_RESET_SCSSI(11, 0), UNIPHIER_RESET_END, }; @@ -225,8 +225,11 @@ static const struct uniphier_reset_data uniphier_pro4_peri_reset_data[] = { UNIPHIER_PERI_RESET_FI2C(8, 4), UNIPHIER_PERI_RESET_FI2C(9, 5), UNIPHIER_PERI_RESET_FI2C(10, 6), - UNIPHIER_PERI_RESET_SCSSI(11), - UNIPHIER_PERI_RESET_MCSSI(12), + UNIPHIER_PERI_RESET_SCSSI(11, 0), + UNIPHIER_PERI_RESET_SCSSI(12, 1), + UNIPHIER_PERI_RESET_SCSSI(13, 2), + UNIPHIER_PERI_RESET_SCSSI(14, 3), + UNIPHIER_PERI_RESET_MCSSI(15), UNIPHIER_RESET_END, };