Merge branch 'next/late' with mainline

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / stm32f469-disco.dts

diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts
index 8877c00ce8e8bf8f12f3ff58d6566a07d09a6fb3..0dd56ef574fa23f6fd54a404848e7a6be28db8b9 100644 (file)
--- a/arch/arm/boot/dts/stm32f469-disco.dts
+++ b/arch/arm/boot/dts/stm32f469-disco.dts
@@ -58,7 +58,7 @@
        };
 
        memory {
-               reg = <0x00000000 0x800000>;
+               reg = <0x00000000 0x1000000>;
        };
 
        aliases {
@@ -78,6 +78,40 @@
        clock-frequency = <8000000>;
 };
 
+&rtc {
+       status = "okay";
+};
+
+&timers1 {
+       status = "okay";
+
+       pwm {
+               pinctrl-0 = <&pwm1_pins>;
+               pinctrl-names = "default";
+               status = "okay";
+       };
+
+       timer@0 {
+               status = "okay";
+       };
+};
+
+&timers3 {
+       status = "okay";
+
+       pwm {
+               pinctrl-0 = <&pwm3_pins>;
+               pinctrl-names = "default";
+               status = "okay";
+       };
+
+       timer@2 {
+               status = "okay";
+       };
+};
+
 &usart3 {
+       pinctrl-0 = <&usart3_pins_a>;
+       pinctrl-names = "default";
        status = "okay";
 };