karo: tx53: clear persistent bits in lpgr upon boot

[karo-tx-uboot.git] / board / karo / tx53 / tx53.c

diff --git a/board/karo/tx53/tx53.c b/board/karo/tx53/tx53.c
index e877b2c44cbb44e7b796ee694ea6af45ee08f846..32d541e765346e8860182c2bdddb2f2a92378599 100644 (file)
--- a/board/karo/tx53/tx53.c
+++ b/board/karo/tx53/tx53.c
@@ -173,9 +173,31 @@ static void print_reset_cause(void)
        printf("\n");
 }
 
+#define pr_lpgr_val(v, n, b, c) do {                                   \
+       u32 __v = ((v) >> (b)) & ((1 << (c)) - 1);                      \
+       if (__v)                                                        \
+               printf(" %s=%0*x", #n, DIV_ROUND_UP(c, 4), __v);        \
+} while (0)
+
+static inline void print_lpgr(u32 lpgr)
+{
+       if (!lpgr)
+               return;
+
+       printf("LPGR=%08x:", lpgr);
+       pr_lpgr_val(lpgr, SW_ISO, 31, 1);
+       pr_lpgr_val(lpgr, SECONDARY_BOOT, 30, 1);
+       pr_lpgr_val(lpgr, BLOCK_REWRITE, 29, 1);
+       pr_lpgr_val(lpgr, WDOG_BOOT, 28, 1);
+       pr_lpgr_val(lpgr, SBMR_SHADOW, 0, 26);
+       printf("\n");
+}
+
 static void tx53_print_cpuinfo(void)
 {
        u32 cpurev;
+       struct srtc_regs *srtc_regs = (void *)SRTC_BASE_ADDR;
+       u32 lpgr = readl(&srtc_regs->lpgr);
 
        cpurev = get_cpu_rev();
 
@@ -185,6 +207,20 @@ static void tx53_print_cpuinfo(void)
                mxc_get_clock(MXC_ARM_CLK) / 1000000);
 
        print_reset_cause();
+
+       print_lpgr(lpgr);
+
+       if (lpgr & (1 << 30))
+               printf("WARNING: U-Boot started from secondary bootstrap image\n");
+
+       if (lpgr) {
+               struct mxc_ccm_reg *ccm_regs = (void *)CCM_BASE_ADDR;
+               u32 ccgr4 = readl(&ccm_regs->CCGR4);
+
+               writel(ccgr4 | MXC_CCM_CCGR4_SRTC(3), &ccm_regs->CCGR4);
+               writel(0, &srtc_regs->lpgr);
+               writel(ccgr4, &ccm_regs->CCGR4);
+       }
 }
 
 enum LTC3589_REGS {
@@ -428,7 +464,7 @@ int board_early_init_f(void)
        writel(0x00000000, AIPS2_BASE_ADDR + 0x50);
 
        writel(0xffcf0fff, &ccm_regs->CCGR0);
-       writel(0x000fffc3, &ccm_regs->CCGR1);
+       writel(0x000fffcf, &ccm_regs->CCGR1);
        writel(0x033c0000, &ccm_regs->CCGR2);
        writel(0x000000ff, &ccm_regs->CCGR3);
        writel(0x00000000, &ccm_regs->CCGR4);
@@ -1369,7 +1405,7 @@ void ft_board_setup(void *blob, bd_t *bd)
 
        karo_fdt_fixup_touchpanel(blob, tx53_touchpanels,
                                ARRAY_SIZE(tx53_touchpanels));
-       karo_fdt_fixup_usb_otg(blob, "usbotg", "fsl,usbphy");
+       karo_fdt_fixup_usb_otg(blob, "usbotg", "fsl,usbphy", "vbus-supply");
        karo_fdt_fixup_flexcan(blob, stk5_v5);
        tx53_fixup_rtc(blob);
        karo_fdt_update_fb_mode(blob, video_mode);