- 16 May, 2012 2 commits
-
-
git://git.linaro.org/people/mturquette/linuxArnd Bergmann authored
* 'clk-next' of git://git.linaro.org/people/mturquette/linux: clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate(). clk: Provide dummy clk_unregister() ARM: Kirkwood: Replace clock gating ARM: Orion: Audio: Add clk/clkdev support ARM: Orion: PCIE: Add support for clk ARM: Orion: XOR: Add support for clk ARM: Orion: CESA: Add support for clk ARM: Orion: SDIO: Add support for clk. ARM: Orion: NAND: Add support for clk, if there is one. ARM: Orion: EHCI: Add support for enabling clocks ARM: Orion: SATA: Add per channel clk/clkdev support. ARM: Orion: UART: Get the clock rate via clk_get_rate(). ARM: Orion: WDT: Add clk/clkdev support ARM: Orion: Eth: Add clk/clkdev support. ARM: Orion: SPI: Add clk/clkdev support. ARM: Orion: Add clocks using the generic clk infrastructure. Signed-off-by:
Arnd Bergmann <arnd@arndb.de>
-
Saravana Kannan authored
The clk_set_rate() code shouldn't check the clock's enable count when validating CLK_SET_RATE_GATE flag since the enable count could change after the validation. Similar to clk_set_parent(), it should instead check the prepare count. The prepare count should go to zero only when the end user expects the clock to not be enabled in the future. Since the code already grabs the prepare count before validation, it's not possible for prepare count to change after validation and by association not possible for a well behaving end user to enable the clock while the set rate is in progress. Signed-off-by:
Saravana Kannan <skannan@codeaurora.org> Reviewed-by:
Richard Zhao <richard.zhao@freescale.com> Signed-off-by:
Mike Turquette <mturquette@linaro.org>
-
- 15 May, 2012 1 commit
-
-
Mark Brown authored
While there's no actual implementation behind it having the call to use in drivers makes them feel neater from a driver author point of view. An actual implementation can wait for someone who needs to use the function in a real system. Signed-off-by:
Mark Brown <broonie@opensource.wolfsonmicro.com> [mturquette@linaro.org: void return type instead of int -EINVAL] Signed-off-by:
Mike Turquette <mturquette@linaro.org>
-
- 14 May, 2012 4 commits
-
-
Arnd Bergmann authored
Updated to resolve dependencies. Signed-off-by:
Arnd Bergmann <arnd@arndb.de>
-
Arnd Bergmann authored
Conflicts: arch/arm/mach-spear3xx/clock.c arch/arm/mach-spear3xx/include/mach/generic.h arch/arm/mach-spear3xx/include/mach/misc_regs.h arch/arm/mach-spear3xx/spear320.c arch/arm/mach-spear6xx/clock.c arch/arm/mach-spear6xx/include/mach/misc_regs.h Resolve even more merge conflicts. Signed-off-by:
Arnd Bergmann <arnd@arndb.de>
-
Arnd Bergmann authored
Conflicts: arch/arm/mach-spear3xx/Makefile arch/arm/mach-spear3xx/clock.c arch/arm/mach-spear3xx/include/mach/generic.h arch/arm/mach-spear6xx/clock.c arch/arm/plat-spear/Makefile drivers/pinctrl/core.c This resolves some annoying merge conflicts. Signed-off-by:
Arnd Bergmann <arnd@arndb.de>
-
Arnd Bergmann authored
Conflicts: drivers/mmc/host/sdhci-esdhc-imx.c drivers/net/ethernet/freescale/fec.c drivers/spi/spi-imx.c drivers/tty/serial/imx.c This resolves dependencies between the pinctrl and clock changes in imx. Signed-off-by:
Arnd Bergmann <arnd@arndb.de>
-
- 12 May, 2012 23 commits
-
-
Arnd Bergmann authored
Viresh Kumar <viresh.kumar@st.com> writes: This is rebased over a (merge of Mike's/clk-next & SPEAr's DT) + Russell's patch: CLKDEV: provide helpers for common clock framework rebased over them. * spear/clock: SPEAr: Switch to common clock framework SPEAr: Call clk_prepare() before calling clk_enable SPEAr: clk: Add General Purpose Timer Synthesizer clock SPEAr: clk: Add Fractional Synthesizer clock SPEAr: clk: Add Auxiliary Synthesizer clock SPEAr: clk: Add VCO-PLL Synthesizer clock Conflicts: drivers/clk/Makefile [Arnd: rebased again without the spear/dt branch] Signed-off-by:
Arnd Bergmann <arnd@arndb.de>
-
Viresh Kumar authored
This patch updates following configuration: - Update MTD specific configurations - Enables JFFS2 FS support - Updates 6xx defconfig, with recent changes done by Arnd in 6xx Kconfig Signed-off-by:
Viresh Kumar <viresh.kumar@st.com> Signed-off-by:
Arnd Bergmann <arnd@arndb.de> Acked-by:
Stefan Roese <sr@denx.de>
-
Viresh Kumar authored
This patch adds NOR partitions in all SPEAr boards dts files. Signed-off-by:
Viresh Kumar <viresh.kumar@st.com> Acked-by:
Arnd Bergmann <arnd@arndb.de> Acked-by:
Stefan Roese <sr@denx.de> Signed-off-by:
Arnd Bergmann <arnd@arndb.de>
-
Viresh Kumar authored
SPEAr SoCs used its own clock framework since now. From now on they will move to use common clock framework. This patch updates existing SPEAr machine support to adapt for common clock framework. Signed-off-by:
Viresh Kumar <viresh.kumar@st.com> Reviewed-by:
Mike Turquette <mturquette@linaro.org> Acked-by:
Arnd Bergmann <arnd@arndb.de>
-
Viresh Kumar authored
With common clock framework, it is must to call clk_{un}prepare() before/after clk_{dis}enable. This patch fixes this for SPEAr timer. Signed-off-by:
Viresh Kumar <viresh.kumar@st.com> Reviewed-by:
Mike Turquette <mturquette@linaro.org>
-
Viresh Kumar authored
All SPEAr SoC's contain GPT Synthesizers. Their Fout is derived from following equations: Fout= Fin/((2 ^ (N+1)) * (M+1)) This patch adds in support for this type of clock. Signed-off-by:
Viresh Kumar <viresh.kumar@st.com> Reviewed-by:
Mike Turquette <mturquette@linaro.org>
-
Viresh Kumar authored
All SPEAr SoC's contain Fractional Synthesizers. Their Fout is derived from following equations: Fout = Fin / (2 * div) (division factor) div is 17 bits:- 0-13 (fractional part) 14-16 (integer part) div is (16-14 bits).(13-0 bits) (in binary) Fout = Fin/(2 * div) Fout = ((Fin / 10000)/(2 * div)) * 10000 Fout = (2^14 * (Fin / 10000)/(2^14 * (2 * div))) * 10000 Fout = (((Fin / 10000) << 14)/(2 * (div << 14))) * 10000 div << 14 is simply 17 bit value written at register. This patch adds in support for this type of clock. Signed-off-by:
Viresh Kumar <viresh.kumar@st.com> Reviewed-by:
Mike Turquette <mturquette@linaro.org>
-
Viresh Kumar authored
All SPEAr SoC's contain Auxiliary Synthesizers. Their Fout is derived based on values of eq, x and y. Fout from synthesizer can be given from two equations: Fout1 = (Fin * X/Y)/2 EQ1 Fout2 = Fin * X/Y EQ2 This patch adds in support for this type of clock. Signed-off-by:
Viresh Kumar <viresh.kumar@st.com> Reviewed-by:
Mike Turquette <mturquette@linaro.org>
-
Viresh Kumar authored
All SPEAr SoC's contain PLLs. Their Fout is derived based on following equations - In normal mode vco = (2 * M[15:8] * Fin)/N - In Dithered mode vco = (2 * M[15:0] * Fin)/(256 * N) pll_rate = vco/2^p vco and pll are very closely bound to each other, "vco needs to program: mode, m & n" and "pll needs to program p", both share common enable/disable logic and registers. This patch adds in support for this type of clock. Signed-off-by:
Viresh Kumar <viresh.kumar@st.com> Reviewed-by:
Mike Turquette <mturquette@linaro.org>
-
Viresh Kumar authored
All SPEAr SoC's use ST's Timer module. This patch adds device tree probing capability for that. Signed-off-by:
Viresh Kumar <viresh.kumar@st.com> Signed-off-by:
Arnd Bergmann <arnd@arndb.de>
-
Arnd Bergmann authored
The spear/pinctrl branch has hard dependencies on both the pinctrl branch and the clkdev branch. We merge those here to fix it up without having to rebase a branch that has been pulled into other stable branches already. Conflicts: Documentation/driver-model/devres.txt Signed-off-by:
Arnd Bergmann <arnd@arndb.de>
-
Shawn Guo authored
Signed-off-by:
Shawn Guo <shawn.guo@linaro.org>
-
Shawn Guo authored
Cc: linux-fbdev@vger.kernel.org Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Signed-off-by:
Shawn Guo <shawn.guo@linaro.org>
-
Shawn Guo authored
Cc: alsa-devel@alsa-project.org Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Acked-by:
Mark Brown <broonie@opensource.wolfsonmicro.com>
-
Shawn Guo authored
Cc: linux-i2c@vger.kernel.org Cc: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by:
Shawn Guo <shawn.guo@linaro.org>
-
Shawn Guo authored
Cc: linux-mtd@lists.infradead.org Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by:
Shawn Guo <shawn.guo@linaro.org>
-
Shawn Guo authored
Cc: linux-mmc@vger.kernel.org Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Acked-by:
Chris Ball <cjb@laptop.org>
-
Shawn Guo authored
Cc: linux-serial@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by:
Shawn Guo <shawn.guo@linaro.org>
-
Shawn Guo authored
Cc: linux-serial@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Acked-by:
Russell King <rmk+kernel@arm.linux.org.uk>
-
Shawn Guo authored
Cc: spi-devel-general@lists.sourceforge.net Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Acked-by:
Dong Aisheng <dong.aisheng@linaro.org>
-
Shawn Guo authored
Cc: linux-i2c@vger.kernel.org Cc: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Acked-by:
Dong Aisheng <dong.aisheng@linaro.org>
-
Shawn Guo authored
Cc: linux-can@vger.kernel.org Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Acked-by:
Marc Kleine-Budde <mkl@pengutronix.de> Acked-by:
Dong Aisheng <dong.aisheng@linaro.org>
-
Shawn Guo authored
Cc: netdev@vger.kernel.org Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Acked-by:
Dong Aisheng <dong.aisheng@linaro.org> Acked-by:
David S. Miller <davem@davemloft.net>
-
- 11 May, 2012 6 commits
-
-
git://git.linaro.org/people/shawnguo/linux-2.6Arnd Bergmann authored
Shawn Guo <shawn.guo@linaro.org> writes: mxs common clk porting for v3.5. It depends on the following two branches. [1] git://git.linaro.org/people/mturquette/linux.git clk-next [2] http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git clkdev As the mxs device tree conversion will constantly touch clock files, to save the conflicts, the updated mxs/dt branch coming later will based on this pull-request. * 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: mxs: remove now unused timer_clk argument from mxs_timer_init ARM: mxs: remove old clock support ARM: mxs: switch to common clk framework ARM: mxs: change the lookup name for fec phy clock ARM: mxs: request clock for timer clk: mxs: add clock support for imx28 clk: mxs: add clock support for imx23 clk: mxs: add mxs specific clocks Includes an update to Linux 3.4-rc6 Conflicts: drivers/clk/Makefile Signed-off-by:
Arnd Bergmann <arnd@arndb.de>
-
git://git.pengutronix.de/git/imx/linux-2.6Arnd Bergmann authored
Sascha Hauer <s.hauer@pengutronix.de> writes: ARM i.MX common clock framework support Same as with Shawns series this one depends on: git://git.linaro.org/people/mturquette/linux.git clk-next http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git clkdev * tag 'imx-common-clk' of git://git.pengutronix.de/git/imx/linux-2.6: (34 commits) ARM i.MX: remove now unused clock files ARM: i.MX6: implement clocks using common clock framework ARM i.MX35: implement clocks using common clock framework ARM i.MX5: implement clocks using common clock framework ARM i.MX31: implement clocks using common clock framework ARM i.MX27: implement clocks using common clock framework ARM i.MX21: implement clocks using common clock framework ARM i.MX1: implement clocks using common clock framework ARM i.MX25: implement clocks using common clock framework ARM: imx: add common clock support for clk busy ARM: imx: add common clock support for pfd ARM i.MX: Add common clock support for 2bit gate ARM: imx: add common clock support for pllv3 ARM i.MX: Add common clock support for pllv2 ARM i.MX: Add common clock support for pllv1 ARM i.MX: prepare for common clock framework ARM i.MX3: Make ccm base address a variable ARM i.MX timer: request correct clock ARM i.MX5: prepare gpc_dvfs_clk rtc: imx dryice: Add missing clk_prepare ... Signed-off-by:
Arnd Bergmann <arnd@arndb.de>
-
Arnd Bergmann authored
* depends/rmk/clkdev: CLKDEV: provide helpers for common clock framework ARM: 7392/1: CLKDEV: Optimize clk_find() ARM: 7376/1: clkdev: Implement managed clk_get()
-
Arnd Bergmann authored
Mike Turquette <mturquette@ti.com> has asked me to take the clock changes through the arm-soc tree while there are still so many inderdependencies, so this is the entire branch. * depends/clk/clk-next: (30 commits) clk: add a fixed factor clock clk: mux: assign init data clk: remove COMMON_CLK_DISABLE_UNUSED clk: prevent spurious parent rate propagation MAINTAINERS: add entry for common clk framework clk: clk_set_rate() must fail if CLK_SET_RATE_GATE is set and clk is enabled clk: Use a separate struct for holding init data. clk: constify parent name arrays in macros clk: remove trailing whitespace from clk.h clk: select CLKDEV_LOOKUP for COMMON_CLK clk: Don't set clk->new_rate twice clk: clk-private: Add DEFINE_CLK macro clk: clk-gate: Create clk_gate_endisable() clk: Fix typo in comment clk: propagate round_rate for CLK_SET_RATE_PARENT case clk: pass parent_rate into .set_rate clk: always pass parent_rate into .round_rate clk: basic: improve parent_names & return errors clk: core: copy parent_names & return error codes clk: Constify parent name arrays ... Signed-off-by:
Arnd Bergmann <arnd@arndb.de>
-
Shawn Guo authored
Cc: linux-serial@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Acked-by:
Dong Aisheng <dong.aisheng@linaro.org>
-
Dong Aisheng authored
Cc: linux-mmc@vger.kernel.org Cc: Chris Ball <cjb@laptop.org> Signed-off-by:
Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Acked-by:
Stephen Warren <swarren@wwwdotorg.org>
-
- 10 May, 2012 1 commit
-
-
Guennadi Liakhovetski authored
This removes a repeated word and a repeated and incomplete line from two pinctrl headers. Signed-off-by:
Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by:
Linus Walleij <linus.walleij@linaro.org>
-
- 09 May, 2012 3 commits
-
-
Sascha Hauer authored
Signed-off-by:
Sascha Hauer <s.hauer@pengutronix.de>
-
Shawn Guo authored
Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Signed-off-by:
Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Sascha Hauer authored
This patch also adds the SPDIF baud clock mux and dividers. Signed-off-by:
Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-