From cf5d29d51fd743da5def2776e80623f1566c7aab Mon Sep 17 00:00:00 2001 From: huang lin Date: Tue, 9 Jun 2015 11:14:24 +0800 Subject: [PATCH] rockchip: rk3288: add HDMI related iomux configuration BUG=none BRANCH=none TEST=Boot from mickey board (note: for cherry-pick, resolved a merge conflict by omitting a #define from the "rk3288: Add software I2C support" patch) Signed-off-by: huang lin Reviewed-on: https://chromium-review.googlesource.com/276290 Reviewed-by: David Hendricks Change-Id: I438527ee0870044f48b23a6842986e7cf166e191 Reviewed-on: https://chromium-review.googlesource.com/284088 Tested-by: David Hendricks Commit-Queue: David Hendricks --- src/soc/rockchip/rk3288/include/soc/grf.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/soc/rockchip/rk3288/include/soc/grf.h b/src/soc/rockchip/rk3288/include/soc/grf.h index 9126aed834..971dcfa4e8 100644 --- a/src/soc/rockchip/rk3288/include/soc/grf.h +++ b/src/soc/rockchip/rk3288/include/soc/grf.h @@ -221,4 +221,7 @@ static struct rk3288_sgrf_regs * const rk3288_sgrf = (void *)GRF_SECURE_BASE; #define IOMUX_EMMCCMD RK_CLRSETBITS(0x3f, 2 << 4 | 2 << 2 | 2 << 0) #define IOMUX_PWM1 RK_SETBITS(1 << 2) #define IOMUX_EDP_HOTPLUG RK_CLRSETBITS(0x3 << 6, 0x2 << 6) -#endif +#define IOMUX_HDMI_EDP_I2C_SDA RK_CLRSETBITS(0x3 << 12, 2 << 12) +#define IOMUX_HDMI_EDP_I2C_SCL RK_CLRSETBITS(0x3 << 0, 2 << 0) + +#endif /* __SOC_ROCKCHIP_RK3288_GRF_H__ */