mirror of
https://github.com/torvalds/linux.git
synced 2024-12-06 19:11:31 +00:00
f9efbce633
Most of this branch consists of updates, additions and general churn of the device tree source files in the kernel (arch/arm/boot/dts). Besides that, there are a few things to point out: - Lots of platform conversion on OMAP2+, with removal of old board files for various platforms. - Final conversion of a bunch of ux500 (ST-Ericsson) platforms as well - Some updates to pinctrl and other subsystems. Most of these are for DT-enablement of the various platforms and acks have been collected. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJSgB6cAAoJEIwa5zzehBx3uuEP/0n8b7qgmx2e0HPtx3qlqPiR 3bit2/5MzJNufb46qnYhhE+DF+bo1yfGlrIQK7nBXuv1fMKKlVMoUZ7Ql3EBbPzd UWrENl2eiapO7D9uN9EZ5WVYu+tKJewU89xkhM70xlCBUHGgQ4k958E8TH9vmELI Qj1s2UcsYftMF9EH6sbQZ7Jkhrg2M9zVgqUcrqqZT/ZF97174SCEJzAt6n9RGGvr M9sPOPOIO2D5/tu1oOz1dCQQmATj2r5NYAMOu/jVlvB0OpsCrsFwrTWGHWfssR4z 3uIxcaVb4XgtxCtY9o+C9nJiLGqoENWQS7ScuAx6GTHjn4dwL9OZBMjb/vGGFKQp dtikMRCaNAkJ8XNl/s8ND+rLzXuPF2KIqkZZz/Nwm02lZq/0OPu0ysBGpdN4C4pk TRiLxnqE0OZg5cnFQFOMAZF4ABh/0x8cM7a1PPBT5MnTvuH1YrLAuvL5daReU5u1 LlxlFd9rSq8SVn8pBLgKk8RlMkqduDm1HusABnFlzBJMJ0Jy2Ol1X3fPK/8wHq6e 4NedNaQbnx1U5pB2mGIPutkBdVkjK7dKvlDXgYi1sunf5Ake+vej3zJ7u4UfWeIJ lHJgjnPHdGtZ74RU4/ckp5ba+JHXJ15XAxFKk9XRiOjf+9ciQ4dLRF/JfiSRG2Yc 9NZi38w8M3wC2P7U3dh4 =nH67 -----END PGP SIGNATURE----- Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC DT updates from Olof Johansson: "Most of this branch consists of updates, additions and general churn of the device tree source files in the kernel (arch/arm/boot/dts). Besides that, there are a few things to point out: - Lots of platform conversion on OMAP2+, with removal of old board files for various platforms. - Final conversion of a bunch of ux500 (ST-Ericsson) platforms as well - Some updates to pinctrl and other subsystems. Most of these are for DT-enablement of the various platforms and acks have been collected" * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (385 commits) ARM: dts: bcm11351: Use GIC/IRQ defines for sdio interrupts ARM: dts: bcm: Add missing UARTs for bcm11351 (bcm281xx) ARM: dts: bcm281xx: Add card detect GPIO ARM: dts: rename ARCH_BCM to ARCH_BCM_MOBILE (dt) ARM: bcm281xx: Add device node for the GPIO controller ARM: mvebu: Add Netgear ReadyNAS 104 board ARM: tegra: fix Tegra114 IOMMU register address ARM: kirkwood: add support for OpenBlocks A7 platform ARM: dts: omap4-panda: add DPI pinmuxing ARM: dts: AM33xx: Add RNG node ARM: dts: AM33XX: Add hwspinlock node ARM: dts: OMAP5: Add hwspinlock node ARM: dts: OMAP4: Add hwspinlock node ARM: dts: use 'status' property for PCIe nodes ARM: dts: sirf: add missed address-cells and size-cells for prima2 I2C ARM: dts: sirf: add missed cell, cs and dma channel for SPI nodes ARM: dts: sirf: add missed graphics2d iobg in atlas6 dts ARM: dts: sirf: add missed chhifbg node in prima2 and atlas6 dts ARM: dts: sirf: add missed memcontrol-monitor node in prima2 and atlas6 dts ARM: mvebu: Add the core-divider clock to Armada 370/XP ...
402 lines
9.4 KiB
C
402 lines
9.4 KiB
C
/*
|
|
* Copyright (C) 2010 ST-Ericsson AB
|
|
* Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
|
|
*
|
|
* Based on omap2430.c
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 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, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/err.h>
|
|
#include <linux/io.h>
|
|
#include <linux/of.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/usb/musb-ux500.h>
|
|
|
|
#include "musb_core.h"
|
|
|
|
static struct musb_hdrc_config ux500_musb_hdrc_config = {
|
|
.multipoint = true,
|
|
.dyn_fifo = true,
|
|
.num_eps = 16,
|
|
.ram_bits = 16,
|
|
};
|
|
|
|
struct ux500_glue {
|
|
struct device *dev;
|
|
struct platform_device *musb;
|
|
struct clk *clk;
|
|
};
|
|
#define glue_to_musb(g) platform_get_drvdata(g->musb)
|
|
|
|
static void ux500_musb_set_vbus(struct musb *musb, int is_on)
|
|
{
|
|
u8 devctl;
|
|
unsigned long timeout = jiffies + msecs_to_jiffies(1000);
|
|
/* HDRC controls CPEN, but beware current surges during device
|
|
* connect. They can trigger transient overcurrent conditions
|
|
* that must be ignored.
|
|
*/
|
|
|
|
devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
|
|
|
|
if (is_on) {
|
|
if (musb->xceiv->state == OTG_STATE_A_IDLE) {
|
|
/* start the session */
|
|
devctl |= MUSB_DEVCTL_SESSION;
|
|
musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
|
|
/*
|
|
* Wait for the musb to set as A device to enable the
|
|
* VBUS
|
|
*/
|
|
while (musb_readb(musb->mregs, MUSB_DEVCTL) & 0x80) {
|
|
|
|
if (time_after(jiffies, timeout)) {
|
|
dev_err(musb->controller,
|
|
"configured as A device timeout");
|
|
break;
|
|
}
|
|
}
|
|
|
|
} else {
|
|
musb->is_active = 1;
|
|
musb->xceiv->otg->default_a = 1;
|
|
musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;
|
|
devctl |= MUSB_DEVCTL_SESSION;
|
|
MUSB_HST_MODE(musb);
|
|
}
|
|
} else {
|
|
musb->is_active = 0;
|
|
|
|
/* NOTE: we're skipping A_WAIT_VFALL -> A_IDLE and jumping
|
|
* right to B_IDLE...
|
|
*/
|
|
musb->xceiv->otg->default_a = 0;
|
|
devctl &= ~MUSB_DEVCTL_SESSION;
|
|
MUSB_DEV_MODE(musb);
|
|
}
|
|
musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
|
|
|
|
/*
|
|
* Devctl values will be updated after vbus goes below
|
|
* session_valid. The time taken depends on the capacitance
|
|
* on VBUS line. The max discharge time can be upto 1 sec
|
|
* as per the spec. Typically on our platform, it is 200ms
|
|
*/
|
|
if (!is_on)
|
|
mdelay(200);
|
|
|
|
dev_dbg(musb->controller, "VBUS %s, devctl %02x\n",
|
|
usb_otg_state_string(musb->xceiv->state),
|
|
musb_readb(musb->mregs, MUSB_DEVCTL));
|
|
}
|
|
|
|
static int musb_otg_notifications(struct notifier_block *nb,
|
|
unsigned long event, void *unused)
|
|
{
|
|
struct musb *musb = container_of(nb, struct musb, nb);
|
|
|
|
dev_dbg(musb->controller, "musb_otg_notifications %ld %s\n",
|
|
event, usb_otg_state_string(musb->xceiv->state));
|
|
|
|
switch (event) {
|
|
case UX500_MUSB_ID:
|
|
dev_dbg(musb->controller, "ID GND\n");
|
|
ux500_musb_set_vbus(musb, 1);
|
|
break;
|
|
case UX500_MUSB_VBUS:
|
|
dev_dbg(musb->controller, "VBUS Connect\n");
|
|
break;
|
|
case UX500_MUSB_NONE:
|
|
dev_dbg(musb->controller, "VBUS Disconnect\n");
|
|
if (is_host_active(musb))
|
|
ux500_musb_set_vbus(musb, 0);
|
|
else
|
|
musb->xceiv->state = OTG_STATE_B_IDLE;
|
|
break;
|
|
default:
|
|
dev_dbg(musb->controller, "ID float\n");
|
|
return NOTIFY_DONE;
|
|
}
|
|
return NOTIFY_OK;
|
|
}
|
|
|
|
static irqreturn_t ux500_musb_interrupt(int irq, void *__hci)
|
|
{
|
|
unsigned long flags;
|
|
irqreturn_t retval = IRQ_NONE;
|
|
struct musb *musb = __hci;
|
|
|
|
spin_lock_irqsave(&musb->lock, flags);
|
|
|
|
musb->int_usb = musb_readb(musb->mregs, MUSB_INTRUSB);
|
|
musb->int_tx = musb_readw(musb->mregs, MUSB_INTRTX);
|
|
musb->int_rx = musb_readw(musb->mregs, MUSB_INTRRX);
|
|
|
|
if (musb->int_usb || musb->int_tx || musb->int_rx)
|
|
retval = musb_interrupt(musb);
|
|
|
|
spin_unlock_irqrestore(&musb->lock, flags);
|
|
|
|
return retval;
|
|
}
|
|
|
|
static int ux500_musb_init(struct musb *musb)
|
|
{
|
|
int status;
|
|
|
|
musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
|
|
if (IS_ERR_OR_NULL(musb->xceiv)) {
|
|
pr_err("HS USB OTG: no transceiver configured\n");
|
|
return -EPROBE_DEFER;
|
|
}
|
|
|
|
musb->nb.notifier_call = musb_otg_notifications;
|
|
status = usb_register_notifier(musb->xceiv, &musb->nb);
|
|
if (status < 0) {
|
|
dev_dbg(musb->controller, "notification register failed\n");
|
|
return status;
|
|
}
|
|
|
|
musb->isr = ux500_musb_interrupt;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ux500_musb_exit(struct musb *musb)
|
|
{
|
|
usb_unregister_notifier(musb->xceiv, &musb->nb);
|
|
|
|
usb_put_phy(musb->xceiv);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct musb_platform_ops ux500_ops = {
|
|
.init = ux500_musb_init,
|
|
.exit = ux500_musb_exit,
|
|
|
|
.set_vbus = ux500_musb_set_vbus,
|
|
};
|
|
|
|
static struct musb_hdrc_platform_data *
|
|
ux500_of_probe(struct platform_device *pdev, struct device_node *np)
|
|
{
|
|
struct musb_hdrc_platform_data *pdata;
|
|
const char *mode;
|
|
int strlen;
|
|
|
|
pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
|
|
if (!pdata)
|
|
return NULL;
|
|
|
|
mode = of_get_property(np, "dr_mode", &strlen);
|
|
if (!mode) {
|
|
dev_err(&pdev->dev, "No 'dr_mode' property found\n");
|
|
return NULL;
|
|
}
|
|
|
|
if (strlen > 0) {
|
|
if (!strcmp(mode, "host"))
|
|
pdata->mode = MUSB_HOST;
|
|
if (!strcmp(mode, "otg"))
|
|
pdata->mode = MUSB_OTG;
|
|
if (!strcmp(mode, "peripheral"))
|
|
pdata->mode = MUSB_PERIPHERAL;
|
|
}
|
|
|
|
return pdata;
|
|
}
|
|
|
|
static int ux500_probe(struct platform_device *pdev)
|
|
{
|
|
struct resource musb_resources[2];
|
|
struct musb_hdrc_platform_data *pdata = dev_get_platdata(&pdev->dev);
|
|
struct device_node *np = pdev->dev.of_node;
|
|
struct platform_device *musb;
|
|
struct ux500_glue *glue;
|
|
struct clk *clk;
|
|
int ret = -ENOMEM;
|
|
|
|
if (!pdata) {
|
|
if (np) {
|
|
pdata = ux500_of_probe(pdev, np);
|
|
if (!pdata)
|
|
goto err0;
|
|
|
|
pdev->dev.platform_data = pdata;
|
|
} else {
|
|
dev_err(&pdev->dev, "no pdata or device tree found\n");
|
|
goto err0;
|
|
}
|
|
}
|
|
|
|
glue = kzalloc(sizeof(*glue), GFP_KERNEL);
|
|
if (!glue) {
|
|
dev_err(&pdev->dev, "failed to allocate glue context\n");
|
|
goto err0;
|
|
}
|
|
|
|
musb = platform_device_alloc("musb-hdrc", PLATFORM_DEVID_AUTO);
|
|
if (!musb) {
|
|
dev_err(&pdev->dev, "failed to allocate musb device\n");
|
|
goto err1;
|
|
}
|
|
|
|
clk = clk_get(&pdev->dev, NULL);
|
|
if (IS_ERR(clk)) {
|
|
dev_err(&pdev->dev, "failed to get clock\n");
|
|
ret = PTR_ERR(clk);
|
|
goto err3;
|
|
}
|
|
|
|
ret = clk_prepare_enable(clk);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "failed to enable clock\n");
|
|
goto err4;
|
|
}
|
|
|
|
musb->dev.parent = &pdev->dev;
|
|
musb->dev.dma_mask = &pdev->dev.coherent_dma_mask;
|
|
musb->dev.coherent_dma_mask = pdev->dev.coherent_dma_mask;
|
|
musb->dev.of_node = pdev->dev.of_node;
|
|
|
|
glue->dev = &pdev->dev;
|
|
glue->musb = musb;
|
|
glue->clk = clk;
|
|
|
|
pdata->platform_ops = &ux500_ops;
|
|
pdata->config = &ux500_musb_hdrc_config;
|
|
|
|
platform_set_drvdata(pdev, glue);
|
|
|
|
memset(musb_resources, 0x00, sizeof(*musb_resources) *
|
|
ARRAY_SIZE(musb_resources));
|
|
|
|
musb_resources[0].name = pdev->resource[0].name;
|
|
musb_resources[0].start = pdev->resource[0].start;
|
|
musb_resources[0].end = pdev->resource[0].end;
|
|
musb_resources[0].flags = pdev->resource[0].flags;
|
|
|
|
musb_resources[1].name = pdev->resource[1].name;
|
|
musb_resources[1].start = pdev->resource[1].start;
|
|
musb_resources[1].end = pdev->resource[1].end;
|
|
musb_resources[1].flags = pdev->resource[1].flags;
|
|
|
|
ret = platform_device_add_resources(musb, musb_resources,
|
|
ARRAY_SIZE(musb_resources));
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "failed to add resources\n");
|
|
goto err5;
|
|
}
|
|
|
|
ret = platform_device_add_data(musb, pdata, sizeof(*pdata));
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "failed to add platform_data\n");
|
|
goto err5;
|
|
}
|
|
|
|
ret = platform_device_add(musb);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "failed to register musb device\n");
|
|
goto err5;
|
|
}
|
|
|
|
return 0;
|
|
|
|
err5:
|
|
clk_disable_unprepare(clk);
|
|
|
|
err4:
|
|
clk_put(clk);
|
|
|
|
err3:
|
|
platform_device_put(musb);
|
|
|
|
err1:
|
|
kfree(glue);
|
|
|
|
err0:
|
|
return ret;
|
|
}
|
|
|
|
static int ux500_remove(struct platform_device *pdev)
|
|
{
|
|
struct ux500_glue *glue = platform_get_drvdata(pdev);
|
|
|
|
platform_device_unregister(glue->musb);
|
|
clk_disable_unprepare(glue->clk);
|
|
clk_put(glue->clk);
|
|
kfree(glue);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_PM
|
|
static int ux500_suspend(struct device *dev)
|
|
{
|
|
struct ux500_glue *glue = dev_get_drvdata(dev);
|
|
struct musb *musb = glue_to_musb(glue);
|
|
|
|
usb_phy_set_suspend(musb->xceiv, 1);
|
|
clk_disable_unprepare(glue->clk);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ux500_resume(struct device *dev)
|
|
{
|
|
struct ux500_glue *glue = dev_get_drvdata(dev);
|
|
struct musb *musb = glue_to_musb(glue);
|
|
int ret;
|
|
|
|
ret = clk_prepare_enable(glue->clk);
|
|
if (ret) {
|
|
dev_err(dev, "failed to enable clock\n");
|
|
return ret;
|
|
}
|
|
|
|
usb_phy_set_suspend(musb->xceiv, 0);
|
|
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
static SIMPLE_DEV_PM_OPS(ux500_pm_ops, ux500_suspend, ux500_resume);
|
|
|
|
static const struct of_device_id ux500_match[] = {
|
|
{ .compatible = "stericsson,db8500-musb", },
|
|
{}
|
|
};
|
|
|
|
static struct platform_driver ux500_driver = {
|
|
.probe = ux500_probe,
|
|
.remove = ux500_remove,
|
|
.driver = {
|
|
.name = "musb-ux500",
|
|
.pm = &ux500_pm_ops,
|
|
.of_match_table = ux500_match,
|
|
},
|
|
};
|
|
|
|
MODULE_DESCRIPTION("UX500 MUSB Glue Layer");
|
|
MODULE_AUTHOR("Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>");
|
|
MODULE_LICENSE("GPL v2");
|
|
module_platform_driver(ux500_driver);
|