mbox series

[v6,00/12] Add OTG mode support to Tegra USB PHY, SMB347 and Nexus 7

Message ID 20210731173842.19643-1-digetx@gmail.com
Headers show
Series Add OTG mode support to Tegra USB PHY, SMB347 and Nexus 7 | expand

Message

Dmitry Osipenko July 31, 2021, 5:38 p.m. UTC 
Hi,

This series adds USB OTG mode support to the NVIDIA Tegra USB PHY driver,
SMB347 charger driver and Nexus 7 tablet.

Changelog:

v6: - Added r-b from Rob Herring to the OTG properties DT binding patch.

    - Corrected "smb347-charger: generic regmap caching" patch, it now
      sets the .num_reg_defaults_raw, initializing cache properly.

    - Added new patch "smb347-charger: Add missing pin control activation",
      which prevents never-enabled charging on Nexus 7.

    - The "otg-fsm: Fix hrtimer list corruption" patch of v5 was already
      applied to next, so it's not included anymore.

v5: - Replaced "Remove caching of charger state" patch with "Utilize
      generic regmap caching" after Sebastian's notice about disabled
      regmap caching.

v4: - Added r-b from Rob Herring.

    - Added unevaluatedProperties into SMB binding for VBUS regulator,
      which was Requested by Rob Herring.

    - Added cell to nvidia,pmc phandle instead of explicit h/w ID
      property. Requested by Rob Herring.

    - Added stack trace to commit message and ack from Peter Chen to
      OTG FSM patch.

v3: - Further improved interrupt handling in the PHY driver by removing
      assumption that interrupt is enabled by the CI driver at the time
      of set_wakeup() invocation, which makes this function a bit more
      universal.

v2: - The PHY's interrupt is now enabled from PHY's set_wakeup() callback.
      It prevents getting a spurious interrupt during the CI driver probe
      time.

Dmitry Osipenko (12):
  dt-bindings: phy: tegra20-usb-phy: Convert to schema
  dt-bindings: phy: tegra20-usb-phy: Document properties needed for OTG
    mode
  soc/tegra: pmc: Expose USB regmap to all SoCs
  usb: phy: tegra: Support OTG mode programming
  dt-bindings: power: supply: smb347-charger: Document USB VBUS
    regulator
  power: supply: smb347-charger: Make smb347_set_writable() IRQ-safe
  power: supply: smb347-charger: Utilize generic regmap caching
  power: supply: smb347-charger: Add missing pin control activation
  power: supply: smb347-charger: Implement USB VBUS regulator
  ARM: tegra: Add new properties to USB PHY device-tree nodes
  ARM: tegra: nexus7: Enable USB OTG mode
  arm64: tegra132: Add new properties to USB PHY device-tree node

 .../bindings/phy/nvidia,tegra20-usb-phy.txt   |  74 ----
 .../bindings/phy/nvidia,tegra20-usb-phy.yaml  | 373 ++++++++++++++++++
 .../power/supply/summit,smb347-charger.yaml   |  30 ++
 arch/arm/boot/dts/tegra114.dtsi               |   4 +
 arch/arm/boot/dts/tegra124.dtsi               |   6 +
 arch/arm/boot/dts/tegra20.dtsi                |   6 +
 .../tegra30-asus-nexus7-grouper-common.dtsi   |  25 +-
 arch/arm/boot/dts/tegra30.dtsi                |   6 +
 arch/arm64/boot/dts/nvidia/tegra132.dtsi      |   6 +
 drivers/power/supply/Kconfig                  |   1 +
 drivers/power/supply/smb347-charger.c         | 271 ++++++++++++-
 drivers/soc/tegra/pmc.c                       |   6 +-
 drivers/usb/phy/phy-tegra-usb.c               | 197 ++++++++-
 .../dt-bindings/power/summit,smb347-charger.h |   4 +
 include/linux/usb/tegra_usb_phy.h             |   5 +
 15 files changed, 911 insertions(+), 103 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt
 create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml

Comments

Sebastian Reichel Aug. 6, 2021, 9:13 p.m. UTC | #1 
Hi,

