mfd: Near complete mc13783 rewrite

[safe/jmp/linux-2.6] / drivers / mfd / wm8350-regmap.c

diff --git a/drivers/mfd/wm8350-regmap.c b/drivers/mfd/wm8350-regmap.c
index 9a4cc95..e965139 100644 (file)
--- a/drivers/mfd/wm8350-regmap.c
+++ b/drivers/mfd/wm8350-regmap.c
@@ -3170,14 +3170,6 @@ const u16 wm8352_mode3_defaults[] = {
 };
 #endif
 
-/* The register defaults for the config mode used must be compiled in but
- * due to the impact on kernel size it is possible to disable
- */
-#ifndef WM8350_HAVE_CONFIG_MODE
-#warning No WM8350 config modes supported - select at least one of the
-#warning MFD_WM8350_CONFIG_MODE_n options from the board driver.
-#endif
-
 /*
  * Access masks.
  */
@@ -3186,7 +3178,7 @@ const struct wm8350_reg_access wm8350_reg_io_map[] = {
        /*  read    write volatile */
        { 0xFFFF, 0xFFFF, 0xFFFF }, /* R0   - Reset/ID */
        { 0x7CFF, 0x0C00, 0x7FFF }, /* R1   - ID */
-       { 0x0000, 0x0000, 0x0000 }, /* R2 */
+       { 0x007F, 0x0000, 0x0000 }, /* R2   - ROM Mask ID */
        { 0xBE3B, 0xBE3B, 0x8000 }, /* R3   - System Control 1 */
        { 0xFEF7, 0xFEF7, 0xF800 }, /* R4   - System Control 2 */
        { 0x80FF, 0x80FF, 0x8000 }, /* R5   - System Hibernate */
@@ -3411,7 +3403,7 @@ const struct wm8350_reg_access wm8350_reg_io_map[] = {
        { 0x0000, 0x0000, 0x0000 }, /* R224 */
        { 0x8F3F, 0x0000, 0xFFFF }, /* R225 - DCDC/LDO status */
        { 0x0000, 0x0000, 0xFFFF }, /* R226 - Charger status */
-       { 0x0000, 0x0000, 0xFFFF }, /* R227 */
+       { 0x34FE, 0x0000, 0xFFFF }, /* R227 */
        { 0x0000, 0x0000, 0x0000 }, /* R228 */
        { 0x0000, 0x0000, 0x0000 }, /* R229 */
        { 0xFFFF, 0x1FFF, 0xFFFF }, /* R230 - GPIO Pin Status */