lkml.org 
[lkml]   [2015]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] mfd: wm8998: Fixup register defaults/readables
On Wed, 09 Sep 2015, Charles Keepax wrote:

> Remove defaults for a bunch of volatile registers and remove
> ARIZONA_CTRL_IF_SPI_CFG_1 from the readable list since it doesn't exist
> on wm8998 which is I2C only.
>
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/wm8998-tables.c | 8 --------
> 1 files changed, 0 insertions(+), 8 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/wm8998-tables.c b/drivers/mfd/wm8998-tables.c
> index e6de3cd..08fc520 100644
> --- a/drivers/mfd/wm8998-tables.c
> +++ b/drivers/mfd/wm8998-tables.c
> @@ -199,8 +199,6 @@ static const struct reg_default wm8998_reg_default[] = {
> { 0x00000069, 0x01FF }, /* R105 - Always On Triggers Sequence Select 4 */
> { 0x0000006A, 0x01FF }, /* R106 - Always On Triggers Sequence Select 5 */
> { 0x0000006B, 0x01FF }, /* R107 - Always On Triggers Sequence Select 6 */
> - { 0x0000006E, 0x01FF }, /* R110 - Trigger Sequence Select 32 */
> - { 0x0000006F, 0x01FF }, /* R111 - Trigger Sequence Select 33 */
> { 0x00000090, 0x0000 }, /* R144 - Haptics Control 1 */
> { 0x00000091, 0x7FFF }, /* R145 - Haptics Control 2 */
> { 0x00000092, 0x0000 }, /* R146 - Haptics phase 1 intensity */
> @@ -270,16 +268,13 @@ static const struct reg_default wm8998_reg_default[] = {
> { 0x0000021A, 0x01A6 }, /* R538 - Mic Bias Ctrl 3 */
> { 0x00000293, 0x0080 }, /* R659 - Accessory Detect Mode 1 */
> { 0x0000029B, 0x0000 }, /* R667 - Headphone Detect 1 */
> - { 0x0000029C, 0x0000 }, /* R668 - Headphone Detect 2 */
> { 0x000002A2, 0x0000 }, /* R674 - Micd Clamp control */
> { 0x000002A3, 0x1102 }, /* R675 - Mic Detect 1 */
> { 0x000002A4, 0x009F }, /* R676 - Mic Detect 2 */
> - { 0x000002A5, 0x0000 }, /* R677 - Mic Detect 3 */
> { 0x000002A6, 0x3737 }, /* R678 - Mic Detect Level 1 */
> { 0x000002A7, 0x2C37 }, /* R679 - Mic Detect Level 2 */
> { 0x000002A8, 0x1422 }, /* R680 - Mic Detect Level 3 */
> { 0x000002A9, 0x030A }, /* R681 - Mic Detect Level 4 */
> - { 0x000002AB, 0x0000 }, /* R683 - Mic Detect 4 */
> { 0x000002CB, 0x0000 }, /* R715 - Isolation control */
> { 0x000002D3, 0x0000 }, /* R723 - Jack detect analogue */
> { 0x00000300, 0x0000 }, /* R768 - Input Enables */
> @@ -707,13 +702,11 @@ static const struct reg_default wm8998_reg_default[] = {
> { 0x00000D1A, 0xFFFF }, /* R3354 - IRQ2 Status 3 Mask */
> { 0x00000D1B, 0xFFFF }, /* R3355 - IRQ2 Status 4 Mask */
> { 0x00000D1C, 0xFEFF }, /* R3356 - IRQ2 Status 5 Mask */
> - { 0x00000D1D, 0xFFFF }, /* R3357 - IRQ2 Status 6 Mask */
> { 0x00000D1F, 0x0000 }, /* R3359 - IRQ2 Control */
> { 0x00000D53, 0xFFFF }, /* R3411 - AOD IRQ Mask IRQ1 */
> { 0x00000D54, 0xFFFF }, /* R3412 - AOD IRQ Mask IRQ2 */
> { 0x00000D56, 0x0000 }, /* R3414 - Jack detect debounce */
> { 0x00000E00, 0x0000 }, /* R3584 - FX_Ctrl1 */
> - { 0x00000E01, 0x0000 }, /* R3585 - FX_Ctrl2 */
> { 0x00000E10, 0x6318 }, /* R3600 - EQ1_1 */
> { 0x00000E11, 0x6300 }, /* R3601 - EQ1_2 */
> { 0x00000E12, 0x0FC8 }, /* R3602 - EQ1_3 */
> @@ -833,7 +826,6 @@ static bool wm8998_readable_register(struct device *dev, unsigned int reg)
> switch (reg) {
> case ARIZONA_SOFTWARE_RESET:
> case ARIZONA_DEVICE_REVISION:
> - case ARIZONA_CTRL_IF_SPI_CFG_1:
> case ARIZONA_CTRL_IF_I2C1_CFG_1:
> case ARIZONA_CTRL_IF_I2C1_CFG_2:
> case ARIZONA_WRITE_SEQUENCER_CTRL_0:

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog


\
 
 \ /
  Last update: 2015-09-20 06:41    [W:0.036 / U:1.344 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site