All of lore.kernel.org
 help / color / mirror / Atom feed
From: Samuel Holland <samuel@sholland.org>
To: u-boot@lists.denx.de, Jagan Teki <jagan@amarulasolutions.com>,
	Andre Przywara <andre.przywara@arm.com>,
	Simon Glass <sjg@chromium.org>
Cc: Samuel Holland <samuel@sholland.org>,
	Bharat Gooty <bharat.gooty@broadcom.com>,
	Heiko Schocher <hs@denx.de>, Icenowy Zheng <icenowy@aosc.io>,
	Jernej Skrabec <jernej.skrabec@gmail.com>,
	Joe Hershberger <joe.hershberger@ni.com>,
	Pratyush Yadav <p.yadav@ti.com>,
	Ramon Fried <rfried.dev@gmail.com>,
	Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>,
	Yuan Fang <fangyuanseu@gmail.com>
Subject: [RFC PATCH 21/23] pwm: sunxi: Remove non-DM pin setup
Date: Wed, 20 Oct 2021 23:55:38 -0500	[thread overview]
Message-ID: <20211021045540.31578-22-samuel@sholland.org> (raw)
In-Reply-To: <20211021045540.31578-1-samuel@sholland.org>

This is now handled automatically by the pinctrl driver.

Signed-off-by: Samuel Holland <samuel@sholland.org>
---

 arch/arm/include/asm/arch-sunxi/gpio.h |  1 -
 drivers/pwm/sunxi_pwm.c                | 11 -----------
 2 files changed, 12 deletions(-)

diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h
index 7c44302b8b..4e3c39a640 100644
--- a/arch/arm/include/asm/arch-sunxi/gpio.h
+++ b/arch/arm/include/asm/arch-sunxi/gpio.h
@@ -158,7 +158,6 @@ enum sunxi_gpio_number {
 
 #define SUNXI_GPD_LCD0		2
 #define SUNXI_GPD_LVDS0		3
-#define SUNXI_GPD_PWM		2
 
 #define SUNXI_GPF_SDC0		2
 #define SUNXI_GPF_UART0		4
diff --git a/drivers/pwm/sunxi_pwm.c b/drivers/pwm/sunxi_pwm.c
index e3d5ee456b..bb1bec05ec 100644
--- a/drivers/pwm/sunxi_pwm.c
+++ b/drivers/pwm/sunxi_pwm.c
@@ -13,7 +13,6 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/pwm.h>
-#include <asm/arch/gpio.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -45,14 +44,6 @@ static const u32 prescaler_table[] = {
 	1,	/* 1111 */
 };
 
-static int sunxi_pwm_config_pinmux(void)
-{
-#ifdef CONFIG_MACH_SUN50I
-	sunxi_gpio_set_cfgpin(SUNXI_GPD(22), SUNXI_GPD_PWM);
-#endif
-	return 0;
-}
-
 static int sunxi_pwm_set_invert(struct udevice *dev, uint channel,
 				bool polarity)
 {
@@ -137,8 +128,6 @@ static int sunxi_pwm_set_enable(struct udevice *dev, uint channel, bool enable)
 		return 0;
 	}
 
-	sunxi_pwm_config_pinmux();
-
 	if (priv->invert)
 		v &= ~SUNXI_PWM_CTRL_CH0_ACT_STA;
 	else
-- 
2.32.0


  parent reply	other threads:[~2021-10-21  5:03 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-21  4:55 [RFC PATCH 00/23] sunxi: Add and use a pinctrl driver Samuel Holland
2021-10-21  4:55 ` [RFC PATCH 01/23] sunxi: pinctrl: Create the driver skeleton Samuel Holland
2021-10-21  5:13   ` Sean Anderson
2021-10-22  3:55     ` Samuel Holland
2021-10-21  4:55 ` [RFC PATCH 02/23] sunxi: pinctrl: Implement pin muxing functions Samuel Holland
2021-10-21  4:55 ` [RFC PATCH 03/23] sunxi: pinctrl: Implement get_pin_muxing function Samuel Holland
2021-10-21  4:55 ` [RFC PATCH 04/23] sunxi: pinctrl: Implement pin configuration Samuel Holland
2021-10-24 19:53   ` Simon Glass
2021-10-21  4:55 ` [RFC PATCH 05/23] pinctrl: sunxi: Add UART pinmuxes Samuel Holland
2021-10-21  4:55 ` [RFC PATCH 06/23] sunxi: Skip non-DM UART pin setup when PINCTRL=y Samuel Holland
2021-10-24 19:53   ` Simon Glass
2021-10-21  4:55 ` [RFC PATCH 07/23] pinctrl: sunxi: Add sun4i EMAC pinmuxes Samuel Holland
2021-10-21  4:55 ` [RFC PATCH 08/23] net: sunxi_emac: Remove non-DM pin setup Samuel Holland
2021-11-09 15:33   ` Heinrich Schuchardt
2021-10-21  4:55 ` [RFC PATCH 09/23] pinctrl: sunxi: Add sunxi GMAC pinmuxes Samuel Holland
2021-10-21  4:55 ` [RFC PATCH 12/23] net: sun8i_emac: Remove non-DM pin setup Samuel Holland
2021-10-21  4:55 ` [RFC PATCH 13/23] pinctrl: sunxi: Add I2C pinmuxes Samuel Holland
2021-10-21  4:55 ` [RFC PATCH 14/23] sunxi: Remove options and setup code for I2C2-I2C4 Samuel Holland
2021-10-21  4:55 ` [RFC PATCH 15/23] sunxi: Remove non-DM I2C clock/pin setup from U-Boot Samuel Holland
2021-10-21  4:55 ` [RFC PATCH 16/23] i2c: sun6i_p2wi: Only do non-DM pin setup for non-DM I2C Samuel Holland
2021-10-21  4:55 ` [RFC PATCH 17/23] i2c: sun8i_rsb: " Samuel Holland
2021-10-21  4:55 ` [RFC PATCH 18/23] pinctrl: sunxi: Add MMC pinmuxes Samuel Holland
2021-10-21  4:55 ` [RFC PATCH 19/23] sunxi: Remove non-DM MMC pin setup Samuel Holland
2021-10-21  4:55 ` [RFC PATCH 20/23] pinctrl: sunxi: a64: Add the PWM pinmux Samuel Holland
2021-10-21  4:55 ` Samuel Holland [this message]
2021-10-21  4:55 ` [RFC PATCH 22/23] pinctrl: sunxi: Add SPI0 pinmuxes Samuel Holland
2021-10-21  4:55 ` [RFC PATCH 23/23] spi: sun4i_spi: Remove non-DM pin setup Samuel Holland
2021-11-05 13:00 ` [RFC PATCH 00/23] sunxi: Add and use a pinctrl driver Heinrich Schuchardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211021045540.31578-22-samuel@sholland.org \
    --to=samuel@sholland.org \
    --cc=andre.przywara@arm.com \
    --cc=bharat.gooty@broadcom.com \
    --cc=fangyuanseu@gmail.com \
    --cc=hs@denx.de \
    --cc=icenowy@aosc.io \
    --cc=jagan@amarulasolutions.com \
    --cc=jernej.skrabec@gmail.com \
    --cc=joe.hershberger@ni.com \
    --cc=p.yadav@ti.com \
    --cc=rayagonda.kokatanur@broadcom.com \
    --cc=rfried.dev@gmail.com \
    --cc=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.