rockchip: rk3308: Move cru and grf include files to arch-rockchip
authorJonas Karlman <jonas@kwiboo.se>
Mon, 8 Apr 2024 18:14:11 +0000 (18:14 +0000)
committerKever Yang <kever.yang@rock-chips.com>
Fri, 26 Apr 2024 07:47:03 +0000 (15:47 +0800)
Move cru_rk3308.h and grf_rk3308.h to arch-rockchip to match path used
for all other Rockchip SoCs.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
arch/arm/include/asm/arch-rk3308/cru_rk3308.h [deleted file]
arch/arm/include/asm/arch-rk3308/grf_rk3308.h [deleted file]
arch/arm/include/asm/arch-rockchip/cru_rk3308.h [new file with mode: 0644]
arch/arm/include/asm/arch-rockchip/grf_rk3308.h [new file with mode: 0644]
arch/arm/mach-rockchip/rk3308/clk_rk3308.c
arch/arm/mach-rockchip/rk3308/rk3308.c
board/firefly/firefly-rk3308/roc_cc_rk3308.c
drivers/clk/rockchip/clk_rk3308.c
drivers/net/gmac_rockchip.c
drivers/ram/rockchip/sdram_rk3308.c

diff --git a/arch/arm/include/asm/arch-rk3308/cru_rk3308.h b/arch/arm/include/asm/arch-rk3308/cru_rk3308.h
deleted file mode 100644 (file)
index 091ae82..0000000
+++ /dev/null
@@ -1,317 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2018 Rockchip Electronics Co., Ltd.
- */
-#ifndef _ASM_ARCH_CRU_RK3308_H
-#define _ASM_ARCH_CRU_RK3308_H
-
-#define MHz            1000000
-#define OSC_HZ         (24 * MHz)
-
-#define APLL_HZ                (816 * MHz)
-
-#define CORE_ACLK_HZ   408000000
-#define CORE_DBG_HZ    204000000
-
-#define BUS_ACLK_HZ    200000000
-#define BUS_HCLK_HZ    100000000
-#define BUS_PCLK_HZ    100000000
-
-#define PERI_ACLK_HZ   200000000
-#define PERI_HCLK_HZ   100000000
-#define PERI_PCLK_HZ   100000000
-
-#define AUDIO_HCLK_HZ  100000000
-#define AUDIO_PCLK_HZ  100000000
-
-#define RK3308_PLL_CON(x)      ((x) * 0x4)
-#define RK3308_MODE_CON                0xa0
-
-/* RK3308 pll id */
-enum rk3308_pll_id {
-       APLL,
-       DPLL,
-       VPLL0,
-       VPLL1,
-       PLL_COUNT,
-};
-
-struct rk3308_clk_info {
-       unsigned long id;
-       char *name;
-};
-
-/* Private data for the clock driver - used by rockchip_get_cru() */
-struct rk3308_clk_priv {
-       struct rk3308_cru *cru;
-       ulong armclk_hz;
-       ulong dpll_hz;
-       ulong vpll0_hz;
-       ulong vpll1_hz;
-};
-
-struct rk3308_cru {
-       struct rk3308_pll {
-               unsigned int con0;
-               unsigned int con1;
-               unsigned int con2;
-               unsigned int con3;
-               unsigned int con4;
-               unsigned int reserved0[3];
-       } pll[4];
-       unsigned int reserved1[8];
-       unsigned int mode;
-       unsigned int misc;
-       unsigned int reserved2[2];
-       unsigned int glb_cnt_th;
-       unsigned int glb_rst_st;
-       unsigned int glb_srst_fst;
-       unsigned int glb_srst_snd;
-       unsigned int glb_rst_con;
-       unsigned int pll_lock;
-       unsigned int reserved3[6];
-       unsigned int hwffc_con0;
-       unsigned int reserved4;
-       unsigned int hwffc_th;
-       unsigned int hwffc_intst;
-       unsigned int apll_con0_s;
-       unsigned int apll_con1_s;
-       unsigned int clksel_con0_s;
-       unsigned int reserved5;
-       unsigned int clksel_con[74];
-       unsigned int reserved6[54];
-       unsigned int clkgate_con[15];
-       unsigned int reserved7[(0x380 - 0x338) / 4 - 1];
-       unsigned int ssgtbl[32];
-       unsigned int softrst_con[10];
-       unsigned int reserved8[(0x480 - 0x424) / 4 - 1];
-       unsigned int sdmmc_con[2];
-       unsigned int sdio_con[2];
-       unsigned int emmc_con[2];
-};
-
-enum {
-       /* PLLCON0*/
-       PLL_BP_SHIFT            = 15,
-       PLL_POSTDIV1_SHIFT      = 12,
-       PLL_POSTDIV1_MASK       = 7 << PLL_POSTDIV1_SHIFT,
-       PLL_FBDIV_SHIFT         = 0,
-       PLL_FBDIV_MASK          = 0xfff,
-
-       /* PLLCON1 */
-       PLL_PDSEL_SHIFT         = 15,
-       PLL_PD1_SHIFT           = 14,
-       PLL_PD_SHIFT            = 13,
-       PLL_PD_MASK             = 1 << PLL_PD_SHIFT,
-       PLL_DSMPD_SHIFT         = 12,
-       PLL_DSMPD_MASK          = 1 << PLL_DSMPD_SHIFT,
-       PLL_LOCK_STATUS_SHIFT   = 10,
-       PLL_LOCK_STATUS_MASK    = 1 << PLL_LOCK_STATUS_SHIFT,
-       PLL_POSTDIV2_SHIFT      = 6,
-       PLL_POSTDIV2_MASK       = 7 << PLL_POSTDIV2_SHIFT,
-       PLL_REFDIV_SHIFT        = 0,
-       PLL_REFDIV_MASK         = 0x3f,
-
-       /* PLLCON2 */
-       PLL_FOUT4PHASEPD_SHIFT  = 27,
-       PLL_FOUTVCOPD_SHIFT     = 26,
-       PLL_FOUTPOSTDIVPD_SHIFT = 25,
-       PLL_DACPD_SHIFT         = 24,
-       PLL_FRAC_DIV    = 0xffffff,
-
-       /* CRU_MODE */
-       PLLMUX_FROM_XIN24M      = 0,
-       PLLMUX_FROM_PLL,
-       PLLMUX_FROM_RTC32K,
-       USBPHY480M_MODE_SHIFT   = 8,
-       USBPHY480M_MODE_MASK    = 3 << USBPHY480M_MODE_SHIFT,
-       VPLL1_MODE_SHIFT                = 6,
-       VPLL1_MODE_MASK         = 3 << VPLL1_MODE_SHIFT,
-       VPLL0_MODE_SHIFT                = 4,
-       VPLL0_MODE_MASK         = 3 << VPLL0_MODE_SHIFT,
-       DPLL_MODE_SHIFT         = 2,
-       DPLL_MODE_MASK          = 3 << DPLL_MODE_SHIFT,
-       APLL_MODE_SHIFT         = 0,
-       APLL_MODE_MASK          = 3 << APLL_MODE_SHIFT,
-
-       /* CRU_CLK_SEL0_CON */
-       CORE_ACLK_DIV_SHIFT     = 12,
-       CORE_ACLK_DIV_MASK      = 0x7 << CORE_ACLK_DIV_SHIFT,
-       CORE_DBG_DIV_SHIFT      = 8,
-       CORE_DBG_DIV_MASK       = 0xf << CORE_DBG_DIV_SHIFT,
-       CORE_CLK_PLL_SEL_SHIFT  = 6,
-       CORE_CLK_PLL_SEL_MASK   = 0x3 << CORE_CLK_PLL_SEL_SHIFT,
-       CORE_CLK_PLL_SEL_APLL   = 0,
-       CORE_CLK_PLL_SEL_VPLL0,
-       CORE_CLK_PLL_SEL_VPLL1,
-       CORE_DIV_CON_SHIFT      = 0,
-       CORE_DIV_CON_MASK       = 0x0f << CORE_DIV_CON_SHIFT,
-
-       /* CRU_CLK_SEL2_CON */
-       CLK_RTC32K_SEL_SHIFT    = 8,
-       CLK_RTC32K_SEL_MASK     = 3 << CLK_RTC32K_SEL_SHIFT,
-       CLK_RTC32K_IO           = 0,
-       CLK_RTC32K_PVTM,
-       CLK_RTC32K_FRAC_DIV,
-       CLK_RTC32K_DIV,
-
-       /* CRU_CLK_SEL3_CON */
-       CLK_RTC32K_FRAC_NUMERATOR_SHIFT         = 16,
-       CLK_RTC32K_FRAC_NUMERATOR_MASK          = 0xffff << 16,
-       CLK_RTC32K_FRAC_DENOMINATOR_SHIFT       = 0,
-       CLK_RTC32K_FRAC_DENOMINATOR_MASK        = 0xffff,
-
-       /* CRU_CLK_SEL5_CON */
-       BUS_PLL_SEL_SHIFT       = 6,
-       BUS_PLL_SEL_MASK        = 0x3 << BUS_PLL_SEL_SHIFT,
-       BUS_PLL_SEL_DPLL        = 0,
-       BUS_PLL_SEL_VPLL0,
-       BUS_PLL_SEL_VPLL1,
-       BUS_ACLK_DIV_SHIFT      = 0,
-       BUS_ACLK_DIV_MASK       = 0x1f << BUS_ACLK_DIV_SHIFT,
-
-       /* CRU_CLK_SEL6_CON */
-       BUS_PCLK_DIV_SHIFT      = 8,
-       BUS_PCLK_DIV_MASK       = 0x1f << BUS_PCLK_DIV_SHIFT,
-       BUS_HCLK_DIV_SHIFT      = 0,
-       BUS_HCLK_DIV_MASK       = 0x1f << BUS_HCLK_DIV_SHIFT,
-
-       /* CRU_CLK_SEL7_CON */
-       CRYPTO_APK_SEL_SHIFT    = 14,
-       CRYPTO_APK_PLL_SEL_MASK = 3 << CRYPTO_APK_SEL_SHIFT,
-       CRYPTO_PLL_SEL_DPLL     = 0,
-       CRYPTO_PLL_SEL_VPLL0,
-       CRYPTO_PLL_SEL_VPLL1    = 0,
-       CRYPTO_APK_DIV_SHIFT    = 8,
-       CRYPTO_APK_DIV_MASK     = 0x1f << CRYPTO_APK_DIV_SHIFT,
-       CRYPTO_PLL_SEL_SHIFT    = 6,
-       CRYPTO_PLL_SEL_MASK     = 3 << CRYPTO_PLL_SEL_SHIFT,
-       CRYPTO_DIV_SHIFT        = 0,
-       CRYPTO_DIV_MASK         = 0x1f << CRYPTO_DIV_SHIFT,
-
-       /* CRU_CLK_SEL8_CON */
-       DCLK_VOP_SEL_SHIFT      = 14,
-       DCLK_VOP_SEL_MASK       = 0x3 << DCLK_VOP_SEL_SHIFT,
-       DCLK_VOP_SEL_DIVOUT     = 0,
-       DCLK_VOP_SEL_FRACOUT,
-       DCLK_VOP_SEL_24M,
-       DCLK_VOP_PLL_SEL_SHIFT  = 10,
-       DCLK_VOP_PLL_SEL_MASK   = 0x3 << DCLK_VOP_PLL_SEL_SHIFT,
-       DCLK_VOP_PLL_SEL_DPLL   = 0,
-       DCLK_VOP_PLL_SEL_VPLL0,
-       DCLK_VOP_PLL_SEL_VPLL1,
-       DCLK_VOP_DIV_SHIFT      = 0,
-       DCLK_VOP_DIV_MASK       = 0xff,
-
-       /* CRU_CLKSEL_CON10 */
-       /* CRU_CLKSEL_CON13 */
-       /* CRU_CLKSEL_CON16 */
-       /* CRU_CLKSEL_CON19 */
-       /* CRU_CLKSEL_CON22 */
-       CLK_UART_PLL_SEL_SHIFT          = 13,
-       CLK_UART_PLL_SEL_MASK           = 0x7 << CLK_UART_PLL_SEL_SHIFT,
-       CLK_UART_PLL_SEL_DPLL           = 0,
-       CLK_UART_PLL_SEL_VPLL0,
-       CLK_UART_PLL_SEL_VPLL1,
-       CLK_UART_PLL_SEL_480M,
-       CLK_UART_PLL_SEL_24M,
-       CLK_UART_DIV_CON_SHIFT          = 0,
-       CLK_UART_DIV_CON_MASK           = 0x1f << CLK_UART_DIV_CON_SHIFT,
-
-       /* CRU_CLK_SEL25_CON */
-       /* CRU_CLK_SEL26_CON */
-       /* CRU_CLK_SEL27_CON */
-       /* CRU_CLK_SEL28_CON */
-       CLK_I2C_PLL_SEL_SHIFT           = 14,
-       CLK_I2C_PLL_SEL_MASK            = 0x3 << CLK_I2C_PLL_SEL_SHIFT,
-       CLK_I2C_PLL_SEL_DPLL            = 0,
-       CLK_I2C_PLL_SEL_VPLL0,
-       CLK_I2C_PLL_SEL_24M,
-       CLK_I2C_DIV_CON_SHIFT           = 0,
-       CLK_I2C_DIV_CON_MASK            = 0x7f << CLK_I2C_DIV_CON_SHIFT,
-
-       /* CRU_CLK_SEL29_CON */
-       CLK_PWM_PLL_SEL_SHIFT           = 14,
-       CLK_PWM_PLL_SEL_MASK            = 0x3 << CLK_PWM_PLL_SEL_SHIFT,
-       CLK_PWM_PLL_SEL_DPLL            = 0,
-       CLK_PWM_PLL_SEL_VPLL0,
-       CLK_PWM_PLL_SEL_24M,
-       CLK_PWM_DIV_CON_SHIFT           = 0,
-       CLK_PWM_DIV_CON_MASK            = 0x7f << CLK_PWM_DIV_CON_SHIFT,
-
-       /* CRU_CLK_SEL30_CON */
-       /* CRU_CLK_SEL31_CON */
-       /* CRU_CLK_SEL32_CON */
-       CLK_SPI_PLL_SEL_SHIFT           = 14,
-       CLK_SPI_PLL_SEL_MASK            = 0x3 << CLK_SPI_PLL_SEL_SHIFT,
-       CLK_SPI_PLL_SEL_DPLL            = 0,
-       CLK_SPI_PLL_SEL_VPLL0,
-       CLK_SPI_PLL_SEL_24M,
-       CLK_SPI_DIV_CON_SHIFT           = 0,
-       CLK_SPI_DIV_CON_MASK            = 0x7f << CLK_SPI_DIV_CON_SHIFT,
-
-       /* CRU_CLK_SEL34_CON */
-       CLK_SARADC_DIV_CON_SHIFT        = 0,
-       CLK_SARADC_DIV_CON_MASK         = 0x7ff << CLK_SARADC_DIV_CON_SHIFT,
-
-       /* CRU_CLK_SEL36_CON */
-       PERI_PLL_SEL_SHIFT      = 6,
-       PERI_PLL_SEL_MASK       = 0x3 << PERI_PLL_SEL_SHIFT,
-       PERI_PLL_DPLL           = 0,
-       PERI_PLL_VPLL0,
-       PERI_PLL_VPLL1,
-       PERI_ACLK_DIV_SHIFT     = 0,
-       PERI_ACLK_DIV_MASK      = 0x1f << PERI_ACLK_DIV_SHIFT,
-
-       /* CRU_CLK_SEL37_CON */
-       PERI_PCLK_DIV_SHIFT     = 8,
-       PERI_PCLK_DIV_MASK      = 0x1f << PERI_PCLK_DIV_SHIFT,
-       PERI_HCLK_DIV_SHIFT     = 0,
-       PERI_HCLK_DIV_MASK      = 0x1f << PERI_HCLK_DIV_SHIFT,
-
-       /* CRU_CLKSEL41_CON */
-       EMMC_CLK_SEL_SHIFT      = 15,
-       EMMC_CLK_SEL_MASK       = 1 << EMMC_CLK_SEL_SHIFT,
-       EMMC_CLK_SEL_EMMC       = 0,
-       EMMC_CLK_SEL_EMMC_DIV50,
-       EMMC_PLL_SHIFT          = 8,
-       EMMC_PLL_MASK           = 0x3 << EMMC_PLL_SHIFT,
-       EMMC_SEL_DPLL           = 0,
-       EMMC_SEL_VPLL0,
-       EMMC_SEL_VPLL1,
-       EMMC_SEL_24M,
-       EMMC_DIV_SHIFT          = 0,
-       EMMC_DIV_MASK           = 0xff << EMMC_DIV_SHIFT,
-
-       /* CRU_CLKSEL43_CON */
-       MAC_CLK_SPEED_SEL_SHIFT = 15,
-       MAC_CLK_SPEED_SEL_MASK = 1 << MAC_CLK_SPEED_SEL_SHIFT,
-       MAC_CLK_SPEED_SEL_10M = 0,
-       MAC_CLK_SPEED_SEL_100M,
-       MAC_CLK_SOURCE_SEL_SHIFT = 14,
-       MAC_CLK_SOURCE_SEL_MASK = 1 << MAC_CLK_SOURCE_SEL_SHIFT,
-       MAC_CLK_SOURCE_SEL_INTERNAL     = 0,
-       MAC_CLK_SOURCE_SEL_EXTERNAL,
-       MAC_PLL_SHIFT           = 6,
-       MAC_PLL_MASK            = 0x3 << MAC_PLL_SHIFT,
-       MAC_SEL_DPLL            = 0,
-       MAC_SEL_VPLL0,
-       MAC_SEL_VPLL1,
-       MAC_DIV_SHIFT           = 0,
-       MAC_DIV_MASK            = 0x1f << MAC_DIV_SHIFT,
-
-       /* CRU_CLK_SEL45_CON */
-       AUDIO_PCLK_DIV_SHIFT    = 8,
-       AUDIO_PCLK_DIV_MASK     = 0x1f << AUDIO_PCLK_DIV_SHIFT,
-       AUDIO_PLL_SEL_SHIFT     = 6,
-       AUDIO_PLL_SEL_MASK      = 0x3 << AUDIO_PLL_SEL_SHIFT,
-       AUDIO_PLL_VPLL0         = 0,
-       AUDIO_PLL_VPLL1,
-       AUDIO_PLL_24M,
-       AUDIO_HCLK_DIV_SHIFT    = 0,
-       AUDIO_HCLK_DIV_MASK     = 0x1f << AUDIO_HCLK_DIV_SHIFT,
-};
-
-check_member(rk3308_cru, emmc_con[1], 0x494);
-
-#endif
diff --git a/arch/arm/include/asm/arch-rk3308/grf_rk3308.h b/arch/arm/include/asm/arch-rk3308/grf_rk3308.h
deleted file mode 100644 (file)
index a995bb9..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- *Copyright 2019 Rockchip Electronics Co., Ltd.
- */
-#ifndef _ASM_ARCH_GRF_rk3308_H
-#define _ASM_ARCH_GRF_rk3308_H
-
-struct rk3308_grf {
-       unsigned int gpio0a_iomux;
-       unsigned int reserved0;
-       unsigned int gpio0b_iomux;
-       unsigned int reserved1;
-       unsigned int gpio0c_iomux;
-       unsigned int reserved2[3];
-       unsigned int gpio1a_iomux;
-       unsigned int reserved3;
-       unsigned int gpio1bl_iomux;
-       unsigned int gpio1bh_iomux;
-       unsigned int gpio1cl_iomux;
-       unsigned int gpio1ch_iomux;
-       unsigned int gpio1d_iomux;
-       unsigned int reserved4;
-       unsigned int gpio2a_iomux;
-       unsigned int reserved5;
-       unsigned int gpio2b_iomux;
-       unsigned int reserved6;
-       unsigned int gpio2c_iomux;
-       unsigned int reserved7[3];
-       unsigned int gpio3a_iomux;
-       unsigned int reserved8;
-       unsigned int gpio3b_iomux;
-       unsigned int reserved9[5];
-       unsigned int gpio4a_iomux;
-       unsigned int reserved33;
-       unsigned int gpio4b_iomux;
-       unsigned int reserved10;
-       unsigned int gpio4c_iomux;
-       unsigned int reserved11;
-       unsigned int gpio4d_iomux;
-       unsigned int reserved34;
-       unsigned int gpio0a_p;
-       unsigned int gpio0b_p;
-       unsigned int gpio0c_p;
-       unsigned int reserved12;
-       unsigned int gpio1a_p;
-       unsigned int gpio1b_p;
-       unsigned int gpio1c_p;
-       unsigned int gpio1d_p;
-       unsigned int gpio2a_p;
-       unsigned int gpio2b_p;
-       unsigned int gpio2c_p;
-       unsigned int reserved13;
-       unsigned int gpio3a_p;
-       unsigned int gpio3b_p;
-       unsigned int reserved14[2];
-       unsigned int gpio4a_p;
-       unsigned int gpio4b_p;
-       unsigned int gpio4c_p;
-       unsigned int gpio4d_p;
-       unsigned int reserved15[(0x100 - 0xec) / 4 - 1];
-       unsigned int gpio0a_e;
-       unsigned int gpio0b_e;
-       unsigned int gpio0c_e;
-       unsigned int reserved16;
-       unsigned int gpio1a_e;
-       unsigned int gpio1b_e;
-       unsigned int gpio1c_e;
-       unsigned int gpio1d_e;
-       unsigned int gpio2a_e;
-       unsigned int gpio2b_e;
-       unsigned int gpio2c_e;
-       unsigned int reserved17;
-       unsigned int gpio3a_e;
-       unsigned int gpio3b_e;
-       unsigned int reserved18[2];
-       unsigned int gpio4a_e;
-       unsigned int gpio4b_e;
-       unsigned int gpio4c_e;
-       unsigned int gpio4d_e;
-       unsigned int gpio0a_sr;
-       unsigned int gpio0b_sr;
-       unsigned int gpio0c_sr;
-       unsigned int reserved19;
-       unsigned int gpio1a_sr;
-       unsigned int gpio1b_sr;
-       unsigned int gpio1c_sr;
-       unsigned int gpio1d_sr;
-       unsigned int gpio2a_sr;
-       unsigned int gpio2b_sr;
-       unsigned int gpio2c_sr;
-       unsigned int reserved20;
-       unsigned int gpio3a_sr;
-       unsigned int gpio3b_sr;
-       unsigned int reserved21[2];
-       unsigned int gpio4a_sr;
-       unsigned int gpio4b_sr;
-       unsigned int gpio4c_sr;
-       unsigned int gpio4d_sr;
-       unsigned int gpio0a_smt;
-       unsigned int gpio0b_smt;
-       unsigned int gpio0c_smt;
-       unsigned int reserved22;
-       unsigned int gpio1a_smt;
-       unsigned int gpio1b_smt;
-       unsigned int gpio1c_smt;
-       unsigned int gpio1d_smt;
-       unsigned int gpio2a_smt;
-       unsigned int gpio2b_smt;
-       unsigned int gpio2c_smt;
-       unsigned int reserved23;
-       unsigned int gpio3a_smt;
-       unsigned int gpio3b_smt;
-       unsigned int reserved35[2];
-       unsigned int gpio4a_smt;
-       unsigned int gpio4b_smt;
-       unsigned int gpio4c_smt;
-       unsigned int gpio4d_smt;
-       unsigned int reserved24[(0x300 - 0x1EC) / 4 - 1];
-       unsigned int soc_con0;
-       unsigned int soc_con1;
-       unsigned int soc_con2;
-       unsigned int soc_con3;
-       unsigned int soc_con4;
-       unsigned int soc_con5;
-       unsigned int soc_con6;
-       unsigned int soc_con7;
-       unsigned int soc_con8;
-       unsigned int soc_con9;
-       unsigned int soc_con10;
-       unsigned int reserved25[(0x380 - 0x328) / 4 - 1];
-       unsigned int soc_status0;
-       unsigned int reserved26[(0x400 - 0x380) / 4 - 1];
-       unsigned int cpu_con0;
-       unsigned int cpu_con1;
-       unsigned int cpu_con2;
-       unsigned int reserved27[(0x420 - 0x408) / 4 - 1];
-       unsigned int cpu_status0;
-       unsigned int cpu_status1;
-       unsigned int reserved28[(0x440 - 0x424) / 4 - 1];
-       unsigned int pvtm_con0;
-       unsigned int pvtm_con1;
-       unsigned int pvtm_status0;
-       unsigned int pvtm_status1;
-       unsigned int reserved29[(0x460 - 0x44C) / 4 - 1];
-       unsigned int tsadc_tbl;
-       unsigned int tsadc_tbh;
-       unsigned int reserved30[(0x480 - 0x464) / 4 - 1];
-       unsigned int host0_con0;
-       unsigned int host0_con1;
-       unsigned int otg_con0;
-       unsigned int host0_status0;
-       unsigned int reserved31[(0x4a0 - 0x48C) / 4 - 1];
-       unsigned int mac_con0;
-       unsigned int upctrl_con0;
-       unsigned int upctrl_status0;
-       unsigned int reserved32[(0x500 - 0x4A8) / 4 - 1];
-       unsigned int os_reg0;
-       unsigned int os_reg1;
-       unsigned int os_reg2;
-       unsigned int os_reg3;
-       unsigned int os_reg4;
-       unsigned int os_reg5;
-       unsigned int os_reg6;
-       unsigned int os_reg7;
-       unsigned int os_reg8;
-       unsigned int os_reg9;
-       unsigned int os_reg10;
-       unsigned int os_reg11;
-       unsigned int reserved38[(0x600 - 0x52c) / 4 - 1];
-       unsigned int soc_con12;
-       unsigned int reserved39;
-       unsigned int soc_con13;
-       unsigned int soc_con14;
-       unsigned int soc_con15;
-       unsigned int reserved40[(0x800 - 0x610) / 4 - 1];
-       unsigned int chip_id;
-};
-check_member(rk3308_grf, gpio0a_p, 0xa0);
-
-struct rk3308_sgrf {
-       unsigned int soc_con0;
-       unsigned int soc_con1;
-       unsigned int con_tzma_r0size;
-       unsigned int con_secure0;
-       unsigned int reserved0;
-       unsigned int clk_timer_en;
-       unsigned int clkgat_con;
-       unsigned int fastboot_addr;
-       unsigned int fastboot_en;
-       unsigned int reserved1[(0x30 - 0x24) / 4];
-       unsigned int srst_con;
-};
-check_member(rk3308_sgrf, fastboot_en, 0x20);
-
-#endif
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3308.h b/arch/arm/include/asm/arch-rockchip/cru_rk3308.h
new file mode 100644 (file)
index 0000000..091ae82
--- /dev/null
@@ -0,0 +1,317 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2018 Rockchip Electronics Co., Ltd.
+ */
+#ifndef _ASM_ARCH_CRU_RK3308_H
+#define _ASM_ARCH_CRU_RK3308_H
+
+#define MHz            1000000
+#define OSC_HZ         (24 * MHz)
+
+#define APLL_HZ                (816 * MHz)
+
+#define CORE_ACLK_HZ   408000000
+#define CORE_DBG_HZ    204000000
+
+#define BUS_ACLK_HZ    200000000
+#define BUS_HCLK_HZ    100000000
+#define BUS_PCLK_HZ    100000000
+
+#define PERI_ACLK_HZ   200000000
+#define PERI_HCLK_HZ   100000000
+#define PERI_PCLK_HZ   100000000
+
+#define AUDIO_HCLK_HZ  100000000
+#define AUDIO_PCLK_HZ  100000000
+
+#define RK3308_PLL_CON(x)      ((x) * 0x4)
+#define RK3308_MODE_CON                0xa0
+
+/* RK3308 pll id */
+enum rk3308_pll_id {
+       APLL,
+       DPLL,
+       VPLL0,
+       VPLL1,
+       PLL_COUNT,
+};
+
+struct rk3308_clk_info {
+       unsigned long id;
+       char *name;
+};
+
+/* Private data for the clock driver - used by rockchip_get_cru() */
+struct rk3308_clk_priv {
+       struct rk3308_cru *cru;
+       ulong armclk_hz;
+       ulong dpll_hz;
+       ulong vpll0_hz;
+       ulong vpll1_hz;
+};
+
+struct rk3308_cru {
+       struct rk3308_pll {
+               unsigned int con0;
+               unsigned int con1;
+               unsigned int con2;
+               unsigned int con3;
+               unsigned int con4;
+               unsigned int reserved0[3];
+       } pll[4];
+       unsigned int reserved1[8];
+       unsigned int mode;
+       unsigned int misc;
+       unsigned int reserved2[2];
+       unsigned int glb_cnt_th;
+       unsigned int glb_rst_st;
+       unsigned int glb_srst_fst;
+       unsigned int glb_srst_snd;
+       unsigned int glb_rst_con;
+       unsigned int pll_lock;
+       unsigned int reserved3[6];
+       unsigned int hwffc_con0;
+       unsigned int reserved4;
+       unsigned int hwffc_th;
+       unsigned int hwffc_intst;
+       unsigned int apll_con0_s;
+       unsigned int apll_con1_s;
+       unsigned int clksel_con0_s;
+       unsigned int reserved5;
+       unsigned int clksel_con[74];
+       unsigned int reserved6[54];
+       unsigned int clkgate_con[15];
+       unsigned int reserved7[(0x380 - 0x338) / 4 - 1];
+       unsigned int ssgtbl[32];
+       unsigned int softrst_con[10];
+       unsigned int reserved8[(0x480 - 0x424) / 4 - 1];
+       unsigned int sdmmc_con[2];
+       unsigned int sdio_con[2];
+       unsigned int emmc_con[2];
+};
+
+enum {
+       /* PLLCON0*/
+       PLL_BP_SHIFT            = 15,
+       PLL_POSTDIV1_SHIFT      = 12,
+       PLL_POSTDIV1_MASK       = 7 << PLL_POSTDIV1_SHIFT,
+       PLL_FBDIV_SHIFT         = 0,
+       PLL_FBDIV_MASK          = 0xfff,
+
+       /* PLLCON1 */
+       PLL_PDSEL_SHIFT         = 15,
+       PLL_PD1_SHIFT           = 14,
+       PLL_PD_SHIFT            = 13,
+       PLL_PD_MASK             = 1 << PLL_PD_SHIFT,
+       PLL_DSMPD_SHIFT         = 12,
+       PLL_DSMPD_MASK          = 1 << PLL_DSMPD_SHIFT,
+       PLL_LOCK_STATUS_SHIFT   = 10,
+       PLL_LOCK_STATUS_MASK    = 1 << PLL_LOCK_STATUS_SHIFT,
+       PLL_POSTDIV2_SHIFT      = 6,
+       PLL_POSTDIV2_MASK       = 7 << PLL_POSTDIV2_SHIFT,
+       PLL_REFDIV_SHIFT        = 0,
+       PLL_REFDIV_MASK         = 0x3f,
+
+       /* PLLCON2 */
+       PLL_FOUT4PHASEPD_SHIFT  = 27,
+       PLL_FOUTVCOPD_SHIFT     = 26,
+       PLL_FOUTPOSTDIVPD_SHIFT = 25,
+       PLL_DACPD_SHIFT         = 24,
+       PLL_FRAC_DIV    = 0xffffff,
+
+       /* CRU_MODE */
+       PLLMUX_FROM_XIN24M      = 0,
+       PLLMUX_FROM_PLL,
+       PLLMUX_FROM_RTC32K,
+       USBPHY480M_MODE_SHIFT   = 8,
+       USBPHY480M_MODE_MASK    = 3 << USBPHY480M_MODE_SHIFT,
+       VPLL1_MODE_SHIFT                = 6,
+       VPLL1_MODE_MASK         = 3 << VPLL1_MODE_SHIFT,
+       VPLL0_MODE_SHIFT                = 4,
+       VPLL0_MODE_MASK         = 3 << VPLL0_MODE_SHIFT,
+       DPLL_MODE_SHIFT         = 2,
+       DPLL_MODE_MASK          = 3 << DPLL_MODE_SHIFT,
+       APLL_MODE_SHIFT         = 0,
+       APLL_MODE_MASK          = 3 << APLL_MODE_SHIFT,
+
+       /* CRU_CLK_SEL0_CON */
+       CORE_ACLK_DIV_SHIFT     = 12,
+       CORE_ACLK_DIV_MASK      = 0x7 << CORE_ACLK_DIV_SHIFT,
+       CORE_DBG_DIV_SHIFT      = 8,
+       CORE_DBG_DIV_MASK       = 0xf << CORE_DBG_DIV_SHIFT,
+       CORE_CLK_PLL_SEL_SHIFT  = 6,
+       CORE_CLK_PLL_SEL_MASK   = 0x3 << CORE_CLK_PLL_SEL_SHIFT,
+       CORE_CLK_PLL_SEL_APLL   = 0,
+       CORE_CLK_PLL_SEL_VPLL0,
+       CORE_CLK_PLL_SEL_VPLL1,
+       CORE_DIV_CON_SHIFT      = 0,
+       CORE_DIV_CON_MASK       = 0x0f << CORE_DIV_CON_SHIFT,
+
+       /* CRU_CLK_SEL2_CON */
+       CLK_RTC32K_SEL_SHIFT    = 8,
+       CLK_RTC32K_SEL_MASK     = 3 << CLK_RTC32K_SEL_SHIFT,
+       CLK_RTC32K_IO           = 0,
+       CLK_RTC32K_PVTM,
+       CLK_RTC32K_FRAC_DIV,
+       CLK_RTC32K_DIV,
+
+       /* CRU_CLK_SEL3_CON */
+       CLK_RTC32K_FRAC_NUMERATOR_SHIFT         = 16,
+       CLK_RTC32K_FRAC_NUMERATOR_MASK          = 0xffff << 16,
+       CLK_RTC32K_FRAC_DENOMINATOR_SHIFT       = 0,
+       CLK_RTC32K_FRAC_DENOMINATOR_MASK        = 0xffff,
+
+       /* CRU_CLK_SEL5_CON */
+       BUS_PLL_SEL_SHIFT       = 6,
+       BUS_PLL_SEL_MASK        = 0x3 << BUS_PLL_SEL_SHIFT,
+       BUS_PLL_SEL_DPLL        = 0,
+       BUS_PLL_SEL_VPLL0,
+       BUS_PLL_SEL_VPLL1,
+       BUS_ACLK_DIV_SHIFT      = 0,
+       BUS_ACLK_DIV_MASK       = 0x1f << BUS_ACLK_DIV_SHIFT,
+
+       /* CRU_CLK_SEL6_CON */
+       BUS_PCLK_DIV_SHIFT      = 8,
+       BUS_PCLK_DIV_MASK       = 0x1f << BUS_PCLK_DIV_SHIFT,
+       BUS_HCLK_DIV_SHIFT      = 0,
+       BUS_HCLK_DIV_MASK       = 0x1f << BUS_HCLK_DIV_SHIFT,
+
+       /* CRU_CLK_SEL7_CON */
+       CRYPTO_APK_SEL_SHIFT    = 14,
+       CRYPTO_APK_PLL_SEL_MASK = 3 << CRYPTO_APK_SEL_SHIFT,
+       CRYPTO_PLL_SEL_DPLL     = 0,
+       CRYPTO_PLL_SEL_VPLL0,
+       CRYPTO_PLL_SEL_VPLL1    = 0,
+       CRYPTO_APK_DIV_SHIFT    = 8,
+       CRYPTO_APK_DIV_MASK     = 0x1f << CRYPTO_APK_DIV_SHIFT,
+       CRYPTO_PLL_SEL_SHIFT    = 6,
+       CRYPTO_PLL_SEL_MASK     = 3 << CRYPTO_PLL_SEL_SHIFT,
+       CRYPTO_DIV_SHIFT        = 0,
+       CRYPTO_DIV_MASK         = 0x1f << CRYPTO_DIV_SHIFT,
+
+       /* CRU_CLK_SEL8_CON */
+       DCLK_VOP_SEL_SHIFT      = 14,
+       DCLK_VOP_SEL_MASK       = 0x3 << DCLK_VOP_SEL_SHIFT,
+       DCLK_VOP_SEL_DIVOUT     = 0,
+       DCLK_VOP_SEL_FRACOUT,
+       DCLK_VOP_SEL_24M,
+       DCLK_VOP_PLL_SEL_SHIFT  = 10,
+       DCLK_VOP_PLL_SEL_MASK   = 0x3 << DCLK_VOP_PLL_SEL_SHIFT,
+       DCLK_VOP_PLL_SEL_DPLL   = 0,
+       DCLK_VOP_PLL_SEL_VPLL0,
+       DCLK_VOP_PLL_SEL_VPLL1,
+       DCLK_VOP_DIV_SHIFT      = 0,
+       DCLK_VOP_DIV_MASK       = 0xff,
+
+       /* CRU_CLKSEL_CON10 */
+       /* CRU_CLKSEL_CON13 */
+       /* CRU_CLKSEL_CON16 */
+       /* CRU_CLKSEL_CON19 */
+       /* CRU_CLKSEL_CON22 */
+       CLK_UART_PLL_SEL_SHIFT          = 13,
+       CLK_UART_PLL_SEL_MASK           = 0x7 << CLK_UART_PLL_SEL_SHIFT,
+       CLK_UART_PLL_SEL_DPLL           = 0,
+       CLK_UART_PLL_SEL_VPLL0,
+       CLK_UART_PLL_SEL_VPLL1,
+       CLK_UART_PLL_SEL_480M,
+       CLK_UART_PLL_SEL_24M,
+       CLK_UART_DIV_CON_SHIFT          = 0,
+       CLK_UART_DIV_CON_MASK           = 0x1f << CLK_UART_DIV_CON_SHIFT,
+
+       /* CRU_CLK_SEL25_CON */
+       /* CRU_CLK_SEL26_CON */
+       /* CRU_CLK_SEL27_CON */
+       /* CRU_CLK_SEL28_CON */
+       CLK_I2C_PLL_SEL_SHIFT           = 14,
+       CLK_I2C_PLL_SEL_MASK            = 0x3 << CLK_I2C_PLL_SEL_SHIFT,
+       CLK_I2C_PLL_SEL_DPLL            = 0,
+       CLK_I2C_PLL_SEL_VPLL0,
+       CLK_I2C_PLL_SEL_24M,
+       CLK_I2C_DIV_CON_SHIFT           = 0,
+       CLK_I2C_DIV_CON_MASK            = 0x7f << CLK_I2C_DIV_CON_SHIFT,
+
+       /* CRU_CLK_SEL29_CON */
+       CLK_PWM_PLL_SEL_SHIFT           = 14,
+       CLK_PWM_PLL_SEL_MASK            = 0x3 << CLK_PWM_PLL_SEL_SHIFT,
+       CLK_PWM_PLL_SEL_DPLL            = 0,
+       CLK_PWM_PLL_SEL_VPLL0,
+       CLK_PWM_PLL_SEL_24M,
+       CLK_PWM_DIV_CON_SHIFT           = 0,
+       CLK_PWM_DIV_CON_MASK            = 0x7f << CLK_PWM_DIV_CON_SHIFT,
+
+       /* CRU_CLK_SEL30_CON */
+       /* CRU_CLK_SEL31_CON */
+       /* CRU_CLK_SEL32_CON */
+       CLK_SPI_PLL_SEL_SHIFT           = 14,
+       CLK_SPI_PLL_SEL_MASK            = 0x3 << CLK_SPI_PLL_SEL_SHIFT,
+       CLK_SPI_PLL_SEL_DPLL            = 0,
+       CLK_SPI_PLL_SEL_VPLL0,
+       CLK_SPI_PLL_SEL_24M,
+       CLK_SPI_DIV_CON_SHIFT           = 0,
+       CLK_SPI_DIV_CON_MASK            = 0x7f << CLK_SPI_DIV_CON_SHIFT,
+
+       /* CRU_CLK_SEL34_CON */
+       CLK_SARADC_DIV_CON_SHIFT        = 0,
+       CLK_SARADC_DIV_CON_MASK         = 0x7ff << CLK_SARADC_DIV_CON_SHIFT,
+
+       /* CRU_CLK_SEL36_CON */
+       PERI_PLL_SEL_SHIFT      = 6,
+       PERI_PLL_SEL_MASK       = 0x3 << PERI_PLL_SEL_SHIFT,
+       PERI_PLL_DPLL           = 0,
+       PERI_PLL_VPLL0,
+       PERI_PLL_VPLL1,
+       PERI_ACLK_DIV_SHIFT     = 0,
+       PERI_ACLK_DIV_MASK      = 0x1f << PERI_ACLK_DIV_SHIFT,
+
+       /* CRU_CLK_SEL37_CON */
+       PERI_PCLK_DIV_SHIFT     = 8,
+       PERI_PCLK_DIV_MASK      = 0x1f << PERI_PCLK_DIV_SHIFT,
+       PERI_HCLK_DIV_SHIFT     = 0,
+       PERI_HCLK_DIV_MASK      = 0x1f << PERI_HCLK_DIV_SHIFT,
+
+       /* CRU_CLKSEL41_CON */
+       EMMC_CLK_SEL_SHIFT      = 15,
+       EMMC_CLK_SEL_MASK       = 1 << EMMC_CLK_SEL_SHIFT,
+       EMMC_CLK_SEL_EMMC       = 0,
+       EMMC_CLK_SEL_EMMC_DIV50,
+       EMMC_PLL_SHIFT          = 8,
+       EMMC_PLL_MASK           = 0x3 << EMMC_PLL_SHIFT,
+       EMMC_SEL_DPLL           = 0,
+       EMMC_SEL_VPLL0,
+       EMMC_SEL_VPLL1,
+       EMMC_SEL_24M,
+       EMMC_DIV_SHIFT          = 0,
+       EMMC_DIV_MASK           = 0xff << EMMC_DIV_SHIFT,
+
+       /* CRU_CLKSEL43_CON */
+       MAC_CLK_SPEED_SEL_SHIFT = 15,
+       MAC_CLK_SPEED_SEL_MASK = 1 << MAC_CLK_SPEED_SEL_SHIFT,
+       MAC_CLK_SPEED_SEL_10M = 0,
+       MAC_CLK_SPEED_SEL_100M,
+       MAC_CLK_SOURCE_SEL_SHIFT = 14,
+       MAC_CLK_SOURCE_SEL_MASK = 1 << MAC_CLK_SOURCE_SEL_SHIFT,
+       MAC_CLK_SOURCE_SEL_INTERNAL     = 0,
+       MAC_CLK_SOURCE_SEL_EXTERNAL,
+       MAC_PLL_SHIFT           = 6,
+       MAC_PLL_MASK            = 0x3 << MAC_PLL_SHIFT,
+       MAC_SEL_DPLL            = 0,
+       MAC_SEL_VPLL0,
+       MAC_SEL_VPLL1,
+       MAC_DIV_SHIFT           = 0,
+       MAC_DIV_MASK            = 0x1f << MAC_DIV_SHIFT,
+
+       /* CRU_CLK_SEL45_CON */
+       AUDIO_PCLK_DIV_SHIFT    = 8,
+       AUDIO_PCLK_DIV_MASK     = 0x1f << AUDIO_PCLK_DIV_SHIFT,
+       AUDIO_PLL_SEL_SHIFT     = 6,
+       AUDIO_PLL_SEL_MASK      = 0x3 << AUDIO_PLL_SEL_SHIFT,
+       AUDIO_PLL_VPLL0         = 0,
+       AUDIO_PLL_VPLL1,
+       AUDIO_PLL_24M,
+       AUDIO_HCLK_DIV_SHIFT    = 0,
+       AUDIO_HCLK_DIV_MASK     = 0x1f << AUDIO_HCLK_DIV_SHIFT,
+};
+
+check_member(rk3308_cru, emmc_con[1], 0x494);
+
+#endif
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3308.h b/arch/arm/include/asm/arch-rockchip/grf_rk3308.h
new file mode 100644 (file)
index 0000000..a995bb9
--- /dev/null
@@ -0,0 +1,195 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ *Copyright 2019 Rockchip Electronics Co., Ltd.
+ */
+#ifndef _ASM_ARCH_GRF_rk3308_H
+#define _ASM_ARCH_GRF_rk3308_H
+
+struct rk3308_grf {
+       unsigned int gpio0a_iomux;
+       unsigned int reserved0;
+       unsigned int gpio0b_iomux;
+       unsigned int reserved1;
+       unsigned int gpio0c_iomux;
+       unsigned int reserved2[3];
+       unsigned int gpio1a_iomux;
+       unsigned int reserved3;
+       unsigned int gpio1bl_iomux;
+       unsigned int gpio1bh_iomux;
+       unsigned int gpio1cl_iomux;
+       unsigned int gpio1ch_iomux;
+       unsigned int gpio1d_iomux;
+       unsigned int reserved4;
+       unsigned int gpio2a_iomux;
+       unsigned int reserved5;
+       unsigned int gpio2b_iomux;
+       unsigned int reserved6;
+       unsigned int gpio2c_iomux;
+       unsigned int reserved7[3];
+       unsigned int gpio3a_iomux;
+       unsigned int reserved8;
+       unsigned int gpio3b_iomux;
+       unsigned int reserved9[5];
+       unsigned int gpio4a_iomux;
+       unsigned int reserved33;
+       unsigned int gpio4b_iomux;
+       unsigned int reserved10;
+       unsigned int gpio4c_iomux;
+       unsigned int reserved11;
+       unsigned int gpio4d_iomux;
+       unsigned int reserved34;
+       unsigned int gpio0a_p;
+       unsigned int gpio0b_p;
+       unsigned int gpio0c_p;
+       unsigned int reserved12;
+       unsigned int gpio1a_p;
+       unsigned int gpio1b_p;
+       unsigned int gpio1c_p;
+       unsigned int gpio1d_p;
+       unsigned int gpio2a_p;
+       unsigned int gpio2b_p;
+       unsigned int gpio2c_p;
+       unsigned int reserved13;
+       unsigned int gpio3a_p;
+       unsigned int gpio3b_p;
+       unsigned int reserved14[2];
+       unsigned int gpio4a_p;
+       unsigned int gpio4b_p;
+       unsigned int gpio4c_p;
+       unsigned int gpio4d_p;
+       unsigned int reserved15[(0x100 - 0xec) / 4 - 1];
+       unsigned int gpio0a_e;
+       unsigned int gpio0b_e;
+       unsigned int gpio0c_e;
+       unsigned int reserved16;
+       unsigned int gpio1a_e;
+       unsigned int gpio1b_e;
+       unsigned int gpio1c_e;
+       unsigned int gpio1d_e;
+       unsigned int gpio2a_e;
+       unsigned int gpio2b_e;
+       unsigned int gpio2c_e;
+       unsigned int reserved17;
+       unsigned int gpio3a_e;
+       unsigned int gpio3b_e;
+       unsigned int reserved18[2];
+       unsigned int gpio4a_e;
+       unsigned int gpio4b_e;
+       unsigned int gpio4c_e;
+       unsigned int gpio4d_e;
+       unsigned int gpio0a_sr;
+       unsigned int gpio0b_sr;
+       unsigned int gpio0c_sr;
+       unsigned int reserved19;
+       unsigned int gpio1a_sr;
+       unsigned int gpio1b_sr;
+       unsigned int gpio1c_sr;
+       unsigned int gpio1d_sr;
+       unsigned int gpio2a_sr;
+       unsigned int gpio2b_sr;
+       unsigned int gpio2c_sr;
+       unsigned int reserved20;
+       unsigned int gpio3a_sr;
+       unsigned int gpio3b_sr;
+       unsigned int reserved21[2];
+       unsigned int gpio4a_sr;
+       unsigned int gpio4b_sr;
+       unsigned int gpio4c_sr;
+       unsigned int gpio4d_sr;
+       unsigned int gpio0a_smt;
+       unsigned int gpio0b_smt;
+       unsigned int gpio0c_smt;
+       unsigned int reserved22;
+       unsigned int gpio1a_smt;
+       unsigned int gpio1b_smt;
+       unsigned int gpio1c_smt;
+       unsigned int gpio1d_smt;
+       unsigned int gpio2a_smt;
+       unsigned int gpio2b_smt;
+       unsigned int gpio2c_smt;
+       unsigned int reserved23;
+       unsigned int gpio3a_smt;
+       unsigned int gpio3b_smt;
+       unsigned int reserved35[2];
+       unsigned int gpio4a_smt;
+       unsigned int gpio4b_smt;
+       unsigned int gpio4c_smt;
+       unsigned int gpio4d_smt;
+       unsigned int reserved24[(0x300 - 0x1EC) / 4 - 1];
+       unsigned int soc_con0;
+       unsigned int soc_con1;
+       unsigned int soc_con2;
+       unsigned int soc_con3;
+       unsigned int soc_con4;
+       unsigned int soc_con5;
+       unsigned int soc_con6;
+       unsigned int soc_con7;
+       unsigned int soc_con8;
+       unsigned int soc_con9;
+       unsigned int soc_con10;
+       unsigned int reserved25[(0x380 - 0x328) / 4 - 1];
+       unsigned int soc_status0;
+       unsigned int reserved26[(0x400 - 0x380) / 4 - 1];
+       unsigned int cpu_con0;
+       unsigned int cpu_con1;
+       unsigned int cpu_con2;
+       unsigned int reserved27[(0x420 - 0x408) / 4 - 1];
+       unsigned int cpu_status0;
+       unsigned int cpu_status1;
+       unsigned int reserved28[(0x440 - 0x424) / 4 - 1];
+       unsigned int pvtm_con0;
+       unsigned int pvtm_con1;
+       unsigned int pvtm_status0;
+       unsigned int pvtm_status1;
+       unsigned int reserved29[(0x460 - 0x44C) / 4 - 1];
+       unsigned int tsadc_tbl;
+       unsigned int tsadc_tbh;
+       unsigned int reserved30[(0x480 - 0x464) / 4 - 1];
+       unsigned int host0_con0;
+       unsigned int host0_con1;
+       unsigned int otg_con0;
+       unsigned int host0_status0;
+       unsigned int reserved31[(0x4a0 - 0x48C) / 4 - 1];
+       unsigned int mac_con0;
+       unsigned int upctrl_con0;
+       unsigned int upctrl_status0;
+       unsigned int reserved32[(0x500 - 0x4A8) / 4 - 1];
+       unsigned int os_reg0;
+       unsigned int os_reg1;
+       unsigned int os_reg2;
+       unsigned int os_reg3;
+       unsigned int os_reg4;
+       unsigned int os_reg5;
+       unsigned int os_reg6;
+       unsigned int os_reg7;
+       unsigned int os_reg8;
+       unsigned int os_reg9;
+       unsigned int os_reg10;
+       unsigned int os_reg11;
+       unsigned int reserved38[(0x600 - 0x52c) / 4 - 1];
+       unsigned int soc_con12;
+       unsigned int reserved39;
+       unsigned int soc_con13;
+       unsigned int soc_con14;
+       unsigned int soc_con15;
+       unsigned int reserved40[(0x800 - 0x610) / 4 - 1];
+       unsigned int chip_id;
+};
+check_member(rk3308_grf, gpio0a_p, 0xa0);
+
+struct rk3308_sgrf {
+       unsigned int soc_con0;
+       unsigned int soc_con1;
+       unsigned int con_tzma_r0size;
+       unsigned int con_secure0;
+       unsigned int reserved0;
+       unsigned int clk_timer_en;
+       unsigned int clkgat_con;
+       unsigned int fastboot_addr;
+       unsigned int fastboot_en;
+       unsigned int reserved1[(0x30 - 0x24) / 4];
+       unsigned int srst_con;
+};
+check_member(rk3308_sgrf, fastboot_en, 0x20);
+
+#endif
index ccda53380c6fb49a6bd48d7cfee6632fa02404ec..201bf661f9bb107cbc7a41fe0d7c4eddd9082fbb 100644 (file)
@@ -7,7 +7,7 @@
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
-#include <asm/arch/cru_rk3308.h>
+#include <asm/arch-rockchip/cru_rk3308.h>
 #include <linux/err.h>
 
 int rockchip_get_clk(struct udevice **devp)
