Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de1893f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mfd-fixes-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes 

Pull MFD fixes from Samuel Ortiz:
 "This is the first batch of MFD fixes for 3.9.

  With this one we have:

   - An ab8500 build failure fix.
   - An ab8500 device tree parsing fix.
   - A fix for twl4030_madc remove routine to work properly (when
     built-in).
   - A fix for properly registering palmas interrupt handler.
   - A fix for omap-usb init routine to actually write into the
     hostconfig register.
   - A couple of warning fixes for ab8500-gpadc and tps65912"

* tag 'mfd-fixes-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes:
  mfd: twl4030-madc: Remove __exit_p annotation
  mfd: ab8500: Kill "reg" property from binding
  mfd: ab8500-gpadc: Complain if we fail to enable vtvout LDO
  mfd: wm831x: Don't forward declare enum wm831x_auxadc
  mfd: twl4030-audio: Fix argument type for twl4030_audio_disable_resource()
  mfd: tps65912: Declare and use tps65912_irq_exit()
  mfd: palmas: Provide irq flags through DT/platform data
  mfd: Make AB8500_CORE select POWER_SUPPLY to fix build error
  mfd: omap-usb-host: Actually update hostconfig
parents 92fbb1c9 03715410

Documentation/devicetree/bindings/mfd/ab8500.txt

+1 −5
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ Required parent device properties: 
                                  4 = active high level-sensitive

                                  8 = active low level-sensitive



Optional parent device properties:

- reg                    : contains the PRCMU mailbox address for the AB8500 i2c port



The AB8500 consists of a large and varied group of sub-devices:



Device                     IRQ Names              Supply Names   Description
@@ -86,9 +83,8 @@ Non-standard child device properties: 
   - stericsson,amic2-bias-vamic1           : Analoge Mic wishes to use a non-standard Vamic

   - stericsson,earpeice-cmv                : Earpeice voltage (only: 950 | 1100 | 1270 | 1580)



ab8500@5 {

ab8500 {

         compatible = "stericsson,ab8500";

         reg = <5>; /* mailbox 5 is i2c */

         interrupts = <0 40 0x4>;

         interrupt-controller;

         #interrupt-cells = <2>;

arch/arm/boot/dts/dbx5x0.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -319,9 +319,8 @@ 
				};

			};



			ab8500@5 {

			ab8500 {

				compatible = "stericsson,ab8500";

				reg = <5>; /* mailbox 5 is i2c */

				interrupt-parent = <&intc>;

				interrupts = <0 40 0x4>;

				interrupt-controller;

arch/arm/boot/dts/href.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ 
				};

			};



			ab8500@5 {

			ab8500 {

				ab8500-regulators {

					ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {

						regulator-name = "V-DISPLAY";

arch/arm/boot/dts/hrefv60plus.dts

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ 
				};

			};



			ab8500@5 {

			ab8500 {

				ab8500-regulators {

					ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {

						regulator-name = "V-DISPLAY";

arch/arm/boot/dts/snowball.dts

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ 
				};

			};



			ab8500@5 {

			ab8500 {

				ab8500-regulators {

					ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {

						regulator-name = "V-DISPLAY";