From 57e89090818537d6dd9bd478a3aa6b5ec2ea8704 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Wed, 23 Oct 2019 21:45:23 -0600 Subject: src/soc: change "unsigned" to "unsigned int" Signed-off-by: Martin Roth Change-Id: I9c1228d3f9e7a12fe30c48e3b1f143520fed875c Reviewed-on: https://review.coreboot.org/c/coreboot/+/36332 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Rudolph --- src/soc/qualcomm/ipq806x/gpio.c | 16 ++++++++-------- src/soc/qualcomm/ipq806x/gsbi.c | 12 ++++++------ src/soc/qualcomm/ipq806x/i2c.c | 6 +++--- src/soc/qualcomm/ipq806x/include/soc/cdp.h | 18 +++++++++--------- src/soc/qualcomm/ipq806x/include/soc/clock.h | 2 +- src/soc/qualcomm/ipq806x/include/soc/qup.h | 10 +++++----- src/soc/qualcomm/ipq806x/lcc.c | 16 ++++++++-------- src/soc/qualcomm/ipq806x/qup.c | 28 ++++++++++++++-------------- src/soc/qualcomm/ipq806x/spi.c | 8 ++++---- src/soc/qualcomm/ipq806x/timer.c | 2 +- src/soc/qualcomm/ipq806x/uart.c | 4 ++-- 11 files changed, 61 insertions(+), 61 deletions(-) (limited to 'src/soc/qualcomm/ipq806x') diff --git a/src/soc/qualcomm/ipq806x/gpio.c b/src/soc/qualcomm/ipq806x/gpio.c index 2b27e6d2e0..019635110a 100644 --- a/src/soc/qualcomm/ipq806x/gpio.c +++ b/src/soc/qualcomm/ipq806x/gpio.c @@ -59,11 +59,11 @@ Return : None *******************************************************/ -void gpio_tlmm_config_set(gpio_t gpio, unsigned func, - unsigned pull, unsigned drvstr, - unsigned enable) +void gpio_tlmm_config_set(gpio_t gpio, unsigned int func, + unsigned int pull, unsigned int drvstr, + unsigned int enable) { - unsigned val = 0; + unsigned int val = 0; if (gpio_not_valid(gpio)) return; @@ -89,11 +89,11 @@ Return : None *******************************************************/ -void gpio_tlmm_config_get(gpio_t gpio, unsigned *func, - unsigned *pull, unsigned *drvstr, - unsigned *enable) +void gpio_tlmm_config_get(gpio_t gpio, unsigned int *func, + unsigned int *pull, unsigned int *drvstr, + unsigned int *enable) { - unsigned val; + unsigned int val; void *addr = GPIO_CONFIG_ADDR(gpio); if (gpio_not_valid(gpio)) diff --git a/src/soc/qualcomm/ipq806x/gsbi.c b/src/soc/qualcomm/ipq806x/gsbi.c index 4e3c780925..18b1876933 100644 --- a/src/soc/qualcomm/ipq806x/gsbi.c +++ b/src/soc/qualcomm/ipq806x/gsbi.c @@ -57,12 +57,12 @@ static inline void *gsbi_ctl_reg_addr(gsbi_id_t gsbi_id) gsbi_return_t gsbi_init(gsbi_id_t gsbi_id, gsbi_protocol_t protocol) { - unsigned reg_val; - unsigned m = 1; - unsigned n = 4; - unsigned pre_div = 4; - unsigned src = 3; - unsigned mnctr_mode = 2; + unsigned int reg_val; + unsigned int m = 1; + unsigned int n = 4; + unsigned int pre_div = 4; + unsigned int src = 3; + unsigned int mnctr_mode = 2; void *gsbi_ctl = gsbi_ctl_reg_addr(gsbi_id); if (!gsbi_ctl) diff --git a/src/soc/qualcomm/ipq806x/i2c.c b/src/soc/qualcomm/ipq806x/i2c.c index c81373fade..e24e76d51d 100644 --- a/src/soc/qualcomm/ipq806x/i2c.c +++ b/src/soc/qualcomm/ipq806x/i2c.c @@ -96,9 +96,9 @@ static int i2c_write(uint32_t gsbi_id, uint8_t slave, return 0; } -static int i2c_init(unsigned bus) +static int i2c_init(unsigned int bus) { - unsigned gsbi_id = bus; + unsigned int gsbi_id = bus; qup_config_t *qup_config; switch (gsbi_id) { @@ -139,7 +139,7 @@ static int i2c_init(unsigned bus) return 0; } -int platform_i2c_transfer(unsigned bus, struct i2c_msg *segments, +int platform_i2c_transfer(unsigned int bus, struct i2c_msg *segments, int seg_count) { struct i2c_msg *seg = segments; diff --git a/src/soc/qualcomm/ipq806x/include/soc/cdp.h b/src/soc/qualcomm/ipq806x/include/soc/cdp.h index 89636ace18..35659a7fcc 100644 --- a/src/soc/qualcomm/ipq806x/include/soc/cdp.h +++ b/src/soc/qualcomm/ipq806x/include/soc/cdp.h @@ -18,7 +18,7 @@ #include -unsigned smem_get_board_machtype(void); +unsigned int smem_get_board_machtype(void); typedef enum { PHY_INTERFACE_MODE_MII, @@ -101,17 +101,17 @@ typedef struct { } spinorflash_params_t; typedef struct { - unsigned count; + unsigned int count; uint8_t addr[7]; } ipq_gmac_phy_addr_t; typedef struct { - unsigned base; + unsigned int base; int unit; - unsigned is_macsec; - unsigned mac_pwr0; - unsigned mac_pwr1; - unsigned mac_conn_to_phy; + unsigned int is_macsec; + unsigned int mac_pwr0; + unsigned int mac_pwr1; + unsigned int mac_conn_to_phy; phy_interface_t phy; ipq_gmac_phy_addr_t phy_addr; } ipq_gmac_board_cfg_t; @@ -154,8 +154,8 @@ static inline int gmac_cfg_is_valid(ipq_gmac_board_cfg_t *cfg) } #endif -unsigned int get_board_index(unsigned machid); -void ipq_configure_gpio(const gpio_func_data_t *gpio, unsigned count); +unsigned int get_board_index(unsigned int machid); +void ipq_configure_gpio(const gpio_func_data_t *gpio, unsigned int count); void board_nand_init(void); diff --git a/src/soc/qualcomm/ipq806x/include/soc/clock.h b/src/soc/qualcomm/ipq806x/include/soc/clock.h index 7ecc1eee16..47d7d49ce7 100644 --- a/src/soc/qualcomm/ipq806x/include/soc/clock.h +++ b/src/soc/qualcomm/ipq806x/include/soc/clock.h @@ -193,6 +193,6 @@ void uart_clock_config(unsigned int gsbi_port, unsigned int m, unsigned int n, unsigned int d, unsigned int clk_dummy); void nand_clock_config(void); void usb_clock_config(void); -int audio_clock_config(unsigned frequency); +int audio_clock_config(unsigned int frequency); #endif /* __IPQ860X_CLOCK_H_ */ diff --git a/src/soc/qualcomm/ipq806x/include/soc/qup.h b/src/soc/qualcomm/ipq806x/include/soc/qup.h index 5168b19cc0..2b0cff3914 100644 --- a/src/soc/qualcomm/ipq806x/include/soc/qup.h +++ b/src/soc/qualcomm/ipq806x/include/soc/qup.h @@ -145,10 +145,10 @@ typedef enum { typedef struct { qup_protocol_t protocol; - unsigned clk_frequency; - unsigned src_frequency; + unsigned int clk_frequency; + unsigned int src_frequency; qup_mode_t mode; - unsigned initialized; + unsigned int initialized; } qup_config_t; typedef struct { @@ -157,12 +157,12 @@ typedef struct { struct { uint8_t addr; uint8_t *data; - unsigned data_len; + unsigned int data_len; } iic; struct { void *in; void *out; - unsigned size; + unsigned int size; } spi; } p; } qup_data_t; diff --git a/src/soc/qualcomm/ipq806x/lcc.c b/src/soc/qualcomm/ipq806x/lcc.c index 8f862b4d49..7d8d7bf4d2 100644 --- a/src/soc/qualcomm/ipq806x/lcc.c +++ b/src/soc/qualcomm/ipq806x/lcc.c @@ -76,11 +76,11 @@ typedef struct __packed { } Ipq806xLccPllRegs; struct lcc_freq_tbl { - unsigned freq; - unsigned pd; - unsigned m; - unsigned n; - unsigned d; + unsigned int freq; + unsigned int pd; + unsigned int m; + unsigned int n; + unsigned int d; }; static const struct lcc_freq_tbl lcc_mi2s_freq_tbl[] = { @@ -205,12 +205,12 @@ static int lcc_init_enable_ahbix(Ipq806xLccClocks *bus) return 1; } -static int lcc_init_mi2s(Ipq806xLccClocks *bus, unsigned freq) +static int lcc_init_mi2s(Ipq806xLccClocks *bus, unsigned int freq) { Ipq806xLccMi2sRegs *mi2s_regs = bus->lcc_mi2s_regs; uint32_t regval; uint8_t pd, m, n, d; - unsigned i; + unsigned int i; i = 0; while (lcc_mi2s_freq_tbl[i].freq != 0) { @@ -285,7 +285,7 @@ static int lcc_enable_mi2s(Ipq806xLccClocks *bus) return 1; } -int audio_clock_config(unsigned frequency) +int audio_clock_config(unsigned int frequency) { Ipq806xLccClocks bus = { .gcc_apcs_regs = (void *)(MSM_GCC_BASE + GCC_PLL_APCS_REG), diff --git a/src/soc/qualcomm/ipq806x/qup.c b/src/soc/qualcomm/ipq806x/qup.c index 3ceb84d881..dcfc00cb84 100644 --- a/src/soc/qualcomm/ipq806x/qup.c +++ b/src/soc/qualcomm/ipq806x/qup.c @@ -37,14 +37,14 @@ #define TIMEOUT_CNT 100000 //TODO: refactor the following array to iomap driver. -static unsigned gsbi_qup_base[] = { - (unsigned)GSBI_QUP1_BASE, - (unsigned)GSBI_QUP2_BASE, - (unsigned)GSBI_QUP3_BASE, - (unsigned)GSBI_QUP4_BASE, - (unsigned)GSBI_QUP5_BASE, - (unsigned)GSBI_QUP6_BASE, - (unsigned)GSBI_QUP7_BASE, +static unsigned int gsbi_qup_base[] = { + (unsigned int)GSBI_QUP1_BASE, + (unsigned int)GSBI_QUP2_BASE, + (unsigned int)GSBI_QUP3_BASE, + (unsigned int)GSBI_QUP4_BASE, + (unsigned int)GSBI_QUP5_BASE, + (unsigned int)GSBI_QUP6_BASE, + (unsigned int)GSBI_QUP7_BASE, }; #define QUP_ADDR(gsbi_num, reg) ((void *)((gsbi_qup_base[gsbi_num-1]) + (reg))) @@ -91,7 +91,7 @@ static int check_bit_state(uint32_t *reg, int wait_for) /* * Check whether GSBIn_QUP State is valid */ -static qup_return_t qup_wait_for_state(gsbi_id_t gsbi_id, unsigned wait_for) +static qup_return_t qup_wait_for_state(gsbi_id_t gsbi_id, unsigned int wait_for) { return check_bit_state(QUP_ADDR(gsbi_id, QUP_STATE), wait_for); } @@ -155,8 +155,8 @@ static qup_return_t qup_i2c_write_fifo(gsbi_id_t gsbi_id, qup_data_t *p_tx_obj, qup_return_t ret = QUP_ERR_UNDEFINED; uint8_t addr = p_tx_obj->p.iic.addr; uint8_t *data_ptr = p_tx_obj->p.iic.data; - unsigned data_len = p_tx_obj->p.iic.data_len; - unsigned idx = 0; + unsigned int data_len = p_tx_obj->p.iic.data_len; + unsigned int idx = 0; qup_reset_master_status(gsbi_id); qup_set_state(gsbi_id, QUP_STATE_RUN); @@ -228,8 +228,8 @@ static qup_return_t qup_i2c_read_fifo(gsbi_id_t gsbi_id, qup_data_t *p_tx_obj) qup_return_t ret = QUP_ERR_UNDEFINED; uint8_t addr = p_tx_obj->p.iic.addr; uint8_t *data_ptr = p_tx_obj->p.iic.data; - unsigned data_len = p_tx_obj->p.iic.data_len; - unsigned idx = 0; + unsigned int data_len = p_tx_obj->p.iic.data_len; + unsigned int idx = 0; qup_reset_master_status(gsbi_id); qup_set_state(gsbi_id, QUP_STATE_RUN); @@ -377,7 +377,7 @@ bailout: qup_return_t qup_set_state(gsbi_id_t gsbi_id, uint32_t state) { qup_return_t ret = QUP_ERR_UNDEFINED; - unsigned curr_state = read32(QUP_ADDR(gsbi_id, QUP_STATE)); + unsigned int curr_state = read32(QUP_ADDR(gsbi_id, QUP_STATE)); if (state <= QUP_STATE_PAUSE && (curr_state & QUP_STATE_VALID_MASK)) { /* diff --git a/src/soc/qualcomm/ipq806x/spi.c b/src/soc/qualcomm/ipq806x/spi.c index 64a98d5123..183b33c20a 100644 --- a/src/soc/qualcomm/ipq806x/spi.c +++ b/src/soc/qualcomm/ipq806x/spi.c @@ -632,7 +632,7 @@ static void spi_ctrlr_release_bus(const struct spi_slave *slave) } static int spi_xfer_tx_packet(struct ipq_spi_slave *ds, - const uint8_t *dout, unsigned out_bytes) + const uint8_t *dout, unsigned int out_bytes) { int ret; @@ -660,7 +660,7 @@ static int spi_xfer_tx_packet(struct ipq_spi_slave *ds, } static int spi_xfer_rx_packet(struct ipq_spi_slave *ds, - uint8_t *din, unsigned in_bytes) + uint8_t *din, unsigned int in_bytes) { int ret; @@ -711,7 +711,7 @@ static int spi_ctrlr_xfer(const struct spi_slave *slave, const void *dout, SPI_QUP_CONF_OUTPUT_ENA); while (out_bytes) { - unsigned todo = MIN(out_bytes, MAX_PACKET_COUNT); + unsigned int todo = MIN(out_bytes, MAX_PACKET_COUNT); ret = spi_xfer_tx_packet(ds, dout, todo); if (ret) @@ -733,7 +733,7 @@ spi_receive: SPI_QUP_CONF_INPUT_ENA); while (in_bytes) { - unsigned todo = MIN(in_bytes, MAX_PACKET_COUNT); + unsigned int todo = MIN(in_bytes, MAX_PACKET_COUNT); ret = spi_xfer_rx_packet(ds, din, todo); if (ret) diff --git a/src/soc/qualcomm/ipq806x/timer.c b/src/soc/qualcomm/ipq806x/timer.c index f52f2efdc8..25eebf4eb9 100644 --- a/src/soc/qualcomm/ipq806x/timer.c +++ b/src/soc/qualcomm/ipq806x/timer.c @@ -72,7 +72,7 @@ void init_timer(void) * udelay - generates micro second delay. * @param usec: delay duration in microseconds */ -void udelay(unsigned usec) +void udelay(unsigned int usec) { uint32_t now; uint32_t last; diff --git a/src/soc/qualcomm/ipq806x/uart.c b/src/soc/qualcomm/ipq806x/uart.c index f3e7de5910..36084f7806 100644 --- a/src/soc/qualcomm/ipq806x/uart.c +++ b/src/soc/qualcomm/ipq806x/uart.c @@ -47,7 +47,7 @@ typedef struct { void *uart_dm_base; void *uart_gsbi_base; - unsigned uart_gsbi; + unsigned int uart_gsbi; uart_clk_mnd_t mnd_value; gpio_func_data_t dbg_uart_gpio[NO_OF_DBG_UART_GPIOS]; } uart_params_t; @@ -194,7 +194,7 @@ msm_boot_uart_dm_read(unsigned int *data, int *count, int wait) void uart_tx_byte(int idx, unsigned char data) { int num_of_chars = 1; - unsigned tx_data = 0; + unsigned int tx_data = 0; void *base = uart_board_param.uart_dm_base; /* Wait until transmit FIFO is empty. */ -- cgit v1.2.3