Merge tag 'at91-fixes2' of git://github.com/at91linux/linux-at91 into fixes

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap2 / prminst44xx.c

diff --git a/arch/arm/mach-omap2/prminst44xx.c b/arch/arm/mach-omap2/prminst44xx.c
index 280f3c58abe505c9047e6027071ec8bafd720c57..05fcf6de44ee51a0377771ef518e71e04d491b2d 100644 (file)
--- a/arch/arm/mach-omap2/prminst44xx.c
+++ b/arch/arm/mach-omap2/prminst44xx.c
@@ -25,6 +25,7 @@
 #include "prminst44xx.h"
 #include "prm-regbits-44xx.h"
 #include "prcm44xx.h"
+#include "prcm43xx.h"
 #include "prcm_mpu44xx.h"
 #include "soc.h"
 
@@ -176,6 +177,8 @@ void omap4_prminst_global_warm_sw_reset(void)
                dev_inst = OMAP54XX_PRM_DEVICE_INST;
        else if (soc_is_dra7xx())
                dev_inst = DRA7XX_PRM_DEVICE_INST;
+       else if (soc_is_am43xx())
+               dev_inst = AM43XX_PRM_DEVICE_INST;
        else
                return;