diff options
| -rw-r--r-- | arch/arm/configs/mop500_power_defconfig | 5 | ||||
| -rw-r--r-- | drivers/misc/Kconfig | 41 | ||||
| -rw-r--r-- | drivers/misc/ab8500.c | 43 | ||||
| -rw-r--r-- | drivers/regulator/ab8500-regulator.c | 6 |
4 files changed, 84 insertions, 11 deletions
diff --git a/arch/arm/configs/mop500_power_defconfig b/arch/arm/configs/mop500_power_defconfig index 4df6a3eb43a..677c16f0442 100644 --- a/arch/arm/configs/mop500_power_defconfig +++ b/arch/arm/configs/mop500_power_defconfig @@ -586,6 +586,11 @@ CONFIG_ANDROID_PMEM=y # CONFIG_APANIC is not set CONFIG_APANIC_PLABEL="kpanic" CONFIG_AB8500=y +# CONFIG_AB8500_ACCESS_CONFIG1 is not set +# CONFIG_AB8500_ACCESS_CONFIG2 is not set +# CONFIG_AB8500_ACCESS_CONFIG3 is not set +# CONFIG_AB8500_ACCESS_CONFIG4 is not set +CONFIG_AB8500_ACCESS_CONFIG5=y # CONFIG_AB8500_GPADC is not set # CONFIG_C2PORT is not set diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index bd851088099..4b9cb1a5d6b 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -336,6 +336,47 @@ config AB8500 chip. This connects to U8500 on the SSP/SPI bus and exports read/write functions for the devices to get access to this chip. This chip embeds various other multimedia funtionalities as well. +choice + prompt "AB8500 Access Method" + depends on AB8500 + default AB8500_ACCESS_CONFIG3 + + config AB8500_ACCESS_CONFIG1 + depends on AB8500 + bool "CONFIG_1" + help + Select this option to enable AB8500 accesses via PRCMU I2C for + all register banks + + config AB8500_ACCESS_CONFIG2 + depends on AB8500 + bool "CONFIG_2" + help + Select this option to enable AB8500 accesses via PRCMU I2C for + all register banks except SIM control which happens via Modem I2C + + config AB8500_ACCESS_CONFIG3 + depends on AB8500 + bool "CONFIG_3" + help + Select this option to enable AB8500 accesses via SPI for + all register banks except SIM control which happens via Modem I2C + + config AB8500_ACCESS_CONFIG4 + depends on AB8500 + bool "CONFIG_4" + help + Select this option to enable AB8500 accesses via SPI for + all register banks + + config AB8500_ACCESS_CONFIG5 + depends on AB8500 + bool "CONFIG_5" + help + Select this option to enable AB8500 voltage regulator bank access via + PRCMU I2C, SIM control access via Modem I2C and rest of banks accessed + via SPI +endchoice config AB8500_GPADC bool "AB8500 GPADC driver" diff --git a/drivers/misc/ab8500.c b/drivers/misc/ab8500.c index fc8a813a819..0ebd51aaa29 100644 --- a/drivers/misc/ab8500.c +++ b/drivers/misc/ab8500.c @@ -504,12 +504,25 @@ int ab8500_write(u8 block, u32 adr, u8 data) if (!ab8500) return -ENODEV; -#if 0 - /* disabled as prcmu i2c not tested */ +#if defined(CONFIG_AB8500_ACCESS_CONFIG1) || \ + defined(CONFIG_AB8500_ACCESS_CONFIG2) if (!u8500_is_earlydrop()) { - if ( block == AB8500_REGU_CTRL2 ) - return prcmu_i2c_write(block, adr, data); + down(&(ab8500->ab8500_sem)); + error = prcmu_i2c_write(block, adr, data); + up(&(ab8500->ab8500_sem)); + return error; } +#else +#ifdef CONFIG_AB8500_ACCESS_CONFIG5 + if (!u8500_is_earlydrop()) { + if (block == AB8500_REGU_CTRL2) { + down(&(ab8500->ab8500_sem)); + error = prcmu_i2c_write(block, adr, data); + up(&(ab8500->ab8500_sem)); + return error; + } + } +#endif #endif /** @@ -568,12 +581,26 @@ int ab8500_read(u8 block, u32 adr) */ if (!ab8500) return -ENODEV; -#if 0 - /* disabled as prcmu i2c not tested */ + +#if defined(CONFIG_AB8500_ACCESS_CONFIG1) || \ + defined(CONFIG_AB8500_ACCESS_CONFIG2) if (!u8500_is_earlydrop()) { - if ( block == AB8500_REGU_CTRL2 ) - return prcmu_i2c_read(block, adr); + down(&(ab8500->ab8500_sem)); + retval = prcmu_i2c_read(block, adr); + up(&(ab8500->ab8500_sem)); + return retval; } +#else +#ifdef CONFIG_AB8500_ACCESS_CONFIG5 + if (!u8500_is_earlydrop()) { + if (block == AB8500_REGU_CTRL2) { + down(&(ab8500->ab8500_sem)); + retval = prcmu_i2c_read(block, adr); + up(&(ab8500->ab8500_sem)); + return retval; + } + } +#endif #endif data = 1 << 23 | block << 18 | adr << 10; diff --git a/drivers/regulator/ab8500-regulator.c b/drivers/regulator/ab8500-regulator.c index 474294324b6..1314e7c9742 100644 --- a/drivers/regulator/ab8500-regulator.c +++ b/drivers/regulator/ab8500-regulator.c @@ -47,16 +47,16 @@ static int ab8500_ldo_enable(struct regulator_dev *rdev) */ if ((regulator_id == AB8500_LDO_VAUX1) || (regulator_id == AB8500_LDO_VAUX2)) - prcmu_i2c_write(AB8500_REGU_CTRL2, + ab8500_write(AB8500_REGU_CTRL2, AB8500_REGU_VAUX12_REGU_REG, 0x5); switch (regulator_id) { case AB8500_LDO_VAUX1: - prcmu_i2c_write(AB8500_REGU_CTRL2, + ab8500_write(AB8500_REGU_CTRL2, AB8500_REGU_VAUX1_SEL_REG, 0x0F); break; case AB8500_LDO_VAUX2: - prcmu_i2c_write(AB8500_REGU_CTRL2, + ab8500_write(AB8500_REGU_CTRL2, AB8500_REGU_VAUX2_SEL_REG, 0x0D); break; case AB8500_LDO_VTVOUT: |