Skip to content

Commit

Permalink
mfd: ab8500: Kill "reg" property from binding
Browse files Browse the repository at this point in the history
The ab8500 device is a child of the prcmu device, which is a memory mapped
bus device, whose children are addressable using physical memory addresses,
not using mailboxes, so a mailbox number in the ab8500 node cannot be
parsed by DT. Nothing uses this number, since it was only introduced
as part of the failed attempt to clean up prcmu mailbox handling, and
we can simply remove it.

Signed-off-by: Arnd Bergmann <[email protected]>
Signed-off-by: Samuel Ortiz <[email protected]>
  • Loading branch information
arndb authored and Samuel Ortiz committed Mar 12, 2013
1 parent 54fc403 commit d52701d
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 10 deletions.
6 changes: 1 addition & 5 deletions Documentation/devicetree/bindings/mfd/ab8500.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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>;
Expand Down
3 changes: 1 addition & 2 deletions arch/arm/boot/dts/dbx5x0.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/href.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
};
};

ab8500@5 {
ab8500 {
ab8500-regulators {
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
regulator-name = "V-DISPLAY";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/hrefv60plus.dts
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
};
};

ab8500@5 {
ab8500 {
ab8500-regulators {
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
regulator-name = "V-DISPLAY";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/snowball.dts
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@
};
};

ab8500@5 {
ab8500 {
ab8500-regulators {
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
regulator-name = "V-DISPLAY";
Expand Down

0 comments on commit d52701d

Please sign in to comment.