From patchwork Tue May 27 21:52:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 893538 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 E9A7A214812; Tue, 27 May 2025 21:53:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748382793; cv=none; b=APQZQ2T1DKl6PIdmdKRxLC1f2fn+zejZb1urduxM+wkhKCvrrbZSIGmgj3zWK26PxxOwDcVf/IDOFuAVG0EgEe8foPoLoevogF52Flpev/uDk/MdmEFcJYCx6W3f+fOkfAt8wXRHP0Gs/Q6gLQTl9apjX8B+DW2EUbmaVTmfM5w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748382793; c=relaxed/simple; bh=XA27u/VOEH9VoBWsiugWrpftUIiRrwvmykvq6UgMRpg=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f7sYo85IMyVZyatyBgTYBSiwNWOR6hAldgxwxY6NahmCW5RsMcX0olAeRywpFQo7cLYLYie1SCAvc95WKkI6ArFhlBIPcuF2cte+CwHYtxsiRjjRb2sNkRBbjJVFqyWv2/cG4XVpW3pjtHsrnQ22QU7z70Kk2YcAFu/K+PIQrwo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=aUwAsnyC; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aUwAsnyC" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-3a361b8a664so3921521f8f.3; Tue, 27 May 2025 14:53:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748382790; x=1748987590; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=/vr7W9LI+qlsRFn4c9Ws/BXSMWXobP4FxVmqkbUjGpg=; b=aUwAsnyCuR2bEVP6zuC8I0DV7OkBPPQ42vQIzMScYGc9/bLkusosC9sajNK++wRIr/ u38X2CKzXzQySrhXju+QwgCySmdpdhHsB7xq4DsOZvggm9CDurIX44cunrcFczV5cJ2z QAVZUIWRfU8xQhn2628aB9I7Kgi+r0go37eoIwGun3d87Xfynl+TQEyw+9JTHGb1PpHw qE0A2yYpGe1zLy5eS/vEjw2yhi2NisrYC1kp2icR8EPcyths0VSdzq5HFBVRVurqcKtn /zCcEV4cEkvusCI4EO0Q/gJRTPryDhCEQ0PR9zmkbvTdRjGc8mJtFF4W3CK5WMeRlzci 5fJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748382790; x=1748987590; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/vr7W9LI+qlsRFn4c9Ws/BXSMWXobP4FxVmqkbUjGpg=; b=VAKQQ9w85wZIfunagkmbFH+W1SbVhWtCtyGGYQd5KK0iTM2SRsc6hxH4Ics31H4kmt HOhQyYSGjQw+fUMqwqDSfVMIJgAMbBvlphgZ5fxoWiInREheLZPsFc/tdr5bnOPpUqwp DW+QYKeH3WbUjek+GS5LyeEhGxoRJu37Zyf98PCsBFXWimgKmlBTn97GnVEKb+jepALG 3IujGR+ctbLg1xGd8IM9j72PlXE5xcY0d3H8+SBG8gJEOay42prpEzoSIcEfgUiTi6P6 3ljM70uiR3y6aM18A9i7qlyE3YLWR/3fx695gvegCHwH4w5a4LxcqIsHs/vSXApOmbUG IrTA== X-Forwarded-Encrypted: i=1; AJvYcCV6QgzQE7AMWMsFEXSeXDCzCFGItrJkQvHLf5ORSlsD8rfsReNPF/xK/CZ2IIBlSryhF0zdZhoWgig=@vger.kernel.org, AJvYcCVVWz+QDQkzmnEpmRmmOtlBgaDwM+UkPUV9dxjdkWv46vVsPWINdIIaSztWpRvJw6kYT8qf9LHx+aVwxq/U@vger.kernel.org, AJvYcCWogKzjKgM14W07eY1MIq0UO0P42Hm8NZ3O7dvfFyS+beWS+boo4Ie9VWbHUBNv6HQNCIaTgaoPbzOo@vger.kernel.org X-Gm-Message-State: AOJu0Yy/CJAXdStj22MqoFSDo0PwcVoq44cyfBYz7692qNoQU9mttDuD WMmP1Y8T1PYtecLjrxBtC3u4PUp7hxHCoo3kWAbpKVwzHP9ZewvNI2CS X-Gm-Gg: ASbGncvJl4T0KqoaePqtPZNfjQYAtVrYLNCOCWdNn4/lq/3W3RzoBrgjk88bi4idafB FRKbaBXK5sJpF+V9IXkCM7CWxDWPxeS+4pAJbsSArdZNY3PuGgBFSyFVPr6o3iZpKf3OZzAOsXI PXE4NBbTRsMW9FyGtwIFfIX8gXu8iibpJ1I5ts+HhPbCO+BU6XCQAj8ho/wgrmogvqp2oSyQbCO lPjro9+xhUtYDcZIc0zjlSAK00HRyxN757EQLUOZufow/gcpY3GNSU3vST1T/c+oQ6sJp1T/cHo ezEVn9x593HFvSU5K4F1N6apcPkVWLlC/syB1XDsSoJ6iPtDPfAAnmwK+mH+U3Z9tIz9QbyDg6V bFUpfuV+9TE5yVPra7x4x X-Google-Smtp-Source: AGHT+IE6QOQz+a1kye7D3ulzyyMOIW7d/Ze4H3u6DTzGuKGl3DXiuLYMpFBoawkartGvPgUf69RB9Q== X-Received: by 2002:a05:6000:290d:b0:3a4:d85e:9afd with SMTP id ffacd0b85a97d-3a4d85e9dc4mr8065793f8f.33.1748382790116; Tue, 27 May 2025 14:53:10 -0700 (PDT) Received: from localhost.localdomain (93-34-88-225.ip49.fastwebnet.it. [93.34.88.225]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-3a4e8b8dcdasm206656f8f.11.2025.05.27.14.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 May 2025 14:53:09 -0700 (PDT) From: Christian Marangi To: "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Christian Marangi , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/5] thermal/drivers: airoha: Generalize probe function Date: Tue, 27 May 2025 23:52:36 +0200 Message-ID: <20250527215241.25767-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250527215241.25767-1-ansuelsmth@gmail.com> References: <20250527215241.25767-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In preparation for support of Airoha AN7583, generalize the probe function to address for the 2 SoC differece. Implement a match_data struct where it's possible to define a more specific probe and post_probe function and specific thermal ops and pllrg protect value. Signed-off-by: Christian Marangi --- drivers/thermal/airoha_thermal.c | 102 +++++++++++++++++++++++-------- 1 file changed, 75 insertions(+), 27 deletions(-) diff --git a/drivers/thermal/airoha_thermal.c b/drivers/thermal/airoha_thermal.c index 04bda890dbb1..9bfa59b97032 100644 --- a/drivers/thermal/airoha_thermal.c +++ b/drivers/thermal/airoha_thermal.c @@ -198,12 +198,23 @@ struct airoha_thermal_priv { struct regmap *chip_scu; struct resource scu_adc_res; + u32 pllrg_protect; + struct thermal_zone_device *tz; int init_temp; int default_slope; int default_offset; }; +struct airoha_thermal_soc_data { + u32 pllrg_protect; + + const struct thermal_zone_device_ops *thdev_ops; + int (*probe)(struct platform_device *pdev, + struct airoha_thermal_priv *priv); + int (*post_probe)(struct platform_device *pdev); +}; + static int airoha_get_thermal_ADC(struct airoha_thermal_priv *priv) { u32 val; @@ -220,7 +231,8 @@ static void airoha_init_thermal_ADC_mode(struct airoha_thermal_priv *priv) regmap_read(priv->chip_scu, EN7581_PLLRG_PROTECT, &pllrg); /* Give access to thermal regs */ - regmap_write(priv->chip_scu, EN7581_PLLRG_PROTECT, EN7581_SCU_THERMAL_PROTECT_KEY); + regmap_write(priv->chip_scu, EN7581_PLLRG_PROTECT, + priv->pllrg_protect); adc_mux = FIELD_PREP(EN7581_MUX_TADC, EN7581_SCU_THERMAL_MUX_DIODE1); regmap_write(priv->chip_scu, EN7581_PWD_TADC, adc_mux); @@ -228,7 +240,7 @@ static void airoha_init_thermal_ADC_mode(struct airoha_thermal_priv *priv) regmap_write(priv->chip_scu, EN7581_PLLRG_PROTECT, pllrg); } -static int airoha_thermal_get_temp(struct thermal_zone_device *tz, int *temp) +static int en7581_thermal_get_temp(struct thermal_zone_device *tz, int *temp) { struct airoha_thermal_priv *priv = thermal_zone_device_priv(tz); int min_value, max_value, avg_value, value; @@ -253,7 +265,7 @@ static int airoha_thermal_get_temp(struct thermal_zone_device *tz, int *temp) return 0; } -static int airoha_thermal_set_trips(struct thermal_zone_device *tz, int low, +static int en7581_thermal_set_trips(struct thermal_zone_device *tz, int low, int high) { struct airoha_thermal_priv *priv = thermal_zone_device_priv(tz); @@ -290,12 +302,12 @@ static int airoha_thermal_set_trips(struct thermal_zone_device *tz, int low, return 0; } -static const struct thermal_zone_device_ops thdev_ops = { - .get_temp = airoha_thermal_get_temp, - .set_trips = airoha_thermal_set_trips, +static const struct thermal_zone_device_ops en7581_thdev_ops = { + .get_temp = en7581_thermal_get_temp, + .set_trips = en7581_thermal_set_trips, }; -static irqreturn_t airoha_thermal_irq(int irq, void *data) +static irqreturn_t en7581_thermal_irq(int irq, void *data) { struct airoha_thermal_priv *priv = data; enum thermal_notify_event event; @@ -326,7 +338,7 @@ static irqreturn_t airoha_thermal_irq(int irq, void *data) return IRQ_HANDLED; } -static void airoha_thermal_setup_adc_val(struct device *dev, +static void en7581_thermal_setup_adc_val(struct device *dev, struct airoha_thermal_priv *priv) { u32 efuse_calib_info, cpu_sensor; @@ -356,7 +368,7 @@ static void airoha_thermal_setup_adc_val(struct device *dev, } } -static void airoha_thermal_setup_monitor(struct airoha_thermal_priv *priv) +static void en7581_thermal_setup_monitor(struct airoha_thermal_priv *priv) { /* Set measure mode */ regmap_write(priv->map, EN7581_TEMPMSRCTL0, @@ -411,30 +423,26 @@ static void airoha_thermal_setup_monitor(struct airoha_thermal_priv *priv) FIELD_PREP(EN7581_ADC_POLL_INTVL, 146)); } -static const struct regmap_config airoha_thermal_regmap_config = { +static const struct regmap_config en7581_thermal_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, }; -static int airoha_thermal_probe(struct platform_device *pdev) +static int en7581_thermal_probe(struct platform_device *pdev, + struct airoha_thermal_priv *priv) { - struct airoha_thermal_priv *priv; struct device_node *chip_scu_np; struct device *dev = &pdev->dev; void __iomem *base; int irq, ret; - priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); - if (!priv) - return -ENOMEM; - base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(base)) return PTR_ERR(base); priv->map = devm_regmap_init_mmio(dev, base, - &airoha_thermal_regmap_config); + &en7581_thermal_regmap_config); if (IS_ERR(priv->map)) return PTR_ERR(priv->map); @@ -454,18 +462,55 @@ static int airoha_thermal_probe(struct platform_device *pdev) return irq; ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, - airoha_thermal_irq, IRQF_ONESHOT, + en7581_thermal_irq, IRQF_ONESHOT, pdev->name, priv); if (ret) { dev_err(dev, "Can't get interrupt working.\n"); return ret; } - airoha_thermal_setup_monitor(priv); - airoha_thermal_setup_adc_val(dev, priv); + en7581_thermal_setup_monitor(priv); + en7581_thermal_setup_adc_val(dev, priv); + + return 0; +} + +static int en7581_thermal_post_probe(struct platform_device *pdev) +{ + struct airoha_thermal_priv *priv = platform_get_drvdata(pdev); + + /* Enable LOW and HIGH interrupt (if supported) */ + regmap_write(priv->map, EN7581_TEMPMONINT, + EN7581_HOFSINTEN0 | EN7581_LOFSINTEN0); + + return 0; +} + +static int airoha_thermal_probe(struct platform_device *pdev) +{ + const struct airoha_thermal_soc_data *soc_data; + struct airoha_thermal_priv *priv; + struct device *dev = &pdev->dev; + int ret; + + soc_data = device_get_match_data(dev); + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->pllrg_protect = soc_data->pllrg_protect; + + if (!soc_data->probe) + return -EINVAL; + + ret = soc_data->probe(pdev, priv); + if (ret) + return ret; /* register of thermal sensor and get info from DT */ - priv->tz = devm_thermal_of_zone_register(dev, 0, priv, &thdev_ops); + priv->tz = devm_thermal_of_zone_register(dev, 0, priv, + soc_data->thdev_ops); if (IS_ERR(priv->tz)) { dev_err(dev, "register thermal zone sensor failed\n"); return PTR_ERR(priv->tz); @@ -473,15 +518,18 @@ static int airoha_thermal_probe(struct platform_device *pdev) platform_set_drvdata(pdev, priv); - /* Enable LOW and HIGH interrupt */ - regmap_write(priv->map, EN7581_TEMPMONINT, - EN7581_HOFSINTEN0 | EN7581_LOFSINTEN0); - - return 0; + return soc_data->post_probe ? soc_data->post_probe(pdev) : 0; } +static const struct airoha_thermal_soc_data en7581_data = { + .pllrg_protect = EN7581_SCU_THERMAL_PROTECT_KEY, + .thdev_ops = &en7581_thdev_ops, + .probe = &en7581_thermal_probe, + .post_probe = &en7581_thermal_post_probe, +}; + static const struct of_device_id airoha_thermal_match[] = { - { .compatible = "airoha,en7581-thermal" }, + { .compatible = "airoha,en7581-thermal", .data = &en7581_data }, {}, }; MODULE_DEVICE_TABLE(of, airoha_thermal_match);