]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'for-3.16/bcm-dt' of git://github.com/broadcom/mach-bcm into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 21:33:19 +0000 (23:33 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 21:49:22 +0000 (23:49 +0200)
Merge "mach-bcm dt updates for 3.16" from Matt Porter:

* Add PWM support to bcm281xx and bcm28155 ap board
* Add gpldo and vbus regulators to bcm590xx

* tag 'for-3.16/bcm-dt' of git://github.com/broadcom/mach-bcm:
  ARM: dts: bcm590xx: add support for GPLDO and VBUS regulators
  ARM: dts: Enable the PWM for bcm28155 AP board
  ARM: dts: Declare the PWM for bcm11351 (bcm281xx)

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge