Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Stephen Boyd and committed by
Andy Gross
65d4e83e b32e592d

+12 -12
+2 -2
arch/arm/boot/dts/qcom-pm8841.dtsi
··· 11 11 12 12 pm8841_mpps: mpps@a000 { 13 13 compatible = "qcom,pm8841-mpp", "qcom,spmi-mpp"; 14 - reg = <0xa000 0x400>; 14 + reg = <0xa000>; 15 15 gpio-controller; 16 16 #gpio-cells = <2>; 17 17 interrupts = <4 0xa0 0 IRQ_TYPE_NONE>, ··· 22 22 23 23 temp-alarm@2400 { 24 24 compatible = "qcom,spmi-temp-alarm"; 25 - reg = <0x2400 0x100>; 25 + reg = <0x2400>; 26 26 interrupts = <4 0x24 0 IRQ_TYPE_EDGE_RISING>; 27 27 }; 28 28 };
+10 -10
arch/arm/boot/dts/qcom-pm8941.dtsi
··· 12 12 13 13 rtc@6000 { 14 14 compatible = "qcom,pm8941-rtc"; 15 - reg = <0x6000 0x100>, 16 - <0x6100 0x100>; 15 + reg = <0x6000>, 16 + <0x6100>; 17 17 reg-names = "rtc", "alarm"; 18 18 interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>; 19 19 }; 20 20 21 21 pwrkey@800 { 22 22 compatible = "qcom,pm8941-pwrkey"; 23 - reg = <0x800 0x100>; 23 + reg = <0x800>; 24 24 interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>; 25 25 debounce = <15625>; 26 26 bias-pull-up; ··· 28 28 29 29 charger@1000 { 30 30 compatible = "qcom,pm8941-charger"; 31 - reg = <0x1000 0x700>; 31 + reg = <0x1000>; 32 32 interrupts = <0x0 0x10 7 IRQ_TYPE_EDGE_BOTH>, 33 33 <0x0 0x10 5 IRQ_TYPE_EDGE_BOTH>, 34 34 <0x0 0x10 4 IRQ_TYPE_EDGE_BOTH>, ··· 49 49 50 50 pm8941_gpios: gpios@c000 { 51 51 compatible = "qcom,pm8941-gpio", "qcom,spmi-gpio"; 52 - reg = <0xc000 0x2400>; 52 + reg = <0xc000>; 53 53 gpio-controller; 54 54 #gpio-cells = <2>; 55 55 interrupts = <0 0xc0 0 IRQ_TYPE_NONE>, ··· 92 92 93 93 pm8941_mpps: mpps@a000 { 94 94 compatible = "qcom,pm8941-mpp", "qcom,spmi-mpp"; 95 - reg = <0xa000 0x800>; 95 + reg = <0xa000>; 96 96 gpio-controller; 97 97 #gpio-cells = <2>; 98 98 interrupts = <0 0xa0 0 IRQ_TYPE_NONE>, ··· 107 107 108 108 pm8941_temp: temp-alarm@2400 { 109 109 compatible = "qcom,spmi-temp-alarm"; 110 - reg = <0x2400 0x100>; 110 + reg = <0x2400>; 111 111 interrupts = <0 0x24 0 IRQ_TYPE_EDGE_RISING>; 112 112 io-channels = <&pm8941_vadc VADC_DIE_TEMP>; 113 113 io-channel-names = "thermal"; ··· 116 116 117 117 pm8941_vadc: vadc@3100 { 118 118 compatible = "qcom,spmi-vadc"; 119 - reg = <0x3100 0x100>; 119 + reg = <0x3100>; 120 120 interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>; 121 121 #address-cells = <1>; 122 122 #size-cells = <0>; ··· 141 141 142 142 pm8941_iadc: iadc@3600 { 143 143 compatible = "qcom,pm8941-iadc", "qcom,spmi-iadc"; 144 - reg = <0x3600 0x100>; 144 + reg = <0x3600>; 145 145 interrupts = <0x0 0x36 0x0 IRQ_TYPE_EDGE_RISING>; 146 146 qcom,external-resistor-micro-ohms = <10000>; 147 147 }; ··· 161 161 162 162 pm8941_wled: wled@d800 { 163 163 compatible = "qcom,pm8941-wled"; 164 - reg = <0xd800 0x100>; 164 + reg = <0xd800>; 165 165 label = "backlight"; 166 166 167 167 status = "disabled";