ARM: dts: qcom: Remove size elements from pmic reg properties

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>

diff --git a/arch/arm/boot/dts/qcom-pm8841.dtsi b/arch/arm/boot/dts/qcom-pm8841.dtsi
index 9f357f68713c44fedd26a899303480f5cab7f09a..0512f645922e29e7b9c31067f9937724e1b041c0 100644 (file)
--- a/arch/arm/boot/dts/qcom-pm8841.dtsi
+++ b/arch/arm/boot/dts/qcom-pm8841.dtsi
@@ -11,7 +11,7 @@ pm8841_0: pm8841@4 {
 
                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>,
@@ -22,7 +22,7 @@ pm8841_mpps: mpps@a000 {
 
                temp-alarm@2400 {
                        compatible = "qcom,spmi-temp-alarm";
-                       reg = <0x2400 0x100>;
+                       reg = <0x2400>;
                        interrupts = <4 0x24 0 IRQ_TYPE_EDGE_RISING>;
                };
        };

diff --git a/arch/arm/boot/dts/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom-pm8941.dtsi
index ca53a5947437525d1e706259909616c16a3d21de..d95edb6f6265394e6b3dca251098b4016aff3cc8 100644 (file)
--- a/arch/arm/boot/dts/qcom-pm8941.dtsi
+++ b/arch/arm/boot/dts/qcom-pm8941.dtsi
@@ -12,15 +12,15 @@ pm8941_0: pm8941@0 {
 
                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;
@@ -28,7 +28,7 @@ pwrkey@800 {
 
                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>,
@@ -49,7 +49,7 @@ charger@1000 {
 
                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>,
@@ -92,7 +92,7 @@ pm8941_gpios: gpios@c000 {
 
                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>,
@@ -107,7 +107,7 @@ pm8941_mpps: mpps@a000 {
 
                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";
@@ -116,7 +116,7 @@ pm8941_temp: temp-alarm@2400 {
 
                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>;
@@ -141,7 +141,7 @@ ref_vdd {
 
                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>;
                };
@@ -161,7 +161,7 @@ pm8941_1: pm8941@1 {
 
                pm8941_wled: wled@d800 {
                        compatible = "qcom,pm8941-wled";
-                       reg = <0xd800 0x100>;
+                       reg = <0xd800>;
                        label = "backlight";
 
                        status = "disabled";