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 E075D17CA08 for ; Tue, 16 Jul 2024 12:17:30 +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=1721132253; cv=none; b=kkO0q+/7UEcTXwNfQqrBKo5zeAPgyrwDewwhOIPZWpV2wh9YpUZlE0EcsNuSeLXuTLTWHAEgYcCiIiB1ZBv6E1oHVoox92PETKfMVVN+3uFFRbsR0K/wjRjEMcVaN2DKb2Hp+DjChgxd3ovPllqY+Cgy1J/q7EWomr4DAghsAQ0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721132253; c=relaxed/simple; bh=3va6R3ZZDZxoqHLA+PQX1kiONoNUXEoXT6Gk7c/J2Ow=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=CM6x0HltjrR6EUtsuSYSsbkvEVNhKJgKiBZLkdX2DToWbn/N8hD0Aa9Yl6tdNYD2nO44MqZS9iQdqq6hFdIg8aAF8TTEsM0ozfgBakf9GGLAvRYf+fbkAjbgd7502ci9uVBIgARJEMf5GSwj+9v1ayEFqxw4ZZ59dikv9hB7SwM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=axDj7KFv; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="axDj7KFv" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-427b9dcbb09so5670945e9.3 for ; Tue, 16 Jul 2024 05:17:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1721132249; x=1721737049; darn=vger.kernel.org; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=FCyvorohijdRKm4vXZWOZPoWQcguYD1LDURxXWUj1WE=; b=axDj7KFvCiHQJa66XkZMsZ9cUca9/MuF/SmaiJ14Ljzzk/KGOqTbI0HiNpE0R0STUe 4x5IPBXN5V2j/fXY6nvI1oOHJeicBdGnErY6hDTUgUlX8dJepzPUoFbl8iNjRaTtpN2p dhFZQZZxdX3XvqqsCNwn5Afbwr72uUBu9lfz/lMIe4uDWT/iHDM7OvIv6Hq97nrnXSka btoJ0Pv4WIK/y9QgVAkKOm5qinHUv0bMLkMhFyVo8cfP4LnvFKAzXuOtGON6KtWhg/IG /A7hF34cEnH+SbHyybBLCJ5RuC8Whh/hEbhSwtbfvUvMW98wnIP4nOmDGwhnhBW5OFuE Sl6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721132249; x=1721737049; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FCyvorohijdRKm4vXZWOZPoWQcguYD1LDURxXWUj1WE=; b=grdvdCYNTB1n1D4x8sJiWaLc0ORIwgeckqKF2wY5iWukfdC0+AE6zF/iYL2qpg1R9m NZMgvBFVYFqvHia7Jvk6Qe01UV5mY0wm7NkIzePco3hlLTFCCs5rW90iOBEBLJkUe775 a6y1CD/ZxwVlZpnGQrvqjYPleuTcPecbWxbG5D6nr74Llmr/wph8gIX72PtJqS1N9cOg sr5pg2PIpDImta/C6EqCQKaZdmqbcXs6tAhKp9QMP0AHJmX7grRCCOKDGL2La1yOTzOj ++b7dcEv2kOSbOE1LL1eAnDWts1ISK1yc4RLjIe9QRRrpp22EmTnn4QiQ5/FOiHH10CZ EuGQ== X-Forwarded-Encrypted: i=1; AJvYcCV++XB6R1lDJJatA6Dch5LFfo2kx7OfAEaW6QGRBb/t38vc3KVQWllnfjmzPpuHFf1dSrwk3pPkjIVbqZyFzT2L8fBMAq1uPJDqWI/J X-Gm-Message-State: AOJu0YzWK/PAMN/qR60t+sfRAtRQH3LrwNIOypMEyLZGN0lj6FQG5Pwd LDiC+WVoFkdVjOvzM3mJptuAMDp9zeXlY9T6vESfA41REnlxdtawYROMJ0fMlOE= X-Google-Smtp-Source: AGHT+IH4yigp1gkjcQxeAeOLYjio+1QZ5295mCJAsZNF/cho9G7FBybV0wRa9cSEe7GhaXwmooof4Q== X-Received: by 2002:a05:600c:46c9:b0:425:69b7:3361 with SMTP id 5b1f17b1804b1-427ba696a81mr12199525e9.18.1721132249171; Tue, 16 Jul 2024 05:17:29 -0700 (PDT) Received: from localhost ([2a01:e0a:3c5:5fb1:e816:4889:4177:9f12]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4279f2cc27asm159281425e9.34.2024.07.16.05.17.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jul 2024 05:17:28 -0700 (PDT) From: Jerome Brunet To: Jan Dakinevich Cc: Philipp Zabel , Stephen Boyd , Neil Armstrong , , , Subject: Re: [PATCH 3/8] reset: amlogic: split the device and platform probe In-Reply-To: <66ef4ff5-b472-44ee-a4fc-a68ceacea159@salutedevices.com> (Jan Dakinevich's message of "Tue, 16 Jul 2024 01:48:18 +0300") References: <20240710162526.2341399-1-jbrunet@baylibre.com> <20240710162526.2341399-4-jbrunet@baylibre.com> <66ef4ff5-b472-44ee-a4fc-a68ceacea159@salutedevices.com> Date: Tue, 16 Jul 2024 14:17:27 +0200 Message-ID: <1j34o9pm3s.fsf@starbuckisacylon.baylibre.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain On Tue 16 Jul 2024 at 01:48, Jan Dakinevich wrote: > On 7/10/24 19:25, Jerome Brunet wrote: >> To prepare the addition of the auxiliary device support, split >> out the device probe from the probe of the platform device. >> >> The device probe will be common to both the platform and auxiliary >> driver. >> >> Signed-off-by: Jerome Brunet >> --- >> drivers/reset/reset-meson.c | 55 +++++++++++++++++++++++-------------- >> 1 file changed, 34 insertions(+), 21 deletions(-) >> >> diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c >> index 59126c9f194a..fec55321b52b 100644 >> --- a/drivers/reset/reset-meson.c >> +++ b/drivers/reset/reset-meson.c >> @@ -87,6 +87,27 @@ static const struct reset_control_ops meson_reset_ops = { >> .deassert = meson_reset_deassert, >> }; >> >> +static int meson_reset_probe(struct device *dev, struct regmap *map, >> + const struct meson_reset_param *param) >> +{ >> + unsigned int stride = regmap_get_reg_stride(map); >> + struct meson_reset *data; >> + >> + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); >> + if (!data) >> + return -ENOMEM; >> + >> + data->param = param; >> + data->map = map; >> + data->rcdev.owner = dev->driver->owner; >> + data->rcdev.nr_resets = param->reg_count * BITS_PER_BYTE >> + * stride; >> + data->rcdev.ops = &meson_reset_ops; >> + data->rcdev.of_node = dev->of_node; > > It will be good to add here something like this. Later it would help in > reset debugging. > > data->rcdev.dev = dev; That is not the purpose of this change. I'm merely re-organizing exiting code, not changing it. Plus, if you refering to rcdev_name(), we already populate rcdev->of_node, so a name is provided. > >> + >> + return devm_reset_controller_register(dev, &data->rcdev); >> +} >> + >> static const struct meson_reset_param meson8b_param = { >> .reg_count = 8, >> .reset_offset = 0x0, >> @@ -125,46 +146,38 @@ static const struct regmap_config regmap_config = { >> .reg_stride = 4, >> }; >> >> -static int meson_reset_probe(struct platform_device *pdev) >> +static int meson_reset_pltf_probe(struct platform_device *pdev) >> { >> + >> + const struct meson_reset_param *param; >> struct device *dev = &pdev->dev; >> - struct meson_reset *data; >> + struct regmap *map; >> void __iomem *base; >> >> - data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); >> - if (!data) >> - return -ENOMEM; >> - >> base = devm_platform_ioremap_resource(pdev, 0); >> if (IS_ERR(base)) >> return PTR_ERR(base); >> >> - data->param = of_device_get_match_data(dev); >> - if (!data->param) >> + param = of_device_get_match_data(dev); >> + if (!param) >> return -ENODEV; >> >> - data->map = devm_regmap_init_mmio(dev, base, ®map_config); >> - if (IS_ERR(data->map)) >> - return dev_err_probe(dev, PTR_ERR(data->map), >> + map = devm_regmap_init_mmio(dev, base, ®map_config); >> + if (IS_ERR(map)) >> + return dev_err_probe(dev, PTR_ERR(map), >> "can't init regmap mmio region\n"); >> >> - data->rcdev.owner = THIS_MODULE; >> - data->rcdev.nr_resets = data->param->reg_count * BITS_PER_BYTE >> - * regmap_config.reg_stride; >> - data->rcdev.ops = &meson_reset_ops; >> - data->rcdev.of_node = dev->of_node; >> - >> - return devm_reset_controller_register(dev, &data->rcdev); >> + return meson_reset_probe(dev, map, param); >> } >> >> -static struct platform_driver meson_reset_driver = { >> - .probe = meson_reset_probe, >> +static struct platform_driver meson_reset_pltf_driver = { >> + .probe = meson_reset_pltf_probe, >> .driver = { >> .name = "meson_reset", >> .of_match_table = meson_reset_dt_ids, >> }, >> }; >> -module_platform_driver(meson_reset_driver); >> +module_platform_driver(meson_reset_pltf_driver); >> >> MODULE_DESCRIPTION("Amlogic Meson Reset Controller driver"); >> MODULE_AUTHOR("Neil Armstrong "); -- Jerome