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>
This commit is contained in:
Arnd Bergmann 2014-05-23 23:33:19 +02:00
commit 40b0f135ef
3 changed files with 33 additions and 0 deletions

View File

@ -193,6 +193,14 @@
status = "disabled";
};
pwm: pwm@3e01a000 {
compatible = "brcm,bcm11351-pwm", "brcm,kona-pwm";
reg = <0x3e01a000 0xcc>;
clocks = <&slave_ccu BCM281XX_SLAVE_CCU_PWM>;
#pwm-cells = <3>;
status = "disabled";
};
clocks {
#address-cells = <1>;
#size-cells = <1>;

View File

@ -69,6 +69,10 @@
status = "okay";
};
pwm: pwm@3e01a000 {
status = "okay";
};
usbotg: usb@3f120000 {
vusb_d-supply = <&usbldo_reg>;
vusb_a-supply = <&iosr1_reg>;

View File

@ -70,5 +70,26 @@
vsr_reg: vsr {
};
gpldo1_reg: gpldo1 {
};
gpldo2_reg: gpldo2 {
};
gpldo3_reg: gpldo3 {
};
gpldo4_reg: gpldo4 {
};
gpldo5_reg: gpldo5 {
};
gpldo6_reg: gpldo6 {
};
vbus_reg: vbus {
};
};
};