From b1959bd0b0c9c942a9f46722c227a36298208101 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Tue, 8 May 2018 20:43:01 +1000 Subject: [PATCH 1/2] rockchip: set SYS_NS16550_MEM32 for all SoCs Add back part of patch send out as 'rockchip: enable SYS_NS16550 for all SoCs by default' that seems to have gotten lost when it got merged to set SYS_NS16550_MEM32. Allows serial output to work on tinker-rk3288 again after c3c0331db1fb7b1f4ff41e144fc04353b37c785c. Signed-off-by: Kever Yang Signed-off-by: Jonathan Gray Cc: Philipp Tomsich Reviewed-by: Philipp Tomsich Acked-by: Philipp Tomsich Tested-by: Heinrich Schuchardt --- include/configs/rockchip-common.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index dee82ca99d..68e1105a4b 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -7,6 +7,8 @@ #define _ROCKCHIP_COMMON_H_ #include +#define CONFIG_SYS_NS16550_MEM32 + #ifndef CONFIG_SPL_BUILD /* First try to boot from SD (index 0), then eMMC (index 1) */ From ed1030e1523541801ae1e36bc34ee6872d474184 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Tue, 8 May 2018 19:49:05 +1000 Subject: [PATCH 2/2] rockchip: clk: rk3288: handle clk_enable requests for GMAC Since b0ba1e7e9d9b9441a18048ec67a3b3100c096975 (rockchip: clk: rk3288: add clk_enable function and support USB HOST0/HSIC) Ethernet no longer probes on RK3288. Add no-ops for GMAC clocks observed to be requested which match the clk_enable cases in RK3368 and RK3399. Signed-off-by: Jonathan Gray Cc: Wadim Egorov Cc: Philipp Tomsich Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- drivers/clk/rockchip/clk_rk3288.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c index 9375681187..4a6e5c7113 100644 --- a/drivers/clk/rockchip/clk_rk3288.c +++ b/drivers/clk/rockchip/clk_rk3288.c @@ -898,6 +898,16 @@ static int rk3288_clk_enable(struct clk *clk) case HCLK_USBHOST0: case HCLK_HSIC: return 0; + + case SCLK_MAC: + case SCLK_MAC_RX: + case SCLK_MAC_TX: + case SCLK_MACREF: + case SCLK_MACREF_OUT: + case ACLK_GMAC: + case PCLK_GMAC: + /* Required to successfully probe the Designware GMAC driver */ + return 0; } debug("%s: unsupported clk %ld\n", __func__, clk->id);