* [PATCH v2 1/2] dt-bindings: ata: qcom,ipq806x-ahci: use dtschema
2024-07-17 10:03 [PATCH v2 0/2] Convert {a,i}pq8064 SATA AHCI controller bindings to dtschema Rayyan Ansari
@ 2024-07-17 10:03 ` Rayyan Ansari
2024-07-17 11:56 ` Krzysztof Kozlowski
2024-07-17 10:03 ` [PATCH v2 2/2] dt-bindings: ata: qcom,apq8064-ahci: add to dtschema Rayyan Ansari
2024-07-24 5:57 ` [PATCH v2 0/2] Convert {a,i}pq8064 SATA AHCI controller bindings " Damien Le Moal
2 siblings, 1 reply; 5+ messages in thread
From: Rayyan Ansari @ 2024-07-17 10:03 UTC (permalink / raw)
To: devicetree, linux-arm-msm
Cc: Rayyan Ansari, Conor Dooley, Damien Le Moal, de Goede, Jens Axboe,
Krzysztof Kozlowski, linux-ide, linux-kernel, Niklas Cassel,
Rob Herring
Remove old text bindings and add ipq806x AHCI compatible to
ahci-common.yaml, as well as its required properties.
Signed-off-by: Rayyan Ansari <rayyan.ansari@linaro.org>
---
v1 -> v2: removed assigned-* properties from binding
.../bindings/ata/ahci-platform.yaml | 30 +++++++++++-
.../devicetree/bindings/ata/qcom-sata.txt | 48 -------------------
2 files changed, 28 insertions(+), 50 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/ata/qcom-sata.txt
diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.yaml b/Documentation/devicetree/bindings/ata/ahci-platform.yaml
index 358617115bb8..2c8fdfc3df9b 100644
--- a/Documentation/devicetree/bindings/ata/ahci-platform.yaml
+++ b/Documentation/devicetree/bindings/ata/ahci-platform.yaml
@@ -30,6 +30,7 @@ select:
- marvell,armada-3700-ahci
- marvell,armada-8k-ahci
- marvell,berlin2q-ahci
+ - qcom,ipq806x-ahci
- socionext,uniphier-pro4-ahci
- socionext,uniphier-pxs2-ahci
- socionext,uniphier-pxs3-ahci
@@ -45,6 +46,7 @@ properties:
- marvell,armada-8k-ahci
- marvell,berlin2-ahci
- marvell,berlin2q-ahci
+ - qcom,ipq806x-ahci
- socionext,uniphier-pro4-ahci
- socionext,uniphier-pxs2-ahci
- socionext,uniphier-pxs3-ahci
@@ -64,11 +66,11 @@ properties:
clocks:
minItems: 1
- maxItems: 3
+ maxItems: 5
clock-names:
minItems: 1
- maxItems: 3
+ maxItems: 5
interrupts:
maxItems: 1
@@ -97,6 +99,30 @@ required:
allOf:
- $ref: ahci-common.yaml#
+
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - qcom,ipq806x-ahci
+ then:
+ properties:
+ clocks:
+ minItems: 5
+ clock-names:
+ items:
+ - const: slave_iface
+ - const: iface
+ - const: core
+ - const: rxoob
+ - const: pmalive
+ required:
+ - phys
+ - phy-names
+ - clocks
+ - clock-names
+
- if:
properties:
compatible:
diff --git a/Documentation/devicetree/bindings/ata/qcom-sata.txt b/Documentation/devicetree/bindings/ata/qcom-sata.txt
deleted file mode 100644
index 094de91cd9fd..000000000000
--- a/Documentation/devicetree/bindings/ata/qcom-sata.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-* Qualcomm AHCI SATA Controller
-
-SATA nodes are defined to describe on-chip Serial ATA controllers.
-Each SATA controller should have its own node.
-
-Required properties:
-- compatible : compatible list, must contain "generic-ahci"
-- interrupts : <interrupt mapping for SATA IRQ>
-- reg : <registers mapping>
-- phys : Must contain exactly one entry as specified
- in phy-bindings.txt
-- phy-names : Must be "sata-phy"
-
-Required properties for "qcom,ipq806x-ahci" compatible:
-- clocks : Must contain an entry for each entry in clock-names.
-- clock-names : Shall be:
- "slave_iface" - Fabric port AHB clock for SATA
- "iface" - AHB clock
- "core" - core clock
- "rxoob" - RX out-of-band clock
- "pmalive" - Power Module Alive clock
-- assigned-clocks : Shall be:
- SATA_RXOOB_CLK
- SATA_PMALIVE_CLK
-- assigned-clock-rates : Shall be:
- 100Mhz (100000000) for SATA_RXOOB_CLK
- 100Mhz (100000000) for SATA_PMALIVE_CLK
-
-Example:
- sata@29000000 {
- compatible = "qcom,ipq806x-ahci", "generic-ahci";
- reg = <0x29000000 0x180>;
-
- interrupts = <0 209 0x0>;
-
- clocks = <&gcc SFAB_SATA_S_H_CLK>,
- <&gcc SATA_H_CLK>,
- <&gcc SATA_A_CLK>,
- <&gcc SATA_RXOOB_CLK>,
- <&gcc SATA_PMALIVE_CLK>;
- clock-names = "slave_iface", "iface", "core",
- "rxoob", "pmalive";
- assigned-clocks = <&gcc SATA_RXOOB_CLK>, <&gcc SATA_PMALIVE_CLK>;
- assigned-clock-rates = <100000000>, <100000000>;
-
- phys = <&sata_phy>;
- phy-names = "sata-phy";
- };
--
2.45.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 2/2] dt-bindings: ata: qcom,apq8064-ahci: add to dtschema
2024-07-17 10:03 [PATCH v2 0/2] Convert {a,i}pq8064 SATA AHCI controller bindings to dtschema Rayyan Ansari
2024-07-17 10:03 ` [PATCH v2 1/2] dt-bindings: ata: qcom,ipq806x-ahci: use dtschema Rayyan Ansari
@ 2024-07-17 10:03 ` Rayyan Ansari
2024-07-24 5:57 ` [PATCH v2 0/2] Convert {a,i}pq8064 SATA AHCI controller bindings " Damien Le Moal
2 siblings, 0 replies; 5+ messages in thread
From: Rayyan Ansari @ 2024-07-17 10:03 UTC (permalink / raw)
To: devicetree, linux-arm-msm
Cc: Rayyan Ansari, Krzysztof Kozlowski, Conor Dooley, Damien Le Moal,
de Goede, Jens Axboe, Krzysztof Kozlowski, linux-ide,
linux-kernel, Niklas Cassel, Rob Herring
The APQ8064 SATA AHCI controller is used in apq8064.dtsi, although it
was not documented in the old text bindings.
Add its compatible to ahci-platform.yaml.
Signed-off-by: Rayyan Ansari <rayyan.ansari@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
v1 -> v2: added r-b tag
Documentation/devicetree/bindings/ata/ahci-platform.yaml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.yaml b/Documentation/devicetree/bindings/ata/ahci-platform.yaml
index 2c8fdfc3df9b..ef19468e3022 100644
--- a/Documentation/devicetree/bindings/ata/ahci-platform.yaml
+++ b/Documentation/devicetree/bindings/ata/ahci-platform.yaml
@@ -30,6 +30,7 @@ select:
- marvell,armada-3700-ahci
- marvell,armada-8k-ahci
- marvell,berlin2q-ahci
+ - qcom,apq8064-ahci
- qcom,ipq806x-ahci
- socionext,uniphier-pro4-ahci
- socionext,uniphier-pxs2-ahci
@@ -46,6 +47,7 @@ properties:
- marvell,armada-8k-ahci
- marvell,berlin2-ahci
- marvell,berlin2q-ahci
+ - qcom,apq8064-ahci
- qcom,ipq806x-ahci
- socionext,uniphier-pro4-ahci
- socionext,uniphier-pxs2-ahci
@@ -105,6 +107,7 @@ allOf:
compatible:
contains:
enum:
+ - qcom,apq8064-ahci
- qcom,ipq806x-ahci
then:
properties:
--
2.45.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2 0/2] Convert {a,i}pq8064 SATA AHCI controller bindings to dtschema
2024-07-17 10:03 [PATCH v2 0/2] Convert {a,i}pq8064 SATA AHCI controller bindings to dtschema Rayyan Ansari
2024-07-17 10:03 ` [PATCH v2 1/2] dt-bindings: ata: qcom,ipq806x-ahci: use dtschema Rayyan Ansari
2024-07-17 10:03 ` [PATCH v2 2/2] dt-bindings: ata: qcom,apq8064-ahci: add to dtschema Rayyan Ansari
@ 2024-07-24 5:57 ` Damien Le Moal
2 siblings, 0 replies; 5+ messages in thread
From: Damien Le Moal @ 2024-07-24 5:57 UTC (permalink / raw)
To: Rayyan Ansari, devicetree, linux-arm-msm
Cc: Conor Dooley, de Goede, Jens Axboe, Krzysztof Kozlowski,
linux-ide, linux-kernel, Niklas Cassel, Rob Herring
On 7/17/24 7:03 PM, Rayyan Ansari wrote:
> Hi,
> The following patches convert the old text bindings to dtschema by using
> ahci-platform.yaml.
>
> Note: patch 1/3 from v1 of this series has been sent as a separate patch
> for v2: https://lore.kernel.org/all/20240717094914.17931-2-rayyan.ansari@linaro.org/
>
> v1: https://lore.kernel.org/all/20240716105245.49549-1-rayyan.ansari@linaro.org/
>
> Thanks,
> Rayyan
>
> Rayyan Ansari (2):
> dt-bindings: ata: qcom,ipq806x-ahci: use dtschema
> dt-bindings: ata: qcom,apq8064-ahci: add to dtschema
>
> .../bindings/ata/ahci-platform.yaml | 33 ++++++++++++-
> .../devicetree/bindings/ata/qcom-sata.txt | 48 -------------------
> 2 files changed, 31 insertions(+), 50 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/ata/qcom-sata.txt
Applied to for-6.12. Thanks !
--
Damien Le Moal
Western Digital Research
^ permalink raw reply [flat|nested] 5+ messages in thread