Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / vf610.dtsi

diff --git a/arch/arm/boot/dts/vf610.dtsi b/arch/arm/boot/dts/vf610.dtsi
index 3c91b84066a1bda86c937091a086977a9d89cdbb..6cc314e7b8fb7064af09b3d7d24d6f7ebbba714e 100644 (file)
--- a/arch/arm/boot/dts/vf610.dtsi
+++ b/arch/arm/boot/dts/vf610.dtsi
@@ -183,6 +183,19 @@
                                clock-names = "pit";
                        };
 
+                       pwm0: pwm@40038000 {
+                               compatible = "fsl,vf610-ftm-pwm";
+                               #pwm-cells = <3>;
+                               reg = <0x40038000 0x1000>;
+                               clock-names = "ftm_sys", "ftm_ext",
+                                             "ftm_fix", "ftm_cnt_clk_en";
+                               clocks = <&clks VF610_CLK_FTM0>,
+                                       <&clks VF610_CLK_FTM0_EXT_SEL>,
+                                       <&clks VF610_CLK_FTM0_FIX_SEL>,
+                                       <&clks VF610_CLK_FTM0_EXT_FIX_EN>;
+                               status = "disabled";
+                       };
+
                        adc0: adc@4003b000 {
                                compatible = "fsl,vf610-adc";
                                reg = <0x4003b000 0x1000>;
@@ -347,6 +360,17 @@
                                status = "disabled";
                        };
 
+                       esdhc1: esdhc@400b2000 {
+                               compatible = "fsl,imx53-esdhc";
+                               reg = <0x400b2000 0x4000>;
+                               interrupts = <0 28 0x04>;
+                               clocks = <&clks VF610_CLK_IPG_BUS>,
+                                       <&clks VF610_CLK_PLATFORM_BUS>,
+                                       <&clks VF610_CLK_ESDHC1>;
+                               clock-names = "ipg", "ahb", "per";
+                               status = "disabled";
+                       };
+
                        ftm: ftm@400b8000 {
                                compatible = "fsl,ftm-timer";
                                reg = <0x400b8000 0x1000 0x400b9000 0x1000>;