Zynq: revised CCF code
Subsystems (7)
v2 cover Zynq: revised CCF code
I rebased this series on v3.10-rc1 eliminating all dependencies and incorporated Greg's feedback.
I'll push this also to my github repository.
https://github.com/sorenb-xlnx/linux-xlnx/tree/zynq/clkc
v2:
- dropped the 'sort #includes' patches
S?ren
Soren Brinkmann (5):
tty: xuartps: Remove suspend/resume functions
clk: zynq: Factor out PLL driver
clk: zynq: Add clock controller driver
arm: zynq: Migrate platform to clock controller
clk: zynq: Remove deprecated clock code
.../devicetree/bindings/clock/zynq-7000.txt | 127 +++-- arch/arm/boot/dts/zynq-7000.dtsi | 71 +-- arch/arm/boot/dts/zynq-zc702.dts | 4 - arch/arm/mach-zynq/slcr.c | 2 +- drivers/clk/Makefile | 2 +- drivers/clk/clk-zynq.c | 378 --------------- drivers/clk/zynq/Makefile | 3 + drivers/clk/zynq/clkc.c | 533 +++++++++++++++++++++ drivers/clk/zynq/pll.c | 235 +++++++++ drivers/clocksource/cadence_ttc_timer.c | 23 +- drivers/tty/serial/xilinx_uartps.c | 115 +++-- include/linux/clk/zynq.h | 8 +- 12 files changed, 974 insertions(+), 527 deletions(-) delete mode 100644 drivers/clk/clk-zynq.c create mode 100644 drivers/clk/zynq/Makefile create mode 100644 drivers/clk/zynq/clkc.c create mode 100644 drivers/clk/zynq/pll.c
Signature · 1 line
1.8.2.3
PATCH v2 1/5 tty: xuartps: Remove suspend/resume functions
Currently Zynq does not support suspend/resume.
The driver callbacks are never used or tested, broken and using the old PM interface.
--- drivers/tty/serial/xilinx_uartps.c | 30 ------------------------------ 1 file changed, 30 deletions(-)
drivers/tty/serial/xilinx_uartps.c +0 -30
@@ -1006,34 +1006,6 @@ static int xuartps_remove(struct platform_device *pdev)return rc; } -/** -* xuartps_suspend - suspend event -* @pdev: Pointer to the platform device structure -* @state: State of the device -* -* Returns 0 -**/ -static int xuartps_suspend (struct platform_device *pdev,pm_message_t state) -{ -/* Call the API provided in serial_core.c file which handles -* the suspend. -*/ -uart_suspend_port (&xuartps_uart_driver, &xuartps_port[pdev->id]); -return 0 ; -} - -/** -* xuartps_resume - Resume after a previous suspend -* @pdev: Pointer to the platform device structure -* -* Returns 0 -**/ -static int xuartps_resume (struct platform_device *pdev) -{ -uart_resume_port (&xuartps_uart_driver, &xuartps_port[pdev->id]); -return 0 ; -} -/* Match table for of_platform binding */ static struct of_device_id xuartps_of_match[] = { { .compatible ="xlnx,xuartps" , },
@@ -1044,8 +1016,6 @@ MODULE_DEVICE_TABLE(of, xuartps_of_match);static struct platform_driver xuartps_platform_driver = { .probe = xuartps_probe,/* Probe method */ .remove = xuartps_remove,/* Detach method */ - .suspend = xuartps_suspend,/* Suspend */ - .resume = xuartps_resume,/* Resume after a suspend */ .driver = { .owner =THIS_MODULE , .name =XUARTPS_NAME ,/* Driver name */
Signature · 1 line
1.8.2.3
Re: [PATCH v2 1/5] tty: xuartps: Remove suspend/resume functions
Hi Greg,
can you please add this patch to your tree?
It is unrelated to clk changes which Soren sent.
Thanks,
Michal
Quoted 61 lines · Soren Brinkmann
Currently Zynq does not support suspend/resume.
The driver callbacks are never used or tested, broken and using the old PM interface.Signed-off-by Soren Brinkmann <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Jiri Slaby <[email protected]>Cc linux-serial at vger.kernel.org--- drivers/tty/serial/xilinx_uartps.c | 30 ------------------------------ 1 file changed, 30 deletions(-)drivers/tty/serial/xilinx_uartps.c +0
-30@@ -1006,34 +1006,6 @@ static int xuartps_remove(struct platform_device *pdev)return rc; } -/** -* xuartps_suspend - suspend event -* @pdev: Pointer to the platform device structure -* @state: State of the device -* -* Returns 0 -**/ -static int xuartps_suspend (struct platform_device *pdev,pm_message_t state) -{ -/* Call the API provided in serial_core.c file which handles -* the suspend. -*/ -uart_suspend_port (&xuartps_uart_driver, &xuartps_port[pdev->id]); -return 0 ; -} - -/** -* xuartps_resume - Resume after a previous suspend -* @pdev: Pointer to the platform device structure -* -* Returns 0 -**/ -static int xuartps_resume (struct platform_device *pdev) -{ -uart_resume_port (&xuartps_uart_driver, &xuartps_port[pdev->id]); -return 0 ; -} -/* Match table for of_platform binding */ static struct of_device_id xuartps_of_match[] = { { .compatible ="xlnx,xuartps" , },@@ -1044,8 +1016,6 @@ MODULE_DEVICE_TABLE(of, xuartps_of_match);static struct platform_driver xuartps_platform_driver = { .probe = xuartps_probe,/* Probe method */ .remove = xuartps_remove,/* Detach method */ - .suspend = xuartps_suspend,/* Suspend */ - .resume = xuartps_resume,/* Resume after a suspend */ .driver = { .owner =THIS_MODULE , .name =XUARTPS_NAME ,/* Driver name */
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 263 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130517/0fdc1a86/attachment.sig>
Greg Kroah-Hartman
maintainerRe: [PATCH v2 1/5] tty: xuartps: Remove suspend/resume functions
Quoted 4 lines · Michal Simek
Hi Greg,
can you please add this patch to your tree?
It is unrelated to clk changes which Soren sent.
Ok, will do.
greg k-h
PATCH v2 2/5 clk: zynq: Factor out PLL driver
In reply to Soren BrinkmannRefactor the PLL driver so it works with the clock controller driver.
--- drivers/clk/zynq/pll.c | 235 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 235 insertions(+) create mode 100644 drivers/clk/zynq/pll.c
drivers/clk/zynq/pll.c new file +235 -0
@@ -0,0 +1,235 @@ +/* +* Zynq PLL driver +* +* Copyright (C) 2013 Xilinx +* +* S?ren Brinkmann <[email protected]> +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License v2 as published by +* the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +* +*/ +#include <linux/clk/zynq.h> +#include <linux/clk-provider.h> +#include <linux/slab.h> +#include <linux/io.h> + +/** +* struct zynq_pll +* @hw: Handle between common and hardware-specific interfaces +* @pll_ctrl: PLL control register +* @pll_status: PLL status register +* @lock: Register lock +* @lockbit: Indicates the associated PLL_LOCKED bit in the PLL status +* register. +*/ +struct zynq_pll { +struct clk_hw hw; +void __iomem *pll_ctrl; +void __iomem *pll_status; +spinlock_t *lock; +u8 lockbit; +}; +#define to_zynq_pll (_hw) container_of(_hw, struct zynq_pll, hw) + +/* Register bitfield defines */ +#define PLLCTRL_FBDIV_MASK 0x7f000 +#define PLLCTRL_FBDIV_SHIFT 12 +#define PLLCTRL_BPQUAL_MASK (1 << 3) +#define PLLCTRL_PWRDWN_MASK 2 +#define PLLCTRL_PWRDWN_SHIFT 1 +#define PLLCTRL_RESET_MASK 1 +#define PLLCTRL_RESET_SHIFT 0 + +/** +* zynq_pll_round_rate() - Round a clock frequency +* @hw: Handle between common and hardware-specific interfaces +* @rate: Desired clock frequency +* @prate: Clock frequency of parent clock +* Returns frequency closest to @rate the hardware can generate. +*/ +static long zynq_pll_round_rate (struct clk_hw *hw,unsigned long rate, +unsigned long *prate) +{ +u32 fbdiv; + + fbdiv =DIV_ROUND_CLOSEST (rate, *prate); +if (fbdiv <13 ) + fbdiv =13 ; +else if (fbdiv >66 ) + fbdiv =66 ; + +return *prate * fbdiv; +} + +/** +* zynq_pll_recalc_rate() - Recalculate clock frequency +* @hw: Handle between common and hardware-specific interfaces +* @parent_rate: Clock frequency of parent clock +* Returns current clock frequency. +*/ +static unsigned long zynq_pll_recalc_rate (struct clk_hw *hw, +unsigned long parent_rate) +{ +struct zynq_pll *clk =to_zynq_pll (hw); +u32 fbdiv; + +/* +* makes probably sense to redundantly save fbdiv in the struct +* zynq_pll to save the IO access. +*/ + fbdiv = (readl (clk->pll_ctrl) &PLLCTRL_FBDIV_MASK ) >> +PLLCTRL_FBDIV_SHIFT ; + +return parent_rate * fbdiv; +} + +/** +* zynq_pll_is_enabled - Check if a clock is enabled +* @hw: Handle between common and hardware-specific interfaces +* Returns 1 if the clock is enabled, 0 otherwise. +* +* Not sure this is a good idea, but since disabled means bypassed for +* this clock implementation we say we are always enabled. +*/ +static int zynq_pll_is_enabled (struct clk_hw *hw) +{ +unsigned long flags =0 ; +u32 reg; +struct zynq_pll *clk =to_zynq_pll (hw); + +spin_lock_irqsave (clk->lock, flags); + + reg =readl (clk->pll_ctrl); + +spin_unlock_irqrestore (clk->lock, flags); + +return !(reg & (PLLCTRL_RESET_MASK |PLLCTRL_PWRDWN_MASK )); +} + +/** +* zynq_pll_enable - Enable clock +* @hw: Handle between common and hardware-specific interfaces +* Returns 0 on success +*/ +static int zynq_pll_enable (struct clk_hw *hw) +{ +unsigned long flags =0 ; +u32 reg; +struct zynq_pll *clk =to_zynq_pll (hw); + +if (zynq_pll_is_enabled (hw)) +return 0 ; + +pr_info ("PLL: enable\n" ); + +/* Power up PLL and wait for lock */ +spin_lock_irqsave (clk->lock, flags); + + reg =readl (clk->pll_ctrl); + reg &= ~(PLLCTRL_RESET_MASK |PLLCTRL_PWRDWN_MASK ); +writel (reg, clk->pll_ctrl); +while (!(readl (clk->pll_status) & (1 << clk->lockbit))) + ; + +spin_unlock_irqrestore (clk->lock, flags); + +return 0 ; +} + +/** +* zynq_pll_disable - Disable clock +* @hw: Handle between common and hardware-specific interfaces +* Returns 0 on success +*/ +static void zynq_pll_disable (struct clk_hw *hw) +{ +unsigned long flags =0 ; +u32 reg; +struct zynq_pll *clk =to_zynq_pll (hw); + +if (!zynq_pll_is_enabled (hw)) +return ; + +pr_info ("PLL: shutdown\n" ); + +/* shut down PLL */ +spin_lock_irqsave (clk->lock, flags); + + reg =readl (clk->pll_ctrl); + reg |=PLLCTRL_RESET_MASK |PLLCTRL_PWRDWN_MASK ; +writel (reg, clk->pll_ctrl); + +spin_unlock_irqrestore (clk->lock, flags); +} + +static const struct clk_ops zynq_pll_ops = { + .enable = zynq_pll_enable, + .disable = zynq_pll_disable, + .is_enabled = zynq_pll_is_enabled, + .round_rate = zynq_pll_round_rate, + .recalc_rate = zynq_pll_recalc_rate +}; + +/** +* clk_register_zynq_pll() - Register PLL with the clock framework +* @np Pointer to the DT device node +*/ +struct clk *clk_register_zynq_pll (const char *name,const char *parent, +void __iomem *pll_ctrl,void __iomem *pll_status,u8 lock_index, +spinlock_t *lock) +{ +struct zynq_pll *pll; +struct clk *clk; +u32 reg; +const char *parent_arr[1 ] = {parent}; +unsigned long flags =0 ; +struct clk_init_data initd = { + .name = name, + .parent_names = parent_arr, + .ops = &zynq_pll_ops, + .num_parents =1 , + .flags =0 + }; + + pll =kmalloc (sizeof (*pll),GFP_KERNEL ); +if (!pll) { +pr_err ("%s: Could not allocate Zynq PLL clk.\n" , __func__); +return ERR_PTR (-ENOMEM ); + } + +/* Populate the struct */ + pll->hw.init = &initd; + pll->pll_ctrl = pll_ctrl; + pll->pll_status = pll_status; + pll->lockbit = lock_index; + pll->lock = lock; + +spin_lock_irqsave (pll->lock, flags); + + reg =readl (pll->pll_ctrl); + reg &= ~PLLCTRL_BPQUAL_MASK ; +writel (reg, pll->pll_ctrl); + +spin_unlock_irqrestore (pll->lock, flags); + + clk =clk_register (NULL , &pll->hw); +if (WARN_ON (IS_ERR (clk))) + goto free_pll; + +return clk; + +free_pll: +kfree (pll); + +return clk; +}
Signature · 1 line
1.8.2.3
PATCH v2 3/5 clk: zynq: Add clock controller driver
In reply to Soren BrinkmannAdd a clock controller driver and documentation.
--- .../devicetree/bindings/clock/zynq-7000.txt | 98 ++++ drivers/clk/zynq/clkc.c | 533 +++++++++++++++++++++ 2 files changed, 631 insertions(+) create mode 100644 drivers/clk/zynq/clkc.c
Documentation/devicetree/bindings/clock/zynq-7000.txt +98 -0
@@ -6,6 +6,104 @@ The purpose of this document is to document their usage. See clock_bindings.txt for more information on the generic clock bindings. See Chapter 25 of Zynq TRM for more information about Zynq clocks. +== Clock Controller == +The clock controller is a logical abstration of Zynq's clock tree. It reads +required input clock frequencies from the devictree and acts as clock provider +for all clock consumers of PS clocks. + +Required properties: + - #clock-cells : Must be 1 + - compatible : "xlnx,ps7-clkc" + - ps-clk-frequency : Frequency of the oscillator providing ps_clk in HZ + (usually 33 MHz oscillators are used for Zynq platforms) + - clock-output-names : List of strings used to name the clock outputs. Shall be + a list of the outputs given below. + +Optional properties: + - clocks : as described in the clock bindings + - clock-names : as described in the clock bindings + +Clock inputs: +The following strings are optional parameters to the 'clock-names' property in +order to provide an optional (E)MIO clock source. + - swdt_ext_clk + - gem0_emio_clk + - gem1_emio_clk + - mio_clk_XX # with XX = 00..53 +... + +Clock outputs: + 0: armpll + 1: ddrpll + 2: iopll + 3: cpu_6or4x + 4: cpu_3or2x + 5: cpu_2x + 6: cpu_1x + 7: ddr2x + 8: ddr3x + 9: dci + 10: lqspi + 11: smc + 12: pcap + 13: gem0 + 14: gem1 + 15: fclk0 + 16: fclk1 + 17: fclk2 + 18: fclk3 + 19: can0 + 20: can1 + 21: sdio0 + 22: sdio1 + 23: uart0 + 24: uart1 + 25: spi0 + 26: spi1 + 27: dma + 28: usb0_aper + 29: usb1_aper + 30: gem0_aper + 31: gem1_aper + 32: sdio0_aper + 33: sdio1_aper + 34: spi0_aper + 35: spi1_aper + 36: can0_aper + 37: can1_aper + 38: i2c0_aper + 39: i2c1_aper + 40: uart0_aper + 41: uart1_aper + 42: gpio_aper + 43: lqspi_aper + 44: smc_aper + 45: swdt + 46: dbg_trc + 47: dbg_apb + +Example: + clkc: clkc { + #clock-cells = <1>; + compatible = "xlnx,ps7-clkc"; + ps-clk-frequency = <33333333>; + clock-output-names = "armpll", "ddrpll", "iopll", "cpu_6or4x", + "cpu_3or2x", "cpu_2x", "cpu_1x", "ddr2x", "ddr3x", + "dci", "lqspi", "smc", "pcap", "gem0", "gem1", + "fclk0", "fclk1", "fclk2", "fclk3", "can0", "can1", + "sdio0", "sdio1", "uart0", "uart1", "spi0", "spi1", + "dma", "usb0_aper", "usb1_aper", "gem0_aper", + "gem1_aper", "sdio0_aper", "sdio1_aper", + "spi0_aper", "spi1_aper", "can0_aper", "can1_aper", + "i2c0_aper", "i2c1_aper", "uart0_aper", "uart1_aper", + "gpio_aper", "lqspi_aper", "smc_aper", "swdt", + "dbg_trc", "dbg_apb"; + # optional props + clocks = <&clkc 16>, <&clk_foo>; + clock-names = "gem1_emio_clk", "can_mio_clk_23"; + }; + + == PLLs == Used to describe the ARM_PLL, DDR_PLL, and IO_PLL.
drivers/clk/zynq/clkc.c new file +533 -0
533 lines not on this page · raw message
Signature · 1 line
1.8.2.3
PATCH v2 4/5 arm: zynq: Migrate platform to clock controller
In reply to Soren BrinkmannMigrate the Zynq platform and its drivers to use the new clock controller driver.
--- arch/arm/boot/dts/zynq-7000.dtsi | 71 ++++++++------------------- arch/arm/boot/dts/zynq-zc702.dts | 4 -- arch/arm/mach-zynq/slcr.c | 2 +- drivers/clk/Makefile | 2 +- drivers/clk/zynq/Makefile | 3 ++ drivers/clocksource/cadence_ttc_timer.c | 23 +++++++-- drivers/tty/serial/xilinx_uartps.c | 85 ++++++++++++++++++++++++++------- include/linux/clk/zynq.h | 8 +++- 8 files changed, 118 insertions(+), 80 deletions(-) create mode 100644 drivers/clk/zynq/Makefile
arch/arm/boot/dts/zynq-7000.dtsi +21 -50
@@ -49,16 +49,18 @@ uart0: uart at e0000000 { compatible = "xlnx,xuartps"; + clocks = <&clkc 23>, <&clkc 40>; + clock-names = "ref_clk", "aper_clk"; reg = <0xE0000000 0x1000>; interrupts = <0 27 4>; - clocks = <&uart_clk 0>; }; uart1: uart at e0001000 { compatible = "xlnx,xuartps"; + clocks = <&clkc 24>, <&clkc 41>; + clock-names = "ref_clk", "aper_clk"; reg = <0xE0001000 0x1000>; interrupts = <0 50 4>; - clocks = <&uart_clk 1>; }; slcr: slcr at f8000000 {
@@ -69,50 +71,21 @@ #address-cells = <1>; #size-cells = <0>; - ps_clk: ps_clk { - #clock-cells = <0>; - compatible = "fixed-clock"; - /* clock-frequency set in board-specific file */ - clock-output-names = "ps_clk"; - }; - armpll: armpll { - #clock-cells = <0>; - compatible = "xlnx,zynq-pll"; - clocks = <&ps_clk>; - reg = <0x100 0x110>; - clock-output-names = "armpll"; - }; - ddrpll: ddrpll { - #clock-cells = <0>; - compatible = "xlnx,zynq-pll"; - clocks = <&ps_clk>; - reg = <0x104 0x114>; - clock-output-names = "ddrpll"; - }; - iopll: iopll { - #clock-cells = <0>; - compatible = "xlnx,zynq-pll"; - clocks = <&ps_clk>; - reg = <0x108 0x118>; - clock-output-names = "iopll"; - }; - uart_clk: uart_clk { - #clock-cells = <1>; - compatible = "xlnx,zynq-periph-clock"; - clocks = <&iopll &armpll &ddrpll>; - reg = <0x154>; - clock-output-names = "uart0_ref_clk", - "uart1_ref_clk"; - }; - cpu_clk: cpu_clk { + clkc: clkc { #clock-cells = <1>; - compatible = "xlnx,zynq-cpu-clock"; - clocks = <&iopll &armpll &ddrpll>; - reg = <0x120 0x1C4>; - clock-output-names = "cpu_6x4x", - "cpu_3x2x", - "cpu_2x", - "cpu_1x"; + compatible = "xlnx,ps7-clkc"; + ps-clk-frequency = <33333333>; + clock-output-names = "armpll", "ddrpll", "iopll", "cpu_6or4x", + "cpu_3or2x", "cpu_2x", "cpu_1x", "ddr2x", "ddr3x", + "dci", "lqspi", "smc", "pcap", "gem0", "gem1", + "fclk0", "fclk1", "fclk2", "fclk3", "can0", "can1", + "sdio0", "sdio1", "uart0", "uart1", "spi0", "spi1", + "dma", "usb0_aper", "usb1_aper", "gem0_aper", + "gem1_aper", "sdio0_aper", "sdio1_aper", + "spi0_aper", "spi1_aper", "can0_aper", "can1_aper", + "i2c0_aper", "i2c1_aper", "uart0_aper", "uart1_aper", + "gpio_aper", "lqspi_aper", "smc_aper", "swdt", + "dbg_trc", "dbg_apb"; }; }; };
@@ -121,9 +94,8 @@ interrupt-parent = <&intc>; interrupts = < 0 10 4 0 11 4 0 12 4 >; compatible = "cdns,ttc"; + clocks = <&clkc 6>; reg = <0xF8001000 0x1000>; - clocks = <&cpu_clk 3>; - clock-names = "cpu_1x"; clock-ranges; };
@@ -131,9 +103,8 @@ interrupt-parent = <&intc>; interrupts = < 0 37 4 0 38 4 0 39 4 >; compatible = "cdns,ttc"; + clocks = <&clkc 6>; reg = <0xF8002000 0x1000>; - clocks = <&cpu_clk 3>; - clock-names = "cpu_1x"; clock-ranges; }; scutimer: scutimer at f8f00600 {
@@ -141,7 +112,7 @@ interrupts = < 1 13 0x301 >; compatible = "arm,cortex-a9-twd-timer"; reg = < 0xf8f00600 0x20 >; - clocks = <&cpu_clk 1>; + clocks = <&clkc 4>; } ; }; };
arch/arm/boot/dts/zynq-zc702.dts +0 -4
@@ -28,7 +28,3 @@ }; }; - -&ps_clk { - clock-frequency = <33333330>; -};
arch/arm/mach-zynq/slcr.c +1 -1
@@ -117,7 +117,7 @@ int __init zynq_slcr_init(void)pr_info ("%s mapped to %p\n" , np->name, zynq_slcr_base); -xilinx_zynq_clocks_init (zynq_slcr_base); +zynq_clock_init (zynq_slcr_base);of_node_put (np);
drivers/clk/Makefile +1 -1
@@ -27,7 +27,7 @@ obj-$(CONFIG_MACH_LOONGSON1) += clk-ls1x.o obj-$(CONFIG_ARCH_SUNXI) += sunxi/ obj-$(CONFIG_ARCH_U8500) += ux500/ obj-$(CONFIG_ARCH_VT8500) += clk-vt8500.o -obj-$(CONFIG_ARCH_ZYNQ) += clk-zynq.o +obj-$(CONFIG_ARCH_ZYNQ) += zynq/ obj-$(CONFIG_ARCH_TEGRA) += tegra/ obj-$(CONFIG_PLAT_SAMSUNG) += samsung/
drivers/clk/zynq/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# Zynq clock specific Makefile + +obj-$(CONFIG_ARCH_ZYNQ) += clkc.o pll.o
drivers/clocksource/cadence_ttc_timer.c +18 -5
@@ -51,6 +51,8 @@#define TTC_CNT_CNTRL_DISABLE_MASK 0x1 +#define TTC_CLK_CNTRL_CSRC_MASK (1 << 5)/* clock source */ +/* * Setup the timers to use pre-scaling, using a fixed value for now that will * work across most input frequency, but it may need to be more dynamic
@@ -396,8 +398,9 @@ static void __init ttc_timer_init(struct device_node *timer) {unsigned int irq;void __iomem *timer_baseaddr; -struct clk *clk; +struct clk *clk_cs, *clk_ce;static int initialized; +int clksel;if (initialized)return ;
@@ -421,14 +424,24 @@ static void __init ttc_timer_init(struct device_node *timer)BUG (); } - clk =of_clk_get_by_name (timer,"cpu_1x" ); -if (IS_ERR (clk)) { + clksel =__raw_readl (timer_baseaddr +TTC_CLK_CNTRL_OFFSET ); + clksel = !!(clksel &TTC_CLK_CNTRL_CSRC_MASK ); + clk_cs =of_clk_get (timer, clksel); +if (IS_ERR (clk_cs)) { +pr_err ("ERROR: timer input clock not found\n" ); +BUG (); + } + + clksel =__raw_readl (timer_baseaddr +4 +TTC_CLK_CNTRL_OFFSET ); + clksel = !!(clksel &TTC_CLK_CNTRL_CSRC_MASK ); + clk_ce =of_clk_get (timer, clksel); +if (IS_ERR (clk_ce)) {pr_err ("ERROR: timer input clock not found\n" );BUG (); } -ttc_setup_clocksource (clk, timer_baseaddr); -ttc_setup_clockevent (clk, timer_baseaddr +4 , irq); +ttc_setup_clocksource (clk_cs, timer_baseaddr); +ttc_setup_clockevent (clk_ce, timer_baseaddr +4 , irq);pr_info ("%s #0@%p, irq=%d\n" , timer->name, timer_baseaddr, irq); }
drivers/tty/serial/xilinx_uartps.c +67 -18
145 lines not on this page · raw message
include/linux/clk/zynq.h +7 -1
@@ -1,4 +1,5 @@/* +* Copyright (C) 2013 Xilinx Inc. * Copyright (C) 2012 National Instruments * * This program is free software; you can redistribute it and/or modify
@@ -19,6 +20,11 @@#ifndef __LINUX_CLK_ZYNQ_H_#define __LINUX_CLK_ZYNQ_H_ -void __init xilinx_zynq_clocks_init (void __iomem *slcr); +#include <linux/spinlock.h> +void zynq_clock_init (void __iomem *slcr); + +struct clk *clk_register_zynq_pll (const char *name,const char *parent, +void __iomem *pll_ctrl,void __iomem *pll_status,u8 lock_index, +spinlock_t *lock);#endif
Signature · 1 line
1.8.2.3
PATCH v2 5/5 clk: zynq: Remove deprecated clock code
In reply to Soren Brinkmann--- .../devicetree/bindings/clock/zynq-7000.txt | 49 --- drivers/clk/clk-zynq.c | 378 --------------------- 2 files changed, 427 deletions(-) delete mode 100644 drivers/clk/clk-zynq.c
Documentation/devicetree/bindings/clock/zynq-7000.txt +0 -49
@@ -102,52 +102,3 @@ Example: clocks = <&clkc 16>, <&clk_foo>; clock-names = "gem1_emio_clk", "can_mio_clk_23"; }; - - -== PLLs == - -Used to describe the ARM_PLL, DDR_PLL, and IO_PLL. - -Required properties: -- #clock-cells : shall be 0 (only one clock is output from this node) -- compatible : "xlnx,zynq-pll" -- reg : pair of u32 values, which are the address offsets within the SLCR - of the relevant PLL_CTRL register and PLL_CFG register respectively -- clocks : phandle for parent clock. should be the phandle for ps_clk - -Optional properties: -- clock-output-names : name of the output clock - -Example: - armpll: armpll { - #clock-cells = <0>; - compatible = "xlnx,zynq-pll"; - clocks = <&ps_clk>; - reg = <0x100 0x110>; - clock-output-names = "armpll"; - }; - -== Peripheral clocks == - -Describes clock node for the SDIO, SMC, SPI, QSPI, and UART clocks. - -Required properties: -- #clock-cells : shall be 1 -- compatible : "xlnx,zynq-periph-clock" -- reg : a single u32 value, describing the offset within the SLCR where - the CLK_CTRL register is found for this peripheral -- clocks : phandle for parent clocks. should hold phandles for - the IO_PLL, ARM_PLL, and DDR_PLL in order -- clock-output-names : names of the output clock(s). For peripherals that have - two output clocks (for example, the UART), two clocks - should be listed. - -Example: - uart_clk: uart_clk { - #clock-cells = <1>; - compatible = "xlnx,zynq-periph-clock"; - clocks = <&iopll &armpll &ddrpll>; - reg = <0x154>; - clock-output-names = "uart0_ref_clk", - "uart1_ref_clk"; - };
drivers/clk/clk-zynq.c deleted +0 -378
378 lines not on this page · raw message
Signature · 1 line
1.8.2.3
Hi Mike,
I have sent email to Greg to take this patch from this series though his serial tree because it is unrelated to this clock stuff.
Can you please give me your ACK for these patches or add them to your CLK tree?
I just need to move this to be able to start to push other drivers which are related to this.
Thanks,
Michal
Quoted 36 lines · Soren Brinkmann
I rebased this series on v3.10-rc1 eliminating all dependencies and incorporated Greg's feedback.
I'll push this also to my github repository.
https://github.com/sorenb-xlnx/linux-xlnx/tree/zynq/clkcv2:
- dropped the 'sort #includes' patchesS?ren
Soren Brinkmann (5):
tty: xuartps: Remove suspend/resume functions
clk: zynq: Factor out PLL driver
clk: zynq: Add clock controller driver
arm: zynq: Migrate platform to clock controller
clk: zynq: Remove deprecated clock code.../devicetree/bindings/clock/zynq-7000.txt | 127 +++-- arch/arm/boot/dts/zynq-7000.dtsi | 71 +-- arch/arm/boot/dts/zynq-zc702.dts | 4 - arch/arm/mach-zynq/slcr.c | 2 +- drivers/clk/Makefile | 2 +- drivers/clk/clk-zynq.c | 378 --------------- drivers/clk/zynq/Makefile | 3 + drivers/clk/zynq/clkc.c | 533 +++++++++++++++++++++ drivers/clk/zynq/pll.c | 235 +++++++++ drivers/clocksource/cadence_ttc_timer.c | 23 +- drivers/tty/serial/xilinx_uartps.c | 115 +++-- include/linux/clk/zynq.h | 8 +- 12 files changed, 974 insertions(+), 527 deletions(-) delete mode 100644 drivers/clk/clk-zynq.c create mode 100644 drivers/clk/zynq/Makefile create mode 100644 drivers/clk/zynq/clkc.c create mode 100644 drivers/clk/zynq/pll.c
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 263 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130517/5be86dfb/attachment.sig>
v2 cover Zynq: revised CCF code
Quoting Michal Simek (2013-05-17 05:14:47)
Quoted 8 lines
Hi Mike,
I have sent email to Greg to take this patch from this series though his serial tree because it is unrelated to this clock stuff.
Can you please give me your ACK for these patches or add them to your CLK tree?
For the four clock-related patches:
Regards,
Mike
Quoted 52 lines
I just need to move this to be able to start to push other drivers which are related to this.
Thanks,
MichalQuoted 36 lines · Soren Brinkmann
I rebased this series on v3.10-rc1 eliminating all dependencies and incorporated Greg's feedback.
I'll push this also to my github repository.
https://github.com/sorenb-xlnx/linux-xlnx/tree/zynq/clkcv2:
- dropped the 'sort #includes' patchesS?ren
Soren Brinkmann (5):
tty: xuartps: Remove suspend/resume functions
clk: zynq: Factor out PLL driver
clk: zynq: Add clock controller driver
arm: zynq: Migrate platform to clock controller
clk: zynq: Remove deprecated clock code.../devicetree/bindings/clock/zynq-7000.txt | 127 +++-- arch/arm/boot/dts/zynq-7000.dtsi | 71 +-- arch/arm/boot/dts/zynq-zc702.dts | 4 - arch/arm/mach-zynq/slcr.c | 2 +- drivers/clk/Makefile | 2 +- drivers/clk/clk-zynq.c | 378 --------------- drivers/clk/zynq/Makefile | 3 + drivers/clk/zynq/clkc.c | 533 +++++++++++++++++++++ drivers/clk/zynq/pll.c | 235 +++++++++ drivers/clocksource/cadence_ttc_timer.c | 23 +- drivers/tty/serial/xilinx_uartps.c | 115 +++-- include/linux/clk/zynq.h | 8 +- 12 files changed, 974 insertions(+), 527 deletions(-) delete mode 100644 drivers/clk/clk-zynq.c create mode 100644 drivers/clk/zynq/Makefile create mode 100644 drivers/clk/zynq/clkc.c create mode 100644 drivers/clk/zynq/pll.cSignature · 5 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
Quoted 6 lines · Mike Turquette
Quoting Michal Simek (2013-05-17 05:14:47)
Quoted 5 lines
Hi Mike,
I have sent email to Greg to take this patch from this series though his serial tree because it is unrelated to this clock stuff.
Quoted 7 lines
Quoted 3 lines
Can you please give me your ACK for these patches or add them to your CLK tree?
For the four clock-related patches:
Acked-by Mike Turquette <[email protected]>
I have already sent pull request to Arnd and Olof. Or is it you who should take these patches through your tree?
Thanks.
Michal
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 263 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130531/7746093e/attachment.sig>
v2 cover Zynq: revised CCF code
Quoting Michal Simek (2013-05-30 22:17:59)
Quoted 11 lines · Mike Turquette
Quoted 10 lines
Quoting Michal Simek (2013-05-17 05:14:47)
Quoted 8 lines
Hi Mike,
I have sent email to Greg to take this patch from this series though his serial tree because it is unrelated to this clock stuff.
Can you please give me your ACK for these patches or add them to your CLK tree?
Quoted 7 lines
Quoted 3 lines
For the four clock-related patches:
Acked-by Mike Turquette <[email protected]>I have already sent pull request to Arnd and Olof. Or is it you who should take these patches through your tree?
Either way is fine. Since you have already sent the pull request to the arm-soc tree then that is probably the best path.
Regards,
Mike
Quoted 10 lines
Thanks.
MichalSignature · 5 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
Quoted 14 lines · Mike Turquette
Quoting Michal Simek (2013-05-30 22:17:59)
Quoted 13 lines · Mike Turquette
Quoted 12 lines
Quoting Michal Simek (2013-05-17 05:14:47)
Quoted 8 lines
Hi Mike,
I have sent email to Greg to take this patch from this series though his serial tree because it is unrelated to this clock stuff.
Can you please give me your ACK for these patches or add them to your CLK tree?
For the four clock-related patches:
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Acked-by Mike Turquette <[email protected]>I have already sent pull request to Arnd and Olof. Or is it you who should take these patches through your tree?
Either way is fine. Since you have already sent the pull request to the arm-soc tree then that is probably the best path.
ok. I will keep my eyes on it.
Thanks,
Michal
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 263 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130531/75d93eb1/attachment.sig>
Quoted 5 lines · Soren Brinkmann
I rebased this series on v3.10-rc1 eliminating all dependencies and incorporated Greg's feedback.
I'll push this also to my github repository.
https://github.com/sorenb-xlnx/linux-xlnx/tree/zynq/clkc
Quoted 8 lines
v2:
- dropped the 'sort #includes' patchesS?ren
Soren Brinkmann (5):
tty: xuartps: Remove suspend/resume functions
This patch will go through Greg trees.
Quoted 4 lines
clk: zynq: Factor out PLL driver
clk: zynq: Add clock controller driver
arm: zynq: Migrate platform to clock controller
clk: zynq: Remove deprecated clock code
I have added these patches to my arm-next branch
and also to zynq/clk branch.
Thanks,
Michal