mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branches 'ib-mfd-arm-i2c-4.14', 'ib-mfd-arm-usb-video-4.14', 'ib-mfd-hwmon-4.14', 'ib-mfd-iio-pwm-4.14', 'ib-mfd-input-rtc-4.14', 'ib-mfd-many-4.14' and 'ib-mfd-pinctrl-regulator-4.14' into ibs-for-mfd-merged
This commit is contained in:
commit
3f979bf8f5
1835 changed files with 32762 additions and 25601 deletions
|
|
@ -13,7 +13,7 @@
|
|||
#include <linux/rtc.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <linux/i2c/dm355evm_msp.h>
|
||||
#include <linux/mfd/dm355evm_msp.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1301,7 +1301,6 @@ static void ds1307_clks_register(struct ds1307 *ds1307)
|
|||
static const struct regmap_config regmap_config = {
|
||||
.reg_bits = 8,
|
||||
.val_bits = 8,
|
||||
.max_register = 0x12,
|
||||
};
|
||||
|
||||
static int ds1307_probe(struct i2c_client *client,
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
#include <linux/interrupt.h>
|
||||
#include <linux/of.h>
|
||||
|
||||
#include <linux/i2c/twl.h>
|
||||
#include <linux/mfd/twl.h>
|
||||
|
||||
enum twl_class {
|
||||
TWL_4030 = 0,
|
||||
|
|
|
|||
Loading…
Reference in a new issue