ahci-platform: Bump max number of clocks to 5
Subsystems (3)
PATCH v5 1/2 ahci-platform: Bump max number of clocks to 5
Qualcomm IPQ806x SoCs with SATA controllers need 5 clocks to be enabled.
---
v4/v5:
* Updated to upstream changes
drivers/ata/ahci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/ahci.h +1 -1
@@ -53,7 +53,7 @@enum {AHCI_MAX_PORTS =32 , -AHCI_MAX_CLKS =4 , +AHCI_MAX_CLKS =5 ,AHCI_MAX_SG =168 ,/* hardware max is 64K */ AHCI_DMA_BOUNDARY =0xffffffff ,AHCI_MAX_CMDS =32 ,
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 2/2 ata: qcom: Add device tree bindings information
Add device tree binding for Qualcomm AHCI SATA controller and specifically the sata controller on the IPQ806x family of SoCs.
We can utilize the "generic-ahci" platform driver with the addition of the sata phy to enable SATA support on Qualcomm SoCs with AHCI controllers.
---
v5:
* Moved to using "generic-ahci" binding support and assigned-clocks so we can use upstream generic ahci support w/o a special driver. Updated binding spec to reflect that.
v4:
* Added simple PM ops implementation
* Added setting of pmalive clk
v3:
* Added comment about suspend/resume not supported
* Fixup ahci_platform_init_host for upstream change to interface
* cleanup error handling of rxoob clk, moved to devm_clk_get/put
v2:
* Fixed MODULE_LICENSE to be GPL v2
.../devicetree/bindings/ata/qcom-sata.txt | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 Documentation/devicetree/bindings/ata/qcom-sata.txt
Documentation/devicetree/bindings/ata/qcom-sata.txt new file +48 -0
@@ -0,0 +1,48 @@ +* 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 at 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"; + };
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Hi,
Thanks, this new set looks good to me, and is:
Regards,
Hans
Quoted 24 lines · Kumar Gala
Qualcomm IPQ806x SoCs with SATA controllers need 5 clocks to be enabled.
Signed-off-by Kumar Gala <[email protected]>---
v4/v5:
* Updated to upstream changesdrivers/ata/ahci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/ata/ahci.h +1
-1@@ -53,7 +53,7 @@enum {AHCI_MAX_PORTS =32 , -AHCI_MAX_CLKS =4 , +AHCI_MAX_CLKS =5 ,AHCI_MAX_SG =168 ,/* hardware max is 64K */ AHCI_DMA_BOUNDARY =0xffffffff ,AHCI_MAX_CMDS =32 ,
Quoted 3 lines · Kumar Gala
Qualcomm IPQ806x SoCs with SATA controllers need 5 clocks to be enabled.
Signed-off-by Kumar Gala <[email protected]>
Applied 1-2 to libata/for-3.18.
Thanks.
Signature · 1 line
tejun