Merge git://git.denx.de/u-boot-spi

[oweals/u-boot.git] / arch / arm / include / asm / arch-rockchip / cru_rk3368.h

diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3368.h b/arch/arm/include/asm/arch-rockchip/cru_rk3368.h
index 24a9cc052517c0f78fdd39e9b4d7b5a24f0ea284..2b1197fd4665a5686247f8e1d637ccab740b95a8 100644 (file)
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3368.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3368.h
@@ -89,19 +89,26 @@ enum {
        MCU_CLK_DIV_SHIFT               = 0,
        MCU_CLK_DIV_MASK                = GENMASK(4, 0),
 
+       /* CLKSEL43_CON */
+       GMAC_MUX_SEL_EXTCLK             = BIT(8),
+
        /* CLKSEL51_CON */
        MMC_PLL_SEL_SHIFT               = 8,
        MMC_PLL_SEL_MASK                = GENMASK(9, 8),
-       MMC_PLL_SEL_CPLL                = 0,
-       MMC_PLL_SEL_GPLL,
-       MMC_PLL_SEL_USBPHY_480M,
-       MMC_PLL_SEL_24M,
+       MMC_PLL_SEL_CPLL                = (0 << MMC_PLL_SEL_SHIFT),
+       MMC_PLL_SEL_GPLL                = (1 << MMC_PLL_SEL_SHIFT),
+       MMC_PLL_SEL_USBPHY_480M         = (2 << MMC_PLL_SEL_SHIFT),
+       MMC_PLL_SEL_24M                 = (3 << MMC_PLL_SEL_SHIFT),
        MMC_CLK_DIV_SHIFT               = 0,
        MMC_CLK_DIV_MASK                = GENMASK(6, 0),
 
        /* SOFTRST1_CON */
        MCU_PO_SRST_MASK                = BIT(13),
        MCU_SYS_SRST_MASK               = BIT(12),
+       DMA1_SRST_REQ                   = BIT(2),
+
+       /* SOFTRST4_CON */
+       DMA2_SRST_REQ                   = BIT(0),
 
        /* GLB_RST_CON */
        PMU_GLB_SRST_CTRL_SHIFT         = 2,