Skip to contentSkip to conversation

video: da8xx-fb: clk_get on connection id fck

PATCH New Manjunathappa 3 participants 4 messages Nov 20, 2012 – Nov 29, 2012

Subsystems (4)
Arm (32-bit) Arm sub-architectures Framebuffer layer TI DaVinci machine support
lore
Share & tools
lore

Manjunathappa

author
#0 lore raw

PATCH 1/1 video: da8xx-fb: clk_get on connection id fck

do clk_get on connection id "fck" to support OMAP based platforms having multiple clocks for module. Without this driver change clk_get fails on am335x.

This patch is based on the discussion in community
http://marc.info/?l=linux-kernel&m=135166018907827&w=2

Signed-off-by Manjunathappa <[email protected]>
Cc Vaibhav Hiremath <[email protected]>
---
 arch/arm/mach-davinci/da830.c     |    2 +-
 arch/arm/mach-davinci/da850.c     |    2 +-
 arch/arm/mach-davinci/pm_domain.c |    1 +
 drivers/video/da8xx-fb.c          |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
arch/arm/mach-davinci/da830.c +1 -1
index deee5c2..ee8504f 100644
@@ -408,7 +408,7 @@ static struct clk_lookup da830_clks[] = {
 	CLK(NULL,		"pwm2",		&pwm2_clk),
 	CLK("eqep.0",		NULL,		&eqep0_clk),
 	CLK("eqep.1",		NULL,		&eqep1_clk),
-	CLK("da8xx_lcdc.0",	NULL,		&lcdc_clk),
+	CLK("da8xx_lcdc.0",	"fck",		&lcdc_clk),
 	CLK("davinci-mcasp.0",	NULL,		&mcasp0_clk),
 	CLK("davinci-mcasp.1",	NULL,		&mcasp1_clk),
 	CLK("davinci-mcasp.2",	NULL,		&mcasp2_clk),
arch/arm/mach-davinci/da850.c +1 -1
index b44dc84..bc75bdd 100644
@@ -389,7 +389,7 @@ static struct clk_lookup da850_clks[] = {
 	CLK(NULL,		"rmii",		&rmii_clk),
 	CLK("davinci_emac.1",	NULL,		&emac_clk),
 	CLK("davinci-mcasp.0",	NULL,		&mcasp_clk),
-	CLK("da8xx_lcdc.0",	NULL,		&lcdc_clk),
+	CLK("da8xx_lcdc.0",	"fck",		&lcdc_clk),
 	CLK("davinci_mmc.0",	NULL,		&mmcsd0_clk),
 	CLK("davinci_mmc.1",	NULL,		&mmcsd1_clk),
 	CLK(NULL,		"aemif",	&aemif_clk),
arch/arm/mach-davinci/pm_domain.c +1 -0
index 00946e2..c90250e 100644
@@ -53,6 +53,7 @@ static struct dev_pm_domain davinci_pm_domain = {
 
 static struct pm_clk_notifier_block platform_bus_notifier = {
 	.pm_domain = &davinci_pm_domain,
+	.con_ids = { "fck", NULL, },
 };
 
 static int __init davinci_pm_runtime_init(void)
drivers/video/da8xx-fb.c +1 -1
index f0f21c8..bb68533 100644
@@ -1248,7 +1248,7 @@ static int __devinit fb_probe(struct platform_device *device)
 		goto err_request_mem;
 	}
 
-	fb_clk = clk_get(&device->dev, NULL);
+	fb_clk = clk_get(&device->dev, "fck");
 	if (IS_ERR(fb_clk)) {
 		dev_err(&device->dev, "Can not get device clock\n");
 		ret = -ENODEV;
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 video: da8xx-fb: clk_get on connection id fck

Quoted 9 lines · Manjunathappa

do clk_get on connection id "fck" to support OMAP based platforms having multiple clocks for module. Without this driver change clk_get fails on am335x.

This patch is based on the discussion in community
http://marc.info/?l=linux-kernel&m=135166018907827&w=2

Signed-off-by Manjunathappa <[email protected]>
Cc Vaibhav Hiremath <[email protected]>

For the mach-davinci changes:

Acked-by Sekhar Nori <[email protected]>

Florian,

I assume you will want to take this through your tree?

Thanks,
Sekhar

author
#2 lore raw

PATCH 1/1 video: da8xx-fb: clk_get on connection id fck

Hi Tomi,

Quoted 11 lines · Sekhar
Quoted 9 lines · Manjunathappa

do clk_get on connection id "fck" to support OMAP based platforms having multiple clocks for module. Without this driver change clk_get fails on am335x.

This patch is based on the discussion in community
http://marc.info/?l=linux-kernel&m=135166018907827&w=2

Signed-off-by Manjunathappa <[email protected]>
Cc Vaibhav Hiremath <[email protected]>
Quoted 8 lines

For the mach-davinci changes:

Acked-by Sekhar Nori <[email protected]>

Florian,

I assume you will want to take this through your tree?

Could you please pull in this?

Thanks,
Prakash

Quoted 3 lines

Thanks,
Sekhar

#3 lore raw

PATCH 1/1 video: da8xx-fb: clk_get on connection id fck

Quoted 16 lines · Prakash

Hi Tomi,

Quoted 13 lines · Sekhar
Quoted 9 lines · Manjunathappa

do clk_get on connection id "fck" to support OMAP based platforms having multiple clocks for module. Without this driver change clk_get fails on am335x.

This patch is based on the discussion in community
http://marc.info/?l=linux-kernel&m=135166018907827&w=2

Signed-off-by Manjunathappa <[email protected]>
Cc Vaibhav Hiremath <[email protected]>

For the mach-davinci changes:

Quoted 8 lines
Quoted 6 lines
Acked-by Sekhar Nori <[email protected]>

Florian,

I assume you will want to take this through your tree?

Could you please pull in this?

Merged this and the "da8xx-fb: LCDC driver cleanup" to:

git://gitorious.org/linux-omap-dss2/linux.git for-next

Tomi

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 899 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121129/affe6c0b/attachment.sig>