From 21b08522c27f2e70a081f4634dc0404c7eeb94f9 Mon Sep 17 00:00:00 2001 From: philipchen Date: Thu, 27 Apr 2017 18:25:11 -0700 Subject: google/gru: skip usbphy1 setup for Scarlet Board Scarlet doesn't use usbphy1. BUG=b:37685249 TEST=boot Scarlet, check the firmware log, and confirm no errors about USB1 Change-Id: I66e0d8a235cc9057964f7abca32bc692d41e88fd Signed-off-by: Philip Chen Reviewed-on: https://review.coreboot.org/19489 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- src/soc/rockchip/rk3399/include/soc/grf.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/soc/rockchip/rk3399/include') diff --git a/src/soc/rockchip/rk3399/include/soc/grf.h b/src/soc/rockchip/rk3399/include/soc/grf.h index c1fd690e78..8e120071a0 100644 --- a/src/soc/rockchip/rk3399/include/soc/grf.h +++ b/src/soc/rockchip/rk3399/include/soc/grf.h @@ -71,10 +71,8 @@ struct rk3399_grf_regs { u32 reserved10[0xc9]; u32 hsicphy_con0; u32 reserved11[3]; - u32 usbphy0_ctrl[26]; - u32 reserved12[6]; - u32 usbphy1_ctrl[26]; - u32 reserved13[0x72f]; + u32 usbphy_ctrl[2][26 + 6]; /* 26 PHY regs, 6 reserved padding regs */ + u32 reserved13[0x729]; u32 soc_con9; u32 reserved14[0x0a]; u32 soc_con20; -- cgit v1.2.3