linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: imx: imx6q, Add i2c4 clock to the clock tree
@ 2014-04-28 13:54 Markus Pargmann
  2014-04-30  6:25 ` Shawn Guo
  0 siblings, 1 reply; 3+ messages in thread
From: Markus Pargmann @ 2014-04-28 13:54 UTC (permalink / raw)
  To: linux-arm-kernel

This clock was missing for imx6dl SoCs. This patch adds the missing
clock so we can use i2c4.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 Documentation/devicetree/bindings/clock/imx6q-clock.txt | 1 +
 arch/arm/mach-imx/clk-imx6q.c                           | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/clock/imx6q-clock.txt b/Documentation/devicetree/bindings/clock/imx6q-clock.txt
index 90ec91f..c6dd7a5 100644
--- a/Documentation/devicetree/bindings/clock/imx6q-clock.txt
+++ b/Documentation/devicetree/bindings/clock/imx6q-clock.txt
@@ -221,6 +221,7 @@ clocks and IDs.
 	lvds1_gate		206
 	lvds2_gate		207
 	esai_ahb		208
+	i2c4			209
 
 Examples:
 
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index eab2781..8b0e284 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -107,7 +107,7 @@ enum mx6q_clks {
 	sata_ref, sata_ref_100m, pcie_ref, pcie_ref_125m, enet_ref, usbphy1_gate,
 	usbphy2_gate, pll4_post_div, pll5_post_div, pll5_video_div, eim_slow,
 	spdif, cko2_sel, cko2_podf, cko2, cko, vdoa, pll4_audio_div,
-	lvds1_sel, lvds2_sel, lvds1_gate, lvds2_gate, esai_ahb, clk_max
+	lvds1_sel, lvds2_sel, lvds1_gate, lvds2_gate, esai_ahb, i2c4, clk_max
 };
 
 static struct clk *clk[clk_max];
@@ -378,6 +378,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
 	clk[i2c1]         = imx_clk_gate2("i2c1",          "ipg_per",           base + 0x70, 6);
 	clk[i2c2]         = imx_clk_gate2("i2c2",          "ipg_per",           base + 0x70, 8);
 	clk[i2c3]         = imx_clk_gate2("i2c3",          "ipg_per",           base + 0x70, 10);
+	clk[i2c4]         = imx_clk_gate2("i2c4",          "ipg_per",           base + 0x6c, 8);
 	clk[iim]          = imx_clk_gate2("iim",           "ipg",               base + 0x70, 12);
 	clk[enfc]         = imx_clk_gate2("enfc",          "enfc_podf",         base + 0x70, 14);
 	clk[vdoa]         = imx_clk_gate2("vdoa",          "vdo_axi",           base + 0x70, 26);
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH] ARM: imx: imx6q, Add i2c4 clock to the clock tree
  2014-04-28 13:54 [PATCH] ARM: imx: imx6q, Add i2c4 clock to the clock tree Markus Pargmann
@ 2014-04-30  6:25 ` Shawn Guo
  2014-04-30  6:57   ` Markus Pargmann
  0 siblings, 1 reply; 3+ messages in thread
From: Shawn Guo @ 2014-04-30  6:25 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Apr 28, 2014 at 03:54:42PM +0200, Markus Pargmann wrote:
> This clock was missing for imx6dl SoCs. This patch adds the missing
> clock so we can use i2c4.
> 
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>

I've queued a patch which adds the clock in a slightly different way.

https://git.kernel.org/cgit/linux/kernel/git/shawnguo/linux.git/commit/?h=imx/soc&id=95dcc2093da280e5ee440d7b418997da4d9b9c01

Shawn

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] ARM: imx: imx6q, Add i2c4 clock to the clock tree
  2014-04-30  6:25 ` Shawn Guo
@ 2014-04-30  6:57   ` Markus Pargmann
  0 siblings, 0 replies; 3+ messages in thread
From: Markus Pargmann @ 2014-04-30  6:57 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Apr 30, 2014 at 02:25:29PM +0800, Shawn Guo wrote:
> On Mon, Apr 28, 2014 at 03:54:42PM +0200, Markus Pargmann wrote:
> > This clock was missing for imx6dl SoCs. This patch adds the missing
> > clock so we can use i2c4.
> > 
> > Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> 
> I've queued a patch which adds the clock in a slightly different way.
> 
> https://git.kernel.org/cgit/linux/kernel/git/shawnguo/linux.git/commit/?h=imx/soc&id=95dcc2093da280e5ee440d7b418997da4d9b9c01

Thanks, I didn't notice that this clock is different for imx6dl.

Regards,

Markus

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140430/70db50af/attachment.sig>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-04-30  6:57 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-28 13:54 [PATCH] ARM: imx: imx6q, Add i2c4 clock to the clock tree Markus Pargmann
2014-04-30  6:25 ` Shawn Guo
2014-04-30  6:57   ` Markus Pargmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).