5 files changed, 11 insertions, 29 deletions
diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts
index bff00c32838..be0c6d98bd3 100644
--- a/arch/arm/dts/rk3399-evb.dts
+++ b/arch/arm/dts/rk3399-evb.dts
@@ -276,19 +276,3 @@
 	rx_delay = <0x10>;
 	status = "okay";
 };
-
-&gmac {
-        phy-supply = <&vcc_phy>;
-	phy-mode = "rgmii";
-	clock_in_out = "input";
-	snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
-	snps,reset-active-low;
-	snps,reset-delays-us = <0 10000 50000>;
-	assigned-clocks = <&cru SCLK_RMII_SRC>;
-	assigned-clock-parents = <&clkin_gmac>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&rgmii_pins>;
-	tx_delay = <0x10>;
-	rx_delay = <0x10>;
-	status = "okay";
-};
diff --git a/arch/arm/dts/rk3399-firefly.dts b/arch/arm/dts/rk3399-firefly.dts
index 3d3f5079345..31e3ba8a474 100644
--- a/arch/arm/dts/rk3399-firefly.dts
+++ b/arch/arm/dts/rk3399-firefly.dts
@@ -211,8 +211,8 @@
 	snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
 	snps,reset-active-low;
 	snps,reset-delays-us = <0 10000 50000>;
-	tx_delay = <0x28>;
-	rx_delay = <0x11>;
+	tx_delay = <0x33>;
+	rx_delay = <0x45>;
 	status = "okay";
 };
 
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk322x.h b/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
index 2a2f804f675..a7999ca5af4 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
@@ -162,20 +162,17 @@ enum {
 	/* CRU_CLKSEL11_CON */
 	EMMC_PLL_SHIFT		= 12,
 	EMMC_PLL_MASK		= 3 << EMMC_PLL_SHIFT,
-	EMMC_SEL_APLL		= 0,
-	EMMC_SEL_DPLL,
+	EMMC_SEL_CPLL		= 0,
 	EMMC_SEL_GPLL,
 	EMMC_SEL_24M,
 	SDIO_PLL_SHIFT		= 10,
 	SDIO_PLL_MASK		= 3 << SDIO_PLL_SHIFT,
-	SDIO_SEL_APLL		= 0,
-	SDIO_SEL_DPLL,
+	SDIO_SEL_CPLL		= 0,
 	SDIO_SEL_GPLL,
 	SDIO_SEL_24M,
 	MMC0_PLL_SHIFT		= 8,
 	MMC0_PLL_MASK		= 3 << MMC0_PLL_SHIFT,
-	MMC0_SEL_APLL		= 0,
-	MMC0_SEL_DPLL,
+	MMC0_SEL_CPLL		= 0,
 	MMC0_SEL_GPLL,
 	MMC0_SEL_24M,
 	MMC0_DIV_SHIFT		= 0,
diff --git a/arch/arm/mach-rockchip/rk322x-board.c b/arch/arm/mach-rockchip/rk322x-board.c
index 1e79c193096..c0ac2e9b56f 100644
--- a/arch/arm/mach-rockchip/rk322x-board.c
+++ b/arch/arm/mach-rockchip/rk322x-board.c
@@ -72,11 +72,13 @@ int board_init(void)
 
 int dram_init_banksize(void)
 {
-	/* Reserve 0x200000 for OPTEE */
-	gd->bd->bi_dram[0].start = 0x60000000;
+	gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
 	gd->bd->bi_dram[0].size = 0x8400000;
-	gd->bd->bi_dram[1].start = 0x6a400000;
-	gd->bd->bi_dram[1].size = gd->ram_size - gd->bd->bi_dram[1].start;
+	/* Reserve 0x200000 for OPTEE */
+	gd->bd->bi_dram[1].start = CONFIG_SYS_SDRAM_BASE
+				+ gd->bd->bi_dram[0].size + 0x200000;
+	gd->bd->bi_dram[1].size = gd->bd->bi_dram[0].start
+				+ gd->ram_size - gd->bd->bi_dram[1].start;
 
 	return 0;
 }
diff --git a/arch/arm/mach-rockchip/rk3399-board-spl.c b/arch/arm/mach-rockchip/rk3399-board-spl.c
index a13b717bbd0..d6bf74f7ad7 100644
--- a/arch/arm/mach-rockchip/rk3399-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3399-board-spl.c
@@ -7,7 +7,6 @@
 #include <common.h>
 #include <debug_uart.h>
 #include <dm.h>
-#include <fdtdec.h>
 #include <ram.h>
 #include <spl.h>
 #include <asm/gpio.h>