summaryrefslogtreecommitdiff
path: root/src/soc/rockchip
diff options
context:
space:
mode:
authorMartin Roth <martin@coreboot.org>2019-10-23 21:45:23 -0600
committerMartin Roth <martinroth@google.com>2019-10-27 21:08:58 +0000
commit57e89090818537d6dd9bd478a3aa6b5ec2ea8704 (patch)
treea218f5dba2bbd93ccc5fc3dc754499244e5378b7 /src/soc/rockchip
parentad0f4853619b1c239b8ace7554958c6b4932c04f (diff)
src/soc: change "unsigned" to "unsigned int"
Signed-off-by: Martin Roth <martin@coreboot.org> Change-Id: I9c1228d3f9e7a12fe30c48e3b1f143520fed875c Reviewed-on: https://review.coreboot.org/c/coreboot/+/36332 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Diffstat (limited to 'src/soc/rockchip')
-rw-r--r--src/soc/rockchip/common/i2c.c2
-rw-r--r--src/soc/rockchip/common/include/soc/i2c.h4
-rw-r--r--src/soc/rockchip/rk3288/clock.c2
-rw-r--r--src/soc/rockchip/rk3288/include/soc/clock.h2
-rw-r--r--src/soc/rockchip/rk3288/software_i2c.c12
-rw-r--r--src/soc/rockchip/rk3399/include/soc/clock.h2
6 files changed, 12 insertions, 12 deletions
diff --git a/src/soc/rockchip/common/i2c.c b/src/soc/rockchip/common/i2c.c
index cd0ed9b94f..953928ed92 100644
--- a/src/soc/rockchip/common/i2c.c
+++ b/src/soc/rockchip/common/i2c.c
@@ -231,7 +231,7 @@ static int i2c_do_xfer(void *reg_addr, struct i2c_msg segment)
return i2c_send_stop(reg_addr) || res;
}
-int platform_i2c_transfer(unsigned bus, struct i2c_msg *segments,
+int platform_i2c_transfer(unsigned int bus, struct i2c_msg *segments,
int seg_count)
{
int i;
diff --git a/src/soc/rockchip/common/include/soc/i2c.h b/src/soc/rockchip/common/include/soc/i2c.h
index 4cdcbe04d1..56ad73256e 100644
--- a/src/soc/rockchip/common/include/soc/i2c.h
+++ b/src/soc/rockchip/common/include/soc/i2c.h
@@ -17,7 +17,7 @@
#define __COREBOOT_SRC_SOC_ROCKCHIP_COMMON_INCLUDE_SOC_I2C_H
void i2c_init(unsigned int bus, unsigned int hz);
-void software_i2c_attach(unsigned bus);
-void software_i2c_detach(unsigned bus);
+void software_i2c_attach(unsigned int bus);
+void software_i2c_detach(unsigned int bus);
#endif /* ! __COREBOOT_SRC_SOC_ROCKCHIP_COMMON_INCLUDE_SOC_I2C_H */
diff --git a/src/soc/rockchip/rk3288/clock.c b/src/soc/rockchip/rk3288/clock.c
index cee1ee2b56..f025d30d4e 100644
--- a/src/soc/rockchip/rk3288/clock.c
+++ b/src/soc/rockchip/rk3288/clock.c
@@ -669,7 +669,7 @@ int rkclk_was_watchdog_reset(void)
return read32(&cru_ptr->cru_glb_rst_st) & 0x30;
}
-unsigned rkclk_i2c_clock_for_bus(unsigned bus)
+unsigned int rkclk_i2c_clock_for_bus(unsigned int bus)
{
/*i2c0,i2c2 src clk from pd_bus_pclk
other i2c src clk from peri_pclk
diff --git a/src/soc/rockchip/rk3288/include/soc/clock.h b/src/soc/rockchip/rk3288/include/soc/clock.h
index b3c6302b3a..40152d7e91 100644
--- a/src/soc/rockchip/rk3288/include/soc/clock.h
+++ b/src/soc/rockchip/rk3288/include/soc/clock.h
@@ -56,6 +56,6 @@ int rkclk_configure_vop_dclk(u32 vop_id, u32 dclk_hz);
void rkclk_configure_edp(void);
void rkclk_configure_hdmi(void);
int rkclk_was_watchdog_reset(void);
-unsigned rkclk_i2c_clock_for_bus(unsigned bus);
+unsigned int rkclk_i2c_clock_for_bus(unsigned int bus);
#endif /* __SOC_ROCKCHIP_RK3288_CLOCK_H__ */
diff --git a/src/soc/rockchip/rk3288/software_i2c.c b/src/soc/rockchip/rk3288/software_i2c.c
index ae1249ec52..8c439842c1 100644
--- a/src/soc/rockchip/rk3288/software_i2c.c
+++ b/src/soc/rockchip/rk3288/software_i2c.c
@@ -33,17 +33,17 @@ static struct {
[5]{.scl = GPIO(7, C, 4), .sda = GPIO(7, C, 3)},
};
-static int get_scl(unsigned bus)
+static int get_scl(unsigned int bus)
{
return gpio_get(pins[bus].scl);
}
-static int get_sda(unsigned bus)
+static int get_sda(unsigned int bus)
{
return gpio_get(pins[bus].sda);
}
-static void set_scl(unsigned bus, int high)
+static void set_scl(unsigned int bus, int high)
{
if (high)
gpio_input_pullup(pins[bus].scl);
@@ -51,7 +51,7 @@ static void set_scl(unsigned bus, int high)
gpio_output(pins[bus].scl, 0);
}
-static void set_sda(unsigned bus, int high)
+static void set_sda(unsigned int bus, int high)
{
if (high)
gpio_input_pullup(pins[bus].sda);
@@ -66,7 +66,7 @@ static struct software_i2c_ops rk_ops = {
.set_sda = set_sda,
};
-void software_i2c_attach(unsigned bus)
+void software_i2c_attach(unsigned int bus)
{
software_i2c[bus] = &rk_ops;
@@ -101,7 +101,7 @@ void software_i2c_attach(unsigned bus)
set_sda(bus, 1);
}
-void software_i2c_detach(unsigned bus)
+void software_i2c_detach(unsigned int bus)
{
software_i2c[bus] = NULL;
diff --git a/src/soc/rockchip/rk3399/include/soc/clock.h b/src/soc/rockchip/rk3399/include/soc/clock.h
index 37a4c09012..e2aeaeaa7a 100644
--- a/src/soc/rockchip/rk3399/include/soc/clock.h
+++ b/src/soc/rockchip/rk3399/include/soc/clock.h
@@ -118,7 +118,7 @@ void rkclk_configure_tsadc(unsigned int hz);
void rkclk_configure_vop_aclk(u32 vop_id, u32 aclk_hz);
void rkclk_ddr_reset(u32 ch, u32 ctl, u32 phy);
int rkclk_was_watchdog_reset(void);
-uint32_t rkclk_i2c_clock_for_bus(unsigned bus);
+uint32_t rkclk_i2c_clock_for_bus(unsigned int bus);
void rkclk_configure_edp(unsigned int hz);
void rkclk_configure_mipi(void);