Commit 72b4fb4c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v6.3-rc7' of... 

Merge tag 'regulator-fix-v6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "A few driver specific fixes, one build coverage issue and a couple of
  'someone typed in the wrong number' style errors in describing devices
  to the subsystem"

* tag 'regulator-fix-v6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: sm5703: Fix missing n_voltages for fixed regulators
  regulator: fan53555: Fix wrong TCS_SLEW_MASK
  regulator: fan53555: Explicitly include bits header
parents 789b4a41 7c750406

drivers/regulator/fan53555.c

+7 −6
Original line number Diff line number Diff line
@@ -8,18 +8,19 @@ 
// Copyright (c) 2012 Marvell Technology Ltd.

// Yunfan Zhang <yfzhang@marvell.com>



#include <linux/bits.h>

#include <linux/err.h>

#include <linux/i2c.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/param.h>

#include <linux/err.h>

#include <linux/platform_device.h>

#include <linux/regmap.h>

#include <linux/regulator/driver.h>

#include <linux/regulator/fan53555.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/of_regulator.h>

#include <linux/of_device.h>

#include <linux/i2c.h>

#include <linux/slab.h>

#include <linux/regmap.h>

#include <linux/regulator/fan53555.h>



/* Voltage setting */

#define FAN53555_VSEL0		0x00
@@ -60,7 +61,7 @@ 
#define TCS_VSEL1_MODE		(1 << 6)



#define TCS_SLEW_SHIFT		3

#define TCS_SLEW_MASK		(0x3 < 3)

#define TCS_SLEW_MASK		GENMASK(4, 3)



enum fan53555_vendor {

	FAN53526_VENDOR_FAIRCHILD = 0,

drivers/regulator/sm5703-regulator.c

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ static const int sm5703_buck_voltagemap[] = { 
		.type = REGULATOR_VOLTAGE,				\

		.id = SM5703_USBLDO ## _id,				\

		.ops = &sm5703_regulator_ops_fixed,			\

		.n_voltages = 1,					\

		.fixed_uV = SM5703_USBLDO_MICROVOLT,			\

		.enable_reg = SM5703_REG_USBLDO12,			\

		.enable_mask = SM5703_REG_EN_USBLDO ##_id,		\
@@ -56,6 +57,7 @@ static const int sm5703_buck_voltagemap[] = { 
		.type = REGULATOR_VOLTAGE,				\

		.id = SM5703_VBUS,					\

		.ops = &sm5703_regulator_ops_fixed,			\

		.n_voltages = 1,					\

		.fixed_uV = SM5703_VBUS_MICROVOLT,			\

		.enable_reg = SM5703_REG_CNTL,				\

		.enable_mask = SM5703_OPERATION_MODE_MASK,		\