Commit 67cc6885 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/fix/as3722' and... 

Merge remote-tracking branches 'regulator/fix/as3722' and 'regulator/fix/pfuze100' into regulator-linus
parents 374b1057 6389075e 236c427c

drivers/regulator/as3722-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -590,8 +590,8 @@ static int as3722_sd016_set_current_limit(struct regulator_dev *rdev, 
	default:

		return -EINVAL;

	}

	ret <<= ffs(mask) - 1;

	val = ret & mask;

	val <<= ffs(mask) - 1;

	return as3722_update_bits(as3722, reg, mask, val);

}

drivers/regulator/pfuze100-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


#define PFUZE100_DEVICEID	0x0

#define PFUZE100_REVID		0x3

#define PFUZE100_FABID		0x3

#define PFUZE100_FABID		0x4



#define PFUZE100_SW1ABVOL	0x20

#define PFUZE100_SW1CVOL	0x2e