Received: by 10.223.185.116 with SMTP id b49csp2396293wrg; Mon, 5 Mar 2018 02:02:55 -0800 (PST) X-Google-Smtp-Source: AG47ELtUEz4xZfhindjnlGDrbmidSIlQDCXBOJ0mztJtvu3Ad9YAymYGm5ic779hxzHwOPYx6e0j X-Received: by 2002:a17:902:57c6:: with SMTP id g6-v6mr12509482plj.358.1520244175489; Mon, 05 Mar 2018 02:02:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520244175; cv=none; d=google.com; s=arc-20160816; b=RiqTnayTQidVdSyrIx5Z1NU5HCaC0tN9H1HptMUmosOx0tJ9X/hmpbZNepdUH5YSLb YMQXxwI4z8LGebk1uVXugi8QgnglntPtj3K9SWjuVVoYCj4GZaOjGkPzWhmEzy//xQLO eg+2V/EpJmxBElY03GyWhiznUqBdscGNY0QDkagj2s2xReN8YEjHwcG22NgjjNiv9ehC wr4IU9TEGJKp81Dq7geA/eU7HIQO5jaoH2FgQHCjz5SPO9kSZqZ9A4ZPvZ95PFx5YPs6 RL9XjIeGzWMoeCRiZhtjWldaRpXmotqnA7BBtCIzF88or70itP5YmubAXS5lgP/sFaX4 A7uw== 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:dmarc-filter:dkim-signature:dkim-signature :arc-authentication-results; bh=cDjPWEGBdT4BBuLCNSAIXJYQ6hI/HJ0CYCyRQsqCJVk=; b=CvdhEJq7VW5oUA4ELbfxL8MiuuO+OtqO/YcyCOri0EfSYRkoBxznTJqDX8KuU+33w1 AOpg2Adizn7poAX8xKUqR0DJgZ0gxYl3GEI7sCHXcpFpPuLT1yZ8ptqJ4clWIBnttAqO 7PRovWiX/Zgd6prSQr2iNuc+TP4pl1BG8UsFNeIeXIQniMmyL6vwwx3b3eOuYudnPHOO mUznKtxwDLnQlbAVOtGL8p3u3AAgHi49yYGMp3kG7VnnyMlUiUvmtMC3jkfgBtKY3JyP HAvWww4sJv82Zf9ir10bbN/7D4NaKXAUy/Xd5hBrCY+uGf8eo8J/XC/91IWaicPsQs45 XfSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=NqDGLfKS; dkim=pass header.i=@codeaurora.org header.s=default header.b=OjFEciY9; 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 s12si8134559pgr.762.2018.03.05.02.02.40; Mon, 05 Mar 2018 02:02:55 -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=@codeaurora.org header.s=default header.b=NqDGLfKS; dkim=pass header.i=@codeaurora.org header.s=default header.b=OjFEciY9; 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 S1752676AbeCEJyJ (ORCPT + 99 others); Mon, 5 Mar 2018 04:54:09 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:47474 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933071AbeCEJyA (ORCPT ); Mon, 5 Mar 2018 04:54:00 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id BB9BD6076C; Mon, 5 Mar 2018 09:53:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1520243639; bh=xwLEl2Nwyl3B1q+z8+DU03NFY/5G2o+Eq7s1lUbyNvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NqDGLfKSSVaKQ6YLMm7UCUps3L74nZQ0ScYnsPmzB4FMUVyJdSJN+X/tdsnj6i4vy zujZdyVxzq1GEiyvu+CY1/XF30yC6ZXbKTRojQD6u94PJiZlcc+k9b6uZHBflvsuc2 Zbk0k93Ht/fR9VrOLJYq/ihiHrUm6HXrDNZX7Qrw= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from blr-ubuntu-87.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.18.19]) (using TLSv1.1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: sibis@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id BCFD06076C; Mon, 5 Mar 2018 09:53:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1520243638; bh=xwLEl2Nwyl3B1q+z8+DU03NFY/5G2o+Eq7s1lUbyNvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OjFEciY9sy/I501kq1D8RQqS47HWyAVWq4gI71XBlNKu8HxHeXfPby4LbJCIEXUBg N1aBXlI4DIHhldwB0uMBW4SSrVjQ2GraFBW1K5IaLLemiZ6QHn5176YNjGyRKJaLyy 2oD7tI2cM1oOaFQmTg65uKqavzbWmyo3MZJUDo9I= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org BCFD06076C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sibis@codeaurora.org From: sibis To: bjorn.andersson@linaro.org Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, sibis@codeaurora.org, georgi.djakov@linaro.org, jassisinghbrar@gmail.com, p.zabel@pengutronix.de, ohad@wizery.com, mark.rutland@arm.com, robh+dt@kernel.org, kyan@codeaurora.org, sricharan@codeaurora.org, akdwived@codeaurora.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 1/6] reset: qcom: AOSS (Always on subsystem) reset controller Date: Mon, 5 Mar 2018 15:23:28 +0530 Message-Id: <1520243613-30393-2-git-send-email-sibis@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1520243613-30393-1-git-send-email-sibis@codeaurora.org> References: <1520243613-30393-1-git-send-email-sibis@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add reset controller driver for Qualcomm SDM845 SoC to control reset signals provided by AOSS for Modem, Venus ADSP, GPU, Camera, Wireless, Display subsystem Signed-off-by: sibis --- .../devicetree/bindings/reset/qcom,aoss-reset.txt | 54 ++++++++ drivers/reset/Kconfig | 10 ++ drivers/reset/Makefile | 1 + drivers/reset/reset-qcom-aoss.c | 151 +++++++++++++++++++++ include/dt-bindings/reset/qcom,aoss-sdm845.h | 17 +++ 5 files changed, 233 insertions(+) create mode 100644 Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt create mode 100644 drivers/reset/reset-qcom-aoss.c create mode 100644 include/dt-bindings/reset/qcom,aoss-sdm845.h diff --git a/Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt b/Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt new file mode 100644 index 0000000..5318e14 --- /dev/null +++ b/Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt @@ -0,0 +1,54 @@ +Qualcomm AOSS Reset Controller +====================================== + +This binding describes a reset-controller found on AOSS (Always on SubSysem) +for Qualcomm SDM845 SoCs. + +Required properties: +- compatible: + Usage: required + Value type: + Definition: must be: + "qcom,aoss-reset-sdm845", "syscon" + +- reg: + Usage: required + Value type: + Definition: must specify the base address and size of the + syscon device. + + +- #reset-cells: + Usage: required + Value type: + Definition: must be 1; cell entry represents the reset index. + +example: + +aoss_reset: qcom,reset-controller@b2e0100 { + compatible = "qcom,aoss-reset-sdm845", "syscon"; + reg = <0xc2b0000 0x20004>; + #reset-cells = <1>; +}; + + +Specifying reset lines connected to IP modules +============================================== + +Device nodes that need access to reset lines should +specify them as a reset phandle in their corresponding node as +specified in reset.txt. + +Example: + + modem-pil@4080000 { + ... + + resets = <&aoss_reset AOSS_CC_MSS_RESTART>; + reset-names = "mss_restart"; + + ... + }; + +For list of all valid reset indicies see + diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index 7fc7769..1141733 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -81,6 +81,16 @@ config RESET_PISTACHIO help This enables the reset driver for ImgTec Pistachio SoCs. +config RESET_QCOM_AOSS + bool "Qcom AOSS Reset Driver" + depends on ARCH_QCOM || COMPILE_TEST + select MFD_SYSCON + help + This enables the AOSS (Always On SubSystem) reset driver + for Qualcomm SDM845 SoCs. Say Y if you want to control + reset signals provided by AOSS for Modem, Venus, ADSP, + GPU, Camera, Wireless, Display subsystem. Otherwise, say N. + config RESET_SIMPLE bool "Simple Reset Controller Driver" if COMPILE_TEST default ARCH_SOCFPGA || ARCH_STM32 || ARCH_STRATIX10 || ARCH_SUNXI || ARCH_ZX diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile index 132c24f..c30044a 100644 --- a/drivers/reset/Makefile +++ b/drivers/reset/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_RESET_LPC18XX) += reset-lpc18xx.o obj-$(CONFIG_RESET_MESON) += reset-meson.o obj-$(CONFIG_RESET_OXNAS) += reset-oxnas.o obj-$(CONFIG_RESET_PISTACHIO) += reset-pistachio.o +obj-$(CONFIG_RESET_QCOM_AOSS) += reset-qcom-aoss.o obj-$(CONFIG_RESET_SIMPLE) += reset-simple.o obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o obj-$(CONFIG_RESET_TI_SCI) += reset-ti-sci.o diff --git a/drivers/reset/reset-qcom-aoss.c b/drivers/reset/reset-qcom-aoss.c new file mode 100644 index 0000000..1f3e3e8 --- /dev/null +++ b/drivers/reset/reset-qcom-aoss.c @@ -0,0 +1,151 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2018 The Linux Foundation. All rights reserved. + */ + +#include +#include +#include +#include +#include +#include +#include + +struct qcom_aoss_reset_map { + unsigned int reg; + u8 bit; +}; + +struct qcom_aoss_desc { + const struct regmap_config *config; + const struct qcom_aoss_reset_map *resets; + int delay; + size_t num_resets; +}; + +struct qcom_aoss_reset_data { + struct reset_controller_dev rcdev; + struct regmap *regmap; + const struct qcom_aoss_desc *desc; +}; + +static const struct regmap_config aoss_sdm845_regmap_config = { + .name = "aoss-reset", + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .max_register = 0x20000, + .fast_io = true, +}; + +static const struct qcom_aoss_reset_map aoss_sdm845_resets[] = { + [AOSS_CC_MSS_RESTART] = { 0x0, 0 }, + [AOSS_CC_CAMSS_RESTART] = { 0x1000, 0 }, + [AOSS_CC_VENUS_RESTART] = { 0x2000, 0 }, + [AOSS_CC_GPU_RESTART] = { 0x3000, 0 }, + [AOSS_CC_DISPSS_RESTART] = { 0x4000, 0 }, + [AOSS_CC_WCSS_RESTART] = { 0x10000, 0 }, + [AOSS_CC_LPASS_RESTART] = { 0x20000, 0 }, +}; + +static const struct qcom_aoss_desc aoss_sdm845_desc = { + .config = &aoss_sdm845_regmap_config, + .resets = aoss_sdm845_resets, + /* Wait 6 32kHz sleep cycles for reset */ + .delay = 200, + .num_resets = ARRAY_SIZE(aoss_sdm845_resets), +}; + +static struct qcom_aoss_reset_data *to_qcom_aoss_reset_data( + struct reset_controller_dev *rcdev) +{ + return container_of(rcdev, struct qcom_aoss_reset_data, rcdev); +} + +static int qcom_aoss_control_assert(struct reset_controller_dev *rcdev, + unsigned long idx) +{ + struct qcom_aoss_reset_data *data = to_qcom_aoss_reset_data(rcdev); + const struct qcom_aoss_reset_map *map = &data->desc->resets[idx]; + + return regmap_update_bits(data->regmap, map->reg, + BIT(map->bit), BIT(map->bit)); +} + +static int qcom_aoss_control_deassert(struct reset_controller_dev *rcdev, + unsigned long idx) +{ + struct qcom_aoss_reset_data *data = to_qcom_aoss_reset_data(rcdev); + const struct qcom_aoss_reset_map *map = &data->desc->resets[idx]; + + return regmap_update_bits(data->regmap, map->reg, BIT(map->bit), 0); +} + +static int qcom_aoss_control_reset(struct reset_controller_dev *rcdev, + unsigned long idx) +{ + struct qcom_aoss_reset_data *data = to_qcom_aoss_reset_data(rcdev); + int ret; + + ret = qcom_aoss_control_assert(rcdev, idx); + if (ret) + return ret; + + udelay(data->desc->delay); + + return qcom_aoss_control_deassert(rcdev, idx); +} + +static const struct reset_control_ops qcom_aoss_reset_ops = { + .reset = qcom_aoss_control_reset, + .assert = qcom_aoss_control_assert, + .deassert = qcom_aoss_control_deassert, +}; + +static int qcom_aoss_reset_probe(struct platform_device *pdev) +{ + struct qcom_aoss_reset_data *data; + struct device *dev = &pdev->dev; + const struct qcom_aoss_desc *desc; + + desc = of_device_get_match_data(dev); + if (!desc) + return -EINVAL; + + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->desc = desc; + data->regmap = syscon_node_to_regmap(dev->of_node); + if (IS_ERR(data->regmap)) { + dev_err(dev, "Unable to get aoss-reset regmap"); + return PTR_ERR(data->regmap); + } + regmap_attach_dev(dev, data->regmap, desc->config); + + data->rcdev.owner = THIS_MODULE; + data->rcdev.ops = &qcom_aoss_reset_ops; + data->rcdev.nr_resets = desc->num_resets; + data->rcdev.of_node = dev->of_node; + + return devm_reset_controller_register(dev, &data->rcdev); +} + +static const struct of_device_id qcom_aoss_reset_of_match[] = { + { .compatible = "qcom,aoss-reset-sdm845", .data = &aoss_sdm845_desc }, + {} +}; + +static struct platform_driver qcom_aoss_reset_driver = { + .probe = qcom_aoss_reset_probe, + .driver = { + .name = "qcom_aoss_reset", + .of_match_table = qcom_aoss_reset_of_match, + }, +}; + +builtin_platform_driver(qcom_aoss_reset_driver); + +MODULE_DESCRIPTION("Qualcomm AOSS Reset Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/include/dt-bindings/reset/qcom,aoss-sdm845.h b/include/dt-bindings/reset/qcom,aoss-sdm845.h new file mode 100644 index 0000000..e9b38fc --- /dev/null +++ b/include/dt-bindings/reset/qcom,aoss-sdm845.h @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2018 The Linux Foundation. All rights reserved. + */ + +#ifndef _DT_BINDINGS_RESET_AOSS_SDM_845_H +#define _DT_BINDINGS_RESET_AOSS_SDM_845_H + +#define AOSS_CC_MSS_RESTART 0 +#define AOSS_CC_CAMSS_RESTART 1 +#define AOSS_CC_VENUS_RESTART 2 +#define AOSS_CC_GPU_RESTART 3 +#define AOSS_CC_DISPSS_RESTART 4 +#define AOSS_CC_WCSS_RESTART 5 +#define AOSS_CC_LPASS_RESTART 6 + +#endif -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project