Skip to content

Commit

Permalink
ARM: dts: qcom: Remove size elements from pmic reg properties
Browse files Browse the repository at this point in the history
The #size-cells for the pmics are 0, but we specify a size in the
reg property so that MPP and GPIO modules can figure out how many
pins there are. Now that we've done that by counting irqs, we can
remove the size elements in the reg properties and be DT
compliant.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Andy Gross <andy.gross@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
  • Loading branch information
Stephen Boyd authored and Andy Gross committed Feb 24, 2016
1 parent b32e592 commit 65d4e83
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/qcom-pm8841.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

pm8841_mpps: mpps@a000 {
compatible = "qcom,pm8841-mpp", "qcom,spmi-mpp";
reg = <0xa000 0x400>;
reg = <0xa000>;
gpio-controller;
#gpio-cells = <2>;
interrupts = <4 0xa0 0 IRQ_TYPE_NONE>,
Expand All @@ -22,7 +22,7 @@

temp-alarm@2400 {
compatible = "qcom,spmi-temp-alarm";
reg = <0x2400 0x100>;
reg = <0x2400>;
interrupts = <4 0x24 0 IRQ_TYPE_EDGE_RISING>;
};
};
Expand Down
20 changes: 10 additions & 10 deletions arch/arm/boot/dts/qcom-pm8941.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@

rtc@6000 {
compatible = "qcom,pm8941-rtc";
reg = <0x6000 0x100>,
<0x6100 0x100>;
reg = <0x6000>,
<0x6100>;
reg-names = "rtc", "alarm";
interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
};

pwrkey@800 {
compatible = "qcom,pm8941-pwrkey";
reg = <0x800 0x100>;
reg = <0x800>;
interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;
debounce = <15625>;
bias-pull-up;
};

charger@1000 {
compatible = "qcom,pm8941-charger";
reg = <0x1000 0x700>;
reg = <0x1000>;
interrupts = <0x0 0x10 7 IRQ_TYPE_EDGE_BOTH>,
<0x0 0x10 5 IRQ_TYPE_EDGE_BOTH>,
<0x0 0x10 4 IRQ_TYPE_EDGE_BOTH>,
Expand All @@ -49,7 +49,7 @@

pm8941_gpios: gpios@c000 {
compatible = "qcom,pm8941-gpio", "qcom,spmi-gpio";
reg = <0xc000 0x2400>;
reg = <0xc000>;
gpio-controller;
#gpio-cells = <2>;
interrupts = <0 0xc0 0 IRQ_TYPE_NONE>,
Expand Down Expand Up @@ -92,7 +92,7 @@

pm8941_mpps: mpps@a000 {
compatible = "qcom,pm8941-mpp", "qcom,spmi-mpp";
reg = <0xa000 0x800>;
reg = <0xa000>;
gpio-controller;
#gpio-cells = <2>;
interrupts = <0 0xa0 0 IRQ_TYPE_NONE>,
Expand All @@ -107,7 +107,7 @@

pm8941_temp: temp-alarm@2400 {
compatible = "qcom,spmi-temp-alarm";
reg = <0x2400 0x100>;
reg = <0x2400>;
interrupts = <0 0x24 0 IRQ_TYPE_EDGE_RISING>;
io-channels = <&pm8941_vadc VADC_DIE_TEMP>;
io-channel-names = "thermal";
Expand All @@ -116,7 +116,7 @@

pm8941_vadc: vadc@3100 {
compatible = "qcom,spmi-vadc";
reg = <0x3100 0x100>;
reg = <0x3100>;
interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
Expand All @@ -141,7 +141,7 @@

pm8941_iadc: iadc@3600 {
compatible = "qcom,pm8941-iadc", "qcom,spmi-iadc";
reg = <0x3600 0x100>;
reg = <0x3600>;
interrupts = <0x0 0x36 0x0 IRQ_TYPE_EDGE_RISING>;
qcom,external-resistor-micro-ohms = <10000>;
};
Expand All @@ -161,7 +161,7 @@

pm8941_wled: wled@d800 {
compatible = "qcom,pm8941-wled";
reg = <0xd800 0x100>;
reg = <0xd800>;
label = "backlight";

status = "disabled";
Expand Down

0 comments on commit 65d4e83

Please sign in to comment.