From: Kishon Vijay Abraham I <kishon@ti.com>
To: <gregkh@linuxfoundation.org>
Cc: <kishon@ti.com>, <linux-kernel@vger.kernel.org>
Subject: [PATCH 25/25] phy: add support for USB cluster on the Armada 375 SoC
Date: Thu, 27 Nov 2014 11:56:17 +0530 [thread overview]
Message-ID: <1417069577-1169-26-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1417069577-1169-1-git-send-email-kishon@ti.com>
From: Gregory CLEMENT <gregory.clement@free-electrons.com>
The Armada 375 SoC comes with an USB2 host and device controller and
an USB3 controller. The USB cluster control register allows to manage
common features of both USB controllers.
This commit adds a driver integrated in the generic PHY framework to
control this USB cluster feature.
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[ kishon@ti.com : Made it to use the updated devm_phy_create API and
soem cosmentic changes in Kconfig file.]
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
---
drivers/phy/Kconfig | 6 ++
drivers/phy/Makefile | 1 +
drivers/phy/phy-armada375-usb2.c | 158 ++++++++++++++++++++++++++++++++++++++
include/dt-bindings/phy/phy.h | 1 +
4 files changed, 166 insertions(+)
create mode 100644 drivers/phy/phy-armada375-usb2.c
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 96d43d5..ccad880 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -29,6 +29,12 @@ config PHY_BERLIN_SATA
help
Enable this to support the SATA PHY on Marvell Berlin SoCs.
+config ARMADA375_USBCLUSTER_PHY
+ def_bool y
+ depends on MACH_ARMADA_375 || COMPILE_TEST
+ depends on OF
+ select GENERIC_PHY
+
config PHY_EXYNOS_MIPI_VIDEO
tristate "S5P/EXYNOS SoC series MIPI CSI-2/DSI PHY driver"
depends on HAS_IOMEM
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 68022f6..aa74f96 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -5,6 +5,7 @@
obj-$(CONFIG_GENERIC_PHY) += phy-core.o
obj-$(CONFIG_PHY_BERLIN_USB) += phy-berlin-usb.o
obj-$(CONFIG_PHY_BERLIN_SATA) += phy-berlin-sata.o
+obj-$(CONFIG_ARMADA375_USBCLUSTER_PHY) += phy-armada375-usb2.o
obj-$(CONFIG_BCM_KONA_USB2_PHY) += phy-bcm-kona-usb2.o
obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO) += phy-exynos-dp-video.o
obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o
diff --git a/drivers/phy/phy-armada375-usb2.c b/drivers/phy/phy-armada375-usb2.c
new file mode 100644
index 0000000..ac7d99d
--- /dev/null
+++ b/drivers/phy/phy-armada375-usb2.c
@@ -0,0 +1,158 @@
+/*
+ * USB cluster support for Armada 375 platform.
+ *
+ * Copyright (C) 2014 Marvell
+ *
+ * Gregory CLEMENT <gregory.clement@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2 or later. This program is licensed "as is"
+ * without any warranty of any kind, whether express or implied.
+ *
+ * Armada 375 comes with an USB2 host and device controller and an
+ * USB3 controller. The USB cluster control register allows to manage
+ * common features of both USB controllers.
+ */
+
+#include <dt-bindings/phy/phy.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
+
+#define USB2_PHY_CONFIG_DISABLE BIT(0)
+
+struct armada375_cluster_phy {
+ struct phy *phy;
+ void __iomem *reg;
+ bool use_usb3;
+ int phy_provided;
+};
+
+static int armada375_usb_phy_init(struct phy *phy)
+{
+ struct armada375_cluster_phy *cluster_phy;
+ u32 reg;
+
+ cluster_phy = dev_get_drvdata(phy->dev.parent);
+ if (!cluster_phy)
+ return -ENODEV;
+
+ reg = readl(cluster_phy->reg);
+ if (cluster_phy->use_usb3)
+ reg |= USB2_PHY_CONFIG_DISABLE;
+ else
+ reg &= ~USB2_PHY_CONFIG_DISABLE;
+ writel(reg, cluster_phy->reg);
+
+ return 0;
+}
+
+static struct phy_ops armada375_usb_phy_ops = {
+ .init = armada375_usb_phy_init,
+ .owner = THIS_MODULE,
+};
+
+/*
+ * Only one controller can use this PHY. We shouldn't have the case
+ * when two controllers want to use this PHY. But if this case occurs
+ * then we provide a phy to the first one and return an error for the
+ * next one. This error has also to be an error returned by
+ * devm_phy_optional_get() so different from ENODEV for USB2. In the
+ * USB3 case it still optional and we use ENODEV.
+ */
+static struct phy *armada375_usb_phy_xlate(struct device *dev,
+ struct of_phandle_args *args)
+{
+ struct armada375_cluster_phy *cluster_phy = dev_get_drvdata(dev);
+
+ if (!cluster_phy)
+ return ERR_PTR(-ENODEV);
+
+ /*
+ * Either the phy had never been requested and then the first
+ * usb claiming it can get it, or it had already been
+ * requested in this case, we only allow to use it with the
+ * same configuration.
+ */
+ if (WARN_ON((cluster_phy->phy_provided != PHY_NONE) &&
+ (cluster_phy->phy_provided != args->args[0]))) {
+ dev_err(dev, "This PHY has already been provided!\n");
+ dev_err(dev, "Check your device tree, only one controller can use it\n.");
+ if (args->args[0] == PHY_TYPE_USB2)
+ return ERR_PTR(-EBUSY);
+ else
+ return ERR_PTR(-ENODEV);
+ }
+
+ if (args->args[0] == PHY_TYPE_USB2)
+ cluster_phy->use_usb3 = false;
+ else if (args->args[0] == PHY_TYPE_USB3)
+ cluster_phy->use_usb3 = true;
+ else {
+ dev_err(dev, "Invalid PHY mode\n");
+ return ERR_PTR(-ENODEV);
+ }
+
+ /* Store which phy mode is used for next test */
+ cluster_phy->phy_provided = args->args[0];
+
+ return cluster_phy->phy;
+}
+
+static int armada375_usb_phy_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct phy *phy;
+ struct phy_provider *phy_provider;
+ void __iomem *usb_cluster_base;
+ struct resource *res;
+ struct armada375_cluster_phy *cluster_phy;
+
+ cluster_phy = devm_kzalloc(dev, sizeof(*cluster_phy), GFP_KERNEL);
+ if (!cluster_phy)
+ return -ENOMEM;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ usb_cluster_base = devm_ioremap_resource(&pdev->dev, res);
+ if (!usb_cluster_base)
+ return -ENOMEM;
+
+ phy = devm_phy_create(dev, NULL, &armada375_usb_phy_ops);
+ if (IS_ERR(phy)) {
+ dev_err(dev, "failed to create PHY\n");
+ return PTR_ERR(phy);
+ }
+
+ cluster_phy->phy = phy;
+ cluster_phy->reg = usb_cluster_base;
+
+ dev_set_drvdata(dev, cluster_phy);
+
+ phy_provider = devm_of_phy_provider_register(&pdev->dev,
+ armada375_usb_phy_xlate);
+ return PTR_ERR_OR_ZERO(phy_provider);
+}
+
+static const struct of_device_id of_usb_cluster_table[] = {
+ { .compatible = "marvell,armada-375-usb-cluster", },
+ { /* end of list */ },
+};
+MODULE_DEVICE_TABLE(of, of_usb_cluster_table);
+
+static struct platform_driver armada375_usb_phy_driver = {
+ .probe = armada375_usb_phy_probe,
+ .driver = {
+ .of_match_table = of_usb_cluster_table,
+ .name = "armada-375-usb-cluster",
+ .owner = THIS_MODULE,
+ }
+};
+module_platform_driver(armada375_usb_phy_driver);
+
+MODULE_DESCRIPTION("Armada 375 USB cluster driver");
+MODULE_AUTHOR("Gregory CLEMENT <gregory.clement@free-electrons.com>");
+MODULE_LICENSE("GPL");
diff --git a/include/dt-bindings/phy/phy.h b/include/dt-bindings/phy/phy.h
index e8c6a3f..6c90193 100644
--- a/include/dt-bindings/phy/phy.h
+++ b/include/dt-bindings/phy/phy.h
@@ -10,6 +10,7 @@
#ifndef _DT_BINDINGS_PHY
#define _DT_BINDINGS_PHY
+#define PHY_NONE 0
#define PHY_TYPE_SATA 1
#define PHY_TYPE_PCIE 2
#define PHY_TYPE_USB2 3
--
1.7.9.5
next prev parent reply other threads:[~2014-11-27 6:27 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-27 6:25 [GIT PULL 00/25] phy: for 3.19 Kishon Vijay Abraham I
2014-11-27 6:25 ` [PATCH 01/25] phy: Add PHY header file for DT x Driver defines Kishon Vijay Abraham I
2014-11-27 6:25 ` [PATCH 02/25] phy: miphy28lp: Add Device Tree bindings for the MiPHY28lp Kishon Vijay Abraham I
2014-11-27 6:25 ` [PATCH 03/25] phy: miphy28lp: Provide support for the MiPHY28lp Generic PHY Kishon Vijay Abraham I
2014-11-27 7:00 ` sanjeev sharma
2014-11-27 6:25 ` [PATCH 04/25] phy: miphy28lp: Add SSC support for SATA Kishon Vijay Abraham I
2014-11-27 6:25 ` [PATCH 05/25] phy: miphy28lp: Add SSC support for PCIE Kishon Vijay Abraham I
2014-11-27 6:25 ` [PATCH 06/25] phy: miphy28lp: Tune tx impedance across Soc cuts Kishon Vijay Abraham I
2014-11-27 6:25 ` [PATCH 07/25] phy: phy-core: use the np present in of_phandle_args to get the PHY Kishon Vijay Abraham I
2014-11-27 6:26 ` [PATCH 08/25] phy: sun4i: add support for USB phy0 Kishon Vijay Abraham I
2014-11-27 6:26 ` [PATCH 09/25] phy: berlin-sata: Move PHY_BASE into private data struct Kishon Vijay Abraham I
2014-11-27 6:26 ` [PATCH 10/25] phy: berlin-sata: Add support for BG2 SATA PHY Kishon Vijay Abraham I
2014-11-27 6:26 ` [PATCH 11/25] phy: berlin-sata: Document BG2 compatible Kishon Vijay Abraham I
2014-11-27 6:26 ` [PATCH 12/25] phy: add the Berlin USB PHY driver Kishon Vijay Abraham I
2014-11-27 6:26 ` [PATCH 13/25] Documentation: bindings: add doc for the Berlin USB PHY Kishon Vijay Abraham I
2014-11-27 6:26 ` [PATCH 14/25] phy: safer to_phy() macro Kishon Vijay Abraham I
2014-11-27 6:26 ` [PATCH 15/25] phy: improved lookup method Kishon Vijay Abraham I
2014-11-27 6:26 ` [PATCH 16/25] phy: twl4030: use the new " Kishon Vijay Abraham I
2014-11-27 6:26 ` [PATCH 17/25] phy: remove the old " Kishon Vijay Abraham I
2014-11-27 6:26 ` [PATCH 18/25] usb: dwc3: host: convey the PHYs to xhci Kishon Vijay Abraham I
2014-11-27 6:26 ` [PATCH 19/25] phy: exynos5-usbdrd: Add pipe-clk, utmi-clk and itp-clk support Kishon Vijay Abraham I
2014-11-27 6:26 ` [PATCH 20/25] phy: exynos5-usbdrd: Add facility for VBUS-BOOST-5V supply Kishon Vijay Abraham I
2014-11-27 6:26 ` [PATCH 21/25] phy: exynos7-usbdrd: Update dependency for ARCH_EXYNOS Kishon Vijay Abraham I
2014-11-27 6:26 ` [PATCH 22/25] phy: Use PTR_ERR_OR_ZERO to fix warning raised by coccinelle Kishon Vijay Abraham I
2014-11-27 6:26 ` [PATCH 23/25] Phy: DT binding documentation for Marvell MVEBU SATA phy Kishon Vijay Abraham I
2014-11-27 6:26 ` [PATCH 24/25] Phy: DT binding documentation for the Armada 375 USB cluster binding Kishon Vijay Abraham I
2014-11-27 6:26 ` Kishon Vijay Abraham I [this message]
2014-11-27 16:49 ` [GIT PULL 00/25] phy: for 3.19 Greg KH
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=1417069577-1169-26-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®