From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751520AbaDRLTw (ORCPT ); Fri, 18 Apr 2014 07:19:52 -0400 Received: from mail-ee0-f53.google.com ([74.125.83.53]:33319 "EHLO mail-ee0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750857AbaDRLTt (ORCPT ); Fri, 18 Apr 2014 07:19:49 -0400 Message-ID: <53510A4D.8050706@gmail.com> Date: Fri, 18 Apr 2014 13:19:41 +0200 From: Sebastian Hesselbarth User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 To: Gregory CLEMENT , Mathias Nyman , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Jason Cooper , Andrew Lunn CC: Thomas Petazzoni , Ezequiel Garcia , linux-arm-kernel@lists.infradead.org, Lior Amsalem , Tawfik Bayouk , Nadav Haklai , Grant Likely , Rob Herring , devicetree@vger.kernel.org Subject: Re: [PATCH 4/8] ARM: mvebu: Add USB3 UTMI support References: <1397816563-9000-1-git-send-email-gregory.clement@free-electrons.com> <1397816563-9000-5-git-send-email-gregory.clement@free-electrons.com> In-Reply-To: <1397816563-9000-5-git-send-email-gregory.clement@free-electrons.com> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 04/18/2014 12:22 PM, Gregory CLEMENT wrote: > The usb3-utmi registers allow to configure the internal USB PHY of the > Armada 380/385 SoCs. A small initialization is needed to be able to use > the USB3 ports. > > Signed-off-by: Gregory CLEMENT > --- > arch/arm/mach-mvebu/Makefile | 2 +- > arch/arm/mach-mvebu/usb-utmi.c | 64 ++++++++++++++++++++++++++++++++++++++++++ Gregory, there is the generic PHY framework, that could possibly be used to avoid adding more code to arch/arm/mach-mvebu. > 2 files changed, 65 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/mach-mvebu/usb-utmi.c > > diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile > index a63e43b6b451..2d98a3eeecf6 100644 > --- a/arch/arm/mach-mvebu/Makefile > +++ b/arch/arm/mach-mvebu/Makefile > @@ -4,7 +4,7 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ > AFLAGS_coherency_ll.o := -Wa,-march=armv7-a > > obj-y += system-controller.o mvebu-soc-id.o > -obj-$(CONFIG_MACH_MVEBU_V7) += board-v7.o > +obj-$(CONFIG_MACH_MVEBU_V7) += board-v7.o usb-utmi.o > obj-$(CONFIG_MACH_DOVE) += dove.o > obj-$(CONFIG_ARCH_MVEBU) += coherency.o coherency_ll.o pmsu.o > obj-$(CONFIG_SMP) += platsmp.o headsmp.o > diff --git a/arch/arm/mach-mvebu/usb-utmi.c b/arch/arm/mach-mvebu/usb-utmi.c > new file mode 100644 > index 000000000000..e91e86f85eb4 > --- /dev/null > +++ b/arch/arm/mach-mvebu/usb-utmi.c > @@ -0,0 +1,64 @@ > +/* > + * USB UTMI support for Armada 38x platform. > + * > + * Copyright (C) 2014 Marvell > + * > + * Gregory CLEMENT > + * > + * This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without any > + * warranty of any kind, whether express or implied. > + * > + */ > + > +#include > +#include > +#include > +#include > +#include nit: sort alphabetically > +#define USB_UTMI_PHY_CTRL_STATUS(i) (0x20+i*4) > +#define USB_UTMI_TX_BITSTUFF_EN BIT(1) > +#define USB_UTMI_PU_PHY BIT(5) > +#define USB_UTMI_VBUS_ON_PHY BIT(6) nit: two TABs in front of the defines above. > +static struct of_device_id of_usb_utmi_table[] = { > + { .compatible = "marvell,armada-380-usb-utmi", }, > + { /* end of list */ }, > +}; > + > +static int __init mvebu_usb_utmi_init(void) > +{ > + struct device_node *np; > + > + np = of_find_matching_node(NULL, of_usb_utmi_table); > + if (np) { > + void __iomem *usb_utmi_base, *utmi_base; > + > + usb_utmi_base = of_iomap(np, 0); > + BUG_ON(!usb_utmi_base); > + > + utmi_base = of_iomap(np, 1); > + BUG_ON(!utmi_base); > + > + writel(USB_UTMI_TX_BITSTUFF_EN | > + USB_UTMI_PU_PHY | > + USB_UTMI_VBUS_ON_PHY, > + usb_utmi_base + USB_UTMI_PHY_CTRL_STATUS(0)); > + > + /* > + * Magic init... the registers and their value are not > + * documented > + */ > + writel(0x40605205, utmi_base); > + writel(0x409, utmi_base + 4); > + writel(0x1be7f6f, utmi_base + 0xc); nit: decimal/hexadecimal offsets, also IMHO filling the values written with leading zeros improves readability of "magic init" alot :) Sebastian > + > + of_node_put(np); > + iounmap(utmi_base); > + iounmap(usb_utmi_base); > + } > + > + return 0; > +} > +postcore_initcall(mvebu_usb_utmi_init); > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastian Hesselbarth Subject: Re: [PATCH 4/8] ARM: mvebu: Add USB3 UTMI support Date: Fri, 18 Apr 2014 13:19:41 +0200 Message-ID: <53510A4D.8050706@gmail.com> References: <1397816563-9000-1-git-send-email-gregory.clement@free-electrons.com> <1397816563-9000-5-git-send-email-gregory.clement@free-electrons.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1397816563-9000-5-git-send-email-gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Gregory CLEMENT , Mathias Nyman , Greg Kroah-Hartman , linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Jason Cooper , Andrew Lunn Cc: Thomas Petazzoni , Ezequiel Garcia , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Lior Amsalem , Tawfik Bayouk , Nadav Haklai , Grant Likely , Rob Herring , devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: devicetree@vger.kernel.org On 04/18/2014 12:22 PM, Gregory CLEMENT wrote: > The usb3-utmi registers allow to configure the internal USB PHY of the > Armada 380/385 SoCs. A small initialization is needed to be able to use > the USB3 ports. > > Signed-off-by: Gregory CLEMENT > --- > arch/arm/mach-mvebu/Makefile | 2 +- > arch/arm/mach-mvebu/usb-utmi.c | 64 ++++++++++++++++++++++++++++++++++++++++++ Gregory, there is the generic PHY framework, that could possibly be used to avoid adding more code to arch/arm/mach-mvebu. > 2 files changed, 65 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/mach-mvebu/usb-utmi.c > > diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile > index a63e43b6b451..2d98a3eeecf6 100644 > --- a/arch/arm/mach-mvebu/Makefile > +++ b/arch/arm/mach-mvebu/Makefile > @@ -4,7 +4,7 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ > AFLAGS_coherency_ll.o := -Wa,-march=armv7-a > > obj-y += system-controller.o mvebu-soc-id.o > -obj-$(CONFIG_MACH_MVEBU_V7) += board-v7.o > +obj-$(CONFIG_MACH_MVEBU_V7) += board-v7.o usb-utmi.o > obj-$(CONFIG_MACH_DOVE) += dove.o > obj-$(CONFIG_ARCH_MVEBU) += coherency.o coherency_ll.o pmsu.o > obj-$(CONFIG_SMP) += platsmp.o headsmp.o > diff --git a/arch/arm/mach-mvebu/usb-utmi.c b/arch/arm/mach-mvebu/usb-utmi.c > new file mode 100644 > index 000000000000..e91e86f85eb4 > --- /dev/null > +++ b/arch/arm/mach-mvebu/usb-utmi.c > @@ -0,0 +1,64 @@ > +/* > + * USB UTMI support for Armada 38x platform. > + * > + * Copyright (C) 2014 Marvell > + * > + * Gregory CLEMENT > + * > + * This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without any > + * warranty of any kind, whether express or implied. > + * > + */ > + > +#include > +#include > +#include > +#include > +#include nit: sort alphabetically > +#define USB_UTMI_PHY_CTRL_STATUS(i) (0x20+i*4) > +#define USB_UTMI_TX_BITSTUFF_EN BIT(1) > +#define USB_UTMI_PU_PHY BIT(5) > +#define USB_UTMI_VBUS_ON_PHY BIT(6) nit: two TABs in front of the defines above. > +static struct of_device_id of_usb_utmi_table[] = { > + { .compatible = "marvell,armada-380-usb-utmi", }, > + { /* end of list */ }, > +}; > + > +static int __init mvebu_usb_utmi_init(void) > +{ > + struct device_node *np; > + > + np = of_find_matching_node(NULL, of_usb_utmi_table); > + if (np) { > + void __iomem *usb_utmi_base, *utmi_base; > + > + usb_utmi_base = of_iomap(np, 0); > + BUG_ON(!usb_utmi_base); > + > + utmi_base = of_iomap(np, 1); > + BUG_ON(!utmi_base); > + > + writel(USB_UTMI_TX_BITSTUFF_EN | > + USB_UTMI_PU_PHY | > + USB_UTMI_VBUS_ON_PHY, > + usb_utmi_base + USB_UTMI_PHY_CTRL_STATUS(0)); > + > + /* > + * Magic init... the registers and their value are not > + * documented > + */ > + writel(0x40605205, utmi_base); > + writel(0x409, utmi_base + 4); > + writel(0x1be7f6f, utmi_base + 0xc); nit: decimal/hexadecimal offsets, also IMHO filling the values written with leading zeros improves readability of "magic init" alot :) Sebastian > + > + of_node_put(np); > + iounmap(utmi_base); > + iounmap(usb_utmi_base); > + } > + > + return 0; > +} > +postcore_initcall(mvebu_usb_utmi_init); > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth) Date: Fri, 18 Apr 2014 13:19:41 +0200 Subject: [PATCH 4/8] ARM: mvebu: Add USB3 UTMI support In-Reply-To: <1397816563-9000-5-git-send-email-gregory.clement@free-electrons.com> References: <1397816563-9000-1-git-send-email-gregory.clement@free-electrons.com> <1397816563-9000-5-git-send-email-gregory.clement@free-electrons.com> Message-ID: <53510A4D.8050706@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 04/18/2014 12:22 PM, Gregory CLEMENT wrote: > The usb3-utmi registers allow to configure the internal USB PHY of the > Armada 380/385 SoCs. A small initialization is needed to be able to use > the USB3 ports. > > Signed-off-by: Gregory CLEMENT > --- > arch/arm/mach-mvebu/Makefile | 2 +- > arch/arm/mach-mvebu/usb-utmi.c | 64 ++++++++++++++++++++++++++++++++++++++++++ Gregory, there is the generic PHY framework, that could possibly be used to avoid adding more code to arch/arm/mach-mvebu. > 2 files changed, 65 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/mach-mvebu/usb-utmi.c > > diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile > index a63e43b6b451..2d98a3eeecf6 100644 > --- a/arch/arm/mach-mvebu/Makefile > +++ b/arch/arm/mach-mvebu/Makefile > @@ -4,7 +4,7 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ > AFLAGS_coherency_ll.o := -Wa,-march=armv7-a > > obj-y += system-controller.o mvebu-soc-id.o > -obj-$(CONFIG_MACH_MVEBU_V7) += board-v7.o > +obj-$(CONFIG_MACH_MVEBU_V7) += board-v7.o usb-utmi.o > obj-$(CONFIG_MACH_DOVE) += dove.o > obj-$(CONFIG_ARCH_MVEBU) += coherency.o coherency_ll.o pmsu.o > obj-$(CONFIG_SMP) += platsmp.o headsmp.o > diff --git a/arch/arm/mach-mvebu/usb-utmi.c b/arch/arm/mach-mvebu/usb-utmi.c > new file mode 100644 > index 000000000000..e91e86f85eb4 > --- /dev/null > +++ b/arch/arm/mach-mvebu/usb-utmi.c > @@ -0,0 +1,64 @@ > +/* > + * USB UTMI support for Armada 38x platform. > + * > + * Copyright (C) 2014 Marvell > + * > + * Gregory CLEMENT > + * > + * This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without any > + * warranty of any kind, whether express or implied. > + * > + */ > + > +#include > +#include > +#include > +#include > +#include nit: sort alphabetically > +#define USB_UTMI_PHY_CTRL_STATUS(i) (0x20+i*4) > +#define USB_UTMI_TX_BITSTUFF_EN BIT(1) > +#define USB_UTMI_PU_PHY BIT(5) > +#define USB_UTMI_VBUS_ON_PHY BIT(6) nit: two TABs in front of the defines above. > +static struct of_device_id of_usb_utmi_table[] = { > + { .compatible = "marvell,armada-380-usb-utmi", }, > + { /* end of list */ }, > +}; > + > +static int __init mvebu_usb_utmi_init(void) > +{ > + struct device_node *np; > + > + np = of_find_matching_node(NULL, of_usb_utmi_table); > + if (np) { > + void __iomem *usb_utmi_base, *utmi_base; > + > + usb_utmi_base = of_iomap(np, 0); > + BUG_ON(!usb_utmi_base); > + > + utmi_base = of_iomap(np, 1); > + BUG_ON(!utmi_base); > + > + writel(USB_UTMI_TX_BITSTUFF_EN | > + USB_UTMI_PU_PHY | > + USB_UTMI_VBUS_ON_PHY, > + usb_utmi_base + USB_UTMI_PHY_CTRL_STATUS(0)); > + > + /* > + * Magic init... the registers and their value are not > + * documented > + */ > + writel(0x40605205, utmi_base); > + writel(0x409, utmi_base + 4); > + writel(0x1be7f6f, utmi_base + 0xc); nit: decimal/hexadecimal offsets, also IMHO filling the values written with leading zeros improves readability of "magic init" alot :) Sebastian > + > + of_node_put(np); > + iounmap(utmi_base); > + iounmap(usb_utmi_base); > + } > + > + return 0; > +} > +postcore_initcall(mvebu_usb_utmi_init); >