Commit 40b0f135 authored by Arnd Bergmann's avatar Arnd Bergmann

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 4078679e de9bd52f
......@@ -193,6 +193,14 @@ i2c@3500d000 {
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>;
......
......@@ -69,6 +69,10 @@ sdio4: sdio@3f1b0000 {
status = "okay";
};
pwm: pwm@3e01a000 {
status = "okay";
};
usbotg: usb@3f120000 {
vusb_d-supply = <&usbldo_reg>;
vusb_a-supply = <&iosr1_reg>;
......
......@@ -70,5 +70,26 @@ sdsr2_reg: sdsr2 {
vsr_reg: vsr {
};
gpldo1_reg: gpldo1 {
};
gpldo2_reg: gpldo2 {
};
gpldo3_reg: gpldo3 {
};
gpldo4_reg: gpldo4 {
};
gpldo5_reg: gpldo5 {
};
gpldo6_reg: gpldo6 {
};
vbus_reg: vbus {
};
};
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment