* [PATCH 0/2] ARM i.MX53: add flexcan support @ 2012-07-18 9:42 Marc Kleine-Budde 2012-07-18 9:42 ` [PATCH 1/2] ARM i.MX53: register CAN clocks Marc Kleine-Budde 2012-07-18 9:42 ` [PATCH 2/2] ARM i.MX53: dts: add flexcan to imx53 Marc Kleine-Budde 0 siblings, 2 replies; 5+ messages in thread From: Marc Kleine-Budde @ 2012-07-18 9:42 UTC (permalink / raw) To: linux-arm-kernel; +Cc: linux-can, Shawn Guo, Sascha Hauer, kernel Hello, this series adds flexcan support to mx53 clock and device tree. In order to work, an updated flexcan driver is needed, which is currently under review [1]. This series applies to v3.5-rc7. regards, Marc [1] http://www.spinics.net/lists/arm-kernel/msg185139.html ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM i.MX53: register CAN clocks 2012-07-18 9:42 [PATCH 0/2] ARM i.MX53: add flexcan support Marc Kleine-Budde @ 2012-07-18 9:42 ` Marc Kleine-Budde 2012-07-18 9:42 ` [PATCH 2/2] ARM i.MX53: dts: add flexcan to imx53 Marc Kleine-Budde 1 sibling, 0 replies; 5+ messages in thread From: Marc Kleine-Budde @ 2012-07-18 9:42 UTC (permalink / raw) To: linux-arm-kernel Cc: linux-can, Shawn Guo, Sascha Hauer, kernel, Steffen Trumtrar, Marc Kleine-Budde From: Sascha Hauer <s.hauer@pengutronix.de> On the imx53, the flexcan core has two clocks, the ipg and the per clock. This patch adds these clocks for both flexcans on the imx53. An updated flexcan driver, taking advantage of these clocks, is currently in the review process. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- arch/arm/mach-imx/clk-imx51-imx53.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c index a2200c7..37eb420 100644 --- a/arch/arm/mach-imx/clk-imx51-imx53.c +++ b/arch/arm/mach-imx/clk-imx51-imx53.c @@ -49,6 +49,7 @@ static const char *mx53_tve_ext_sel[] = { "pll4_sw", "ckih1", }; static const char *tve_sel[] = { "tve_pred", "tve_ext_sel", }; static const char *ipu_sel[] = { "axi_a", "axi_b", "emi_slow_gate", "ahb", }; static const char *vpu_sel[] = { "axi_a", "axi_b", "emi_slow_gate", "ahb", }; +static const char *mx53_can_sel[] = { "ipg", "ckih1", "ckih2", "lp_apm", }; enum imx5_clks { dummy, ckil, osc, ckih1, ckih2, ahb, ipg, axi_a, axi_b, uart_pred, @@ -81,6 +82,7 @@ enum imx5_clks { ssi1_root_podf, ssi2_root_pred, ssi2_root_podf, ssi_ext1_pred, ssi_ext1_podf, ssi_ext2_pred, ssi_ext2_podf, ssi1_root_gate, ssi2_root_gate, ssi3_root_gate, ssi_ext1_gate, ssi_ext2_gate, + can_sel, can1_serial_gate, can1_ipg_gate, clk_max }; @@ -411,8 +413,12 @@ int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc, clk[esdhc4_per_gate] = imx_clk_gate2("esdhc4_per_gate", "esdhc_d_sel", MXC_CCM_CCGR3, 14); clk[usb_phy1_gate] = imx_clk_gate2("usb_phy1_gate", "usb_phy_sel", MXC_CCM_CCGR4, 10); clk[usb_phy2_gate] = imx_clk_gate2("usb_phy2_gate", "usb_phy_sel", MXC_CCM_CCGR4, 12); - clk[can2_serial_gate] = imx_clk_gate2("can2_serial_gate", "ipg", MXC_CCM_CCGR4, 6); - clk[can2_ipg_gate] = imx_clk_gate2("can2_ipg_gate", "ipg", MXC_CCM_CCGR4, 8); + clk[can_sel] = imx_clk_mux("can_sel", MXC_CCM_CSCMR2, 6, 2, + mx53_can_sel, ARRAY_SIZE(mx53_can_sel)); + clk[can1_serial_gate] = imx_clk_gate2("can1_serial_gate", "can_sel", MXC_CCM_CCGR6, 22); + clk[can1_ipg_gate] = imx_clk_gate2("can1_ipg_gate", "ipg", MXC_CCM_CCGR6, 20); + clk[can2_serial_gate] = imx_clk_gate2("can2_serial_gate", "can_sel", MXC_CCM_CCGR4, 8); + clk[can2_ipg_gate] = imx_clk_gate2("can2_ipg_gate", "ipg", MXC_CCM_CCGR4, 6); clk[i2c3_gate] = imx_clk_gate2("i2c3_gate", "per_root", MXC_CCM_CCGR1, 22); for (i = 0; i < ARRAY_SIZE(clk); i++) @@ -445,6 +451,10 @@ int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc, clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "63fcc000.ssi"); clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "50014000.ssi"); clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "63fd0000.ssi"); + clk_register_clkdev(clk[can1_ipg_gate], "ipg", "53fc8000.can"); + clk_register_clkdev(clk[can1_serial_gate], "per", "53fc8000.can"); + clk_register_clkdev(clk[can2_ipg_gate], "ipg", "53fcc000.can"); + clk_register_clkdev(clk[can2_serial_gate], "per", "53fcc000.can"); /* set SDHC root clock to 200MHZ*/ clk_set_rate(clk[esdhc_a_podf], 200000000); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM i.MX53: dts: add flexcan to imx53 2012-07-18 9:42 [PATCH 0/2] ARM i.MX53: add flexcan support Marc Kleine-Budde 2012-07-18 9:42 ` [PATCH 1/2] ARM i.MX53: register CAN clocks Marc Kleine-Budde @ 2012-07-18 9:42 ` Marc Kleine-Budde 2012-07-18 14:53 ` Shawn Guo 1 sibling, 1 reply; 5+ messages in thread From: Marc Kleine-Budde @ 2012-07-18 9:42 UTC (permalink / raw) To: linux-arm-kernel Cc: linux-can, Shawn Guo, Sascha Hauer, kernel, Steffen Trumtrar, Marc Kleine-Budde From: Steffen Trumtrar <s.trumtrar@pengutronix.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- arch/arm/boot/dts/imx53.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi index e3e8694..5ae0dbd 100644 --- a/arch/arm/boot/dts/imx53.dtsi +++ b/arch/arm/boot/dts/imx53.dtsi @@ -196,6 +196,20 @@ status = "disabled"; }; + can1: can@53fc8000 { + compatible = "fsl,imx53-flexcan", "fsl,p1010-flexcan"; + reg = <0x53fc8000 0x4000>; + interrupts = <82>; + status = "disabled"; + }; + + can2: can@53fcc000 { + compatible = "fsl,imx53-flexcan", "fsl,p1010-flexcan"; + reg = <0x53fcc000 0x4000>; + interrupts = <83>; + status = "disabled"; + }; + gpio5: gpio@53fdc000 { compatible = "fsl,imx53-gpio", "fsl,imx31-gpio"; reg = <0x53fdc000 0x4000>; -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ARM i.MX53: dts: add flexcan to imx53 2012-07-18 9:42 ` [PATCH 2/2] ARM i.MX53: dts: add flexcan to imx53 Marc Kleine-Budde @ 2012-07-18 14:53 ` Shawn Guo 2012-07-18 14:38 ` Marc Kleine-Budde 0 siblings, 1 reply; 5+ messages in thread From: Shawn Guo @ 2012-07-18 14:53 UTC (permalink / raw) To: Marc Kleine-Budde Cc: linux-arm-kernel, linux-can, Sascha Hauer, kernel, Steffen Trumtrar On Wed, Jul 18, 2012 at 11:42:43AM +0200, Marc Kleine-Budde wrote: > From: Steffen Trumtrar <s.trumtrar@pengutronix.de> > > Cc: Sascha Hauer <s.hauer@pengutronix.de> > Cc: Shawn Guo <shawn.guo@linaro.org> > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> I have sent all my 3.6 material to arm-soc, so queued it for 3.7. Shawn ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ARM i.MX53: dts: add flexcan to imx53 2012-07-18 14:53 ` Shawn Guo @ 2012-07-18 14:38 ` Marc Kleine-Budde 0 siblings, 0 replies; 5+ messages in thread From: Marc Kleine-Budde @ 2012-07-18 14:38 UTC (permalink / raw) To: Shawn Guo Cc: linux-arm-kernel, linux-can, Sascha Hauer, kernel, Steffen Trumtrar [-- Attachment #1: Type: text/plain, Size: 765 bytes --] On 07/18/2012 04:53 PM, Shawn Guo wrote: > On Wed, Jul 18, 2012 at 11:42:43AM +0200, Marc Kleine-Budde wrote: >> From: Steffen Trumtrar <s.trumtrar@pengutronix.de> >> >> Cc: Sascha Hauer <s.hauer@pengutronix.de> >> Cc: Shawn Guo <shawn.guo@linaro.org> >> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> >> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > > I have sent all my 3.6 material to arm-soc, so queued it for 3.7. Fine with me. Thanks, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 262 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-07-18 14:39 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-07-18 9:42 [PATCH 0/2] ARM i.MX53: add flexcan support Marc Kleine-Budde 2012-07-18 9:42 ` [PATCH 1/2] ARM i.MX53: register CAN clocks Marc Kleine-Budde 2012-07-18 9:42 ` [PATCH 2/2] ARM i.MX53: dts: add flexcan to imx53 Marc Kleine-Budde 2012-07-18 14:53 ` Shawn Guo 2012-07-18 14:38 ` Marc Kleine-Budde
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).