aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-24 23:00:58 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-24 23:00:58 -0500
commitab7826595e9ec51a51f622c5fc91e2f59440481a (patch)
tree34241b399fa7a12c260e06e6c1c31bc69d46e1e3 /arch
parent21fbd5809ad126b949206d78e0a0e07ec872ea11 (diff)
parentff7109fa632654eaef657186f2942f5b679023d6 (diff)
Merge tag 'mfd-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
Pull MFS updates from Samuel Ortiz: "This is the MFD pull request for the 3.9 merge window. No new drivers this time, but a bunch of fairly big cleanups: - Roger Quadros worked on a OMAP USBHS and TLL platform data consolidation, OMAP5 support and clock management code cleanup. - The first step of a major sync for the ab8500 driver from Lee Jones. In particular, the debugfs and the sysct interfaces got extended and improved. - Peter Ujfalusi sent a nice patchset for cleaning and fixing the twl-core driver, with a much needed module id lookup code improvement. - The regular wm5102 and arizona cleanups and fixes from Mark Brown. - Laxman Dewangan extended the palmas APIs in order to implement the palmas GPIO and rt drivers. - Laxman also added DT support for the tps65090 driver. - The Intel SCH and ICH drivers got a couple fixes from Aaron Sierra and Darren Hart. - Linus Walleij patchset for the ab8500 driver allowed ab8500 and ab9540 based devices to switch to the new abx500 pin-ctrl driver. - The max8925 now has device tree and irqdomain support thanks to Qing Xu. - The recently added rtsx driver got a few cleanups and fixes for a better card detection code path and now also supports the RTS5227 chipset, thanks to Wei Wang and Roger Tseng." * tag 'mfd-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (109 commits) mfd: lpc_ich: Use devres API to allocate private data mfd: lpc_ich: Add Device IDs for Intel Wellsburg PCH mfd: lpc_sch: Accomodate partial population of the MFD devices mfd: da9052-i2c: Staticize da9052_i2c_fix() mfd: syscon: Fix sparse warning mfd: twl-core: Fix kernel panic on boot mfd: rtsx: Fix issue that booting OS with SD card inserted mfd: ab8500: Fix compile error mfd: Add missing GENERIC_HARDIRQS dependecies Documentation: Add docs for max8925 dt mfd: max8925: Add dts mfd: max8925: Support dt for backlight mfd: max8925: Fix onkey driver irq base mfd: max8925: Fix mfd device register failure mfd: max8925: Add irqdomain for dt mfd: vexpress: Allow vexpress-sysreg to self-initialise mfd: rtsx: Support RTS5227 mfd: rtsx: Implement driving adjustment to device-dependent callbacks mfd: vexpress: Add pseudo-GPIO based LEDs mfd: ab8500: Rename ab8500 to abx500 for hwmon driver ...
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/mmp2-brownstone.dts158
-rw-r--r--arch/arm/boot/dts/mmp2.dtsi4
-rw-r--r--arch/arm/mach-omap2/board-zoom-display.c14
3 files changed, 168 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/mmp2-brownstone.dts b/arch/arm/boot/dts/mmp2-brownstone.dts
index c9b4f27d191e..7f70a39459f6 100644
--- a/arch/arm/boot/dts/mmp2-brownstone.dts
+++ b/arch/arm/boot/dts/mmp2-brownstone.dts
@@ -29,6 +29,164 @@
29 }; 29 };
30 twsi1: i2c@d4011000 { 30 twsi1: i2c@d4011000 {
31 status = "okay"; 31 status = "okay";
32 pmic: max8925@3c {
33 compatible = "maxium,max8925";
34 reg = <0x3c>;
35 interrupts = <1>;
36 interrupt-parent = <&intcmux4>;
37 interrupt-controller;
38 #interrupt-cells = <1>;
39 maxim,tsc-irq = <0>;
40
41 regulators {
42 SDV1 {
43 regulator-min-microvolt = <637500>;
44 regulator-max-microvolt = <1425000>;
45 regulator-boot-on;
46 regulator-always-on;
47 };
48 SDV2 {
49 regulator-min-microvolt = <650000>;
50 regulator-max-microvolt = <2225000>;
51 regulator-boot-on;
52 regulator-always-on;
53 };
54 SDV3 {
55 regulator-min-microvolt = <750000>;
56 regulator-max-microvolt = <3900000>;
57 regulator-boot-on;
58 regulator-always-on;
59 };
60 LDO1 {
61 regulator-min-microvolt = <750000>;
62 regulator-max-microvolt = <3900000>;
63 regulator-boot-on;
64 regulator-always-on;
65 };
66 LDO2 {
67 regulator-min-microvolt = <650000>;
68 regulator-max-microvolt = <2250000>;
69 regulator-boot-on;
70 regulator-always-on;
71 };
72 LDO3 {
73 regulator-min-microvolt = <650000>;
74 regulator-max-microvolt = <2250000>;
75 regulator-boot-on;
76 regulator-always-on;
77 };
78 LDO4 {
79 regulator-min-microvolt = <750000>;
80 regulator-max-microvolt = <3900000>;
81 regulator-boot-on;
82 regulator-always-on;
83 };
84 LDO5 {
85 regulator-min-microvolt = <750000>;
86 regulator-max-microvolt = <3900000>;
87 regulator-boot-on;
88 regulator-always-on;
89 };
90 LDO6 {
91 regulator-min-microvolt = <750000>;
92 regulator-max-microvolt = <3900000>;
93 regulator-boot-on;
94 regulator-always-on;
95 };
96 LDO7 {
97 regulator-min-microvolt = <750000>;
98 regulator-max-microvolt = <3900000>;
99 regulator-boot-on;
100 regulator-always-on;
101 };
102 LDO8 {
103 regulator-min-microvolt = <750000>;
104 regulator-max-microvolt = <3900000>;
105 regulator-boot-on;
106 regulator-always-on;
107 };
108 LDO9 {
109 regulator-min-microvolt = <750000>;
110 regulator-max-microvolt = <3900000>;
111 regulator-boot-on;
112 regulator-always-on;
113 };
114 LDO10 {
115 regulator-min-microvolt = <750000>;
116 regulator-max-microvolt = <3900000>;
117 };
118 LDO11 {
119 regulator-min-microvolt = <750000>;
120 regulator-max-microvolt = <3900000>;
121 regulator-boot-on;
122 regulator-always-on;
123 };
124 LDO12 {
125 regulator-min-microvolt = <750000>;
126 regulator-max-microvolt = <3900000>;
127 regulator-boot-on;
128 regulator-always-on;
129 };
130 LDO13 {
131 regulator-min-microvolt = <750000>;
132 regulator-max-microvolt = <3900000>;
133 regulator-boot-on;
134 regulator-always-on;
135 };
136 LDO14 {
137 regulator-min-microvolt = <750000>;
138 regulator-max-microvolt = <3900000>;
139 regulator-boot-on;
140 regulator-always-on;
141 };
142 LDO15 {
143 regulator-min-microvolt = <750000>;
144 regulator-max-microvolt = <3900000>;
145 regulator-boot-on;
146 regulator-always-on;
147 };
148 LDO16 {
149 regulator-min-microvolt = <750000>;
150 regulator-max-microvolt = <3900000>;
151 regulator-boot-on;
152 regulator-always-on;
153 };
154 LDO17 {
155 regulator-min-microvolt = <650000>;
156 regulator-max-microvolt = <2250000>;
157 regulator-boot-on;
158 regulator-always-on;
159 };
160 LDO18 {
161 regulator-min-microvolt = <650000>;
162 regulator-max-microvolt = <2250000>;
163 regulator-boot-on;
164 regulator-always-on;
165 };
166 LDO19 {
167 regulator-min-microvolt = <750000>;
168 regulator-max-microvolt = <3900000>;
169 regulator-boot-on;
170 regulator-always-on;
171 };
172 LDO20 {
173 regulator-min-microvolt = <750000>;
174 regulator-max-microvolt = <3900000>;
175 regulator-boot-on;
176 regulator-always-on;
177 };
178 };
179 backlight {
180 maxim,max8925-dual-string = <0>;
181 };
182 charger {
183 batt-detect = <0>;
184 topoff-threshold = <1>;
185 fast-charge = <7>;
186 no-temp-support = <0>;
187 no-insert-detect = <0>;
188 };
189 };
32 }; 190 };
33 rtc: rtc@d4010000 { 191 rtc: rtc@d4010000 {
34 status = "okay"; 192 status = "okay";
diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi
index 0514fb41627e..1429ac05b36d 100644
--- a/arch/arm/boot/dts/mmp2.dtsi
+++ b/arch/arm/boot/dts/mmp2.dtsi
@@ -46,7 +46,7 @@
46 mrvl,intc-nr-irqs = <64>; 46 mrvl,intc-nr-irqs = <64>;
47 }; 47 };
48 48
49 intcmux4@d4282150 { 49 intcmux4: interrupt-controller@d4282150 {
50 compatible = "mrvl,mmp2-mux-intc"; 50 compatible = "mrvl,mmp2-mux-intc";
51 interrupts = <4>; 51 interrupts = <4>;
52 interrupt-controller; 52 interrupt-controller;
@@ -201,6 +201,8 @@
201 compatible = "mrvl,mmp-twsi"; 201 compatible = "mrvl,mmp-twsi";
202 reg = <0xd4011000 0x1000>; 202 reg = <0xd4011000 0x1000>;
203 interrupts = <7>; 203 interrupts = <7>;
204 #address-cells = <1>;
205 #size-cells = <0>;
204 mrvl,i2c-fast-mode; 206 mrvl,i2c-fast-mode;
205 status = "disabled"; 207 status = "disabled";
206 }; 208 };
diff --git a/arch/arm/mach-omap2/board-zoom-display.c b/arch/arm/mach-omap2/board-zoom-display.c
index 1c7c834a5b5f..8cef477d6b00 100644
--- a/arch/arm/mach-omap2/board-zoom-display.c
+++ b/arch/arm/mach-omap2/board-zoom-display.c
@@ -49,13 +49,13 @@ static void zoom_panel_disable_lcd(struct omap_dss_device *dssdev)
49{ 49{
50} 50}
51 51
52/* 52/* Register offsets in TWL4030_MODULE_INTBR */
53 * PWMA/B register offsets (TWL4030_MODULE_PWMA)
54 */
55#define TWL_INTBR_PMBR1 0xD 53#define TWL_INTBR_PMBR1 0xD
56#define TWL_INTBR_GPBR1 0xC 54#define TWL_INTBR_GPBR1 0xC
57#define TWL_LED_PWMON 0x0 55
58#define TWL_LED_PWMOFF 0x1 56/* Register offsets in TWL_MODULE_PWM */
57#define TWL_LED_PWMON 0x3
58#define TWL_LED_PWMOFF 0x4
59 59
60static int zoom_set_bl_intensity(struct omap_dss_device *dssdev, int level) 60static int zoom_set_bl_intensity(struct omap_dss_device *dssdev, int level)
61{ 61{
@@ -93,8 +93,8 @@ static int zoom_set_bl_intensity(struct omap_dss_device *dssdev, int level)
93 } 93 }
94 94
95 c = ((50 * (100 - level)) / 100) + 1; 95 c = ((50 * (100 - level)) / 100) + 1;
96 twl_i2c_write_u8(TWL4030_MODULE_PWM1, 0x7F, TWL_LED_PWMOFF); 96 twl_i2c_write_u8(TWL_MODULE_PWM, 0x7F, TWL_LED_PWMOFF);
97 twl_i2c_write_u8(TWL4030_MODULE_PWM1, c, TWL_LED_PWMON); 97 twl_i2c_write_u8(TWL_MODULE_PWM, c, TWL_LED_PWMON);
98#else 98#else
99 pr_warn("Backlight not enabled\n"); 99 pr_warn("Backlight not enabled\n");
100#endif 100#endif
generated by cgit v1.2.2 (git 2.25.0) at 2026-04-04 23:02:19 -0400