| Message ID | 1362405948-12992-2-git-send-email-s.trumtrar@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
For patches that you intend to go via mxs tree, please prefix it with something like "ARM: mxs: ...". On Mon, Mar 04, 2013 at 03:05:40PM +0100, Steffen Trumtrar wrote: > From: Juergen Beisert <jbe@pengutronix.de> > Please do something with commit log. > Signed-off-by: Juergen Beisert <jbe@pengutronix.de> > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> > --- > arch/arm/boot/dts/imx28.dtsi | 11 +++++++++++ > drivers/clk/mxs/clk-imx28.c | 16 +++++++++++++++- > 2 files changed, 26 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi > index 7ba4966..958bd10 100644 > --- a/arch/arm/boot/dts/imx28.dtsi > +++ b/arch/arm/boot/dts/imx28.dtsi > @@ -37,6 +37,17 @@ > }; > }; > > + clocks { > + #address-cells = <1>; > + #size-cells = <0>; > + > + osc24m: system_oscillator { > + compatible = "fsl,mxs-system", "fixed-clock"; > + #clock-cells = <0>; > + clock-frequency = <24000000>; > + }; > + }; > + > apb@80000000 { > compatible = "simple-bus"; > #address-cells = <1>; > diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c > index 76ce6c6..01048b5 100644 > --- a/drivers/clk/mxs/clk-imx28.c > +++ b/drivers/clk/mxs/clk-imx28.c > @@ -158,7 +158,21 @@ int __init mx28_clocks_init(void) > > clk_misc_init(); > > - clks[ref_xtal] = mxs_clk_fixed("ref_xtal", 24000000); > + /* retrieve the crystal's frequencies from device tree */ > + for_each_compatible_node(np, NULL, "fixed-clock") { > + u32 rate; > + > + if (of_property_read_u32(np, "clock-frequency", &rate)) > + continue; > + > + if (of_device_is_compatible(np, "fsl,mxs-system")) > + clks[ref_xtal] = mxs_clk_fixed("ref_xtal", rate); > + } > + > + /* if not set, guess their frequency */ > + if (clks[ref_xtal] == NULL) > + clks[ref_xtal] = mxs_clk_fixed("ref_xtal", 24000000); > + I think ref_xtal has to be 24 MHz, no? Shawn > clks[pll0] = mxs_clk_pll("pll0", "ref_xtal", PLL0CTRL0, 17, 480000000); > clks[pll1] = mxs_clk_pll("pll1", "ref_xtal", PLL1CTRL0, 17, 480000000); > clks[pll2] = mxs_clk_pll("pll2", "ref_xtal", PLL2CTRL0, 23, 50000000); > -- > 1.7.10.4 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index 7ba4966..958bd10 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -37,6 +37,17 @@ }; }; + clocks { + #address-cells = <1>; + #size-cells = <0>; + + osc24m: system_oscillator { + compatible = "fsl,mxs-system", "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <24000000>; + }; + }; + apb@80000000 { compatible = "simple-bus"; #address-cells = <1>; diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c index 76ce6c6..01048b5 100644 --- a/drivers/clk/mxs/clk-imx28.c +++ b/drivers/clk/mxs/clk-imx28.c @@ -158,7 +158,21 @@ int __init mx28_clocks_init(void) clk_misc_init(); - clks[ref_xtal] = mxs_clk_fixed("ref_xtal", 24000000); + /* retrieve the crystal's frequencies from device tree */ + for_each_compatible_node(np, NULL, "fixed-clock") { + u32 rate; + + if (of_property_read_u32(np, "clock-frequency", &rate)) + continue; + + if (of_device_is_compatible(np, "fsl,mxs-system")) + clks[ref_xtal] = mxs_clk_fixed("ref_xtal", rate); + } + + /* if not set, guess their frequency */ + if (clks[ref_xtal] == NULL) + clks[ref_xtal] = mxs_clk_fixed("ref_xtal", 24000000); + clks[pll0] = mxs_clk_pll("pll0", "ref_xtal", PLL0CTRL0, 17, 480000000); clks[pll1] = mxs_clk_pll("pll1", "ref_xtal", PLL1CTRL0, 17, 480000000); clks[pll2] = mxs_clk_pll("pll2", "ref_xtal", PLL2CTRL0, 23, 50000000);