i2c: fsl_i2c: Fix style violations
PATCH RESEND v2 1/6 i2c: fsl_i2c: Fix style violations
Fix some style violations in the fsl_i2c I2C driver, and use shorter type names for variables in some cases.
---
v1 -> v2:
None
--- drivers/i2c/fsl_i2c.c | 111 +++++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 55 deletions(-)
drivers/i2c/fsl_i2c.c +56 -55
@@ -116,10 +116,10 @@ static const struct {* * The return value is the actual bus speed that is set. */ -static unsigned int set_i2c_bus_speed (const struct fsl_i2c_base *base, -unsigned int i2c_clk,unsigned int speed) +static uint set_i2c_bus_speed (const struct fsl_i2c_base *base, +uint i2c_clk,uint speed) { -unsigned short divider =min (i2c_clk / speed, (unsigned int )USHRT_MAX ); +ushort divider =min (i2c_clk / speed, (uint )USHRT_MAX );/* * We want to choose an FDR/DFSR that generates an I2C bus speed that
@@ -130,8 +130,8 @@ static unsigned int set_i2c_bus_speed(const struct fsl_i2c_base *base,#ifdef __PPC__u8 dfsr, fdr =0x31 ;/* Default if no FDR found */ /* a, b and dfsr matches identifiers A,B and C respectively in AN2919 */ -unsigned short a, b, ga, gb; -unsigned long c_div, est_div; +ushort a, b, ga, gb; +ulong c_div, est_div;#ifdef CONFIG_FSL_I2C_CUSTOM_DFSR dfsr =CONFIG_FSL_I2C_CUSTOM_DFSR ;
@@ -151,18 +151,21 @@ static unsigned int set_i2c_bus_speed(const struct fsl_i2c_base *base,for (ga =0x4 , a =10 ; a <=30 ; ga++, a +=2 ) {for (gb =0 ; gb <8 ; gb++) { b =16 << gb; - c_div = b * (a + ((3 *dfsr)/b)*2 ); -if ((c_div > divider) && (c_div < est_div)) { -unsigned short bin_gb, bin_ga; + c_div = b * (a + ((3 * dfsr) / b) *2 ); +if (c_div > divider && c_div < est_div) { +ushort bin_gb, bin_ga; est_div = c_div; bin_gb = gb <<2 ; bin_ga = (ga &0x3 ) | ((ga &0x4 ) <<3 ); fdr = bin_gb | bin_ga; speed = i2c_clk / est_div; -debug ("FDR:0x%.2x, div:%ld, ga:0x%x, gb:0x%x, " -"a:%d, b:%d, speed:%d\n" , - fdr, est_div, ga, gb, a, b, speed); + +debug ("FDR: 0x%.2x, " , fdr); +debug ("div: %ld, " , est_div); +debug ("ga: 0x%x, gb: 0x%x, " , ga, gb); +debug ("a: %d, b: %d, speed: %d\n" , a, b, speed); +/* Condition 2 not accounted for */ debug("Tr <= %d ns\n", (b - 3 * dfsr) * 1000000 /
@@ -174,13 +177,13 @@ static unsigned int set_i2c_bus_speed(const struct fsl_i2c_base *base,if (a ==24 ) a += 4; } -debug ("divider:%d, est_div:%ld, DFSR:%d\n" , divider, est_div, dfsr); -debug ("FDR:0x%.2x, speed:%d\n" , fdr, speed); +debug ("divider: %d, est_div: %ld, DFSR: %d\n" , divider, est_div, dfsr); +debug ("FDR: 0x%.2x, speed: %d\n" , fdr, speed);#endif writeb (dfsr, &base->dfsrr);/* set default filter */ writeb (fdr, &base->fdr);/* set bus speed */ #else -unsigned int i; +uint i;for (i =0 ; i <ARRAY_SIZE (fsl_i2c_speed_map); i++)if (fsl_i2c_speed_map[i].divider >= divider) {
@@ -197,7 +200,7 @@ static unsigned int set_i2c_bus_speed(const struct fsl_i2c_base *base, }#ifndef CONFIG_DM_I2C -static unsigned int get_i2c_clock (int bus) +static uint get_i2c_clock (int bus) {if (bus)return gd->arch.i2c2_clk;/* I2C2 clock */
@@ -211,10 +214,11 @@ static int fsl_i2c_fixup(const struct fsl_i2c_base *base)const unsigned long long timeout =usec2ticks (CONFIG_I2C_MBB_TIMEOUT );unsigned long long timeval =0 ;int ret =-1 ; -unsigned int flags =0 ; +uint flags =0 ;#ifdef CONFIG_SYS_FSL_ERRATUM_I2C_A004447 -unsigned int svr =get_svr (); +uint svr =get_svr (); +if ((SVR_SOC_VER (svr) ==SVR_8548 &&IS_SVR_REV (svr,3 ,1 )) || (SVR_REV (svr) <=CONFIG_SYS_FSL_A004447_SVR_REV )) flags =I2C_CR_BIT6 ;
@@ -263,7 +267,7 @@ static void __i2c_init(const struct fsl_i2c_base *base, int speed, int/* Call board specific i2c bus reset routine before accessing the * environment, which might be in a chip on that bus. For details * about this problem see doc/I2C_Edge_Conditions. -*/ +*/ i2c_init_board ();#endif writeb (0 , &base->cr);/* stop I2C controller */
@@ -286,8 +290,7 @@ static void __i2c_init(const struct fsl_i2c_base *base, int speed, int } } -static int -i2c_wait4bus (const struct fsl_i2c_base *base) +static int i2c_wait4bus (const struct fsl_i2c_base *base) {unsigned long long timeval =get_ticks ();const unsigned long long timeout =usec2ticks (CONFIG_I2C_MBB_TIMEOUT );
@@ -300,8 +303,7 @@ i2c_wait4bus(const struct fsl_i2c_base *base)return 0 ; } -static inline int -i2c_wait (const struct fsl_i2c_base *base,int write) +static inline int i2c_wait (const struct fsl_i2c_base *base,int write) {u32 csr;unsigned long long timeval =get_ticks ();
@@ -317,29 +319,29 @@ i2c_wait(const struct fsl_i2c_base *base, int write)writeb (0x0 , &base->sr);if (csr &I2C_SR_MAL ) { -debug ("i2c_wait: MAL\n" ); +debug ("%s: MAL\n" , __func__);return -1 ; }if (!(csr &I2C_SR_MCF )) { -debug ("i2c_wait: unfinished\n" ); +debug ("%s: unfinished\n" , __func__);return -1 ; }if (write ==I2C_WRITE_BIT && (csr &I2C_SR_RXAK )) { -debug ("i2c_wait: No RXACK\n" ); +debug ("%s: No RXACK\n" , __func__);return -1 ; }return 0 ; }while ((get_ticks () - timeval) < timeout); -debug ("i2c_wait: timed out\n" ); +debug ("%s: timed out\n" , __func__);return -1 ; } -static inline int -i2c_write_addr (const struct fsl_i2c_base *base,u8 dev,u8 dir,int rsta) +static inline int i2c_write_addr (const struct fsl_i2c_base *base,u8 dev, +u8 dir,int rsta) { writeb(I2C_CR_MEN | I2C_CR_MSTA | I2C_CR_MTX | (rsta ? I2C_CR_RSTA : 0),
@@ -353,8 +355,8 @@ i2c_write_addr(const struct fsl_i2c_base *base, u8 dev, u8 dir, int rsta)return 1 ; } -static inline int -__i2c_write_data (const struct fsl_i2c_base *base,u8 *data,int length) +static inline int __i2c_write_data (const struct fsl_i2c_base *base,u8 *data, +int length) {int i;
@@ -368,8 +370,8 @@ __i2c_write_data(const struct fsl_i2c_base *base, u8 *data, int length)return i; } -static inline int -__i2c_read_data (const struct fsl_i2c_base *base,u8 *data,int length) +static inline int __i2c_read_data (const struct fsl_i2c_base *base,u8 *data, +int length) {int i;
@@ -399,9 +401,8 @@ __i2c_read_data(const struct fsl_i2c_base *base, u8 *data, int length)return i; } -static int -__i2c_read (const struct fsl_i2c_base *base,u8 chip_addr,u8 *offset,int olen, -u8 *data,int dlen) +static int __i2c_read (const struct fsl_i2c_base *base,u8 chip_addr,u8 *offset, +int olen,u8 *data,int dlen) {int ret =-1 ;/* signal error */
@@ -447,9 +448,8 @@ __i2c_read(const struct fsl_i2c_base *base, u8 chip_addr, u8 *offset, int olen,return -1 ; } -static int -__i2c_write (const struct fsl_i2c_base *base,u8 chip_addr,u8 *offset,int olen, -u8 *data,int dlen) +static int __i2c_write (const struct fsl_i2c_base *base,u8 chip_addr, +u8 *offset,int olen,u8 *data,int dlen) {int ret =-1 ;/* signal error */
@@ -471,10 +471,9 @@ __i2c_write(const struct fsl_i2c_base *base, u8 chip_addr, u8 *offset, int olen,return -1 ; } -static int -__i2c_probe_chip (const struct fsl_i2c_base *base,uchar chip) +static int __i2c_probe_chip (const struct fsl_i2c_base *base,uchar chip) { -/* For unknow reason the controller will ACK when +/* For unknown reason the controller will ACK when * probing for a slave with the same address, so skip * it. */
@@ -484,8 +483,8 @@ __i2c_probe_chip(const struct fsl_i2c_base *base, uchar chip)return __i2c_read (base, chip,0 ,0 ,NULL ,0 ); } -static unsigned int __i2c_set_bus_speed (const struct fsl_i2c_base *base, -unsigned int speed,int i2c_clk) +static uint __i2c_set_bus_speed (const struct fsl_i2c_base *base, +uint speed,int i2c_clk) {writeb (0 , &base->cr);/* stop controller */ set_i2c_bus_speed (base, i2c_clk, speed);
@@ -501,32 +500,30 @@ static void fsl_i2c_init(struct i2c_adapter *adap, int speed, int slaveadd) get_i2c_clock(adap->hwadapnr), adap->hwadapnr); } -static int -fsl_i2c_probe_chip (struct i2c_adapter *adap,uchar chip) +static int fsl_i2c_probe_chip (struct i2c_adapter *adap,uchar chip) {return __i2c_probe_chip (i2c_base[adap->hwadapnr], chip); } -static int -fsl_i2c_read (struct i2c_adapter *adap,u8 chip_addr,uint offset,int olen, -u8 *data,int dlen) +static int fsl_i2c_read (struct i2c_adapter *adap,u8 chip_addr,uint offset, +int olen,u8 *data,int dlen) {u8 *o = (u8 *)&offset; +return __i2c_read (i2c_base[adap->hwadapnr], chip_addr, &o[4 - olen], olen, data, dlen); } -static int -fsl_i2c_write (struct i2c_adapter *adap,u8 chip_addr,uint offset,int olen, -u8 *data,int dlen) +static int fsl_i2c_write (struct i2c_adapter *adap,u8 chip_addr,uint offset, +int olen,u8 *data,int dlen) {u8 *o = (u8 *)&offset; +return __i2c_write (i2c_base[adap->hwadapnr], chip_addr, &o[4 - olen], olen, data, dlen); } -static unsigned int fsl_i2c_set_bus_speed (struct i2c_adapter *adap, -unsigned int speed) +static uint fsl_i2c_set_bus_speed (struct i2c_adapter *adap,uint speed) {return __i2c_set_bus_speed (i2c_base[adap->hwadapnr], speed,get_i2c_clock (adap->hwadapnr));
@@ -562,12 +559,14 @@ static int fsl_i2c_probe_chip(struct udevice *bus, u32 chip_addr, u32 chip_flags) {struct fsl_i2c_dev *dev =dev_get_priv (bus); +return __i2c_probe_chip (dev->base, chip_addr); } -static int fsl_i2c_set_bus_speed (struct udevice *bus,unsigned int speed) +static int fsl_i2c_set_bus_speed (struct udevice *bus,uint speed) {struct fsl_i2c_dev *dev =dev_get_priv (bus); +return __i2c_set_bus_speed (dev->base, speed, dev->i2c_clk); }
@@ -600,6 +599,7 @@ static int fsl_i2c_ofdata_to_platdata(struct udevice *bus)static int fsl_i2c_probe (struct udevice *bus) {struct fsl_i2c_dev *dev =dev_get_priv (bus); +__i2c_init (dev->base, dev->speed, dev->slaveadd, dev->i2c_clk, dev->index);return 0 ;
@@ -613,7 +613,8 @@ static int fsl_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs)memset (&dummy,0 ,sizeof (struct i2c_msg ));/* We expect either two messages (one with an offset and one with the -* actucal data) or one message (just data) */ +* actual data) or one message (just data) +*/ if (nmsgs >2 || nmsgs ==0 ) {debug ("%s: Only one or two messages are supported." , __func__);return -1 ;
--
2.11.0
PATCH RESEND v2 2/6 i2c: fsl_i2c: Remove inline declarations
Some functions in the fsl_i2c driver are declared as inline, even though they are quite large, which needlessly increases the size of the resulting binary.
This patch removes the inline declarations.
---
v1 -> v2:
None
--- drivers/i2c/fsl_i2c.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/i2c/fsl_i2c.c +7 -7
@@ -303,7 +303,7 @@ static int i2c_wait4bus(const struct fsl_i2c_base *base)return 0 ; } -static inline int i2c_wait (const struct fsl_i2c_base *base,int write) +static int i2c_wait (const struct fsl_i2c_base *base,int write) {u32 csr;unsigned long long timeval =get_ticks ();
@@ -340,8 +340,8 @@ static inline int i2c_wait(const struct fsl_i2c_base *base, int write)return -1 ; } -static inline int i2c_write_addr (const struct fsl_i2c_base *base,u8 dev, -u8 dir,int rsta) +static int i2c_write_addr (const struct fsl_i2c_base *base,u8 dev, +u8 dir,int rsta) { writeb(I2C_CR_MEN | I2C_CR_MSTA | I2C_CR_MTX | (rsta ? I2C_CR_RSTA : 0),
@@ -355,8 +355,8 @@ static inline int i2c_write_addr(const struct fsl_i2c_base *base, u8 dev,return 1 ; } -static inline int __i2c_write_data (const struct fsl_i2c_base *base,u8 *data, -int length) +static int __i2c_write_data (const struct fsl_i2c_base *base,u8 *data, +int length) {int i;
@@ -370,8 +370,8 @@ static inline int __i2c_write_data(const struct fsl_i2c_base *base, u8 *data,return i; } -static inline int __i2c_read_data (const struct fsl_i2c_base *base,u8 *data, -int length) +static int __i2c_read_data (const struct fsl_i2c_base *base,u8 *data, +int length) {int i;
--
2.11.0
PATCH RESEND v2 2/6 i2c: fsl_i2c: Remove inline declarations
Hello Mario,
Am 15.01.2018 um 11:08 schrieb Mario Six:
Quoted 8 lines
Some functions in the
fsl_i2cdriver are declared as inline, even though they are quite large, which needlessly increases the size of the resulting binary.This patch removes the inline declarations.
Reviewed-by Heiko Schocher <[email protected]>Signed-off-by Mario Six <[email protected]>
Quoted 8 lines
---
v1 -> v2:
None--- drivers/i2c/fsl_i2c.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
Applied to u-boot-i2c master
Thanks!
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH RESEND v2 3/6 i2c: fsl_i2c: Make live-tree compatible
In reply to Mario SixMake the fsl_i2c driver compatible with a live device tree.
---
v1 -> v2:
None
--- drivers/i2c/fsl_i2c.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/i2c/fsl_i2c.c +6 -10
@@ -574,22 +574,18 @@ static int fsl_i2c_ofdata_to_platdata(struct udevice *bus) {struct fsl_i2c_dev *dev =dev_get_priv (bus);fdt_addr_t addr; -fdt_size_t size; -int node =dev_of_offset (bus); - addr =fdtdec_get_addr_size_auto_noparent (gd->fdt_blob, node,"reg" ,0 , - &size, false); + addr =dev_read_u32_default (bus,"reg" ,-1 ); - dev->base =map_sysmem (CONFIG_SYS_IMMR + addr, size); + dev->base =map_sysmem (CONFIG_SYS_IMMR + addr,sizeof (struct fsl_i2c_base ));if (!dev->base)return -ENOMEM ; - dev->index =fdtdec_get_int (gd->fdt_blob, node,"cell-index" ,-1 ); - dev->slaveadd =fdtdec_get_int (gd->fdt_blob, node, -"u-boot,i2c-slave-addr" ,0x7f ); - dev->speed =fdtdec_get_int (gd->fdt_blob, node,"clock-frequency" , -400000 ); + dev->index =dev_read_u32_default (bus,"cell-index" ,-1 ); + dev->slaveadd =dev_read_u32_default (bus,"u-boot,i2c-slave-addr" , +0x7f ); + dev->speed =dev_read_u32_default (bus,"clock-frequency" ,400000 ); dev->i2c_clk = dev->index ? gd->arch.i2c2_clk : gd->arch.i2c1_clk;
--
2.11.0
PATCH RESEND v2 3/6 i2c: fsl_i2c: Make live-tree compatible
Hello Mario,
Am 15.01.2018 um 11:08 schrieb Mario Six:
Quoted 4 lines
Make the
fsl_i2cdriver compatible with a live device tree.Reviewed-by Heiko Schocher <[email protected]>Signed-off-by Mario Six <[email protected]>
Quoted 8 lines
---
v1 -> v2:
None--- drivers/i2c/fsl_i2c.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
Applied to u-boot-i2c master
Thanks!
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH RESEND v2 4/6 i2c: ihs_i2c: Prepare DM conversion
In reply to Mario SixPrepare the function interface of the ihs_i2c driver for DM conversion in a future patch.
While we're at it, fix some style violations, and make the code more readable.
---
v1 -> v2:
None
--- drivers/i2c/ihs_i2c.c | 69 +++++++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 29 deletions(-)
drivers/i2c/ihs_i2c.c +40 -29
@@ -11,6 +11,7 @@#include <common.h> #include <i2c.h> #include <gdsys_fpga.h> +#include <asm/unaligned.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -41,30 +42,38 @@ DECLARE_GLOBAL_DATA_PTR;#endif enum { -I2CINT_ERROR_EV =1 <<13 , -I2CINT_TRANSMIT_EV =1 <<14 , -I2CINT_RECEIVE_EV =1 <<15 , +I2CINT_ERROR_EV =BIT (13 ), +I2CINT_TRANSMIT_EV =BIT (14 ), +I2CINT_RECEIVE_EV =BIT (15 ), };enum { +I2CMB_READ =0 <<10 ,I2CMB_WRITE =1 <<10 , +I2CMB_1BYTE =0 <<11 ,I2CMB_2BYTE =1 <<11 , +I2CMB_DONT_HOLD_BUS =0 <<13 ,I2CMB_HOLD_BUS =1 <<13 ,I2CMB_NATIVE =2 <<14 , }; +enum { +I2COP_WRITE =0 , +I2COP_READ =1 , +}; +static int wait_for_int (bool read) {u16 val; -unsigned int ctr =0 ; +uint ctr =0 ;I2C_GET_REG (interrupt_status, &val); +/* Wait until error or receive/transmit interrupt was raised */ while (!(val & (I2CINT_ERROR_EV | (read ?I2CINT_RECEIVE_EV :I2CINT_TRANSMIT_EV )))) {udelay (10 ); -if (ctr++ >5000 ) { +if (ctr++ >5000 )return 1 ; - }I2C_GET_REG (interrupt_status, &val); }
@@ -76,10 +85,12 @@ static int ihs_i2c_transfer(uchar chip, uchar *buffer, int len, bool read, {u16 val; +/* Clear interrupt status */ I2C_SET_REG (interrupt_status,I2CINT_ERROR_EV |I2CINT_RECEIVE_EV |I2CINT_TRANSMIT_EV );I2C_GET_REG (interrupt_status, &val); +/* If we want to write and have data, write the bytes to the mailbox */ if (!read && len) { val = buffer[0 ];
@@ -98,6 +109,7 @@ static int ihs_i2c_transfer(uchar chip, uchar *buffer, int len, bool read,if (wait_for_int (read))return 1 ; +/* If we want to read, get the bytes from the mailbox */ if (read) {I2C_GET_REG (read_mailbox_ext, &val); buffer[0 ] = val &0xff ;
@@ -108,55 +120,44 @@ static int ihs_i2c_transfer(uchar chip, uchar *buffer, int len, bool read,return 0 ; } -static int ihs_i2c_address (uchar chip,uint addr,int alen,bool hold_bus) +static int ihs_i2c_address (uchar chip,u8 *addr,int alen,bool hold_bus) { -int shift = (alen-1 ) *8 ; -while (alen) {int transfer =min (alen,2 ); -uchar buf[2 ];bool is_last = alen <= transfer; - buf[0 ] = addr >> shift; -if (alen >1 ) - buf[1 ] = addr >> (shift -8 ); - -if (ihs_i2c_transfer (chip, buf, transfer, false, +if (ihs_i2c_transfer (chip, addr, transfer,I2COP_WRITE , hold_bus ? false : is_last))return 1 ; - shift -=16 ; alen -= transfer; }return 0 ; } -static int ihs_i2c_access (struct i2c_adapter *adap,uchar chip,uint addr, -int alen,uchar *buffer,int len,bool read) +static int ihs_i2c_access (struct i2c_adapter *adap,uchar chip,u8 *addr, +int alen,uchar *buffer,int len,int read) { -if (len <=0 ) -return 1 ; - -if (ihs_i2c_address (chip, addr, alen, len)) +/* Don't hold the bus if length of data to send/receive is zero */ +if (len <=0 ||ihs_i2c_address (chip, addr, alen, len))return 1 ;while (len) {int transfer =min (len,2 ); +bool is_last = len <= transfer;if (ihs_i2c_transfer (chip, buffer, transfer, read, - len <= transfer)) -return 1 ; + is_last)) +return 2 ; buffer += transfer; - addr += transfer; len -= transfer; }return 0 ; } -static void ihs_i2c_init (struct i2c_adapter *adap,int speed,int slaveaddr) {#ifdef CONFIG_SYS_I2C_INIT_BOARD
@@ -173,7 +174,7 @@ static int ihs_i2c_probe(struct i2c_adapter *adap, uchar chip) {uchar buffer[2 ]; -if (ihs_i2c_transfer (chip, buffer,0 , true, true)) +if (ihs_i2c_transfer (chip, buffer,0 ,I2COP_READ , true))return 1 ;return 0 ;
@@ -182,13 +183,23 @@ static int ihs_i2c_probe(struct i2c_adapter *adap, uchar chip)static int ihs_i2c_read (struct i2c_adapter *adap,uchar chip,uint addr,int alen,uchar *buffer,int len) { -return ihs_i2c_access (adap, chip, addr, alen, buffer, len, true); +u8 addr_bytes[4 ]; + +put_unaligned_le32 (addr, addr_bytes); + +return ihs_i2c_access (adap, chip, addr_bytes, alen, buffer, len, +I2COP_READ ); }static int ihs_i2c_write (struct i2c_adapter *adap,uchar chip,uint addr,int alen,uchar *buffer,int len) { -return ihs_i2c_access (adap, chip, addr, alen, buffer, len, false); +u8 addr_bytes[4 ]; + +put_unaligned_le32 (addr, addr_bytes); + +return ihs_i2c_access (adap, chip, addr_bytes, alen, buffer, len, +I2COP_WRITE ); } static unsigned int ihs_i2c_set_bus_speed(struct i2c_adapter *adap,
--
2.11.0
PATCH RESEND v2 4/6 i2c: ihs_i2c: Prepare DM conversion
Hello Mario,
Am 15.01.2018 um 11:08 schrieb Mario Six:
Quoted 6 lines
Prepare the function interface of the
ihs_i2cdriver for DM conversion in a future patch.While we're at it, fix some style violations, and make the code more readable.
Signed-off-by Mario Six <[email protected]>
Quoted 8 lines
---
v1 -> v2:
None--- drivers/i2c/ihs_i2c.c | 69 +++++++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 29 deletions(-)
Applied to u-boot-i2c master
Thanks!
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH RESEND v2 5/6 i2c: ihs_i2c: Make DM compatible
In reply to Mario SixMake the ihs_i2c driver DM-compatible; for legacy boards, the old functions are retained within #ifdefs.
No board uses the new DM driver yet; this patch only lays the foundation for future support.
---
v1 -> v2:
* Use put_unaligned_le32 instead of manual buffer copying
* Make driver live-tree compatible
* Accomodated for FPGA handle changes in gdsys_soc driver
* Re-added accidentially deleted IHS Kconfig entry
* Accomodated for IHS FPGA conversion to fpgamap
--- drivers/i2c/Kconfig | 6 ++ drivers/i2c/ihs_i2c.c | 196 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 199 insertions(+), 3 deletions(-)
drivers/i2c/Kconfig +6 -0
@@ -254,6 +254,12 @@ config SYS_I2C_BUS_MAX help Define the maximum number of available I2C buses. +config SYS_I2C_IHS + bool "gdsys IHS I2C driver" + depends on DM_I2C + help + Support for gdsys IHS I2C driver on FPGA bus. + source "drivers/i2c/muxes/Kconfig" endmenu
drivers/i2c/ihs_i2c.c +193 -3
317 lines not on this page · raw message
--
2.11.0
PATCH RESEND v2 5/6 i2c: ihs_i2c: Make DM compatible
Hello Mario,
Am 15.01.2018 um 11:08 schrieb Mario Six:
Quoted 16 lines
Make the
ihs_i2cdriver DM-compatible; for legacy boards, the old functions are retained within #ifdefs.No board uses the new DM driver yet; this patch only lays the foundation for future support.
Signed-off-by Mario Six <[email protected]>---
v1 -> v2:
* Useput_unaligned_le32instead of manual buffer copying
* Make driver live-tree compatible
* Accomodated for FPGA handle changes ingdsys_socdriver
* Re-added accidentially deleted IHSKconfigentry
* Accomodated for IHS FPGA conversion to fpgamap
Quoted 4 lines
--- drivers/i2c/Kconfig | 6 ++ drivers/i2c/ihs_i2c.c | 196 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 199 insertions(+), 3 deletions(-)
Applied to u-boot-i2c master
Thanks!
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH RESEND v2 6/6 i2c: ihs_i2c: Factor out send_buffer method
In reply to Mario SixSimplify the driver logic by extracting a common send_buffer method.
---
v1 -> v2:
None
--- drivers/i2c/ihs_i2c.c | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-)
drivers/i2c/ihs_i2c.c +26 -24
@@ -198,32 +198,48 @@ static int ihs_i2c_transfer(uchar chip, uchar *buffer, int len, bool read, } #ifdef CONFIG_DM_I2C -static int ihs_i2c_address(struct udevice *dev, uchar chip, u8 *addr, int alen, bool hold_bus) +static int ihs_i2c_send_buffer(struct udevice *dev, uchar chip, u8 *data, int len, bool hold_bus, int read) #else -static int ihs_i2c_address (uchar chip,u8 *addr,int alen,bool hold_bus) +static int ihs_i2c_send_buffer(uchar chip, u8 *data, int len, bool hold_bus, + int read) #endif { -while (alen) { -int transfer =min (alen,2 ); -bool is_last = alen <= transfer; + while (len) { + int transfer = min(len, 2); + bool is_last = len <= transfer; #ifdef CONFIG_DM_I2C -if (ihs_i2c_transfer (dev, chip, addr, transfer,I2COP_WRITE , + if (ihs_i2c_transfer(dev, chip, data, transfer, read, hold_bus ? false : is_last)) return 1; #else -if (ihs_i2c_transfer (chip, addr, transfer,I2COP_WRITE , + if (ihs_i2c_transfer(chip, data, transfer, read, hold_bus ? false : is_last)) return 1; #endif - alen -= transfer; + data += transfer; + len -= transfer; } return 0; } #ifdef CONFIG_DM_I2C +static int ihs_i2c_address(struct udevice *dev, uchar chip, u8 *addr, int alen, + bool hold_bus) +#else +static int ihs_i2c_address(uchar chip, u8 *addr, int alen, bool hold_bus) +#endif +{ +#ifdef CONFIG_DM_I2C + return ihs_i2c_send_buffer(dev, chip, addr, alen, hold_bus, I2COP_WRITE); +#else + return ihs_i2c_send_buffer(chip, addr, alen, hold_bus, I2COP_WRITE); +#endif +} + +#ifdef CONFIG_DM_I2C static int ihs_i2c_access(struct udevice *dev, uchar chip, u8 *addr, int alen, uchar *buffer, int len, int read) #else
@@ -240,25 +256,11 @@ static int ihs_i2c_access(struct i2c_adapter *adap, uchar chip, u8 *addr,return 1 ;#endif -while (len) { -int transfer =min (len,2 ); -bool is_last = len <= transfer; -#ifdef CONFIG_DM_I2C -if (ihs_i2c_transfer (dev, chip, buffer, transfer, read, - is_last)) -return 2 ; +return ihs_i2c_send_buffer (dev, chip, buffer, len, false, read);#else -if (ihs_i2c_transfer (chip, buffer, transfer, read, - is_last)) -return 2 ; +return ihs_i2c_send_buffer (chip, buffer, len, false, read);#endif - - buffer += transfer; - len -= transfer; - } - -return 0 ; }#ifdef CONFIG_DM_I2C
--
2.11.0
PATCH RESEND v2 6/6 i2c: ihs_i2c: Factor out send_buffer method
Hello Mario,
Am 15.01.2018 um 11:08 schrieb Mario Six:
Quoted 11 lines
Simplify the driver logic by extracting a common
send_buffermethod.Signed-off-by Mario Six <[email protected]>---
v1 -> v2:
None--- drivers/i2c/ihs_i2c.c | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-)
Applied to u-boot-i2c master
Thanks!
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH RESEND v2 1/6 i2c: fsl_i2c: Fix style violations
In reply to Mario SixHello Mario,
Am 15.01.2018 um 11:08 schrieb Mario Six:
Quoted 5 lines
Fix some style violations in the
fsl_i2cI2C driver, and use shorter type names for variables in some cases.Reviewed-by Heiko Schocher <[email protected]>Signed-off-by Mario Six <[email protected]>
Quoted 8 lines
---
v1 -> v2:
None--- drivers/i2c/fsl_i2c.c | 111 +++++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 55 deletions(-)
Applied to u-boot-i2c master
Thanks!
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de