* [PATCH 1/2] ARM: OMAP2+: Allow clock alias provision from device tree @ 2013-02-11 15:44 Roger Quadros [not found] ` <1360597464-8491-1-git-send-email-rogerq-l0cyMroinI0@public.gmane.org> 0 siblings, 1 reply; 5+ messages in thread From: Roger Quadros @ 2013-02-11 15:44 UTC (permalink / raw) To: tony Cc: b-cousson, balbi, rogerq, linux-omap, linux-arm-kernel, linux-kernel, devicetree-discuss, Russell King, Rajendra Nayak, Santosh Shilimkar Currently on OMAP, it is not possible to specify a clock consumer to any of the OMAP generated clocks using the device tree. This can pose a problem for external devices that run off an OMAP clock as we can't reliably provide a reference to the clock in the device tree. This patch allows device trees to provide a node that contains the clock identifier, clock alias and the device phandle. The board initialization code then creates a clock alias to this clock id, and associates it with the device whose phandle was supplied. Discussion http://www.spinics.net/lists/linux-omap/msg86241.html CC: Russell King <linux@arm.linux.org.uk> CC: Rajendra Nayak <rnayak@ti.com> CC: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Roger Quadros <rogerq@ti.com> --- .../devicetree/bindings/clock/ti-clock-alias.txt | 26 ++++++++ arch/arm/mach-omap2/board-generic.c | 67 ++++++++++++++++++++ 2 files changed, 93 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/ti-clock-alias.txt diff --git a/Documentation/devicetree/bindings/clock/ti-clock-alias.txt b/Documentation/devicetree/bindings/clock/ti-clock-alias.txt new file mode 100644 index 0000000..87ef4c3 --- /dev/null +++ b/Documentation/devicetree/bindings/clock/ti-clock-alias.txt @@ -0,0 +1,26 @@ +* Clock alias provision for TI OMAP2+ boards + +This binding allows the board's device tree file to specify a clock name, +device phandle and clock alias so that that clock can be associated +to the device with the alias. + +This is required in cases where an external device is clocked by an +OMAP generated clock and needs to be assocated to it. + +NOTE: The node's name should be clock_alias + +Required properties +- clock-name: The clock identifier string. Should be one of the + clock ids defined in OMAP common clock data. +- clock-alias: A string specifying the alias that must be created to the clock. +- device: A phandle to the device this clock should be associated to. + +e.g. On the OMAP4 Panda board, the USB PHY device is clocked by the +FREF_CLK3 (auxclk3_ck) from the OMAP. The PHY driver expexts the clock to +be named "main_clk". This binding can be provided like so + +clock_alias { + clock-name = "auxclk3_ck"; + clock-alias = "main_clk"; + device = <&hsusb1_phy>; +}; diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 53cb380b..a4b8813 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -15,6 +15,9 @@ #include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/irqdomain.h> +#include <linux/clk.h> +#include <linux/string.h> +#include <linux/slab.h> #include <asm/hardware/gic.h> #include <asm/mach/arch.h> @@ -36,12 +39,76 @@ static struct of_device_id omap_dt_match_table[] __initdata = { { } }; +static int __init omap_create_clk_alias(struct device_node *np) +{ + int ret = 0; + const char *s, *alias; + char *clk_id; + struct device_node *dev_np; + struct platform_device *pdev; + + of_property_read_string(np, "clock-name", &s); + if (!s) { + pr_err("%s: couldn't find clock-name property in node %s\n", + __func__, np->name); + return -ENODEV; + } + + clk_id = kstrdup(s, GFP_KERNEL); + if (!clk_id) + return -ENOMEM; + + dev_np = of_parse_phandle(np, "device", 0); + if (!dev_np) { + pr_err("%s: couldn't find device phandle for \'%s\'\n", + __func__, clk_id); + ret = -ENODEV; + goto exit; + } + + pdev = of_find_device_by_node(dev_np); + if (!pdev) { + pr_err("%s: couldn't find device for clock \'%s\'\n", + __func__, clk_id); + ret = -ENODEV; + goto exit; + } + + ret = of_property_read_string(np, "clock-alias", &alias); + if (ret) { + pr_err("%s: couldn't find alias for clock \'%s\'\n", + __func__, clk_id); + ret = -ENODEV; + goto exit; + } + + ret = clk_add_alias(alias, dev_name(&pdev->dev), clk_id, NULL); + if (ret) { + pr_err("%s: couldn't add alias \'%s\' to clock \'%s\'\n", + __func__, alias, clk_id); + ret = -ENODEV; + goto exit; + } + +exit: + kfree(clk_id); + return ret; +} + static void __init omap_generic_init(void) { + struct device_node *np; + omap_sdrc_init(NULL, NULL); of_platform_populate(NULL, omap_dt_match_table, NULL, NULL); + /* create clock aliases based on 'clock_alias' nodes */ + for_each_node_by_name(np, "clock_alias") { + omap_create_clk_alias(np); + of_node_put(np); + } + /* * HACK: call display setup code for selected boards to enable omapdss. * This will be removed when omapdss supports DT. -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
[parent not found: <1360597464-8491-1-git-send-email-rogerq-l0cyMroinI0@public.gmane.org>]
* [PATCH 2/2] ARM: dts: omap4-panda: Add clock alias for USB PHY [not found] ` <1360597464-8491-1-git-send-email-rogerq-l0cyMroinI0@public.gmane.org> @ 2013-02-11 15:44 ` Roger Quadros 2013-02-11 15:49 ` [PATCH 1/2] ARM: OMAP2+: Allow clock alias provision from device tree Felipe Balbi 2013-02-11 16:07 ` Sascha Hauer 2 siblings, 0 replies; 5+ messages in thread From: Roger Quadros @ 2013-02-11 15:44 UTC (permalink / raw) To: tony-4v6yS6AI5VpBDgjK7y7TUQ Cc: Russell King, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, linux-kernel-u79uwXL29TY76Z2rM5mHXA, balbi-l0cyMroinI0, Santosh Shilimkar, linux-omap-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, rogerq-l0cyMroinI0 On Panda, the USB Host PHY is clocked by FREF3_CLK (auxclk3_ck) pin of the OMAP. Provide this information in the device tree. CC: Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> CC: Rajendra Nayak <rnayak-l0cyMroinI0@public.gmane.org> CC: Santosh Shilimkar <santosh.shilimkar-l0cyMroinI0@public.gmane.org> Signed-off-by: Roger Quadros <rogerq-l0cyMroinI0@public.gmane.org> --- arch/arm/boot/dts/omap4-panda.dts | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts index d6e59c7..a7d66cc 100644 --- a/arch/arm/boot/dts/omap4-panda.dts +++ b/arch/arm/boot/dts/omap4-panda.dts @@ -86,6 +86,13 @@ reset-supply = <&hsusb1_reset>; vcc-supply = <&hsusb1_power>; }; + + /* hsusb1_phy is clocked by FREF_CLK3 i.e. auxclk3 */ + clock_alias { + clock-name = "auxclk3_ck"; + clock-alias = "main_clk"; + device = <&hsusb1_phy>; + }; }; &omap4_pmx_core { -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ARM: OMAP2+: Allow clock alias provision from device tree [not found] ` <1360597464-8491-1-git-send-email-rogerq-l0cyMroinI0@public.gmane.org> 2013-02-11 15:44 ` [PATCH 2/2] ARM: dts: omap4-panda: Add clock alias for USB PHY Roger Quadros @ 2013-02-11 15:49 ` Felipe Balbi 2013-02-11 16:07 ` Sascha Hauer 2 siblings, 0 replies; 5+ messages in thread From: Felipe Balbi @ 2013-02-11 15:49 UTC (permalink / raw) To: Roger Quadros Cc: Russell King, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, linux-kernel-u79uwXL29TY76Z2rM5mHXA, balbi-l0cyMroinI0, Santosh Shilimkar, linux-omap-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r [-- Attachment #1.1: Type: text/plain, Size: 375 bytes --] Hi, On Mon, Feb 11, 2013 at 05:44:23PM +0200, Roger Quadros wrote: > @@ -36,12 +39,76 @@ static struct of_device_id omap_dt_match_table[] __initdata = { > { } > }; > > +static int __init omap_create_clk_alias(struct device_node *np) if the rest of the folks agree with the aproach, looks like most of this can be made a bit more generic ;-) -- balbi [-- Attachment #1.2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] [-- Attachment #2: Type: text/plain, Size: 192 bytes --] _______________________________________________ devicetree-discuss mailing list devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org https://lists.ozlabs.org/listinfo/devicetree-discuss ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ARM: OMAP2+: Allow clock alias provision from device tree [not found] ` <1360597464-8491-1-git-send-email-rogerq-l0cyMroinI0@public.gmane.org> 2013-02-11 15:44 ` [PATCH 2/2] ARM: dts: omap4-panda: Add clock alias for USB PHY Roger Quadros 2013-02-11 15:49 ` [PATCH 1/2] ARM: OMAP2+: Allow clock alias provision from device tree Felipe Balbi @ 2013-02-11 16:07 ` Sascha Hauer [not found] ` <20130211160752.GG1906-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2 siblings, 1 reply; 5+ messages in thread From: Sascha Hauer @ 2013-02-11 16:07 UTC (permalink / raw) To: Roger Quadros Cc: Russell King, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, linux-kernel-u79uwXL29TY76Z2rM5mHXA, balbi-l0cyMroinI0, Santosh Shilimkar, linux-omap-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r On Mon, Feb 11, 2013 at 05:44:23PM +0200, Roger Quadros wrote: > Currently on OMAP, it is not possible to specify a clock consumer > to any of the OMAP generated clocks using the device tree. This can pose > a problem for external devices that run off an OMAP clock as we > can't reliably provide a reference to the clock in the device tree. There is an established way of providing clocks in the devicetree using the clocks/clock-names properties. Wouldn't it be better using this for OMAP aswell? Sascha -- 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 | ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <20130211160752.GG1906-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>]
* Re: [PATCH 1/2] ARM: OMAP2+: Allow clock alias provision from device tree [not found] ` <20130211160752.GG1906-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> @ 2013-02-12 7:47 ` Roger Quadros 0 siblings, 0 replies; 5+ messages in thread From: Roger Quadros @ 2013-02-12 7:47 UTC (permalink / raw) To: Sascha Hauer, Santosh Shilimkar, Rajendra Nayak Cc: Russell King, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, linux-kernel-u79uwXL29TY76Z2rM5mHXA, balbi-l0cyMroinI0, linux-omap-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r On 02/11/2013 06:07 PM, Sascha Hauer wrote: > On Mon, Feb 11, 2013 at 05:44:23PM +0200, Roger Quadros wrote: >> Currently on OMAP, it is not possible to specify a clock consumer >> to any of the OMAP generated clocks using the device tree. This can pose >> a problem for external devices that run off an OMAP clock as we >> can't reliably provide a reference to the clock in the device tree. > > There is an established way of providing clocks in the devicetree using > the clocks/clock-names properties. Wouldn't it be better using this > for OMAP aswell? > I agree with you, but I'm not sure when this migration will be done. Rajendra/Santosh might know better. regards, -roger ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-02-12 7:47 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-02-11 15:44 [PATCH 1/2] ARM: OMAP2+: Allow clock alias provision from device tree Roger Quadros [not found] ` <1360597464-8491-1-git-send-email-rogerq-l0cyMroinI0@public.gmane.org> 2013-02-11 15:44 ` [PATCH 2/2] ARM: dts: omap4-panda: Add clock alias for USB PHY Roger Quadros 2013-02-11 15:49 ` [PATCH 1/2] ARM: OMAP2+: Allow clock alias provision from device tree Felipe Balbi 2013-02-11 16:07 ` Sascha Hauer [not found] ` <20130211160752.GG1906-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2013-02-12 7:47 ` Roger Quadros
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).