From: Roger Quadros <rogerq-l0cyMroinI0@public.gmane.org>
To: tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org
Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org,
linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
balbi-l0cyMroinI0@public.gmane.org,
linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
rogerq-l0cyMroinI0@public.gmane.org
Subject: [PATCH v2 02/23] ARM: OMAP2+: omap-usb-host: Add usbhs_init_phys()
Date: Fri, 15 Mar 2013 17:16:23 +0200 [thread overview]
Message-ID: <1363360604-21368-3-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1363360604-21368-1-git-send-email-rogerq-l0cyMroinI0@public.gmane.org>
This helper allows board support code to add the PHY's
VCC and RESET regulators which are GPIO controlled.
It also links the "vcc" and "reset" supplies to the
PHY's device ID that is supplied in the struct usbhs_phy_data
argument.
Signed-off-by: Roger Quadros <rogerq-l0cyMroinI0@public.gmane.org>
---
arch/arm/mach-omap2/usb-host.c | 138 +++++++++++++++++++++++++++++++++++++++-
arch/arm/mach-omap2/usb.h | 9 +++
2 files changed, 145 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c
index 5706bdc..e788fe5 100644
--- a/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@@ -22,8 +22,11 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/dma-mapping.h>
-
-#include <asm/io.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
+#include <linux/string.h>
+#include <linux/io.h>
+#include <linux/gpio.h>
#include "soc.h"
#include "omap_device.h"
@@ -526,3 +529,134 @@ void __init usbhs_init(struct usbhs_omap_platform_data *pdata)
}
#endif
+
+static const char *reset_supply = "reset";
+static const char *vcc_supply = "vcc";
+
+/* Template for PHY regulators */
+static struct regulator_consumer_supply hsusb_reg_supplies[] = {
+ { /* .supply & .dev_name filled later */ },
+};
+
+static struct regulator_init_data hsusb_reg_data = {
+ .constraints = {
+ .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+ },
+ .consumer_supplies = hsusb_reg_supplies,
+ .num_consumer_supplies = ARRAY_SIZE(hsusb_reg_supplies),
+};
+
+static struct fixed_voltage_config hsusb_reg_config = {
+ /* .supply_name filled later */
+ .microvolts = 3300000,
+ .gpio = -1, /* updated later */
+ .startup_delay = 70000, /* 70msec */
+ .enable_high = 1, /* updated later */
+ .enabled_at_boot = 0, /* keep in RESET */
+ /* .init_data filled later */
+};
+
+static struct platform_device_info hsusb_reg_pdev_info = {
+ .name = "reg-fixed-voltage",
+ .id = PLATFORM_DEVID_AUTO,
+};
+
+int usbhs_init_phys(struct usbhs_phy_data *phy, int num_phys)
+{
+ struct regulator_consumer_supply *supplies;
+ struct regulator_init_data *reg_data;
+ struct fixed_voltage_config *config;
+ char *supply_name;
+ int i;
+
+ for (i = 0; i < num_phys; i++) {
+
+ if (!phy->phy_id || !phy->port) {
+ pr_info("%s: Invalid phy_id or port\n", __func__);
+ continue;
+ }
+
+ if (!gpio_is_valid(phy->reset_gpio))
+ goto check_vcc;
+
+ supplies = kmemdup(hsusb_reg_supplies,
+ ARRAY_SIZE(hsusb_reg_supplies) *
+ sizeof(struct regulator_consumer_supply),
+ GFP_KERNEL);
+ if (!supplies)
+ return -ENOMEM;
+
+ supplies->supply = reset_supply;
+ supplies->dev_name = phy->phy_id;
+
+ reg_data = kmemdup(&hsusb_reg_data, sizeof(hsusb_reg_data),
+ GFP_KERNEL);
+ if (!reg_data)
+ return -ENOMEM;
+
+ reg_data->consumer_supplies = supplies;
+
+ config = kmemdup(&hsusb_reg_config, sizeof(hsusb_reg_config),
+ GFP_KERNEL);
+ if (!config)
+ return -ENOMEM;
+
+ supply_name = kmalloc(14, GFP_KERNEL);
+ if (!supply_name)
+ return -ENOMEM;
+
+ scnprintf(supply_name, 13, "hsusb%d_reset", phy->port);
+ config->supply_name = supply_name;
+ config->gpio = phy->reset_gpio;
+ config->init_data = reg_data;
+
+ hsusb_reg_pdev_info.data = config;
+ hsusb_reg_pdev_info.size_data = sizeof(hsusb_reg_config);
+ platform_device_register_full(&hsusb_reg_pdev_info);
+
+check_vcc:
+ if (!gpio_is_valid(phy->vcc_gpio))
+ goto next;
+
+ supplies = kmemdup(hsusb_reg_supplies,
+ ARRAY_SIZE(hsusb_reg_supplies) *
+ sizeof(struct regulator_consumer_supply),
+ GFP_KERNEL);
+ if (!supplies)
+ return -ENOMEM;
+
+ supplies->supply = vcc_supply;
+ supplies->dev_name = phy->phy_id;
+
+ reg_data = kmemdup(&hsusb_reg_data, sizeof(hsusb_reg_data),
+ GFP_KERNEL);
+ if (!reg_data)
+ return -ENOMEM;
+
+ reg_data->consumer_supplies = supplies;
+
+ config = kmemdup(&hsusb_reg_config, sizeof(hsusb_reg_config),
+ GFP_KERNEL);
+ if (!config)
+ return -ENOMEM;
+
+ supply_name = kmalloc(14, GFP_KERNEL);
+ if (!supply_name)
+ return -ENOMEM;
+
+ scnprintf(supply_name, 13, "hsusb%d_vcc", phy->port);
+ config->supply_name = supply_name;
+ config->gpio = phy->vcc_gpio;
+ config->enable_high = phy->vcc_polarity;
+ config->init_data = reg_data;
+
+ hsusb_reg_pdev_info.data = config;
+ hsusb_reg_pdev_info.size_data = sizeof(hsusb_reg_config);
+ platform_device_register_full(&hsusb_reg_pdev_info);
+
+next:
+ phy++;
+ }
+
+ return 0;
+}
diff --git a/arch/arm/mach-omap2/usb.h b/arch/arm/mach-omap2/usb.h
index 3319f5c..4c21863 100644
--- a/arch/arm/mach-omap2/usb.h
+++ b/arch/arm/mach-omap2/usb.h
@@ -53,8 +53,17 @@
#define USBPHY_OTGSESSEND_EN (1 << 20)
#define USBPHY_DATA_POLARITY (1 << 23)
+struct usbhs_phy_data {
+ int port; /* 1 indexed port number */
+ int reset_gpio;
+ int vcc_gpio;
+ bool vcc_polarity; /* 1 active high, 0 active low */
+ char *phy_id;
+};
+
extern void usb_musb_init(struct omap_musb_board_data *board_data);
extern void usbhs_init(struct usbhs_omap_platform_data *pdata);
+extern int usbhs_init_phys(struct usbhs_phy_data *phy, int num_phys);
extern void am35x_musb_reset(void);
extern void am35x_musb_phy_power(u8 on);
--
1.7.4.1
next prev parent reply other threads:[~2013-03-15 15:16 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-15 15:16 [PATCH v2 00/23] ARM: OMAP2+: Adapt to ehci-omap changes for 3.10 Roger Quadros
2013-03-15 15:16 ` [PATCH v2 04/23] ARM: OMAP2+: omap4panda: Adapt to ehci-omap changes Roger Quadros
2013-03-15 15:16 ` [PATCH v2 06/23] ARM: OMAP3: 3430SDP: " Roger Quadros
2013-03-15 16:12 ` Tony Lindgren
2013-03-18 12:42 ` Roger Quadros
2013-03-15 15:16 ` [PATCH v2 08/23] ARM: OMAP: AM3517crane: " Roger Quadros
2013-03-15 15:16 ` [PATCH v2 10/23] ARM: OMAP3: cm-t35: " Roger Quadros
[not found] ` <1363360604-21368-1-git-send-email-rogerq-l0cyMroinI0@public.gmane.org>
2013-03-15 15:16 ` [PATCH v2 01/23] usb: phy: nop: Add some parameters to platform data Roger Quadros
2013-03-15 15:16 ` Roger Quadros [this message]
2013-03-15 15:16 ` [PATCH v2 03/23] ARM: OMAP2+: omap4panda: Provide USB Host's PHY " Roger Quadros
2013-03-15 15:16 ` [PATCH v2 05/23] ARM: OMAP3: Beagle: Adapt to ehci-omap changes Roger Quadros
2013-03-15 15:16 ` [PATCH v2 07/23] ARM: OMAP3: 3630SDP: " Roger Quadros
2013-03-15 15:16 ` [PATCH v2 09/23] ARM: OMAP: AM3517evm: " Roger Quadros
2013-03-15 15:16 ` [PATCH v2 11/23] ARM: OMAP3: cm-t3517: " Roger Quadros
2013-03-15 15:16 ` [PATCH v2 12/23] ARM: OMAP: devkit8000: " Roger Quadros
2013-03-15 15:16 ` [PATCH v2 18/23] ARM: OMAP3: overo: " Roger Quadros
2013-03-15 15:16 ` [PATCH v2 22/23] ARM: dts: OMAP3: Add HS USB Host IP nodes Roger Quadros
2013-03-15 15:16 ` [PATCH v2 13/23] ARM: OMAP3: igep0020: Adapt to ehci-omap changes Roger Quadros
2013-03-15 15:16 ` [PATCH v2 14/23] ARM: OMAP3: omap3evm: " Roger Quadros
2013-03-15 15:16 ` [PATCH v2 15/23] ARM: OMAP3: omap3pandora: " Roger Quadros
2013-03-15 15:16 ` [PATCH v2 16/23] ARM: OMAP3: omap3stalker: " Roger Quadros
2013-03-15 15:16 ` [PATCH v2 17/23] ARM: OMAP3: omap3touchbook: " Roger Quadros
2013-03-15 15:16 ` [PATCH v2 19/23] ARM: OMAP: zoom: " Roger Quadros
2013-03-15 15:16 ` [PATCH v2 20/23] ARM: dts: OMAP4: Add HS USB Host IP nodes Roger Quadros
2013-03-15 15:16 ` [PATCH v2 21/23] ARM: dts: omap4-panda: Add USB Host support Roger Quadros
2013-03-15 15:16 ` [PATCH v2 23/23] ARM: dts: omap3-beagle: " Roger Quadros
2013-03-19 18:37 ` [PATCH v2 00/23] ARM: OMAP2+: Adapt to ehci-omap changes for 3.10 Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1363360604-21368-3-git-send-email-rogerq@ti.com \
--to=rogerq-l0cymroini0@public.gmane.org \
--cc=balbi-l0cyMroinI0@public.gmane.org \
--cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).