From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) (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 2A94524B26; Fri, 18 Apr 2025 02:30:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744943433; cv=none; b=EbvDa75dzf/P1baOhO/4RUfOspfA/TQ/hcXkz9hcqf1Uyy2tZPHShlvH3KU27F0gu8G1C9bxYTTALagIaZrK5IDQa/ObAnNESmQhUFVjthqLug90KijX/upcsLNaBr5KZPSjSDD5R+PujQpyX+kdiQXdpUNP+fo4ne6TWnmBKZw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744943433; c=relaxed/simple; bh=tMjTIJgmJCvCZE08QgjAay18aUqAwDfxjinPV3iZzg4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ndV5UtA4/QSVnzs2O5BC60yEuoby3wUIA+l4XeTLY3r8Az/oZ+p1TjgizTWoTLfyRsi6vmNQGP1IwTY3XkTl5ir+cumTTgNfxFpJz+s2hMM65YnbypUMTKeyFzeh326JAnW7y2aD1vMpyKbwQ6riOSI+jrTXvTUwxMlPINI/TCw= 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=bvZ9DQsZ; arc=none smtp.client-ip=209.85.215.181 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="bvZ9DQsZ" Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-af5139ad9a2so943453a12.1; Thu, 17 Apr 2025 19:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744943431; x=1745548231; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w7xED7gAs7WHbJVjZWFN0lIu8Nx3/HGwmoPo1V9lNaU=; b=bvZ9DQsZ1+s8V18+1Z3MjKWJtz625zRJ6OHOf/XbECJ+/nQquLAU6S8FjNGzzPADOB bSgvufq1RbO9a/LO35knRQZ/u713/tkvv7CSS1GDsz9cW4aMZzV4SR+YN65HgkZc1sj3 CLRx8ZBFOkE9l6BDd49B/e45U2hSdoAVwK9qTAE5q2d+UJ2QBA4Ci5aoqytGSvSoGHNx asUGUrbsBEZ4UwmFF7mQcYO+2HIhnmA2EtTJnfPzvImfVUnRpXYuJy0mGau0fYnhEmq6 2xSLAG8/htpcq2IBIvLZ5BWeLWAuytAi9rTVN8f4W/ZwS5BfGOMYFvoRU5hjUw0Zb9tj Jozw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744943431; x=1745548231; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w7xED7gAs7WHbJVjZWFN0lIu8Nx3/HGwmoPo1V9lNaU=; b=pArkp6feXn9QNapIo4WL8rVGapERAcRl1vvTYgfXiKpWVbpsdX42hEiPWeDpzQ2M6+ 0yZ8IYVUJuqdCtpph9kcitq3E6U/D2UM93VgQEDZz6uvpECBSQy5ejtcyRtkWvLAFtBc 6N9dPJ+F7JXkp0KCF40J4ZXKUxQlWEmBAq0xF98icz3wx5/iWPcKvv2R6kViy+l0K/GH 4GP06jkwdGoye5xUTWossJ/iCCc5JsoUENHCbwQ453b//rHYKbx8PFIbL6dWlTAFSMGO EkG7xl4qw2AtM6Az+UjsqctHbx2wWFbdd6INSPkOOqcsFfJq9c0rGZm/cWK9uqGgBF0b cNSQ== X-Forwarded-Encrypted: i=1; AJvYcCU+r7EQFDqbu7+HFeY7Yad/8paRNwb4Zc7qWIOI56uTVRJu6svO23iiZCB/ENavPK+GJ44LmjOlqTRQ@vger.kernel.org, AJvYcCU3UA2WZe3qK76ewKYw3LfZMXBoNr6V318GwAoz2oferFtedEeQGkQReasqpVur/GjWALlLwhzacQ16p3Zg@vger.kernel.org, AJvYcCXqppr8g95mRjUTdYKN5mS49NNoWccnUWeWQ9vvO+wjhdigXjyi8IvLx8J4MEc7/TIP37i1E36A87DD@vger.kernel.org X-Gm-Message-State: AOJu0Yy2xeFoU7GrMBXZ3BpjeYm3N5fZIgNpG4CXdKJ064TU66LgL+Fo 4LZnxbk2RNezUXK85VZ64kPlV/VPZiA6Oy17Ie7N7OERbxGCLJ+Q X-Gm-Gg: ASbGncsZS8LKrNuvoHZ8ZnKyTQQl/MxFgORiKaebipqUR+fLVk8rncpT7aPZxlrqxvI Ozbw6Mq8G1X3Ecm/Ga4WKpfX98dP7P9CpT/Qyxd0OOgPH8qyXqSJ+9icEqBtInkNxFX+Yqeh9fj DE6lVglNryMmpVB7AnGnX8gSiWhTf3TMDEiL40DzW0M7HypJM6oNNiTFSqw3L5NB2zpegScaCbj AbNKf1MN/R7hz2UeHuxPYOl0SUOqDUp6NH1VEyv4X6MIZIUfOfBkK2PJexF8WesGVIG09Ar9x9j 05SKy2TwE/8JV2zUHwdYX8xrDAgsRKXla+M= X-Google-Smtp-Source: AGHT+IH2LAsstNAG96JKkITo4BRlLrgS5Kv05TbZGffG83M6Np6d/MhABgYIJd/eYaTcTtT6FUSpMw== X-Received: by 2002:a17:90a:d64f:b0:306:b78a:e22d with SMTP id 98e67ed59e1d1-3087bb6a6c7mr1594737a91.20.1744943431248; Thu, 17 Apr 2025 19:30:31 -0700 (PDT) Received: from cu.. ([2001:19f0:ac00:4eb8:5400:5ff:fe30:7df3]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3087df0c14esm182185a91.19.2025.04.17.19.30.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Apr 2025 19:30:30 -0700 (PDT) From: Longbin Li To: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen Wang , Inochi Amaoto , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti Cc: Longbin Li , linux-pwm@vger.kernel.org, devicetree@vger.kernel.org, sophgo@lists.linux.dev, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH v2 2/3] pwm: sophgo: reorganize the code structure Date: Fri, 18 Apr 2025 10:29:45 +0800 Message-ID: <20250418022948.22853-3-looong.bin@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250418022948.22853-1-looong.bin@gmail.com> References: <20250418022948.22853-1-looong.bin@gmail.com> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit As the driver logic can be used in both SG2042 and SG2044, it will be better to reorganize the code structure. Signed-off-by: Longbin Li --- drivers/pwm/pwm-sophgo-sg2042.c | 62 +++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/drivers/pwm/pwm-sophgo-sg2042.c b/drivers/pwm/pwm-sophgo-sg2042.c index ff4639d849ce..23a83843ba53 100644 --- a/drivers/pwm/pwm-sophgo-sg2042.c +++ b/drivers/pwm/pwm-sophgo-sg2042.c @@ -26,18 +26,6 @@ #include #include -/* - * Offset RegisterName - * 0x0000 HLPERIOD0 - * 0x0004 PERIOD0 - * 0x0008 HLPERIOD1 - * 0x000C PERIOD1 - * 0x0010 HLPERIOD2 - * 0x0014 PERIOD2 - * 0x0018 HLPERIOD3 - * 0x001C PERIOD3 - * Four groups and every group is composed of HLPERIOD & PERIOD - */ #define SG2042_PWM_HLPERIOD(chan) ((chan) * 8 + 0) #define SG2042_PWM_PERIOD(chan) ((chan) * 8 + 4) @@ -53,6 +41,10 @@ struct sg2042_pwm_ddata { unsigned long clk_rate_hz; }; +struct sg2042_chip_data { + const struct pwm_ops ops; +}; + /* * period_ticks: PERIOD * hlperiod_ticks: HLPERIOD @@ -66,21 +58,13 @@ static void pwm_sg2042_config(struct sg2042_pwm_ddata *ddata, unsigned int chan, writel(hlperiod_ticks, base + SG2042_PWM_HLPERIOD(chan)); } -static int pwm_sg2042_apply(struct pwm_chip *chip, struct pwm_device *pwm, - const struct pwm_state *state) +static void pwm_set_dutycycle(struct pwm_chip *chip, struct pwm_device *pwm, + const struct pwm_state *state) { struct sg2042_pwm_ddata *ddata = pwmchip_get_drvdata(chip); u32 hlperiod_ticks; u32 period_ticks; - if (state->polarity == PWM_POLARITY_INVERSED) - return -EINVAL; - - if (!state->enabled) { - pwm_sg2042_config(ddata, pwm->hwpwm, 0, 0); - return 0; - } - /* * Duration of High level (duty_cycle) = HLPERIOD x Period_of_input_clk * Duration of One Cycle (period) = PERIOD x Period_of_input_clk @@ -92,6 +76,22 @@ static int pwm_sg2042_apply(struct pwm_chip *chip, struct pwm_device *pwm, pwm->hwpwm, period_ticks, hlperiod_ticks); pwm_sg2042_config(ddata, pwm->hwpwm, period_ticks, hlperiod_ticks); +} + +static int pwm_sg2042_apply(struct pwm_chip *chip, struct pwm_device *pwm, + const struct pwm_state *state) +{ + struct sg2042_pwm_ddata *ddata = pwmchip_get_drvdata(chip); + + if (state->polarity == PWM_POLARITY_INVERSED) + return -EINVAL; + + if (!state->enabled) { + pwm_sg2042_config(ddata, pwm->hwpwm, 0, 0); + return 0; + } + + pwm_set_dutycycle(chip, pwm, state); return 0; } @@ -123,13 +123,16 @@ static int pwm_sg2042_get_state(struct pwm_chip *chip, struct pwm_device *pwm, return 0; } -static const struct pwm_ops pwm_sg2042_ops = { - .apply = pwm_sg2042_apply, - .get_state = pwm_sg2042_get_state, +static const struct sg2042_chip_data sg2042_chip_data = { + .ops = { + .apply = pwm_sg2042_apply, + .get_state = pwm_sg2042_get_state, + } }; static const struct of_device_id sg2042_pwm_ids[] = { - { .compatible = "sophgo,sg2042-pwm" }, + { .compatible = "sophgo,sg2042-pwm", + .data = &sg2042_chip_data }, { } }; MODULE_DEVICE_TABLE(of, sg2042_pwm_ids); @@ -137,12 +140,17 @@ MODULE_DEVICE_TABLE(of, sg2042_pwm_ids); static int pwm_sg2042_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + const struct sg2042_chip_data *chip_data; struct sg2042_pwm_ddata *ddata; struct reset_control *rst; struct pwm_chip *chip; struct clk *clk; int ret; + chip_data = device_get_match_data(dev); + if (!chip_data) + return -ENODEV; + chip = devm_pwmchip_alloc(dev, SG2042_PWM_CHANNELNUM, sizeof(*ddata)); if (IS_ERR(chip)) return PTR_ERR(chip); @@ -170,7 +178,7 @@ static int pwm_sg2042_probe(struct platform_device *pdev) if (IS_ERR(rst)) return dev_err_probe(dev, PTR_ERR(rst), "Failed to get reset\n"); - chip->ops = &pwm_sg2042_ops; + chip->ops = &chip_data->ops; chip->atomic = true; ret = devm_pwmchip_add(dev, chip); -- 2.49.0