socfpga: Enable SD/MMC support
Subsystems (7)
v7 cover socfpga: Enable SD/MMC support
From: Dinh Nguyen <[email protected]>
RESEND: Apologies, re-send with CC to all the appropriate lists.
Hi,
This is v7 of the patch series to enable SD/MMC on the SOCFPGA platform.
V7 differences from V6:
* Add a new clock binding property clk-phase. This property is used to represent the 2 clock phase values that is needed for the SD/MMC driver.
Thanks,
Dinh Nguyen (4):
clk: socfpga: Add a clk-phase property to the "altr,socfpga-gate-clk"
dts: socfpga: Add support for SD/MMC on the SOCFPGA platform
mmc: dw_mmc-socfpga: Remove the SOCFPGA specific platform for dw_mmc
ARM: socfpga_defconfig: enable SD/MMC support
.../devicetree/bindings/clock/altr_socfpga.txt | 14 ++ arch/arm/boot/dts/socfpga.dtsi | 14 +- arch/arm/boot/dts/socfpga_arria5.dtsi | 11 ++ arch/arm/boot/dts/socfpga_cyclone5.dtsi | 11 ++ arch/arm/boot/dts/socfpga_vt.dts | 11 ++ arch/arm/configs/socfpga_defconfig | 2 + drivers/clk/socfpga/clk.c | 37 ++++++ drivers/mmc/host/Kconfig | 8 -- drivers/mmc/host/dw_mmc-socfpga.c | 138 -------------------- 9 files changed, 99 insertions(+), 147 deletions(-) delete mode 100644 drivers/mmc/host/dw_mmc-socfpga.c
Signature · 1 line
1.7.9.5
PATCH RESEND v7 1/4 clk: socfpga: Add a clk-phase property to the "altr, socfpga-gate-clk"
From: Dinh Nguyen <[email protected]>
The clk-phase property is used to represent the 2 clock phase values that is needed for the SD/MMC driver. Add a prepare function to the clk_ops, that will use the syscon driver to set sdmmc_clk's phase shift that is located in the system manager.
---
v7: Add dts property to represent the clk phase of the sdmmc_clk. Add a
prepare function to the gate clk that will toggle clock phase setting. Remove the "altr,socfpga-sdmmc-sdr-clk" clock type.
v6: Add a new clock type "altr,socfpga-sdmmc-sdr-clk" that will be used to set the phase shift settings.
v5: Use the "snps,dw-mshc" binding
v4: Use the sdmmc_clk prepare function to set the phase shift settings
v3: Not use the syscon driver because as of 3.13-rc1, the syscon driver is
loaded after the clock driver.
v2: Use the syscon driver
--- .../devicetree/bindings/clock/altr_socfpga.txt | 14 ++++++++ arch/arm/boot/dts/socfpga.dtsi | 1 + drivers/clk/socfpga/clk.c | 36 ++++++++++++++++++++ 3 files changed, 51 insertions(+)
Documentation/devicetree/bindings/clock/altr_socfpga.txt +14 -0
@@ -23,3 +23,17 @@ Optional properties: and the bit index. - div-reg : For "socfpga-gate-clk", div-reg contains the divider register, bit shift, and width. +- clk-phase : For the sdmmc_clk, contains the value of the clock phase that controls + the SDMMC CIU clock. The first value is the clk_sample(smpsel), and the second + value is the cclk_in_drv(drvsel). The clk-phase is used to enable the correct + hold/delay times that is needed for the SD/MMC CIU clock. The values of both + value can be one of the following: + + <0x0> : 0 degrees + <0x1> : 45 degrees + <0x2> : 90 degrees + <0x3> : 135 degrees + <0x4> : 180 degrees + <0x5> : 225 degrees + <0x6> : 270 degrees + <0x7> : 315 degrees
arch/arm/boot/dts/socfpga.dtsi +1 -0
@@ -413,6 +413,7 @@ compatible = "altr,socfpga-gate-clk"; clocks = <&f2s_periph_ref_clk>, <&main_nand_sdmmc_clk>, <&per_nand_mmc_clk>; clk-gate = <0xa0 8>; + clk-phase = <0 3>; }; nand_x_clk: nand_x_clk {
drivers/clk/socfpga/clk.c +36 -0
@@ -21,8 +21,10 @@#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/io.h> +#include <linux/mfd/syscon.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/regmap.h> /* Clock Manager offsets */ #define CLKMGR_CTRL 0x0
@@ -56,6 +58,11 @@#define div_mask (width) ((1 << (width)) - 1)#define streq (a, b) (strcmp((a), (b)) == 0) +/* SDMMC Group for System Manager defines */ +#define SYSMGR_SDMMCGRP_CTRL_OFFSET 0x108 +#define SYSMGR_SDMMC_CTRL_SET (smplsel, drvsel) \ + ((((smplsel) & 0x7) << 3) | (((drvsel) & 0x7) << 0)) +static void __iomem *clk_mgr_base_addr;struct socfpga_clk {
@@ -66,6 +73,7 @@ struct socfpga_clk {void __iomem *div_reg;u32 width;/* only valid if div_reg != 0 */ u32 shift;/* only valid if div_reg != 0 */ +u32 clk_phase[2 ]; };#define to_socfpga_clk (p) container_of(p, struct socfpga_clk, hw.hw)
@@ -243,7 +251,28 @@ static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk,return parent_rate / div; } +static int socfpga_clk_prepare (struct clk_hw *hwclk) +{ +struct socfpga_clk *socfpgaclk =to_socfpga_clk (hwclk); +struct regmap *sys_mgr_base_addr; +u32 hs_timing; + +if (socfpgaclk->clk_phase[0 ] || socfpgaclk->clk_phase[1 ]) { + sys_mgr_base_addr =syscon_regmap_lookup_by_compatible ("altr,sys-mgr" ); +if (IS_ERR (sys_mgr_base_addr)) { +pr_err ("%s: failed to find altr,sys-mgr regmap!\n" , __func__); +return -EINVAL ; + } + hs_timing =SYSMGR_SDMMC_CTRL_SET (socfpgaclk->clk_phase[0 ], + socfpgaclk->clk_phase[1 ]); +regmap_write (sys_mgr_base_addr,SYSMGR_SDMMCGRP_CTRL_OFFSET , + hs_timing); + } +return 0 ; +} +static struct clk_ops gateclk_ops = { + .prepare = socfpga_clk_prepare, .recalc_rate = socfpga_clk_recalc_rate, .get_parent = socfpga_clk_get_parent, .set_parent = socfpga_clk_set_parent,
@@ -254,6 +283,7 @@ static void __init socfpga_gate_clk_init(struct device_node *node, {u32 clk_gate[2 ];u32 div_reg[3 ]; +u32 clk_phase[2 ];u32 fixed_div;struct clk *clk;struct socfpga_clk *socfpga_clk;
@@ -294,6 +324,12 @@ static void __init socfpga_gate_clk_init(struct device_node *node, socfpga_clk->div_reg =0 ; } + rc =of_property_read_u32_array (node,"clk-phase" , clk_phase,2 ); +if (!rc) { + socfpga_clk->clk_phase[0 ] = clk_phase[0 ]; + socfpga_clk->clk_phase[1 ] = clk_phase[1 ]; + } +of_property_read_string (node,"clock-output-names" , &clk_name); init.name = clk_name;
Signature · 1 line
1.7.9.5
PATCH RESEND v7 1/4 clk: socfpga: Add a clk-phase property to the "altr,socfpga-gate-clk"
Quoted 11 lines · dinguyen at altera.com
From: Dinh Nguyen <[email protected]>
drivers/clk/socfpga/clk.c +9
-0+static int socfpga_clk_prepare (struct clk_hw *hwclk) +{ +struct socfpga_clk *socfpgaclk =to_socfpga_clk (hwclk); +struct regmap *sys_mgr_base_addr; +u32 hs_timing; + +if (socfpgaclk->clk_phase[0 ] || socfpgaclk->clk_phase[1 ]) { + sys_mgr_base_addr =syscon_regmap_lookup_by_compatible ("altr,sys-mgr" ); +if (IS_ERR (sys_mgr_base_addr)) {
drivers/clk/socfpga/clk.c static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk, · line 272
Quoted 10 lines
drivers/clk/socfpga/clk.c +10
-0+pr_err ("%s: failed to find altr,sys-mgr regmap!\n" , __func__); +return -EINVAL ; + } + hs_timing =SYSMGR_SDMMC_CTRL_SET (socfpgaclk->clk_phase[0 ], + socfpgaclk->clk_phase[1 ]); +regmap_write (sys_mgr_base_addr,SYSMGR_SDMMCGRP_CTRL_OFFSET , + hs_timing); + } +return 0 ; +}
So reusing gate-clk here and check the node of "altr,sys-mgr". I think it is good and simple.
Also can define new clock combined with node "altr,sys-mgr" with parent of sdmmc_clk.
Thanks for the update, it is fine to me.
Quoted 28 lines
drivers/clk/socfpga/clk.c +9
-0+static struct clk_ops gateclk_ops = { + .prepare = socfpga_clk_prepare, .recalc_rate = socfpga_clk_recalc_rate, .get_parent = socfpga_clk_get_parent, .set_parent = socfpga_clk_set_parent,@@ -254,6 +283,7 @@ static void __init socfpga_gate_clk_init(struct device_node *node, {u32 clk_gate[2 ];u32 div_reg[3 ]; +u32 clk_phase[2 ];u32 fixed_div;struct clk *clk;struct socfpga_clk *socfpga_clk;@@ -294,6 +324,12 @@ static void __init socfpga_gate_clk_init(struct device_node *node, socfpga_clk->div_reg =0 ; } + rc =of_property_read_u32_array (node,"clk-phase" , clk_phase,2 ); +if (!rc) { + socfpga_clk->clk_phase[0 ] = clk_phase[0 ]; + socfpga_clk->clk_phase[1 ] = clk_phase[1 ]; + } +of_property_read_string (node,"clock-output-names" , &clk_name); init.name = clk_name;
PATCH RESEND v7 1/4 clk: socfpga: Add a clk-phase property to the "altr,socfpga-gate-clk"
Hi Zhangfei,
Quoted 32 lines · zhangfei
Quoted 14 lines · On 12/17/2013 01:04 AM, [email protected] wrote:
From: Dinh Nguyen <[email protected]>
drivers/clk/socfpga/clk.c +8
-0+static int socfpga_clk_prepare (struct clk_hw *hwclk) +{ +struct socfpga_clk *socfpgaclk =to_socfpga_clk (hwclk); +struct regmap *sys_mgr_base_addr; +u32 hs_timing; + +if (socfpgaclk->clk_phase[0 ] || socfpgaclk->clk_phase[1 ]) { + sys_mgr_base_addr =
syscon_regmap_lookup_by_compatible("altr,sys-mgr");(quoted diff) +2
-0+ if (IS_ERR(sys_mgr_base_addr)) { + pr_err("%s: failed to find altr,sys-mgr regmap!\n",
__func__);drivers/clk/socfpga/clk.c static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk, · line 272
Quoted 9 lines
drivers/clk/socfpga/clk.c +9
-0+return -EINVAL ; + } + hs_timing =SYSMGR_SDMMC_CTRL_SET (socfpgaclk->clk_phase[0 ], + socfpgaclk->clk_phase[1 ]); +regmap_write (sys_mgr_base_addr,SYSMGR_SDMMCGRP_CTRL_OFFSET , + hs_timing); + } +return 0 ; +}So reusing gate-clk here and check the node of "altr,sys-mgr". I think it is good and simple.
Also can define new clock combined with node "altr,sys-mgr" with parent ofsdmmc_clk.
Quoted 1 line
Thanks for the update, it is fine to me.
Thanks, can I get an Ack from you for this version?
Thanks,
Dinh
Quoted 31 lines
Quoted 31 lines
drivers/clk/socfpga/clk.c +3
-0+static struct clk_ops gateclk_ops = { + .prepare = socfpga_clk_prepare, .recalc_rate = socfpga_clk_recalc_rate, .get_parent = socfpga_clk_get_parent, .set_parent = socfpga_clk_set_parent,@@ -254,6 +283,7 @@ static void __init socfpga_gate_clk_init(struct device_node *node, {u32 clk_gate[2 ];u32 div_reg[3 ]; +u32 clk_phase[2 ];u32 fixed_div;struct clk *clk;struct socfpga_clk *socfpga_clk;drivers/clk/socfpga/clk.c +6
-0@@ -294,6 +324,12 @@ static void __init socfpga_gate_clk_init(struct device_node *node, socfpga_clk->div_reg =0 ; } + rc =of_property_read_u32_array (node,"clk-phase" , clk_phase,2 ); +if (!rc) { + socfpga_clk->clk_phase[0 ] = clk_phase[0 ]; + socfpga_clk->clk_phase[1 ] = clk_phase[1 ]; + } +of_property_read_string (node,"clock-output-names" , &clk_name);init.name = clk_name;
PATCH RESEND v7 1/4 clk: socfpga: Add a clk-phase property to the "altr,socfpga-gate-clk"
Quoted 35 lines · Dinh Nguyen
Hi Zhangfei,
Quoted 32 lines · zhangfei
Quoted 14 lines · dinguyen at altera.com
From: Dinh Nguyen <[email protected]>
drivers/clk/socfpga/clk.c +8
-0+static int socfpga_clk_prepare (struct clk_hw *hwclk) +{ +struct socfpga_clk *socfpgaclk =to_socfpga_clk (hwclk); +struct regmap *sys_mgr_base_addr; +u32 hs_timing; + +if (socfpgaclk->clk_phase[0 ] || socfpgaclk->clk_phase[1 ]) { + sys_mgr_base_addr =
syscon_regmap_lookup_by_compatible("altr,sys-mgr");(quoted diff) +2
-0+ if (IS_ERR(sys_mgr_base_addr)) { + pr_err("%s: failed to find altr,sys-mgr regmap!\n",
__func__);drivers/clk/socfpga/clk.c static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk, · line 272
Quoted 9 lines
drivers/clk/socfpga/clk.c +9
-0+return -EINVAL ; + } + hs_timing =SYSMGR_SDMMC_CTRL_SET (socfpgaclk->clk_phase[0 ], + socfpgaclk->clk_phase[1 ]); +regmap_write (sys_mgr_base_addr,SYSMGR_SDMMCGRP_CTRL_OFFSET , + hs_timing); + } +return 0 ; +}So reusing gate-clk here and check the node of "altr,sys-mgr". I think it is good and simple.
Also can define new clock combined with node "altr,sys-mgr" with parent ofsdmmc_clk.
Quoted 3 lines
Quoted 1 line
Thanks for the update, it is fine to me.
Thanks, can I get an Ack from you for this version?
Sure, if it is helpful.
Thanks
PATCH RESEND v7 1/4 clk: socfpga: Add a clk-phase property to the "altr, socfpga-gate-clk"
In reply to Dinh NguyenQuoting Dinh Nguyen (2013-12-17 05:44:47)
Quoted 35 lines
Hi Zhangfei,
Quoted 32 lines · zhangfei
Quoted 14 lines · dinguyen at altera.com
From: Dinh Nguyen <[email protected]>
drivers/clk/socfpga/clk.c +8
-0+static int socfpga_clk_prepare (struct clk_hw *hwclk) +{ +struct socfpga_clk *socfpgaclk =to_socfpga_clk (hwclk); +struct regmap *sys_mgr_base_addr; +u32 hs_timing; + +if (socfpgaclk->clk_phase[0 ] || socfpgaclk->clk_phase[1 ]) { + sys_mgr_base_addr =
syscon_regmap_lookup_by_compatible("altr,sys-mgr");(quoted diff) +2
-0+ if (IS_ERR(sys_mgr_base_addr)) { + pr_err("%s: failed to find altr,sys-mgr regmap!\n",
__func__);drivers/clk/socfpga/clk.c static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk, · line 272
Quoted 9 lines
drivers/clk/socfpga/clk.c +9
-0+return -EINVAL ; + } + hs_timing =SYSMGR_SDMMC_CTRL_SET (socfpgaclk->clk_phase[0 ], + socfpgaclk->clk_phase[1 ]); +regmap_write (sys_mgr_base_addr,SYSMGR_SDMMCGRP_CTRL_OFFSET , + hs_timing); + } +return 0 ; +}So reusing gate-clk here and check the node of "altr,sys-mgr". I think it is good and simple.
Also can define new clock combined with node "altr,sys-mgr" with parent ofsdmmc_clk.
Quoted 2 lines
Quoted 1 line
Thanks for the update, it is fine to me.
Thanks, can I get an Ack from you for this version?
Dinh,
Will you be spinning another version of this patch? If not I can go ahead and take this into clk-next.
Regards,
Mike
Quoted 35 lines
Thanks,
DinhQuoted 31 lines
Quoted 31 lines
drivers/clk/socfpga/clk.c +3
-0+static struct clk_ops gateclk_ops = { + .prepare = socfpga_clk_prepare, .recalc_rate = socfpga_clk_recalc_rate, .get_parent = socfpga_clk_get_parent, .set_parent = socfpga_clk_set_parent,@@ -254,6 +283,7 @@ static void __init socfpga_gate_clk_init(struct device_node *node, {u32 clk_gate[2 ];u32 div_reg[3 ]; +u32 clk_phase[2 ];u32 fixed_div;struct clk *clk;struct socfpga_clk *socfpga_clk;drivers/clk/socfpga/clk.c +6
-0@@ -294,6 +324,12 @@ static void __init socfpga_gate_clk_init(struct device_node *node, socfpga_clk->div_reg =0 ; } + rc =of_property_read_u32_array (node,"clk-phase" , clk_phase,2 ); +if (!rc) { + socfpga_clk->clk_phase[0 ] = clk_phase[0 ]; + socfpga_clk->clk_phase[1 ] = clk_phase[1 ]; + } +of_property_read_string (node,"clock-output-names" , &clk_name);init.name = clk_name;
PATCH RESEND v7 1/4 clk: socfpga: Add a clk-phase property to the "altr, socfpga-gate-clk"
Hi Mike,
Quoted 33 lines · Mike Turquette
Quoting Dinh Nguyen (2013-12-17 05:44:47)
Quoted 32 lines
Hi Zhangfei,
Quoted 29 lines · zhangfei
Quoted 13 lines · dinguyen at altera.com
From: Dinh Nguyen <[email protected]>
drivers/clk/socfpga/clk.c +8
-0+static int socfpga_clk_prepare (struct clk_hw *hwclk) +{ +struct socfpga_clk *socfpgaclk =to_socfpga_clk (hwclk); +struct regmap *sys_mgr_base_addr; +u32 hs_timing; + +if (socfpgaclk->clk_phase[0 ] || socfpgaclk->clk_phase[1 ]) { + sys_mgr_base_addr =
syscon_regmap_lookup_by_compatible("altr,sys-mgr");(quoted diff) +2
-0+ if (IS_ERR(sys_mgr_base_addr)) { + pr_err("%s: failed to find altr,sys-mgr regmap!\n",
__func__);drivers/clk/socfpga/clk.c static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk, · line 272
Quoted 9 lines
drivers/clk/socfpga/clk.c +9
-0+return -EINVAL ; + } + hs_timing =SYSMGR_SDMMC_CTRL_SET (socfpgaclk->clk_phase[0 ], + socfpgaclk->clk_phase[1 ]); +regmap_write (sys_mgr_base_addr,SYSMGR_SDMMCGRP_CTRL_OFFSET , + hs_timing); + } +return 0 ; +}So reusing gate-clk here and check the node of "altr,sys-mgr". I think it is good and simple.
Also can define new clock combined with node "altr,sys-mgr" with parent ofsdmmc_clk.
Quoted 6 lines
Quoted 2 lines
Quoted 1 line
Thanks for the update, it is fine to me.
Thanks, can I get an Ack from you for this version?
Dinh,
Will you be spinning another version of this patch? If not I can go ahead and take this into clk-next.
If you are OK with the patch, then yes, can you please apply it to clk-next?
Thanks,
Dinh
Quoted 36 lines
Regards,
MikeQuoted 32 lines
Thanks,
DinhQuoted 30 lines
Quoted 30 lines
drivers/clk/socfpga/clk.c +3
-0+static struct clk_ops gateclk_ops = { + .prepare = socfpga_clk_prepare, .recalc_rate = socfpga_clk_recalc_rate, .get_parent = socfpga_clk_get_parent, .set_parent = socfpga_clk_set_parent,@@ -254,6 +283,7 @@ static void __init socfpga_gate_clk_init(struct device_node *node, {u32 clk_gate[2 ];u32 div_reg[3 ]; +u32 clk_phase[2 ];u32 fixed_div;struct clk *clk;struct socfpga_clk *socfpga_clk;drivers/clk/socfpga/clk.c +6
-0@@ -294,6 +324,12 @@ static void __init socfpga_gate_clk_init(struct device_node *node, socfpga_clk->div_reg =0 ; } + rc =of_property_read_u32_array (node,"clk-phase" , clk_phase,2 ); +if (!rc) { + socfpga_clk->clk_phase[0 ] = clk_phase[0 ]; + socfpga_clk->clk_phase[1 ] = clk_phase[1 ]; + } +of_property_read_string (node,"clock-output-names" , &clk_name);init.name = clk_name;
PATCH RESEND v7 1/4 clk: socfpga: Add a clk-phase property to the "altr, socfpga-gate-clk"
In reply to dinguyen at altera.comQuoting dinguyen at altera.com (2013-12-16 09:04:33)
Quoted 52 lines
From: Dinh Nguyen <[email protected]>
The clk-phase property is used to represent the 2 clock phase values that is needed for the SD/MMC driver. Add a prepare function to the
clk_ops, that will use the syscon driver to set sdmmc_clk's phase shift that is located in the system manager.Signed-off-by Dinh Nguyen <[email protected]>---
v7: Add dts property to represent the clk phase of thesdmmc_clk. Add a
prepare function to the gate clk that will toggle clock phase setting. Remove the "altr,socfpga-sdmmc-sdr-clk" clock type.
v6: Add a new clock type "altr,socfpga-sdmmc-sdr-clk" that will be used to set the phase shift settings.
v5: Use the "snps,dw-mshc" binding
v4: Use thesdmmc_clkprepare function to set the phase shift settings
v3: Not use the syscon driver because as of 3.13-rc1, the syscon driver is
loaded after the clock driver.
v2: Use the syscon driver--- .../devicetree/bindings/clock/altr_socfpga.txt | 14 ++++++++ arch/arm/boot/dts/socfpga.dtsi | 1 + drivers/clk/socfpga/clk.c | 36 ++++++++++++++++++++ 3 files changed, 51 insertions(+)Documentation/devicetree/bindings/clock/altr_socfpga.txt +14
-0@@ -23,3 +23,17 @@ Optional properties: and the bit index. - div-reg : For "socfpga-gate-clk", div-reg contains the divider register, bit shift, and width. +- clk-phase : For the sdmmc_clk, contains the value of the clock phase that controls + the SDMMC CIU clock. The first value is the clk_sample(smpsel), and the second + value is the cclk_in_drv(drvsel). The clk-phase is used to enable the correct + hold/delay times that is needed for the SD/MMC CIU clock. The values of both + value can be one of the following: + + <0x0> : 0 degrees + <0x1> : 45 degrees + <0x2> : 90 degrees + <0x3> : 135 degrees + <0x4> : 180 degrees + <0x5> : 225 degrees + <0x6> : 270 degrees + <0x7> : 315 degreesarch/arm/boot/dts/socfpga.dtsi +0
-0
arch/arm/boot/dts/socfpga.dtsi line 416
Quoted 4 lines
arch/arm/boot/dts/socfpga.dtsi +1
-0@@ -413,6 +413,7 @@ compatible = "altr,socfpga-gate-clk"; clocks = <&f2s_periph_ref_clk>, <&main_nand_sdmmc_clk>, <&per_nand_mmc_clk>; clk-gate = <0xa0 8>; + clk-phase = <0 3>;
Looking at this again, I have a hard time understanding the values in the clk-phase property. You reference some functions in the property definition above, but they are not obvious to me.
Additionally I wonder if the binding would better if the clock-phase property was simply the value in degrees. E.g:
clk-phase = <315>; // 315 degrees
Regards,
Mike
Quoted 92 lines
arch/arm/boot/dts/socfpga.dtsi +0
-0}; nand_x_clk: nand_x_clk {drivers/clk/socfpga/clk.c +36
-0@@ -21,8 +21,10 @@#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/io.h> +#include <linux/mfd/syscon.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/regmap.h> /* Clock Manager offsets */ #define CLKMGR_CTRL 0x0@@ -56,6 +58,11 @@#define div_mask (width) ((1 << (width)) - 1)#define streq (a, b) (strcmp((a), (b)) == 0) +/* SDMMC Group for System Manager defines */ +#define SYSMGR_SDMMCGRP_CTRL_OFFSET 0x108 +#define SYSMGR_SDMMC_CTRL_SET (smplsel, drvsel) \ + ((((smplsel) & 0x7) << 3) | (((drvsel) & 0x7) << 0)) +static void __iomem *clk_mgr_base_addr;struct socfpga_clk {@@ -66,6 +73,7 @@ struct socfpga_clk {void __iomem *div_reg;u32 width;/* only valid if div_reg != 0 */ u32 shift;/* only valid if div_reg != 0 */ +u32 clk_phase[2 ]; };#define to_socfpga_clk (p) container_of(p, struct socfpga_clk, hw.hw)@@ -243,7 +251,28 @@ static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk,return parent_rate / div; } +static int socfpga_clk_prepare (struct clk_hw *hwclk) +{ +struct socfpga_clk *socfpgaclk =to_socfpga_clk (hwclk); +struct regmap *sys_mgr_base_addr; +u32 hs_timing; + +if (socfpgaclk->clk_phase[0 ] || socfpgaclk->clk_phase[1 ]) { + sys_mgr_base_addr =syscon_regmap_lookup_by_compatible ("altr,sys-mgr" ); +if (IS_ERR (sys_mgr_base_addr)) { +pr_err ("%s: failed to find altr,sys-mgr regmap!\n" , __func__); +return -EINVAL ; + } + hs_timing =SYSMGR_SDMMC_CTRL_SET (socfpgaclk->clk_phase[0 ], + socfpgaclk->clk_phase[1 ]); +regmap_write (sys_mgr_base_addr,SYSMGR_SDMMCGRP_CTRL_OFFSET , + hs_timing); + } +return 0 ; +} +static struct clk_ops gateclk_ops = { + .prepare = socfpga_clk_prepare, .recalc_rate = socfpga_clk_recalc_rate, .get_parent = socfpga_clk_get_parent, .set_parent = socfpga_clk_set_parent,@@ -254,6 +283,7 @@ static void __init socfpga_gate_clk_init(struct device_node *node, {u32 clk_gate[2 ];u32 div_reg[3 ]; +u32 clk_phase[2 ];u32 fixed_div;struct clk *clk;struct socfpga_clk *socfpga_clk;@@ -294,6 +324,12 @@ static void __init socfpga_gate_clk_init(struct device_node *node, socfpga_clk->div_reg =0 ; } + rc =of_property_read_u32_array (node,"clk-phase" , clk_phase,2 ); +if (!rc) { + socfpga_clk->clk_phase[0 ] = clk_phase[0 ]; + socfpga_clk->clk_phase[1 ] = clk_phase[1 ]; + } +of_property_read_string (node,"clock-output-names" , &clk_name); init.name = clk_name;Signature · 1 line
1.7.9.5
PATCH RESEND v7 1/4 clk: socfpga: Add a clk-phase property to the "altr, socfpga-gate-clk"
Quoted 14 lines · Mike Turquette
arch/arm/boot/dts/socfpga.dtsi line 416
Quoted 9 lines
arch/arm/boot/dts/socfpga.dtsi +1
-0@@ -413,6 +413,7 @@ compatible = "altr,socfpga-gate-clk"; clocks = <&f2s_periph_ref_clk>, <&main_nand_sdmmc_clk>, <&per_nand_mmc_clk>; clk-gate = <0xa0 8>; + clk-phase = <0 3>;Looking at this again, I have a hard time understanding the values in the clk-phase property. You reference some functions in the property definition above, but they are not obvious to me.
Quoted 4 lines
Additionally I wonder if the binding would better if the clock-phase property was simply the value in degrees. E.g:
clk-phase = <315>; // 315 degrees
I would definitely prefer using degrees over an arbitrary enumeration that might work on some platforms but not on others.
I'm also a bit skeptical about the idea of putting the phase into the clock provider rather than the consumer, given the comments about the clk_set_phase() interface earlier. Generally we try to avoid having consumer-specific settings in a provider node (for any DT binding, not just clocks). Can't you have the same numbers in the dw-mshc node instead and let the mmc driver call clk_set_phase instead? If every clock has a fixed phase for a given piece of hardware, it could even be set automatically by making the common clk code read the clk-phase attribute at the time a driver calls clk_get.
Arnd
PATCH RESEND v7 1/4 clk: socfpga: Add a clk-phase property to the "altr, socfpga-gate-clk"
Quoted 21 lines · Arnd Bergmann
Quoted 13 lines · Mike Turquette
arch/arm/boot/dts/socfpga.dtsi line 416
Quoted 9 lines
arch/arm/boot/dts/socfpga.dtsi +1
-0@@ -413,6 +413,7 @@ compatible = "altr,socfpga-gate-clk"; clocks = <&f2s_periph_ref_clk>, <&main_nand_sdmmc_clk>, <&per_nand_mmc_clk>; clk-gate = <0xa0 8>; + clk-phase = <0 3>;Looking at this again, I have a hard time understanding the values in the clk-phase property. You reference some functions in the property definition above, but they are not obvious to me.
Quoted 4 lines
Additionally I wonder if the binding would better if the clock-phase property was simply the value in degrees. E.g:
clk-phase = <315>; // 315 degreesI would definitely prefer using degrees over an arbitrary enumeration that might work on some platforms but not on others.
Quoted 9 lines
I'm also a bit skeptical about the idea of putting the phase into the clock provider rather than the consumer, given the comments about the
clk_set_phase()interface earlier. Generally we try to avoid having consumer-specific settings in a provider node (for any DT binding, not just clocks). Can't you have the same numbers in the dw-mshc node instead and let the mmc driver callclk_set_phaseinstead? If every clock has a fixed phase for a given piece of hardware, it could even be set automatically by making the common clk code read the clk-phase attribute at the time a driver callsclk_get.
So I think this is what you're suggesting:
clocks = <&sdmmc_clk 0 135>, this would specify 0 and 135 degrees phase.
The clock-bindings document is stating that the integer in the clocks property is
specifying the output number of the clock. Would this approach cause a conflict and would
need an update to that document/approach?
Dinh
Quoted 2 lines
Arnd
PATCH RESEND v7 1/4 clk: socfpga: Add a clk-phase property to the "altr, socfpga-gate-clk"
Quoted 15 lines · Dinh Nguyen
Quoted 4 lines · Arnd Bergmann
On Wednesday 18 December 2013, Mike Turquette wrote:
I would definitely prefer using degrees over an arbitrary enumeration that might work on some platforms but not on others.Quoted 9 lines
I'm also a bit skeptical about the idea of putting the phase into the clock provider rather than the consumer, given the comments about the
clk_set_phase()interface earlier. Generally we try to avoid having consumer-specific settings in a provider node (for any DT binding, not just clocks). Can't you have the same numbers in the dw-mshc node instead and let the mmc driver callclk_set_phaseinstead? If every clock has a fixed phase for a given piece of hardware, it could even be set automatically by making the common clk code read the clk-phase attribute at the time a driver callsclk_get.
Quoted 2 lines
So I think this is what you're suggesting:
clocks = <&sdmmc_clk0 135>, this would specify 0 and 135 degrees phase.
It's not what I meant in the paragraph above, but I have suggested this method in the past, and I think that would solve the problem very nicely as well, if Mike agrees.
Quoted 5 lines
The clock-bindings document is stating that the integer in the clocks property is
specifying the output number of the clock. Would this approach cause a conflict and would
need an update to that document/approach?
I don't think we have to change the common binding. While it lists the use of the integer for multiple clock outputs, that's not necessarily the only possible use, and specific bindings can always override the generic ones in a compatible way.
You would certainly have to update the binding of your clock controller to do this, in particular because #clock-cells is now <1>. You will probably need to add a new "compatible" string for a clock that has a phase setting rather than just a gate, and document what the argument is for. If possible, try to model the hardware the way it actually is implemented. If the clock controller supports both the gate and the phase in the same block, then make it one clock device node, but if you have one block generating the clock and another one to shift the phase, it may be best to model that second clock in a separate node so you can split the driver code according to the registers, like
mmcclock-shifted {
compatible = "altr,socfpga-clk-shift";
reg = <0xabcd>;
clocks = <&mmcclock>;
#clock-cells = <1>
};
mshc {
...
clocks = <&/clocks/mmcclock-shifted 135>;
clock-names = "ciu";
};Coming back to what I actually tried to suggest above was
mshc {
...
clocks = <&/clocks/mmcclock>;
clock-names = "ciu";
clock-phases = <135>;
};This would keep the phase setting out of the specific binding and move it to the generic clock binding. In Linux we could implement this either by making the mshc driver read the phase value and call clock_set_phase() on it, or the common clock code could look up the clock-phases property at the same time it looks up clock-names and clocks, and set this behind the back of the driver.
Arnd
PATCH RESEND v7 2/4 dts: socfpga: Add support for SD/MMC on the SOCFPGA platform
In reply to dinguyen at altera.comFrom: Dinh Nguyen <[email protected]>
Use the "snps,dw-mshc" binding to enable the dw_mmc driver. Add the "syscon" binding to the "altr,sys-mgr" node. The clock driver can use the syscon driver to toggle the register for the SD/MMC clock phase shift settings.
---
v7: Use the standard "snps,dw-mshc" binding. Remove "altr,socfpga-sdmmc-sdr-clk".
v6: Add documentation for "altr,socfpga-sdmmc-sdr-clk". Add "syscon" to the sysmgr binding.
v5: Use the "snps,dw-mshc" binding
v4: Re-use "rockchip,rk2928-dw-mshc" binding
v3: none
v2: none
--- arch/arm/boot/dts/socfpga.dtsi | 13 ++++++++++++- arch/arm/boot/dts/socfpga_arria5.dtsi | 11 +++++++++++ arch/arm/boot/dts/socfpga_cyclone5.dtsi | 11 +++++++++++ arch/arm/boot/dts/socfpga_vt.dts | 11 +++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-)
arch/arm/boot/dts/socfpga.dtsi +12 -1
@@ -470,6 +470,17 @@ cache-level = <2>; }; + mmc: dwmmc0 at ff704000 { + compatible = "snps,dw-mshc"; + reg = <0xff704000 0x1000>; + interrupts = <0 139 4>; + fifo-depth = <0x400>; + #address-cells = <1>; + #size-cells = <0>; + clocks = <&l4_mp_clk>, <&sdmmc_clk>; + clock-names = "biu", "ciu"; + }; + /* Local timer */ timer at fffec600 { compatible = "arm,cortex-a9-twd-timer";
@@ -524,7 +535,7 @@ }; sysmgr at ffd08000 { - compatible = "altr,sys-mgr"; + compatible = "altr,sys-mgr", "syscon"; reg = <0xffd08000 0x4000>; }; };
arch/arm/boot/dts/socfpga_arria5.dtsi +11 -0
@@ -27,6 +27,17 @@ }; }; + dwmmc0 at ff704000 { + num-slots = <1>; + supports-highspeed; + broken-cd; + + slot at 0 { + reg = <0>; + bus-width = <4>; + }; + }; + serial0 at ffc02000 { clock-frequency = <100000000>; };
arch/arm/boot/dts/socfpga_cyclone5.dtsi +11 -0
@@ -28,6 +28,17 @@ }; }; + dwmmc0 at ff704000 { + num-slots = <1>; + supports-highspeed; + broken-cd; + + slot at 0 { + reg = <0>; + bus-width = <4>; + }; + }; + ethernet at ff702000 { phy-mode = "rgmii"; phy-addr = <0xffffffff>; /* probe for phy addr */
arch/arm/boot/dts/socfpga_vt.dts +11 -0
@@ -41,6 +41,17 @@ }; }; + dwmmc0 at ff704000 { + num-slots = <1>; + supports-highspeed; + broken-cd; + + slot at 0 { + reg = <0>; + bus-width = <4>; + }; + }; + ethernet at ff700000 { phy-mode = "gmii"; status = "okay";
Signature · 1 line
1.7.9.5
PATCH RESEND v7 3/4 mmc: dw_mmc-socfpga: Remove the SOCFPGA specific platform for dw_mmc
In reply to dinguyen at altera.comFrom: Dinh Nguyen <[email protected]>
It turns now that the only really platform specific code that is needed for SOCFPGA is using the SDMMC_CMD_USE_HOLD_REG in the prepare_command function. Since the Rockchip already has this functionality, re-use the code that is already in dw_mmc-pltfm.c.
---
v7: none
v6: none
v5: none
v4: Remove dw_mmc-socfpga platform specific code
v3: none
v2: none
--- drivers/mmc/host/Kconfig | 8 --- drivers/mmc/host/dw_mmc-socfpga.c | 138 ------------------------------------- 2 files changed, 146 deletions(-) delete mode 100644 drivers/mmc/host/dw_mmc-socfpga.c
drivers/mmc/host/Kconfig +0 -8
@@ -567,14 +567,6 @@ config MMC_DW_EXYNOS Synopsys DesignWare Memory Card Interface driver. Select this option for platforms based on Exynos4 and Exynos5 SoC's. -config MMC_DW_SOCFPGA - tristate "SOCFPGA specific extensions for Synopsys DW Memory Card Interface" - depends on MMC_DW && MFD_SYSCON - select MMC_DW_PLTFM - help - This selects support for Altera SoCFPGA specific extensions to the - Synopsys DesignWare Memory Card Interface driver. - config MMC_DW_PCI tristate "Synopsys Designware MCI support on PCI bus" depends on MMC_DW && PCI
drivers/mmc/host/dw_mmc-socfpga.c deleted +0 -138
138 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH RESEND v7 4/4 ARM: socfpga_defconfig: enable SD/MMC support
In reply to dinguyen at altera.comFrom: Dinh Nguyen <[email protected]>
Enables the dw_mmc driver for SOCFPGA.
---
v7: none
v6: none
v5: Add dw_mmc driver into socfpga_defconfig
v4: none
v3: none
v2: none
--- arch/arm/configs/socfpga_defconfig | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/configs/socfpga_defconfig +2 -0
@@ -82,3 +82,5 @@ CONFIG_DEBUG_INFO=y CONFIG_ENABLE_DEFAULT_TRACERS=y CONFIG_DEBUG_USER=y CONFIG_XZ_DEC=y +CONFIG_MMC=y +CONFIG_MMC_DW=y
Signature · 1 line
1.7.9.5