From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5362EB676 for ; Tue, 8 Oct 2024 07:53:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728374018; cv=none; b=KjJcPB1ZzgtcGZ0QlLkS9QyKj6qA4p8kJ7lFnoFzCtnSTpCk918tUHQDAs7HWGo5DJOz5HFBpL87b6L2NlgaAZj9UDVFV6LnbmLOUJPuz5vzd6FOArvFFxSm14anKwwOZ0ncweUiNyZdI8ZjOiGY8d0FxotMRzOMIe9lybDLuOo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728374018; c=relaxed/simple; bh=0XcNuEdnsJcnQuOsxWKes48KwsFqtGg7x5clR6DMIHc=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:References: In-Reply-To:Content-Type; b=VNA8R8xU7QvXx3YPOSzmLgJZkO1I015OD4K/n41B2kmGKTiCk73LvK4JNYE7CJOyoiisbD6l/SGz4duvCz2qeSgpEnNiAScC+J9/ye2aIPt5C34IUyyDKV9voFmZA/43J5ogOyNzEnoMSrzr09Nr9WHo68jQHXrAssNuJQ9UXU4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=PKQzdEE8; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="PKQzdEE8" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-42cc8782869so54469465e9.2 for ; Tue, 08 Oct 2024 00:53:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1728374015; x=1728978815; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=6RX7qopexhbVavnycdQHirFwBWrFUkZRiDzEyQ/1rf4=; b=PKQzdEE8v5CU7yTYSrq8it/tw3zAMSvnjn5dmL+X+rv4aaKM18XmUo6gZBwQOOnNZO t5FOukHChAVrIMCXUiYM42PbOLfJ31lsaUvtOAzl8uw0gMj0SCmQ2z21XrAeI9e01lqK yl09i3CRfaQxqGF1bZgzPlNe9Lv/XpjkXnAnNAPeNn4WpfqiecbeTwCmhx35j2D9qE6g Xgby7lA2/uOeRo8NOY6FcKyeU4jh3EKUt3WaKo6ClbNBnzzhMlka9MXzwzEOtBNvrIi5 +InwzdU0eDMi6sPwEa67SZPWctlwbIZel1o0TGyR3cYKCwqUtB+G7ShbJ7Xfu21NSMTM D10A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728374015; x=1728978815; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=6RX7qopexhbVavnycdQHirFwBWrFUkZRiDzEyQ/1rf4=; b=e3676ugJugpCCRARqE7NryLUg0gzuaflMHN7Mk6VBesAJ+6Kw2/YcKXhw38FRIrakt cF7A8j7krA0Ou1hInvUdxcCMdFfTCfS3xfg/S1nKEDATnwXQ7BzUhTjgNEctRp9fsRLl mbtamvjT7DI7giXKTLnNgb9YPBvJYLPaYGoDpcQsSnD5gQwVWFpk7vrL2mkifv1ihWAW zESUiyXqd1BLy2DsMIiZFhC+Ka1sWaQZTuSApMn/EEeVaXfrGMLY7Dw6rxUTJ7iBDO7r mvuX+8ICXCd7oEyuZ/9sg9+KI9S5fe9YMF8u9iihCjQuZi9VK7htx+3AcJBl7ODLjfZx Zi8A== X-Forwarded-Encrypted: i=1; AJvYcCXRkcrBriKC/l6NlgiJ3HyD/m1D7i4ZOJAEAUuf6wWdjaX/dVFnS3LWZVkli+gCh4WvpkwIeLSvFnDwj3s=@vger.kernel.org X-Gm-Message-State: AOJu0Ywt9+KUXXbDy22SGSIIYa8GWQfOloyHlm7OiPHvReODtWAXrMw4 b/XDciFXK2x6e9WZopB4popEKMqysa0jSrK+unqH2AgYwx5lmI/lw3II4YCXChY= X-Google-Smtp-Source: AGHT+IGFHv5Ry+zY2n31M2dmAbybEJIH7Gv8mL9ahXAy4Ch9T/yTPyxZKVo+lTwb3AEZenLkHlRfNA== X-Received: by 2002:a05:600c:19c9:b0:428:10d7:a4b1 with SMTP id 5b1f17b1804b1-42f85ae92f4mr110971835e9.25.1728374014302; Tue, 08 Oct 2024 00:53:34 -0700 (PDT) Received: from ?IPV6:2a01:e0a:982:cbb0:4595:23ef:4ba2:2d19? ([2a01:e0a:982:cbb0:4595:23ef:4ba2:2d19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f89ed957asm100379075e9.44.2024.10.08.00.53.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Oct 2024 00:53:33 -0700 (PDT) Message-ID: Date: Tue, 8 Oct 2024 09:53:33 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Neil Armstrong Reply-To: neil.armstrong@linaro.org Subject: Re: [PATCH v2] clk: amlogic: axg-audio: use the auxiliary reset driver To: Jerome Brunet , Michael Turquette , Stephen Boyd , Kevin Hilman , Martin Blumenstingl , Philipp Zabel Cc: linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20241008-meson-clk-rst-aux-v2-1-682ab9151f4f@baylibre.com> Content-Language: en-US, fr Autocrypt: addr=neil.armstrong@linaro.org; keydata= xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4 BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9 qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB AAHNKk5laWwgQXJtc3Ryb25nIDxuZWlsLmFybXN0cm9uZ0BsaW5hcm8ub3JnPsLAkQQTAQoA OwIbIwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBInsPQWERiF0UPIoSBaat7Gkz/iuBQJk Q5wSAhkBAAoJEBaat7Gkz/iuyhMIANiD94qDtUTJRfEW6GwXmtKWwl/mvqQtaTtZID2dos04 YqBbshiJbejgVJjy+HODcNUIKBB3PSLaln4ltdsV73SBcwUNdzebfKspAQunCM22Mn6FBIxQ GizsMLcP/0FX4en9NaKGfK6ZdKK6kN1GR9YffMJd2P08EO8mHowmSRe/ExAODhAs9W7XXExw UNCY4pVJyRPpEhv373vvff60bHxc1k/FF9WaPscMt7hlkbFLUs85kHtQAmr8pV5Hy9ezsSRa GzJmiVclkPc2BY592IGBXRDQ38urXeM4nfhhvqA50b/nAEXc6FzqgXqDkEIwR66/Gbp0t3+r yQzpKRyQif3OwE0ETVkGzwEIALyKDN/OGURaHBVzwjgYq+ZtifvekdrSNl8TIDH8g1xicBYp QTbPn6bbSZbdvfeQPNCcD4/EhXZuhQXMcoJsQQQnO4vwVULmPGgtGf8PVc7dxKOeta+qUh6+ SRh3vIcAUFHDT3f/Zdspz+e2E0hPV2hiSvICLk11qO6cyJE13zeNFoeY3ggrKY+IzbFomIZY 4yG6xI99NIPEVE9lNBXBKIlewIyVlkOaYvJWSV+p5gdJXOvScNN1epm5YHmf9aE2ZjnqZGoM Mtsyw18YoX9BqMFInxqYQQ3j/HpVgTSvmo5ea5qQDDUaCsaTf8UeDcwYOtgI8iL4oHcsGtUX oUk33HEAEQEAAcLAXwQYAQIACQUCTVkGzwIbDAAKCRAWmrexpM/4rrXiB/sGbkQ6itMrAIfn M7IbRuiSZS1unlySUVYu3SD6YBYnNi3G5EpbwfBNuT3H8//rVvtOFK4OD8cRYkxXRQmTvqa3 3eDIHu/zr1HMKErm+2SD6PO9umRef8V82o2oaCLvf4WeIssFjwB0b6a12opuRP7yo3E3gTCS KmbUuLv1CtxKQF+fUV1cVaTPMyT25Od+RC1K+iOR0F54oUJvJeq7fUzbn/KdlhA8XPGzwGRy 4zcsPWvwnXgfe5tk680fEKZVwOZKIEuJC3v+/yZpQzDvGYJvbyix0lHnrCzq43WefRHI5XTT QbM0WUIBIcGmq38+OgUsMYu4NzLu7uZFAcmp6h8g Organization: Linaro In-Reply-To: <20241008-meson-clk-rst-aux-v2-1-682ab9151f4f@baylibre.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 08/10/2024 09:48, Jerome Brunet wrote: > Remove the implementation of the reset driver in axg audio > clock driver and migrate to the one provided by the reset framework > on the auxiliary bus > > Signed-off-by: Jerome Brunet > --- > Change in v2: > * Rebase on the applied version of amlogic auxiliary reset driver > * Link to v1: https://lore.kernel.org/r/20240719094910.3986450-1-jbrunet@baylibre.com > --- > drivers/clk/meson/Kconfig | 1 + > drivers/clk/meson/axg-audio.c | 109 ++++-------------------------------------- > 2 files changed, 10 insertions(+), 100 deletions(-) > > diff --git a/drivers/clk/meson/Kconfig b/drivers/clk/meson/Kconfig > index 78f648c9c97d..7cb21fc223b0 100644 > --- a/drivers/clk/meson/Kconfig > +++ b/drivers/clk/meson/Kconfig > @@ -106,6 +106,7 @@ config COMMON_CLK_AXG_AUDIO > select COMMON_CLK_MESON_SCLK_DIV > select COMMON_CLK_MESON_CLKC_UTILS > select REGMAP_MMIO > + imply RESET_MESON_AUX > help > Support for the audio clock controller on AmLogic A113D devices, > aka axg, Say Y if you want audio subsystem to work. > diff --git a/drivers/clk/meson/axg-audio.c b/drivers/clk/meson/axg-audio.c > index beda86349389..7714bde5ffc0 100644 > --- a/drivers/clk/meson/axg-audio.c > +++ b/drivers/clk/meson/axg-audio.c > @@ -15,6 +15,8 @@ > #include > #include > > +#include > + > #include "meson-clkc-utils.h" > #include "axg-audio.h" > #include "clk-regmap.h" > @@ -1678,84 +1680,6 @@ static struct clk_regmap *const sm1_clk_regmaps[] = { > &sm1_earcrx_dmac_clk, > }; > > -struct axg_audio_reset_data { > - struct reset_controller_dev rstc; > - struct regmap *map; > - unsigned int offset; > -}; > - > -static void axg_audio_reset_reg_and_bit(struct axg_audio_reset_data *rst, > - unsigned long id, > - unsigned int *reg, > - unsigned int *bit) > -{ > - unsigned int stride = regmap_get_reg_stride(rst->map); > - > - *reg = (id / (stride * BITS_PER_BYTE)) * stride; > - *reg += rst->offset; > - *bit = id % (stride * BITS_PER_BYTE); > -} > - > -static int axg_audio_reset_update(struct reset_controller_dev *rcdev, > - unsigned long id, bool assert) > -{ > - struct axg_audio_reset_data *rst = > - container_of(rcdev, struct axg_audio_reset_data, rstc); > - unsigned int offset, bit; > - > - axg_audio_reset_reg_and_bit(rst, id, &offset, &bit); > - > - regmap_update_bits(rst->map, offset, BIT(bit), > - assert ? BIT(bit) : 0); > - > - return 0; > -} > - > -static int axg_audio_reset_status(struct reset_controller_dev *rcdev, > - unsigned long id) > -{ > - struct axg_audio_reset_data *rst = > - container_of(rcdev, struct axg_audio_reset_data, rstc); > - unsigned int val, offset, bit; > - > - axg_audio_reset_reg_and_bit(rst, id, &offset, &bit); > - > - regmap_read(rst->map, offset, &val); > - > - return !!(val & BIT(bit)); > -} > - > -static int axg_audio_reset_assert(struct reset_controller_dev *rcdev, > - unsigned long id) > -{ > - return axg_audio_reset_update(rcdev, id, true); > -} > - > -static int axg_audio_reset_deassert(struct reset_controller_dev *rcdev, > - unsigned long id) > -{ > - return axg_audio_reset_update(rcdev, id, false); > -} > - > -static int axg_audio_reset_toggle(struct reset_controller_dev *rcdev, > - unsigned long id) > -{ > - int ret; > - > - ret = axg_audio_reset_assert(rcdev, id); > - if (ret) > - return ret; > - > - return axg_audio_reset_deassert(rcdev, id); > -} > - > -static const struct reset_control_ops axg_audio_rstc_ops = { > - .assert = axg_audio_reset_assert, > - .deassert = axg_audio_reset_deassert, > - .reset = axg_audio_reset_toggle, > - .status = axg_audio_reset_status, > -}; > - > static struct regmap_config axg_audio_regmap_cfg = { > .reg_bits = 32, > .val_bits = 32, > @@ -1766,16 +1690,14 @@ struct audioclk_data { > struct clk_regmap *const *regmap_clks; > unsigned int regmap_clk_num; > struct meson_clk_hw_data hw_clks; > - unsigned int reset_offset; > - unsigned int reset_num; > unsigned int max_register; > + const char *rst_drvname; > }; > > static int axg_audio_clkc_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > const struct audioclk_data *data; > - struct axg_audio_reset_data *rst; > struct regmap *map; > void __iomem *regs; > struct clk_hw *hw; > @@ -1834,22 +1756,11 @@ static int axg_audio_clkc_probe(struct platform_device *pdev) > if (ret) > return ret; > > - /* Stop here if there is no reset */ > - if (!data->reset_num) > - return 0; > - > - rst = devm_kzalloc(dev, sizeof(*rst), GFP_KERNEL); > - if (!rst) > - return -ENOMEM; > - > - rst->map = map; > - rst->offset = data->reset_offset; > - rst->rstc.nr_resets = data->reset_num; > - rst->rstc.ops = &axg_audio_rstc_ops; > - rst->rstc.of_node = dev->of_node; > - rst->rstc.owner = THIS_MODULE; > + /* Register auxiliary reset driver when applicable */ > + if (data->rst_drvname) > + ret = devm_meson_rst_aux_register(dev, map, data->rst_drvname); > > - return devm_reset_controller_register(dev, &rst->rstc); > + return ret; > } > > static const struct audioclk_data axg_audioclk_data = { > @@ -1869,9 +1780,8 @@ static const struct audioclk_data g12a_audioclk_data = { > .hws = g12a_audio_hw_clks, > .num = ARRAY_SIZE(g12a_audio_hw_clks), > }, > - .reset_offset = AUDIO_SW_RESET, > - .reset_num = 26, > .max_register = AUDIO_CLK_SPDIFOUT_B_CTRL, > + .rst_drvname = "rst-g12a", > }; > > static const struct audioclk_data sm1_audioclk_data = { > @@ -1881,9 +1791,8 @@ static const struct audioclk_data sm1_audioclk_data = { > .hws = sm1_audio_hw_clks, > .num = ARRAY_SIZE(sm1_audio_hw_clks), > }, > - .reset_offset = AUDIO_SM1_SW_RESET0, > - .reset_num = 39, > .max_register = AUDIO_EARCRX_DMAC_CLK_CTRL, > + .rst_drvname = "rst-sm1", > }; > > static const struct of_device_id clkc_match_table[] = { > > --- > base-commit: 0e2d37252dd525b117bda4e4e0e6fac178ba569d > change-id: 20241008-meson-clk-rst-aux-b118809e53d6 > > Best regards, Reviewed-by: Neil Armstrong