Merge tag 'v3.8-rc1' into staging/for_v3.9

[sfrench/cifs-2.6.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 b00ade49807776598527da146397dfd9916e1737..8e1b4ffb5e542411e180401afc36a14af61e744a 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] = {
                {
        char buf[4];
        struct i2c_msg msg[2] = {
                {

-                       .addr = dm6446evm_msp->addr,

                        .flags = 0,
                        .len = 2,
                        .buf = (void __force *)txbuf,
                },
                {
                        .flags = 0,
                        .len = 2,
                        .buf = (void __force *)txbuf,
                },
                {

-                       .addr = dm6446evm_msp->addr,

                        .flags = I2C_M_RD,
                        .len = 4,
                        .buf = buf,
                        .flags = I2C_M_RD,
                        .len = 4,
                        .buf = buf,


@@ -536,6 +534,9 @@ static int dm6444evm_msp430_get_pins(void)
        if (!dm6446evm_msp)
                return -ENXIO;
 
        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
        /* 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


@@ -776,7 +777,7 @@ static __init void davinci_evm_init(void)
        struct davinci_soc_info *soc_info = &davinci_soc_info;
 
        aemif_clk = clk_get(NULL, "aemif");
        struct davinci_soc_info *soc_info = &davinci_soc_info;
 
        aemif_clk = clk_get(NULL, "aemif");

-       clk_enable(aemif_clk);
+       clk_prepare_enable(aemif_clk);

 
        if (HAS_ATA) {
                if (HAS_NAND || HAS_NOR)
 
        if (HAS_ATA) {
                if (HAS_NAND || HAS_NOR)