From 6df3b64c77a868ab8526b980561ed2be3fe392b6 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Mon, 26 Nov 2018 22:53:49 +0100 Subject: src: Remove duplicated round up function This removes CEIL_DIV and div_round_up() altogether and replace it by DIV_ROUND_UP defined in commonlib/helpers.h. Change-Id: I9aabc3fbe7834834c92d6ba59ff0005986622a34 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/29847 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi Reviewed-by: Marshall Dawson --- src/soc/rockchip/common/i2c.c | 2 +- src/soc/rockchip/common/rk808.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/soc/rockchip/common') diff --git a/src/soc/rockchip/common/i2c.c b/src/soc/rockchip/common/i2c.c index f99b3b57ce..8629a70580 100644 --- a/src/soc/rockchip/common/i2c.c +++ b/src/soc/rockchip/common/i2c.c @@ -280,7 +280,7 @@ void i2c_init(unsigned int bus, unsigned int hz) /* SCL Divisor = 8*(CLKDIVL + 1 + CLKDIVH + 1) SCL = PCLK / SCLK Divisor */ - clk_div = div_round_up(i2c_src_clk, hz * 8); + clk_div = DIV_ROUND_UP(i2c_src_clk, hz * 8); divh = clk_div * 3 / 7 - 1; divl = clk_div - divh - 2; i2c_clk = i2c_src_clk / (8 * (divl + 1 + divh + 1)); diff --git a/src/soc/rockchip/common/rk808.c b/src/soc/rockchip/common/rk808.c index 9b4708cfab..58d910c285 100644 --- a/src/soc/rockchip/common/rk808.c +++ b/src/soc/rockchip/common/rk808.c @@ -92,13 +92,13 @@ void rk808_configure_ldo(int ldo, int millivolts) case 4: case 5: case 8: - vsel = div_round_up(millivolts, 100) - 18; + vsel = DIV_ROUND_UP(millivolts, 100) - 18; assert(vsel <= 0x10); break; case 3: case 6: case 7: - vsel = div_round_up(millivolts, 100) - 8; + vsel = DIV_ROUND_UP(millivolts, 100) - 8; assert(vsel <= 0x11); break; default: @@ -118,12 +118,12 @@ void rk808_configure_buck(int buck, int millivolts) case 1: case 2: /* 25mV steps. base = 29 * 25mV = 725 */ - vsel = (div_round_up(millivolts, 25) - 29) * 2 + 1; + vsel = (DIV_ROUND_UP(millivolts, 25) - 29) * 2 + 1; assert(vsel <= 0x3f); buck_reg = BUCK1SEL + 4 * (buck - 1); break; case 4: - vsel = div_round_up(millivolts, 100) - 18; + vsel = DIV_ROUND_UP(millivolts, 100) - 18; assert(vsel <= 0xf); buck_reg = BUCK4SEL; break; -- cgit v1.2.3