This is a first round of trivial bindings & DT fixes for the MDM9615 platform.
This first round focuses on trivial changes, the remaining work will
mainly be .txt to .yaml transition of old qcom pmic & co device bindings.
To: Andy Gross <[email protected]>
To: Bjorn Andersson <[email protected]>
To: Konrad Dybcio <[email protected]>
To: Rob Herring <[email protected]>
To: Krzysztof Kozlowski <[email protected]>
To: Lee Jones <[email protected]>
To: Satya Priya <[email protected]>
To: Dmitry Torokhov <[email protected]>
To: Alessandro Zummo <[email protected]>
To: Alexandre Belloni <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: Bjorn Andersson <[email protected]>
Cc: [email protected]
Cc: [email protected]
Dependencies: None
Cc: Krzysztof Kozlowski <[email protected]>
Signed-off-by: Neil Armstrong <[email protected]>
---
Changes in v4:
- patch 1: None
- patch 2: None
- patch 3: None
- patch 4: None
- patch 5: Added reviewed-by tag
- patch 6: Fix descriptions, Added reviewed-by tags
- patch 7: None
- patch 8: None
- patch 9: Added acked-by tag
- patch 10: None
- patch 11: None
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- Rebased on v6.1-rc1
- patch 1: Added reviewed-by tag
- patch 2: Fixes typo in commit msg and added precision about why MIT was selected
- patch 3: Added reviewed-by tag
- patch 4: None
- patch 5: Drop second example node
- patch 6: Drop Andy, fix interrupts desc and fix example indentation
- patch 7: Fix commit msg wrap & add reviewed-by tag
- patch 8: Reword commit msg & add reviewed-by tag
- patch 9: Reword commit msg & add reviewed-by tag
- patch 10: None
- patch 11: Added reviewed-by tag
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- patch 1: switch to move from swir.txt to qcom.yaml
- patch 2: use MIT licence instead of X11 licence
- patch 3: move reg after compatible
- patch 4: added Krzysztof's review
- patch 5: split into 5 changes:
- document qcom,pm8921 as fallback of qcom,pm8018
- convert qcom,pm8921-pwrkey to dt-schema
- document qcom,pm8921-rtc as fallback of qcom,pm8018-rtc
- drop unused PM8018 compatible
- drop unused pm8018 RTC compatible
- patch 6: None
- patch 7: Reworded commit log based on Dmitry's wording on similar patches
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Neil Armstrong (11):
dt-bindings: arm: qcom: move swir,mangoh-green-wp8548 board documentation to qcom.yaml
arm: dts: qcom: mdm9615*: add SPDX-License-Identifier
arm: dts: qcom: mdm9615: add missing reg in cpu@0 node
arm: dts: qcom: mdm9615: remove invalid spi-max-frequency gsbi3_spi node
dt-bindings: mfd: qcom-pm8xxx: document qcom,pm8921 as fallback of qcom,pm8018
dt-bindings: input: qcom,pm8921-pwrkey: convert to dt-schema
dt-bindings: rtc: qcom-pm8xxx: document qcom,pm8921-rtc as fallback of qcom,pm8018-rtc
mfd: qcom-pm8xxx: drop unused PM8018 compatible
rtc: pm8xxx: drop unused pm8018 compatible
arm: dts: qcom: mdm9615: remove invalid interrupt-names from pl18x mmc nodes
arm: dts: qcom: mdm9615: remove useless amba subnode
Documentation/devicetree/bindings/arm/qcom.yaml | 6 +
Documentation/devicetree/bindings/arm/swir.txt | 12 --
.../bindings/input/qcom,pm8921-pwrkey.yaml | 75 +++++++++++++
.../bindings/input/qcom,pm8xxx-pwrkey.txt | 46 --------
.../devicetree/bindings/mfd/qcom-pm8xxx.yaml | 33 +++++-
.../devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 16 ++-
.../boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts | 39 +------
arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi | 39 +------
arch/arm/boot/dts/qcom-mdm9615.dtsi | 121 +++++++--------------
drivers/mfd/qcom-pm8xxx.c | 1 -
drivers/rtc/rtc-pm8xxx.c | 1 -
11 files changed, 159 insertions(+), 230 deletions(-)
---
base-commit: 9abf2313adc1ca1b6180c508c25f22f9395cc780
change-id: 20220928-mdm9615-dt-schema-fixes-66d4d0ccb7c7
Best regards,
--
Neil Armstrong <[email protected]>
The PM8018 compatible is always used with PM8921 fallback, so PM8018
compatible can be safely removed from device ID table
Reviewed-by: Krzysztof Kozlowski <[email protected]>
Acked-by: Alexandre Belloni <[email protected]>
Signed-off-by: Neil Armstrong <[email protected]>
---
drivers/rtc/rtc-pm8xxx.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/rtc/rtc-pm8xxx.c b/drivers/rtc/rtc-pm8xxx.c
index dc6d1476baa5..716e5d9ad74d 100644
--- a/drivers/rtc/rtc-pm8xxx.c
+++ b/drivers/rtc/rtc-pm8xxx.c
@@ -461,7 +461,6 @@ static const struct pm8xxx_rtc_regs pmk8350_regs = {
*/
static const struct of_device_id pm8xxx_id_table[] = {
{ .compatible = "qcom,pm8921-rtc", .data = &pm8921_regs },
- { .compatible = "qcom,pm8018-rtc", .data = &pm8921_regs },
{ .compatible = "qcom,pm8058-rtc", .data = &pm8058_regs },
{ .compatible = "qcom,pm8941-rtc", .data = &pm8941_regs },
{ .compatible = "qcom,pmk8350-rtc", .data = &pmk8350_regs },
--
b4 0.10.1
The separate amba device node doesn't add anything significant to the
DT. The OF parsing code already creates amba_device or platform_device
depending on the compatibility lists.
Acked-by: Krzysztof Kozlowski <[email protected]>
Signed-off-by: Neil Armstrong <[email protected]>
---
arch/arm/boot/dts/qcom-mdm9615.dtsi | 78 +++++++++++++++++--------------------
1 file changed, 36 insertions(+), 42 deletions(-)
diff --git a/arch/arm/boot/dts/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom-mdm9615.dtsi
index 9d950f96280d..482fd246321c 100644
--- a/arch/arm/boot/dts/qcom-mdm9615.dtsi
+++ b/arch/arm/boot/dts/qcom-mdm9615.dtsi
@@ -314,49 +314,43 @@ sdcc2bam: dma-controller@12142000{
qcom,ee = <0>;
};
- amba {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <1>;
- ranges;
- sdcc1: mmc@12180000 {
- status = "disabled";
- compatible = "arm,pl18x", "arm,primecell";
- arm,primecell-periphid = <0x00051180>;
- reg = <0x12180000 0x2000>;
- interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&gcc SDC1_CLK>, <&gcc SDC1_H_CLK>;
- clock-names = "mclk", "apb_pclk";
- bus-width = <8>;
- max-frequency = <48000000>;
- cap-sd-highspeed;
- cap-mmc-highspeed;
- vmmc-supply = <&vsdcc_fixed>;
- dmas = <&sdcc1bam 2>, <&sdcc1bam 1>;
- dma-names = "tx", "rx";
- assigned-clocks = <&gcc SDC1_CLK>;
- assigned-clock-rates = <400000>;
- };
+ sdcc1: mmc@12180000 {
+ status = "disabled";
+ compatible = "arm,pl18x", "arm,primecell";
+ arm,primecell-periphid = <0x00051180>;
+ reg = <0x12180000 0x2000>;
+ interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&gcc SDC1_CLK>, <&gcc SDC1_H_CLK>;
+ clock-names = "mclk", "apb_pclk";
+ bus-width = <8>;
+ max-frequency = <48000000>;
+ cap-sd-highspeed;
+ cap-mmc-highspeed;
+ vmmc-supply = <&vsdcc_fixed>;
+ dmas = <&sdcc1bam 2>, <&sdcc1bam 1>;
+ dma-names = "tx", "rx";
+ assigned-clocks = <&gcc SDC1_CLK>;
+ assigned-clock-rates = <400000>;
+ };
- sdcc2: mmc@12140000 {
- compatible = "arm,pl18x", "arm,primecell";
- arm,primecell-periphid = <0x00051180>;
- status = "disabled";
- reg = <0x12140000 0x2000>;
- interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&gcc SDC2_CLK>, <&gcc SDC2_H_CLK>;
- clock-names = "mclk", "apb_pclk";
- bus-width = <4>;
- cap-sd-highspeed;
- cap-mmc-highspeed;
- max-frequency = <48000000>;
- no-1-8-v;
- vmmc-supply = <&vsdcc_fixed>;
- dmas = <&sdcc2bam 2>, <&sdcc2bam 1>;
- dma-names = "tx", "rx";
- assigned-clocks = <&gcc SDC2_CLK>;
- assigned-clock-rates = <400000>;
- };
+ sdcc2: mmc@12140000 {
+ compatible = "arm,pl18x", "arm,primecell";
+ arm,primecell-periphid = <0x00051180>;
+ status = "disabled";
+ reg = <0x12140000 0x2000>;
+ interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&gcc SDC2_CLK>, <&gcc SDC2_H_CLK>;
+ clock-names = "mclk", "apb_pclk";
+ bus-width = <4>;
+ cap-sd-highspeed;
+ cap-mmc-highspeed;
+ max-frequency = <48000000>;
+ no-1-8-v;
+ vmmc-supply = <&vsdcc_fixed>;
+ dmas = <&sdcc2bam 2>, <&sdcc2bam 1>;
+ dma-names = "tx", "rx";
+ assigned-clocks = <&gcc SDC2_CLK>;
+ assigned-clock-rates = <400000>;
};
tcsr: syscon@1a400000 {
--
b4 0.10.1
This solves the 'interrupt-names' was unexpected dtbs check error.
Signed-off-by: Neil Armstrong <[email protected]>
---
arch/arm/boot/dts/qcom-mdm9615.dtsi | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/boot/dts/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom-mdm9615.dtsi
index 366241dee522..9d950f96280d 100644
--- a/arch/arm/boot/dts/qcom-mdm9615.dtsi
+++ b/arch/arm/boot/dts/qcom-mdm9615.dtsi
@@ -325,7 +325,6 @@ sdcc1: mmc@12180000 {
arm,primecell-periphid = <0x00051180>;
reg = <0x12180000 0x2000>;
interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;
- interrupt-names = "cmd_irq";
clocks = <&gcc SDC1_CLK>, <&gcc SDC1_H_CLK>;
clock-names = "mclk", "apb_pclk";
bus-width = <8>;
@@ -345,7 +344,6 @@ sdcc2: mmc@12140000 {
status = "disabled";
reg = <0x12140000 0x2000>;
interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
- interrupt-names = "cmd_irq";
clocks = <&gcc SDC2_CLK>, <&gcc SDC2_H_CLK>;
clock-names = "mclk", "apb_pclk";
bus-width = <4>;
--
b4 0.10.1
Convert input/qcom,pm8xxx-pwrkey.txt to YAML, and take in account that
the PM8921 pwrkey compatible is used as fallback for the PM8018 pwrkey.
Reviewed-by: Rob Herring <[email protected]>
Reviewed-by: Krzysztof Kozlowski <[email protected]>
Signed-off-by: Neil Armstrong <[email protected]>
---
.../bindings/input/qcom,pm8921-pwrkey.yaml | 75 ++++++++++++++++++++++
.../bindings/input/qcom,pm8xxx-pwrkey.txt | 46 -------------
2 files changed, 75 insertions(+), 46 deletions(-)
diff --git a/Documentation/devicetree/bindings/input/qcom,pm8921-pwrkey.yaml b/Documentation/devicetree/bindings/input/qcom,pm8921-pwrkey.yaml
new file mode 100644
index 000000000000..12c74c083258
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/qcom,pm8921-pwrkey.yaml
@@ -0,0 +1,75 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/input/qcom,pm8921-pwrkey.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm PM8921 PMIC Power Key
+
+maintainers:
+ - Bjorn Andersson <[email protected]>
+
+allOf:
+ - $ref: input.yaml#
+
+properties:
+ compatible:
+ oneOf:
+ - enum:
+ - qcom,pm8921-pwrkey
+ - qcom,pm8058-pwrkey
+ - items:
+ - enum:
+ - qcom,pm8018-pwrkey
+ - const: qcom,pm8921-pwrkey
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ items:
+ - description: key release
+ - description: key press
+
+ debounce:
+ description:
+ Time in microseconds that key must be pressed or
+ released for state change interrupt to trigger.
+ $ref: /schemas/types.yaml#/definitions/uint32
+
+ pull-up:
+ description:
+ Presence of this property indicates that the KPDPWR_N
+ pin should be configured for pull up.
+ $ref: /schemas/types.yaml#/definitions/flag
+
+required:
+ - compatible
+ - reg
+ - interrupts
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/irq.h>
+ ssbi {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pmic@0 {
+ reg = <0x0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pwrkey@1c {
+ compatible = "qcom,pm8921-pwrkey";
+ reg = <0x1c>;
+ interrupt-parent = <&pmicint>;
+ interrupts = <50 IRQ_TYPE_EDGE_RISING>, <51 IRQ_TYPE_EDGE_RISING>;
+ debounce = <15625>;
+ pull-up;
+ };
+ };
+ };
+...
diff --git a/Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt b/Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt
deleted file mode 100644
index 588536cc96ed..000000000000
--- a/Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-Qualcomm PM8xxx PMIC Power Key
-
-PROPERTIES
-
-- compatible:
- Usage: required
- Value type: <string>
- Definition: must be one of:
- "qcom,pm8058-pwrkey"
- "qcom,pm8921-pwrkey"
-
-- reg:
- Usage: required
- Value type: <prop-encoded-array>
- Definition: address of power key control register
-
-- interrupts:
- Usage: required
- Value type: <prop-encoded-array>
- Definition: the first interrupt specifies the key release interrupt
- and the second interrupt specifies the key press interrupt.
- The format of the specifier is defined by the binding
- document describing the node's interrupt parent.
-
-- debounce:
- Usage: optional
- Value type: <u32>
- Definition: time in microseconds that key must be pressed or release
- for state change interrupt to trigger.
-
-- pull-up:
- Usage: optional
- Value type: <empty>
- Definition: presence of this property indicates that the KPDPWR_N pin
- should be configured for pull up.
-
-EXAMPLE
-
- pwrkey@1c {
- compatible = "qcom,pm8921-pwrkey";
- reg = <0x1c>;
- interrupt-parent = <&pmicintc>;
- interrupts = <50 1>, <51 1>;
- debounce = <15625>;
- pull-up;
- };
--
b4 0.10.1
The spi-max-frequency property has nothing to do in the controller's node,
remove it and fix the 'spi-max-frequency' was unexpected dtbs check error.
Signed-off-by: Neil Armstrong <[email protected]>
Reviewed-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm/boot/dts/qcom-mdm9615.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom-mdm9615.dtsi
index eaa3236f62db..366241dee522 100644
--- a/arch/arm/boot/dts/qcom-mdm9615.dtsi
+++ b/arch/arm/boot/dts/qcom-mdm9615.dtsi
@@ -170,7 +170,6 @@ gsbi3_spi: spi@16280000 {
#size-cells = <0>;
reg = <0x16280000 0x1000>;
interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
- spi-max-frequency = <24000000>;
clocks = <&gcc GSBI3_QUP_CLK>, <&gcc GSBI3_H_CLK>;
clock-names = "core", "iface";
--
b4 0.10.1
The PM8018 compatible is always used with PM8921 fallback, so PM8018
compatible can be safely removed from device ID table
Reviewed-by: Krzysztof Kozlowski <[email protected]>
Signed-off-by: Neil Armstrong <[email protected]>
---
drivers/mfd/qcom-pm8xxx.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/mfd/qcom-pm8xxx.c b/drivers/mfd/qcom-pm8xxx.c
index 2f2734ba5273..601106580e2e 100644
--- a/drivers/mfd/qcom-pm8xxx.c
+++ b/drivers/mfd/qcom-pm8xxx.c
@@ -497,7 +497,6 @@ static const struct pm_irq_data pm8821_data = {
};
static const struct of_device_id pm8xxx_id_table[] = {
- { .compatible = "qcom,pm8018", .data = &pm8xxx_data},
{ .compatible = "qcom,pm8058", .data = &pm8xxx_data},
{ .compatible = "qcom,pm8821", .data = &pm8821_data},
{ .compatible = "qcom,pm8921", .data = &pm8xxx_data},
--
b4 0.10.1
On 21.10.2022 11:06, Neil Armstrong wrote:
> The PM8018 compatible is always used with PM8921 fallback, so PM8018
> compatible can be safely removed from device ID table
>
> Reviewed-by: Krzysztof Kozlowski <[email protected]>
> Acked-by: Alexandre Belloni <[email protected]>
> Signed-off-by: Neil Armstrong <[email protected]>
> ---
Reviewed-by: Konrad Dybcio <[email protected]>
Konrad
> drivers/rtc/rtc-pm8xxx.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/rtc/rtc-pm8xxx.c b/drivers/rtc/rtc-pm8xxx.c
> index dc6d1476baa5..716e5d9ad74d 100644
> --- a/drivers/rtc/rtc-pm8xxx.c
> +++ b/drivers/rtc/rtc-pm8xxx.c
> @@ -461,7 +461,6 @@ static const struct pm8xxx_rtc_regs pmk8350_regs = {
> */
> static const struct of_device_id pm8xxx_id_table[] = {
> { .compatible = "qcom,pm8921-rtc", .data = &pm8921_regs },
> - { .compatible = "qcom,pm8018-rtc", .data = &pm8921_regs },
> { .compatible = "qcom,pm8058-rtc", .data = &pm8058_regs },
> { .compatible = "qcom,pm8941-rtc", .data = &pm8941_regs },
> { .compatible = "qcom,pmk8350-rtc", .data = &pmk8350_regs },
>
On 21.10.2022 11:06, Neil Armstrong wrote:
> The spi-max-frequency property has nothing to do in the controller's node,
> remove it and fix the 'spi-max-frequency' was unexpected dtbs check error.
>
> Signed-off-by: Neil Armstrong <[email protected]>
> Reviewed-by: Krzysztof Kozlowski <[email protected]>
> ---
Reviewed-by: Konrad Dybcio <[email protected]>
Konrad
> arch/arm/boot/dts/qcom-mdm9615.dtsi | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom-mdm9615.dtsi
> index eaa3236f62db..366241dee522 100644
> --- a/arch/arm/boot/dts/qcom-mdm9615.dtsi
> +++ b/arch/arm/boot/dts/qcom-mdm9615.dtsi
> @@ -170,7 +170,6 @@ gsbi3_spi: spi@16280000 {
> #size-cells = <0>;
> reg = <0x16280000 0x1000>;
> interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
> - spi-max-frequency = <24000000>;
>
> clocks = <&gcc GSBI3_QUP_CLK>, <&gcc GSBI3_H_CLK>;
> clock-names = "core", "iface";
>
On 21.10.2022 11:06, Neil Armstrong wrote:
> The separate amba device node doesn't add anything significant to the
> DT. The OF parsing code already creates amba_device or platform_device
> depending on the compatibility lists.
>
> Acked-by: Krzysztof Kozlowski <[email protected]>
> Signed-off-by: Neil Armstrong <[email protected]>
> ---
If we ever wanted to do split buses, per-NoC nodes would make sense, but
as you mentioned, this does not, really.
Reviewed-by: Konrad Dybcio <[email protected]>
Konrad
> arch/arm/boot/dts/qcom-mdm9615.dtsi | 78 +++++++++++++++++--------------------
> 1 file changed, 36 insertions(+), 42 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom-mdm9615.dtsi
> index 9d950f96280d..482fd246321c 100644
> --- a/arch/arm/boot/dts/qcom-mdm9615.dtsi
> +++ b/arch/arm/boot/dts/qcom-mdm9615.dtsi
> @@ -314,49 +314,43 @@ sdcc2bam: dma-controller@12142000{
> qcom,ee = <0>;
> };
>
> - amba {
> - compatible = "simple-bus";
> - #address-cells = <1>;
> - #size-cells = <1>;
> - ranges;
> - sdcc1: mmc@12180000 {
> - status = "disabled";
> - compatible = "arm,pl18x", "arm,primecell";
> - arm,primecell-periphid = <0x00051180>;
> - reg = <0x12180000 0x2000>;
> - interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&gcc SDC1_CLK>, <&gcc SDC1_H_CLK>;
> - clock-names = "mclk", "apb_pclk";
> - bus-width = <8>;
> - max-frequency = <48000000>;
> - cap-sd-highspeed;
> - cap-mmc-highspeed;
> - vmmc-supply = <&vsdcc_fixed>;
> - dmas = <&sdcc1bam 2>, <&sdcc1bam 1>;
> - dma-names = "tx", "rx";
> - assigned-clocks = <&gcc SDC1_CLK>;
> - assigned-clock-rates = <400000>;
> - };
> + sdcc1: mmc@12180000 {
> + status = "disabled";
> + compatible = "arm,pl18x", "arm,primecell";
> + arm,primecell-periphid = <0x00051180>;
> + reg = <0x12180000 0x2000>;
> + interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&gcc SDC1_CLK>, <&gcc SDC1_H_CLK>;
> + clock-names = "mclk", "apb_pclk";
> + bus-width = <8>;
> + max-frequency = <48000000>;
> + cap-sd-highspeed;
> + cap-mmc-highspeed;
> + vmmc-supply = <&vsdcc_fixed>;
> + dmas = <&sdcc1bam 2>, <&sdcc1bam 1>;
> + dma-names = "tx", "rx";
> + assigned-clocks = <&gcc SDC1_CLK>;
> + assigned-clock-rates = <400000>;
> + };
>
> - sdcc2: mmc@12140000 {
> - compatible = "arm,pl18x", "arm,primecell";
> - arm,primecell-periphid = <0x00051180>;
> - status = "disabled";
> - reg = <0x12140000 0x2000>;
> - interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&gcc SDC2_CLK>, <&gcc SDC2_H_CLK>;
> - clock-names = "mclk", "apb_pclk";
> - bus-width = <4>;
> - cap-sd-highspeed;
> - cap-mmc-highspeed;
> - max-frequency = <48000000>;
> - no-1-8-v;
> - vmmc-supply = <&vsdcc_fixed>;
> - dmas = <&sdcc2bam 2>, <&sdcc2bam 1>;
> - dma-names = "tx", "rx";
> - assigned-clocks = <&gcc SDC2_CLK>;
> - assigned-clock-rates = <400000>;
> - };
> + sdcc2: mmc@12140000 {
> + compatible = "arm,pl18x", "arm,primecell";
> + arm,primecell-periphid = <0x00051180>;
> + status = "disabled";
> + reg = <0x12140000 0x2000>;
> + interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&gcc SDC2_CLK>, <&gcc SDC2_H_CLK>;
> + clock-names = "mclk", "apb_pclk";
> + bus-width = <4>;
> + cap-sd-highspeed;
> + cap-mmc-highspeed;
> + max-frequency = <48000000>;
> + no-1-8-v;
> + vmmc-supply = <&vsdcc_fixed>;
> + dmas = <&sdcc2bam 2>, <&sdcc2bam 1>;
> + dma-names = "tx", "rx";
> + assigned-clocks = <&gcc SDC2_CLK>;
> + assigned-clock-rates = <400000>;
> };
>
> tcsr: syscon@1a400000 {
>
The PM8018 RTC is used as compatible with PM8921 RTC on the MDM9615,
document this situation.
Reviewed-by: Krzysztof Kozlowski <[email protected]>
Signed-off-by: Neil Armstrong <[email protected]>
---
.../devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml b/Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml
index 23ab5bb4f395..0a7aa29563c1 100644
--- a/Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml
+++ b/Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml
@@ -11,12 +11,16 @@ maintainers:
properties:
compatible:
- enum:
- - qcom,pm8058-rtc
- - qcom,pm8921-rtc
- - qcom,pm8941-rtc
- - qcom,pm8018-rtc
- - qcom,pmk8350-rtc
+ oneOf:
+ - enum:
+ - qcom,pm8058-rtc
+ - qcom,pm8921-rtc
+ - qcom,pm8941-rtc
+ - qcom,pmk8350-rtc
+ - items:
+ - enum:
+ - qcom,pm8018-rtc
+ - const: qcom,pm8921-rtc
reg:
minItems: 1
--
b4 0.10.1
On Fri, Oct 21, 2022 at 11:06:42AM +0200, Neil Armstrong wrote:
> Convert input/qcom,pm8xxx-pwrkey.txt to YAML, and take in account that
> the PM8921 pwrkey compatible is used as fallback for the PM8018 pwrkey.
>
> Reviewed-by: Rob Herring <[email protected]>
> Reviewed-by: Krzysztof Kozlowski <[email protected]>
> Signed-off-by: Neil Armstrong <[email protected]>
Should I merge this through my tree or you want all these changes to go
together through some particular tree?
Thanks.
--
Dmitry
Hi,
On 27/10/2022 09:55, Dmitry Torokhov wrote:
> On Fri, Oct 21, 2022 at 11:06:42AM +0200, Neil Armstrong wrote:
>> Convert input/qcom,pm8xxx-pwrkey.txt to YAML, and take in account that
>> the PM8921 pwrkey compatible is used as fallback for the PM8018 pwrkey.
>>
>> Reviewed-by: Rob Herring <[email protected]>
>> Reviewed-by: Krzysztof Kozlowski <[email protected]>
>> Signed-off-by: Neil Armstrong <[email protected]>
>
> Should I merge this through my tree or you want all these changes to go
> together through some particular tree?
I have no preference,
Krzysztof will you take it and prepare a branch to Bjorn ?
>
> Thanks.
>
Neil
On 27/10/2022 08:39, Neil Armstrong wrote:
> Hi,
>
> On 27/10/2022 09:55, Dmitry Torokhov wrote:
>> On Fri, Oct 21, 2022 at 11:06:42AM +0200, Neil Armstrong wrote:
>>> Convert input/qcom,pm8xxx-pwrkey.txt to YAML, and take in account that
>>> the PM8921 pwrkey compatible is used as fallback for the PM8018 pwrkey.
>>>
>>> Reviewed-by: Rob Herring <[email protected]>
>>> Reviewed-by: Krzysztof Kozlowski <[email protected]>
>>> Signed-off-by: Neil Armstrong <[email protected]>
>>
>> Should I merge this through my tree or you want all these changes to go
>> together through some particular tree?
>
> I have no preference,
> Krzysztof will you take it and prepare a branch to Bjorn ?
No, I did not plan on doing it.
Dmitry,
Please grab it (assuming there are no dependencies).
Best regards,
Krzysztof
On Thu, Oct 27, 2022 at 08:43:20AM -0400, Krzysztof Kozlowski wrote:
> On 27/10/2022 08:39, Neil Armstrong wrote:
> > Hi,
> >
> > On 27/10/2022 09:55, Dmitry Torokhov wrote:
> >> On Fri, Oct 21, 2022 at 11:06:42AM +0200, Neil Armstrong wrote:
> >>> Convert input/qcom,pm8xxx-pwrkey.txt to YAML, and take in account that
> >>> the PM8921 pwrkey compatible is used as fallback for the PM8018 pwrkey.
> >>>
> >>> Reviewed-by: Rob Herring <[email protected]>
> >>> Reviewed-by: Krzysztof Kozlowski <[email protected]>
> >>> Signed-off-by: Neil Armstrong <[email protected]>
> >>
> >> Should I merge this through my tree or you want all these changes to go
> >> together through some particular tree?
> >
> > I have no preference,
> > Krzysztof will you take it and prepare a branch to Bjorn ?
>
> No, I did not plan on doing it.
>
> Dmitry,
> Please grab it (assuming there are no dependencies).
Applied, thank you.
--
Dmitry
On Fri, 21 Oct 2022, Neil Armstrong wrote:
> The PM8018 compatible is always used with PM8921 fallback, so PM8018
> compatible can be safely removed from device ID table
>
> Reviewed-by: Krzysztof Kozlowski <[email protected]>
> Signed-off-by: Neil Armstrong <[email protected]>
Tags should appear chronologically.
I've fixed this up and applied the patch, thanks.
> ---
> drivers/mfd/qcom-pm8xxx.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/mfd/qcom-pm8xxx.c b/drivers/mfd/qcom-pm8xxx.c
> index 2f2734ba5273..601106580e2e 100644
> --- a/drivers/mfd/qcom-pm8xxx.c
> +++ b/drivers/mfd/qcom-pm8xxx.c
> @@ -497,7 +497,6 @@ static const struct pm_irq_data pm8821_data = {
> };
>
> static const struct of_device_id pm8xxx_id_table[] = {
> - { .compatible = "qcom,pm8018", .data = &pm8xxx_data},
> { .compatible = "qcom,pm8058", .data = &pm8xxx_data},
> { .compatible = "qcom,pm8821", .data = &pm8821_data},
> { .compatible = "qcom,pm8921", .data = &pm8xxx_data},
>
--
Lee Jones [李琼斯]
Hi,
On 31/10/2022 16:32, Lee Jones wrote:
> On Fri, 21 Oct 2022, Neil Armstrong wrote:
>
>> The PM8018 compatible is always used with PM8921 fallback, so PM8018
>> compatible can be safely removed from device ID table
>>
>> Reviewed-by: Krzysztof Kozlowski <[email protected]>
>> Signed-off-by: Neil Armstrong <[email protected]>
>
> Tags should appear chronologically.
Indeed, they were added by b4, I'll report this.
Thanks,
Neil
>
> I've fixed this up and applied the patch, thanks.
>
>> ---
>> drivers/mfd/qcom-pm8xxx.c | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/drivers/mfd/qcom-pm8xxx.c b/drivers/mfd/qcom-pm8xxx.c
>> index 2f2734ba5273..601106580e2e 100644
>> --- a/drivers/mfd/qcom-pm8xxx.c
>> +++ b/drivers/mfd/qcom-pm8xxx.c
>> @@ -497,7 +497,6 @@ static const struct pm_irq_data pm8821_data = {
>> };
>>
>> static const struct of_device_id pm8xxx_id_table[] = {
>> - { .compatible = "qcom,pm8018", .data = &pm8xxx_data},
>> { .compatible = "qcom,pm8058", .data = &pm8xxx_data},
>> { .compatible = "qcom,pm8821", .data = &pm8821_data},
>> { .compatible = "qcom,pm8921", .data = &pm8xxx_data},
>>
>
On 31/10/2022 11:32, Lee Jones wrote:
> On Fri, 21 Oct 2022, Neil Armstrong wrote:
>
>> The PM8018 compatible is always used with PM8921 fallback, so PM8018
>> compatible can be safely removed from device ID table
>>
>> Reviewed-by: Krzysztof Kozlowski <[email protected]>
>> Signed-off-by: Neil Armstrong <[email protected]>
>
> Tags should appear chronologically.
>
I would assume that as well, but `b4 trailers` disagrees. It documents
even this behavior (the chain of custody) here:
https://b4.docs.kernel.org/en/latest/config.html
So while I agree with you, I also prefer the tools to make the decision
instead of humans (to follow the process, assuming the tool implements
the process). Either the tool should be fixed or the tool's decision is
correct.
Best regards,
Krzysztof
On Wed, 02 Nov 2022, Krzysztof Kozlowski wrote:
> On 31/10/2022 11:32, Lee Jones wrote:
> > On Fri, 21 Oct 2022, Neil Armstrong wrote:
> >
> >> The PM8018 compatible is always used with PM8921 fallback, so PM8018
> >> compatible can be safely removed from device ID table
> >>
> >> Reviewed-by: Krzysztof Kozlowski <[email protected]>
> >> Signed-off-by: Neil Armstrong <[email protected]>
> >
> > Tags should appear chronologically.
> >
>
> I would assume that as well, but `b4 trailers` disagrees. It documents
> even this behavior (the chain of custody) here:
> https://b4.docs.kernel.org/en/latest/config.html
>
> So while I agree with you, I also prefer the tools to make the decision
> instead of humans (to follow the process, assuming the tool implements
> the process). Either the tool should be fixed or the tool's decision is
> correct.
Take a look further down the thread, since this has already been
heavily debated. Not sure if there has been a clear winner or any
kind of agreement yet (if there ever will be), but until there is or I
until I am convinced otherwise, I'm going to continue on with the
chronological method.
Also, as far as I'm aware, tools like `b4` and the-like haven't been
mandated (yet?), so using its rules to dictate our actions probably
isn't the correct approach.
--
Lee Jones [李琼斯]
On Fri, 21 Oct 2022 11:06:36 +0200, Neil Armstrong wrote:
> This is a first round of trivial bindings & DT fixes for the MDM9615 platform.
>
> This first round focuses on trivial changes, the remaining work will
> mainly be .txt to .yaml transition of old qcom pmic & co device bindings.
>
>
Applied, thanks!
[01/11] dt-bindings: arm: qcom: move swir,mangoh-green-wp8548 board documentation to qcom.yaml
commit: f4ec5f28af13e2b8e62ae173cb6827e137cdd8cc
[02/11] arm: dts: qcom: mdm9615*: add SPDX-License-Identifier
commit: c69af934db18ad165b1dc84f5450fa55afb34acb
[03/11] arm: dts: qcom: mdm9615: add missing reg in cpu@0 node
commit: e58bdf93db08c16dd06bc1967e978708b44d9c83
[04/11] arm: dts: qcom: mdm9615: remove invalid spi-max-frequency gsbi3_spi node
commit: 75353420d0d0abe3a57cedf4a6cfa00ea05842a3
[10/11] arm: dts: qcom: mdm9615: remove invalid interrupt-names from pl18x mmc nodes
commit: 3627dd180c67d3e589c38a10b4be29a0352a70b6
[11/11] arm: dts: qcom: mdm9615: remove useless amba subnode
commit: 10de96ba6d4287220962cdd82826b6a14af90e2e
Best regards,
--
Bjorn Andersson <[email protected]>