| commit | 40b0f135efdd185685ea9c84c5717224aaee72d1 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Fri May 23 23:33:19 2014 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Fri May 23 23:49:22 2014 +0200 |
| tree | 00dd56099eefea1560a4d3dba7cef533520919af | |
| parent | 4078679ecf93979adff211dd4a840d0956f2aa9f [diff] | |
| parent | de9bd52f21b5677a18a205c2a931c87254dabdeb [diff] |
Merge tag 'for-3.16/bcm-dt' of git://github.com/broadcom/mach-bcm into for-next 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>