From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 20 May 2015 21:04:54 +0000 (+0200)
Subject: Merge tag 'berlin-simple-mfd-4.2-1' of git://git.infradead.org/users/hesselba/linux... 
X-Git-Tag: v5.15~15559^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0fcbffc4bdc262bd9d5802dc61fb0dcf54102f4e;p=platform%2Fkernel%2Flinux-starfive.git

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
---

0fcbffc4bdc262bd9d5802dc61fb0dcf54102f4e