qcom: Remove size elements from pmic reg properties
cover qcom: Remove size elements from pmic reg properties
These patches remove the size elements from the pmic reg properties. Technically they shouldn't be there because size-cells is 0 for the parent node, but we've put them there so that MPP and gpio drivers can figure out how many gpios there are.
So once the gpio and mpp drivers are fixed to count the irqs instead of look at this reg property, we can apply this patch to remove the size elements and be DT compliant. That would be a complicated cross-merge between pinctrl and arm-soc trees though, so perhaps this series should wait until the two trees meet in v4.5?
Stephen Boyd (2):
ARM: dts: qcom: Remove size elements from pmic reg properties
ARM64: dts: qcom: Remove size elements from pmic reg properties
arch/arm/boot/dts/qcom-pm8841.dtsi | 4 ++-- arch/arm/boot/dts/qcom-pm8941.dtsi | 22 +++++++++++----------- arch/arm64/boot/dts/qcom/pm8916.dtsi | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 1/2 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.
--- arch/arm/boot/dts/qcom-pm8841.dtsi | 4 ++-- arch/arm/boot/dts/qcom-pm8941.dtsi | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-)
arch/arm/boot/dts/qcom-pm8841.dtsi +2 -2
@@ -11,7 +11,7 @@ pm8841_mpps: mpps at 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 @@ temp-alarm at 2400 { compatible = "qcom,spmi-temp-alarm"; - reg = <0x2400 0x100>; + reg = <0x2400>; interrupts = <4 0x24 0 IRQ_TYPE_EDGE_RISING>; }; };
arch/arm/boot/dts/qcom-pm8941.dtsi +11 -11
@@ -12,15 +12,15 @@ rtc at 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 at 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 @@ charger at 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 @@ pm8941_gpios: gpios at 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_mpps: mpps at 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_temp: temp-alarm at 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_vadc: vadc at 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,14 +141,14 @@ pm8941_iadc: iadc at 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>; }; coincell at 2800 { compatible = "qcom,pm8941-coincell"; - reg = <0x2800 0x100>; + reg = <0x2800>; status = "disabled"; }; };
@@ -161,7 +161,7 @@ wled at d800 { compatible = "qcom,pm8941-wled"; - reg = <0xd800 0x100>; + reg = <0xd800>; label = "backlight"; qcom,cs-out;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [1/2] ARM: dts: qcom: Remove size elements from pmic reg properties
Quoted 7 lines · Stephen Boyd
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 <[email protected]>
PATCH 2/2 ARM64: dts: qcom: Remove size elements from pmic reg properties
In reply to Stephen BoydThe #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.
--- arch/arm64/boot/dts/qcom/pm8916.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/qcom/pm8916.dtsi +5 -5
@@ -12,7 +12,7 @@ rtc at 6000 { compatible = "qcom,pm8941-rtc"; - reg = <0x6000 0x6100>; + reg = <0x6000>; reg-names = "rtc", "alarm"; interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>; };
@@ -27,7 +27,7 @@ pm8916_gpios: gpios at c000 { compatible = "qcom,pm8916-gpio"; - reg = <0xc000 0x400>; + reg = <0xc000>; gpio-controller; #gpio-cells = <2>; interrupts = <0 0xc0 0 IRQ_TYPE_NONE>,
@@ -38,7 +38,7 @@ pm8916_mpps: mpps at a000 { compatible = "qcom,pm8916-mpp"; - reg = <0xa000 0x400>; + reg = <0xa000>; gpio-controller; #gpio-cells = <2>; interrupts = <0 0xa0 0 IRQ_TYPE_NONE>,
@@ -49,7 +49,7 @@ pm8916_temp: temp-alarm at 2400 { compatible = "qcom,spmi-temp-alarm"; - reg = <0x2400 0x100>; + reg = <0x2400>; interrupts = <0 0x24 0 IRQ_TYPE_EDGE_RISING>; io-channels = <&pm8916_vadc VADC_DIE_TEMP>; io-channel-names = "thermal";
@@ -58,7 +58,7 @@ pm8916_vadc: vadc at 3100 { compatible = "qcom,spmi-vadc"; - reg = <0x3100 0x100>; + reg = <0x3100>; interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>; #address-cells = <1>; #size-cells = <0>;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [2/2] ARM64: dts: qcom: Remove size elements from pmic reg properties
Quoted 9 lines · Stephen Boyd
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 <[email protected]>---