Re: [PATCH 1/6] drivers: net: cpts: Remove hardcoded clock name for CPTS
On Mon, Apr 28, 2014 at 09:40:20AM +0530, George Cherian wrote: CPTS refclk name is hardcoded, which makes it fail in case of DRA7x Remove the hardcoded clock name for CPTS refclk and get the same from DT. Patch ordering - doesn't this patch depend on patch #2? Thanks, Richard -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/6] drivers: net: cpts: Remove hardcoded clock name for CPTS
On 4/28/2014 8:01 PM, Felipe Balbi wrote: On Mon, Apr 28, 2014 at 09:40:20AM +0530, George Cherian wrote: CPTS refclk name is hardcoded, which makes it fail in case of DRA7x Remove the hardcoded clock name for CPTS refclk and get the same from DT. Signed-off-by: George Cherian george.cher...@ti.com --- drivers/net/ethernet/ti/cpts.c | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c index 2435139..0b6f6f7 100644 --- a/drivers/net/ethernet/ti/cpts.c +++ b/drivers/net/ethernet/ti/cpts.c @@ -236,13 +236,11 @@ static void cpts_overflow_check(struct work_struct *work) schedule_delayed_work(cpts-overflow_work, CPTS_OVERFLOW_PERIOD); } -#define CPTS_REF_CLOCK_NAME cpsw_cpts_rft_clk - -static void cpts_clk_init(struct cpts *cpts) +static void cpts_clk_init(struct device *dev, struct cpts *cpts) { - cpts-refclk = clk_get(NULL, CPTS_REF_CLOCK_NAME); + cpts-refclk = devm_clk_get(dev, cpts); if (IS_ERR(cpts-refclk)) { - pr_err(Failed to clk_get %s\n, CPTS_REF_CLOCK_NAME); + pr_err(Failed to get cpts refclk\n); now you have a dev pointer as argument, how about converting this to dev_err() ? Yep will do.. in next version. -- -George -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/6] drivers: net: cpts: Remove hardcoded clock name for CPTS
On Mon, Apr 28, 2014 at 09:40:20AM +0530, George Cherian wrote: CPTS refclk name is hardcoded, which makes it fail in case of DRA7x Remove the hardcoded clock name for CPTS refclk and get the same from DT. Signed-off-by: George Cherian george.cher...@ti.com --- drivers/net/ethernet/ti/cpts.c | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c index 2435139..0b6f6f7 100644 --- a/drivers/net/ethernet/ti/cpts.c +++ b/drivers/net/ethernet/ti/cpts.c @@ -236,13 +236,11 @@ static void cpts_overflow_check(struct work_struct *work) schedule_delayed_work(cpts-overflow_work, CPTS_OVERFLOW_PERIOD); } -#define CPTS_REF_CLOCK_NAME cpsw_cpts_rft_clk - -static void cpts_clk_init(struct cpts *cpts) +static void cpts_clk_init(struct device *dev, struct cpts *cpts) { - cpts-refclk = clk_get(NULL, CPTS_REF_CLOCK_NAME); + cpts-refclk = devm_clk_get(dev, cpts); if (IS_ERR(cpts-refclk)) { - pr_err(Failed to clk_get %s\n, CPTS_REF_CLOCK_NAME); + pr_err(Failed to get cpts refclk\n); now you have a dev pointer as argument, how about converting this to dev_err() ? -- balbi signature.asc Description: Digital signature
[PATCH 1/6] drivers: net: cpts: Remove hardcoded clock name for CPTS
CPTS refclk name is hardcoded, which makes it fail in case of DRA7x Remove the hardcoded clock name for CPTS refclk and get the same from DT. Signed-off-by: George Cherian george.cher...@ti.com --- drivers/net/ethernet/ti/cpts.c | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c index 2435139..0b6f6f7 100644 --- a/drivers/net/ethernet/ti/cpts.c +++ b/drivers/net/ethernet/ti/cpts.c @@ -236,13 +236,11 @@ static void cpts_overflow_check(struct work_struct *work) schedule_delayed_work(cpts-overflow_work, CPTS_OVERFLOW_PERIOD); } -#define CPTS_REF_CLOCK_NAME cpsw_cpts_rft_clk - -static void cpts_clk_init(struct cpts *cpts) +static void cpts_clk_init(struct device *dev, struct cpts *cpts) { - cpts-refclk = clk_get(NULL, CPTS_REF_CLOCK_NAME); + cpts-refclk = devm_clk_get(dev, cpts); if (IS_ERR(cpts-refclk)) { - pr_err(Failed to clk_get %s\n, CPTS_REF_CLOCK_NAME); + pr_err(Failed to get cpts refclk\n); cpts-refclk = NULL; return; } @@ -252,7 +250,6 @@ static void cpts_clk_init(struct cpts *cpts) static void cpts_clk_release(struct cpts *cpts) { clk_disable(cpts-refclk); - clk_put(cpts-refclk); } static int cpts_match(struct sk_buff *skb, unsigned int ptp_class, @@ -390,7 +387,7 @@ int cpts_register(struct device *dev, struct cpts *cpts, for (i = 0; i CPTS_MAX_EVENTS; i++) list_add(cpts-pool_data[i].list, cpts-pool); - cpts_clk_init(cpts); + cpts_clk_init(dev, cpts); cpts_write32(cpts, CPTS_EN, control); cpts_write32(cpts, TS_PEND_EN, int_enable); -- 1.8.3.1 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html