diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-05-20 23:04:54 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-20 23:04:54 +0200 |
commit | 0fcbffc4bdc262bd9d5802dc61fb0dcf54102f4e (patch) | |
tree | 5b6bc24bf5e334df72a53401ebaa0acf0a8400eb /drivers/bus | |
parent | e532ffea4ae598d04552dd1138a2367660f6dd5e (diff) | |
parent | 5be2361160cdbbfcc580b82a440218c115c15504 (diff) | |
download | op-kernel-dev-0fcbffc4bdc262bd9d5802dc61fb0dcf54102f4e.zip op-kernel-dev-0fcbffc4bdc262bd9d5802dc61fb0dcf54102f4e.tar.gz |
Merge tag 'berlin-simple-mfd-4.2-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/drivers
Merge "Berlin simple-mfd for v4.2" from Sebastian Hesselbarth:
- based on arm-soc drivers/simple-mfd branch
- rework of chip/system ctrl nodes to simple-mfd probing for
clk, pinctrl, and reset
- add adc node
* tag 'berlin-simple-mfd-4.2-1' of git://git.infradead.org/users/hesselba/linux-berlin:
ARM: berlin: add an ADC node for the BG2Q
ARM: berlin: remove useless chip and system ctrl compatibles
clk: berlin: drop direct of_iomap of nodes reg property
ARM: berlin: move BG2Q clock node
ARM: berlin: move BG2CD clock node
ARM: berlin: move BG2 clock node
clk: berlin: prepare simple-mfd conversion
pinctrl: berlin: drop SoC stub provided regmap
ARM: berlin: move pinctrl to simple-mfd nodes
pinctrl: berlin: prepare to use regmap provided by syscon
reset: berlin: drop arch_initcall initialization
ARM: berlin: move reset to simple-mfd nodes
reset: berlin: convert to a platform driver
ARM: berlin: prepare simple-mfd/syscon conversion of sys/chip ctrl nodes
ARM: berlin: select MFD_SYSCON by default
Diffstat (limited to 'drivers/bus')
0 files changed, 0 insertions, 0 deletions