index b3ffabc5449a506fbba332f851466af5c5a2810a..a0915c72bfa0c51212c3bf19a61fe039741853ac 100644 (file)
@@ -5,8 +5,8 @@
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
-#include <asm/arch/grf_rk3308.h>
 #include <asm/arch-rockchip/bootrom.h>
+#include <asm/arch-rockchip/grf_rk3308.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/gpio.h>
 #include <debug_uart.h>
index 99a52a77116a091ba27a892a4c62ff07fd5e2e24..af00250e118d427f91e8226c24b5fe5fb623ce11 100644 (file)
@@ -5,7 +5,7 @@
 
 #include <common.h>
 #include <adc.h>
-#include <asm/arch/grf_rk3308.h>
+#include <asm/arch-rockchip/grf_rk3308.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <linux/bitops.h>
 
index c46b58e31626e34569423fb3afe454d908636605..861648321d408431cd05c4f8d76108735f6b0fe5 100644 (file)
@@ -12,8 +12,8 @@
 #include <malloc.h>
 #include <syscon.h>
 #include <asm/global_data.h>
-#include <asm/arch/cru_rk3308.h>
 #include <asm/arch-rockchip/clock.h>
+#include <asm/arch-rockchip/cru_rk3308.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
index 33fc36da507706ee2a7abe7ee2129e82ce651b18..51f835adabc38784f1217f18d232956977e8a1aa 100644 (file)
@@ -19,7 +19,7 @@
 #include <asm/arch-rockchip/grf_px30.h>
 #include <asm/arch-rockchip/grf_rk322x.h>
 #include <asm/arch-rockchip/grf_rk3288.h>
-#include <asm/arch-rk3308/grf_rk3308.h>
+#include <asm/arch-rockchip/grf_rk3308.h>
 #include <asm/arch-rockchip/grf_rk3328.h>
 #include <asm/arch-rockchip/grf_rk3368.h>
 #include <asm/arch-rockchip/grf_rk3399.h>
index 10828e80822a07d2601cb72203f75564d86b471f..264366291cf8b1ef1a237b888ce32013840b7c7c 100644 (file)
@@ -7,8 +7,8 @@
 #include <dm.h>
 #include <ram.h>
 #include <syscon.h>
-#include <asm/arch/grf_rk3308.h>
 #include <asm/arch-rockchip/clock.h>
+#include <asm/arch-rockchip/grf_rk3308.h>
 #include <asm/arch-rockchip/sdram.h>
 
 struct dram_info {