diff options
-rw-r--r-- | drivers/mfd/88pm860x-core.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c index 801aff7c8bab..7ba4aafb051d 100644 --- a/drivers/mfd/88pm860x-core.c +++ b/drivers/mfd/88pm860x-core.c | |||
@@ -21,13 +21,13 @@ | |||
21 | 21 | ||
22 | #define INT_STATUS_NUM 3 | 22 | #define INT_STATUS_NUM 3 |
23 | 23 | ||
24 | static struct resource bk_resources[] __initdata = { | 24 | static struct resource bk_resources[] __devinitdata = { |
25 | {PM8606_BACKLIGHT1, PM8606_BACKLIGHT1, "backlight-0", IORESOURCE_IO,}, | 25 | {PM8606_BACKLIGHT1, PM8606_BACKLIGHT1, "backlight-0", IORESOURCE_IO,}, |
26 | {PM8606_BACKLIGHT2, PM8606_BACKLIGHT2, "backlight-1", IORESOURCE_IO,}, | 26 | {PM8606_BACKLIGHT2, PM8606_BACKLIGHT2, "backlight-1", IORESOURCE_IO,}, |
27 | {PM8606_BACKLIGHT3, PM8606_BACKLIGHT3, "backlight-2", IORESOURCE_IO,}, | 27 | {PM8606_BACKLIGHT3, PM8606_BACKLIGHT3, "backlight-2", IORESOURCE_IO,}, |
28 | }; | 28 | }; |
29 | 29 | ||
30 | static struct resource led_resources[] __initdata = { | 30 | static struct resource led_resources[] __devinitdata = { |
31 | {PM8606_LED1_RED, PM8606_LED1_RED, "led0-red", IORESOURCE_IO,}, | 31 | {PM8606_LED1_RED, PM8606_LED1_RED, "led0-red", IORESOURCE_IO,}, |
32 | {PM8606_LED1_GREEN, PM8606_LED1_GREEN, "led0-green", IORESOURCE_IO,}, | 32 | {PM8606_LED1_GREEN, PM8606_LED1_GREEN, "led0-green", IORESOURCE_IO,}, |
33 | {PM8606_LED1_BLUE, PM8606_LED1_BLUE, "led0-blue", IORESOURCE_IO,}, | 33 | {PM8606_LED1_BLUE, PM8606_LED1_BLUE, "led0-blue", IORESOURCE_IO,}, |
@@ -36,7 +36,7 @@ static struct resource led_resources[] __initdata = { | |||
36 | {PM8606_LED2_BLUE, PM8606_LED2_BLUE, "led1-blue", IORESOURCE_IO,}, | 36 | {PM8606_LED2_BLUE, PM8606_LED2_BLUE, "led1-blue", IORESOURCE_IO,}, |
37 | }; | 37 | }; |
38 | 38 | ||
39 | static struct resource regulator_resources[] __initdata = { | 39 | static struct resource regulator_resources[] __devinitdata = { |
40 | {PM8607_ID_BUCK1, PM8607_ID_BUCK1, "buck-1", IORESOURCE_IO,}, | 40 | {PM8607_ID_BUCK1, PM8607_ID_BUCK1, "buck-1", IORESOURCE_IO,}, |
41 | {PM8607_ID_BUCK2, PM8607_ID_BUCK2, "buck-2", IORESOURCE_IO,}, | 41 | {PM8607_ID_BUCK2, PM8607_ID_BUCK2, "buck-2", IORESOURCE_IO,}, |
42 | {PM8607_ID_BUCK3, PM8607_ID_BUCK3, "buck-3", IORESOURCE_IO,}, | 42 | {PM8607_ID_BUCK3, PM8607_ID_BUCK3, "buck-3", IORESOURCE_IO,}, |
@@ -57,15 +57,15 @@ static struct resource regulator_resources[] __initdata = { | |||
57 | {PM8607_ID_LDO15, PM8607_ID_LDO15, "ldo-15", IORESOURCE_IO,}, | 57 | {PM8607_ID_LDO15, PM8607_ID_LDO15, "ldo-15", IORESOURCE_IO,}, |
58 | }; | 58 | }; |
59 | 59 | ||
60 | static struct resource touch_resources[] __initdata = { | 60 | static struct resource touch_resources[] __devinitdata = { |
61 | {PM8607_IRQ_PEN, PM8607_IRQ_PEN, "touch", IORESOURCE_IRQ,}, | 61 | {PM8607_IRQ_PEN, PM8607_IRQ_PEN, "touch", IORESOURCE_IRQ,}, |
62 | }; | 62 | }; |
63 | 63 | ||
64 | static struct resource onkey_resources[] __initdata = { | 64 | static struct resource onkey_resources[] __devinitdata = { |
65 | {PM8607_IRQ_ONKEY, PM8607_IRQ_ONKEY, "onkey", IORESOURCE_IRQ,}, | 65 | {PM8607_IRQ_ONKEY, PM8607_IRQ_ONKEY, "onkey", IORESOURCE_IRQ,}, |
66 | }; | 66 | }; |
67 | 67 | ||
68 | static struct resource codec_resources[] __initdata = { | 68 | static struct resource codec_resources[] __devinitdata = { |
69 | /* Headset microphone insertion or removal */ | 69 | /* Headset microphone insertion or removal */ |
70 | {PM8607_IRQ_MICIN, PM8607_IRQ_MICIN, "micin", IORESOURCE_IRQ,}, | 70 | {PM8607_IRQ_MICIN, PM8607_IRQ_MICIN, "micin", IORESOURCE_IRQ,}, |
71 | /* Hook-switch press or release */ | 71 | /* Hook-switch press or release */ |
@@ -76,12 +76,12 @@ static struct resource codec_resources[] __initdata = { | |||
76 | {PM8607_IRQ_AUDIO_SHORT, PM8607_IRQ_AUDIO_SHORT, "audio-short", IORESOURCE_IRQ,}, | 76 | {PM8607_IRQ_AUDIO_SHORT, PM8607_IRQ_AUDIO_SHORT, "audio-short", IORESOURCE_IRQ,}, |
77 | }; | 77 | }; |
78 | 78 | ||
79 | static struct resource battery_resources[] __initdata = { | 79 | static struct resource battery_resources[] __devinitdata = { |
80 | {PM8607_IRQ_CC, PM8607_IRQ_CC, "columb counter", IORESOURCE_IRQ,}, | 80 | {PM8607_IRQ_CC, PM8607_IRQ_CC, "columb counter", IORESOURCE_IRQ,}, |
81 | {PM8607_IRQ_BAT, PM8607_IRQ_BAT, "battery", IORESOURCE_IRQ,}, | 81 | {PM8607_IRQ_BAT, PM8607_IRQ_BAT, "battery", IORESOURCE_IRQ,}, |
82 | }; | 82 | }; |
83 | 83 | ||
84 | static struct resource charger_resources[] __initdata = { | 84 | static struct resource charger_resources[] __devinitdata = { |
85 | {PM8607_IRQ_CHG, PM8607_IRQ_CHG, "charger detect", IORESOURCE_IRQ,}, | 85 | {PM8607_IRQ_CHG, PM8607_IRQ_CHG, "charger detect", IORESOURCE_IRQ,}, |
86 | {PM8607_IRQ_CHG_DONE, PM8607_IRQ_CHG_DONE, "charging done", IORESOURCE_IRQ,}, | 86 | {PM8607_IRQ_CHG_DONE, PM8607_IRQ_CHG_DONE, "charging done", IORESOURCE_IRQ,}, |
87 | {PM8607_IRQ_CHG_FAULT, PM8607_IRQ_CHG_FAULT, "charging timeout", IORESOURCE_IRQ,}, | 87 | {PM8607_IRQ_CHG_FAULT, PM8607_IRQ_CHG_FAULT, "charging timeout", IORESOURCE_IRQ,}, |
@@ -90,13 +90,13 @@ static struct resource charger_resources[] __initdata = { | |||
90 | {PM8607_IRQ_VCHG, PM8607_IRQ_VCHG, "vchg voltage", IORESOURCE_IRQ,}, | 90 | {PM8607_IRQ_VCHG, PM8607_IRQ_VCHG, "vchg voltage", IORESOURCE_IRQ,}, |
91 | }; | 91 | }; |
92 | 92 | ||
93 | static struct mfd_cell bk_devs[] __initdata = { | 93 | static struct mfd_cell bk_devs[] = { |
94 | {"88pm860x-backlight", 0,}, | 94 | {"88pm860x-backlight", 0,}, |
95 | {"88pm860x-backlight", 1,}, | 95 | {"88pm860x-backlight", 1,}, |
96 | {"88pm860x-backlight", 2,}, | 96 | {"88pm860x-backlight", 2,}, |
97 | }; | 97 | }; |
98 | 98 | ||
99 | static struct mfd_cell led_devs[] __initdata = { | 99 | static struct mfd_cell led_devs[] = { |
100 | {"88pm860x-led", 0,}, | 100 | {"88pm860x-led", 0,}, |
101 | {"88pm860x-led", 1,}, | 101 | {"88pm860x-led", 1,}, |
102 | {"88pm860x-led", 2,}, | 102 | {"88pm860x-led", 2,}, |
@@ -105,7 +105,7 @@ static struct mfd_cell led_devs[] __initdata = { | |||
105 | {"88pm860x-led", 5,}, | 105 | {"88pm860x-led", 5,}, |
106 | }; | 106 | }; |
107 | 107 | ||
108 | static struct mfd_cell regulator_devs[] __initdata = { | 108 | static struct mfd_cell regulator_devs[] = { |
109 | {"88pm860x-regulator", 0,}, | 109 | {"88pm860x-regulator", 0,}, |
110 | {"88pm860x-regulator", 1,}, | 110 | {"88pm860x-regulator", 1,}, |
111 | {"88pm860x-regulator", 2,}, | 111 | {"88pm860x-regulator", 2,}, |
@@ -126,15 +126,15 @@ static struct mfd_cell regulator_devs[] __initdata = { | |||
126 | {"88pm860x-regulator", 17,}, | 126 | {"88pm860x-regulator", 17,}, |
127 | }; | 127 | }; |
128 | 128 | ||
129 | static struct mfd_cell touch_devs[] __initdata = { | 129 | static struct mfd_cell touch_devs[] = { |
130 | {"88pm860x-touch", -1,}, | 130 | {"88pm860x-touch", -1,}, |
131 | }; | 131 | }; |
132 | 132 | ||
133 | static struct mfd_cell onkey_devs[] __initdata = { | 133 | static struct mfd_cell onkey_devs[] = { |
134 | {"88pm860x-onkey", -1,}, | 134 | {"88pm860x-onkey", -1,}, |
135 | }; | 135 | }; |
136 | 136 | ||
137 | static struct mfd_cell codec_devs[] __initdata = { | 137 | static struct mfd_cell codec_devs[] = { |
138 | {"88pm860x-codec", -1,}, | 138 | {"88pm860x-codec", -1,}, |
139 | }; | 139 | }; |
140 | 140 | ||