Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[platform/kernel/linux-starfive.git] / arch / arm / mach-davinci / board-dm644x-evm.c

diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index a84dfcb..f5e018d 100644 (file)
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -519,13 +519,11 @@ static int dm6444evm_msp430_get_pins(void)
        char buf[4];
        struct i2c_msg msg[2] = {
                {
-                       .addr = dm6446evm_msp->addr,
                        .flags = 0,
                        .len = 2,
                        .buf = (void __force *)txbuf,
                },
                {
-                       .addr = dm6446evm_msp->addr,
                        .flags = I2C_M_RD,
                        .len = 4,
                        .buf = buf,
@@ -536,6 +534,9 @@ static int dm6444evm_msp430_get_pins(void)
        if (!dm6446evm_msp)
                return -ENXIO;
 
+       msg[0].addr = dm6446evm_msp->addr;
+       msg[1].addr = dm6446evm_msp->addr;
+
        /* Command 4 == get input state, returns port 2 and port3 data
         *   S Addr W [A] len=2 [A] cmd=4 [A]
         *   RS Addr R [A] [len=4] A [cmd=4] A [port2] A [port3] N P