On Sat, Jul 31, 2021 at 08:38:36PM +0300, Dmitry Osipenko wrote:
> The smb347_set_writable() is used by interrupt handler and outside of it.
> The interrupt should be disabled when the function is used outside of
> interrupt handler in order to prevent racing with the interrupt context.
> Add new parameter to smb347_set_writable() that allows to disable IRQ.
> 
> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
> ---

Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>

-- Sebastian

>  drivers/power/supply/smb347-charger.c | 30 +++++++++++++++++++--------
>  1 file changed, 21 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/power/supply/smb347-charger.c b/drivers/power/supply/smb347-charger.c
> index df240420f2de..db1378b41f80 100644
> --- a/drivers/power/supply/smb347-charger.c
> +++ b/drivers/power/supply/smb347-charger.c
> @@ -671,10 +671,22 @@ static int smb347_set_temp_limits(struct smb347_charger *smb)
>   *
>   * Returns %0 on success and negative errno in case of failure.
>   */
> -static int smb347_set_writable(struct smb347_charger *smb, bool writable)
> +static int smb347_set_writable(struct smb347_charger *smb, bool writable,
> +			       bool irq_toggle)
>  {
> -	return regmap_update_bits(smb->regmap, CMD_A, CMD_A_ALLOW_WRITE,
> -				  writable ? CMD_A_ALLOW_WRITE : 0);
> +	struct i2c_client *client = to_i2c_client(smb->dev);
> +	int ret;
> +
> +	if (writable && irq_toggle && !smb->irq_unsupported)
> +		disable_irq(client->irq);
> +
> +	ret = regmap_update_bits(smb->regmap, CMD_A, CMD_A_ALLOW_WRITE,
> +				 writable ? CMD_A_ALLOW_WRITE : 0);
> +
> +	if ((!writable || ret) && irq_toggle && !smb->irq_unsupported)
> +		enable_irq(client->irq);
> +
> +	return ret;
>  }
>  
>  static int smb347_hw_init(struct smb347_charger *smb)
> @@ -682,7 +694,7 @@ static int smb347_hw_init(struct smb347_charger *smb)
>  	unsigned int val;
>  	int ret;
>  
> -	ret = smb347_set_writable(smb, true);
> +	ret = smb347_set_writable(smb, true, false);
>  	if (ret < 0)
>  		return ret;
>  
> @@ -758,7 +770,7 @@ static int smb347_hw_init(struct smb347_charger *smb)
>  	ret = smb347_start_stop_charging(smb);
>  
>  fail:
> -	smb347_set_writable(smb, false);
> +	smb347_set_writable(smb, false, false);
>  	return ret;
>  }
>  
> @@ -866,7 +878,7 @@ static int smb347_irq_set(struct smb347_charger *smb, bool enable)
>  	if (smb->irq_unsupported)
>  		return 0;
>  
> -	ret = smb347_set_writable(smb, true);
> +	ret = smb347_set_writable(smb, true, true);
>  	if (ret < 0)
>  		return ret;
>  
> @@ -891,7 +903,7 @@ static int smb347_irq_set(struct smb347_charger *smb, bool enable)
>  	ret = regmap_update_bits(smb->regmap, CFG_PIN, CFG_PIN_EN_CHARGER_ERROR,
>  				 enable ? CFG_PIN_EN_CHARGER_ERROR : 0);
>  fail:
> -	smb347_set_writable(smb, false);
> +	smb347_set_writable(smb, false, true);
>  	return ret;
>  }
>  
> @@ -919,7 +931,7 @@ static int smb347_irq_init(struct smb347_charger *smb,
>  	if (!client->irq)
>  		return 0;
>  
> -	ret = smb347_set_writable(smb, true);
> +	ret = smb347_set_writable(smb, true, false);
>  	if (ret < 0)
>  		return ret;
>  
> @@ -931,7 +943,7 @@ static int smb347_irq_init(struct smb347_charger *smb,
>  				 CFG_STAT_ACTIVE_HIGH | CFG_STAT_DISABLED,
>  				 CFG_STAT_DISABLED);
>  
> -	smb347_set_writable(smb, false);
> +	smb347_set_writable(smb, false, false);
>  
>  	if (ret < 0) {
>  		dev_warn(smb->dev, "failed to initialize IRQ: %d\n", ret);
> -- 
> 2.32.0
>
Sebastian Reichel Aug. 6, 2021, 9:13 p.m. UTC | #2 
Hi,

On Sat, Jul 31, 2021 at 08:38:37PM +0300, Dmitry Osipenko wrote:
> Utilize generic regmap caching in order to avoid unnecessary slow I2C

> accesses to all constant registers each time the supply status updated

> and remove local caching of charger state to make code cleaner.

> 

> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>

> ---


Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>


-- Sebastian

>  drivers/power/supply/smb347-charger.c | 16 ++++------------

>  1 file changed, 4 insertions(+), 12 deletions(-)

> 

> diff --git a/drivers/power/supply/smb347-charger.c b/drivers/power/supply/smb347-charger.c

> index db1378b41f80..27254e6efdde 100644

> --- a/drivers/power/supply/smb347-charger.c

> +++ b/drivers/power/supply/smb347-charger.c

> @@ -135,7 +135,6 @@

>   * @id: SMB charger ID

>   * @mains_online: is AC/DC input connected

>   * @usb_online: is USB input connected

> - * @charging_enabled: is charging enabled

>   * @irq_unsupported: is interrupt unsupported by SMB hardware

>   * @max_charge_current: maximum current (in uA) the battery can be charged

>   * @max_charge_voltage: maximum voltage (in uV) the battery can be charged

> @@ -192,7 +191,6 @@ struct smb347_charger {

>  	unsigned int		id;

>  	bool			mains_online;

>  	bool			usb_online;

> -	bool			charging_enabled;

>  	bool			irq_unsupported;

>  

>  	unsigned int		max_charge_current;

> @@ -358,21 +356,13 @@ static int smb347_charging_status(struct smb347_charger *smb)

>  

>  static int smb347_charging_set(struct smb347_charger *smb, bool enable)

>  {

> -	int ret = 0;

> -

>  	if (smb->enable_control != SMB3XX_CHG_ENABLE_SW) {

>  		dev_dbg(smb->dev, "charging enable/disable in SW disabled\n");

>  		return 0;

>  	}

>  

> -	if (smb->charging_enabled != enable) {

> -		ret = regmap_update_bits(smb->regmap, CMD_A, CMD_A_CHG_ENABLED,

> -					 enable ? CMD_A_CHG_ENABLED : 0);

> -		if (!ret)

> -			smb->charging_enabled = enable;

> -	}

> -

> -	return ret;

> +	return regmap_update_bits(smb->regmap, CMD_A, CMD_A_CHG_ENABLED,

> +				  enable ? CMD_A_CHG_ENABLED : 0);

>  }

>  

>  static inline int smb347_charging_enable(struct smb347_charger *smb)

> @@ -1310,6 +1300,8 @@ static const struct regmap_config smb347_regmap = {

>  	.max_register	= SMB347_MAX_REGISTER,

>  	.volatile_reg	= smb347_volatile_reg,

>  	.readable_reg	= smb347_readable_reg,

> +	.cache_type	= REGCACHE_FLAT,

> +	.num_reg_defaults_raw = SMB347_MAX_REGISTER,

>  };

>  

>  static const struct power_supply_desc smb347_mains_desc = {

> -- 

> 2.32.0

>
Dmitry Osipenko Aug. 13, 2021, 1:42 p.m. UTC | #3 
31.07.2021 20:38, Dmitry Osipenko пишет:
> Support programming USB PHY into OTG mode.
> 
> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
> ---
>  drivers/usb/phy/phy-tegra-usb.c   | 197 +++++++++++++++++++++++++++++-
>  include/linux/usb/tegra_usb_phy.h |   5 +
>  2 files changed, 197 insertions(+), 5 deletions(-)

Greg/Felipe, could you please ack this patch? This series should go via
tegra tree since patches are interdependent.