mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
ARM: SoC fixes for 3.4-rc2
A bunch of fixes for regressions (and a few other problems) in 3.4-rc1: * Fix for regression of mach/io.h cleanup on platforms with PCI or PCMCIA (adding back the include file on those for now) * AT91 fixes for usb and spi * smsc911x ethernet fixes for i.MX * smsc911x fixes for OMAP * gpio fixes for Tegra * A handful of build error and warning fixes for various platforms * cpufreq kconfig dependencies, build and lowlevel debug fixes for Samsung platforms In other words, more or less the regular collection of -rc1/2 type material. A few of them, in particular the smsc911x for OMAP series, aren't technically regressions for 3.4, but they're valid fixes and we're still relatively early in the rc cycle so it seems appropriate to include them. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPfmp2AAoJEIwa5zzehBx31hAP/Rs3xdpOpwtPt0YKnvtg5/k7 FyZuhrhihPd2+hJKpzUVPmaal0TdyWgt2kGCl13JrwqWu7xV6VMDakrBPAl/jXwb 3NJU2zjfx+6YJMbgSxid2f/Gv36/p7bBusqGWiU92vOly0Tw4joqZ8ABoO4ti8mK O1eGbS6Rw5rpHy2u0UkgK3r9xCQxmSJQ1hCezOm7cWmwEhC5pmDe9qKO3Qdbp8tr XdIE3v0qSv5TuQdPedh8+3JsSx5mub+ZYKKqzWIrbQW5xrqawOKXl4nugrNnustr aDIoHpAoo4++qt0WJY2wg4/hHoPj2ibHzZqWhktmWj4leMttwTUFnHZm3wvZ55fA 0kp4x6pCsa7J1FhYhCpUVZUS/CcQv8wKBA7RGGUsl/0t52droqFwfYi/YhB6nCMo zDRHJm+hToZN1/HPiKsyFlM+pQ2nsE/AXs7V5ohf7/GE6w66A5TU/HHolHv3ERvU QoshX3zPtrAUQEe8WT4bG7HqXaNr/aa080ElYSdlVQ/HfGbIcKcSxzavUvZIZmx2 IYFF3SkpAhVtidcPzdnYJPjNF9c3Kr1w0QLUGgyRkrRp6OSPiPkksmI8gcjlf5l3 runmq36+ktqSz1KnNHBNnSF9aQ6drzCNQ7nqpPXeMaTrZ1jdXNcKTw9eLo/Kr3vB 4UHuqt8hfrcpiUYdXRQ1 =RVTD -----END PGP SIGNATURE----- Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull "ARM: SoC fixes: from Olof Johansson: "A bunch of fixes for regressions (and a few other problems) in 3.4-rc1: - Fix for regression of mach/io.h cleanup on platforms with PCI or PCMCIA (adding back the include file on those for now) - AT91 fixes for usb and spi - smsc911x ethernet fixes for i.MX - smsc911x fixes for OMAP - gpio fixes for Tegra - A handful of build error and warning fixes for various platforms - cpufreq kconfig dependencies, build and lowlevel debug fixes for Samsung platforms In other words, more or less the regular collection of -rc1/2 type material. A few of them, in particular the smsc911x for OMAP series, aren't technically regressions for 3.4, but they're valid fixes and we're still relatively early in the rc cycle so it seems appropriate to include them." * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (60 commits) ARM: fix __io macro for PCMCIA ARM: EXYNOS: Fix compiler warning in dma.c file ARM: EXYNOS: fix ISO C90 warning ARM: OMAP2+: hwmod: Fix wrong SYSC_TYPE1_XXX_MASK bit definitions ARM: OMAP2+: hwmod: Make omap_hwmod_softreset wait for reset status ARM: OMAP2+: hwmod: Restore sysc after a reset ARM: OMAP2+: omap_hwmod: Allow io_ring wakeup configuration for all modules ARM: OMAP3: clock data: fill in some missing clockdomains ARM: OMAP4: clock data: Force a DPLL clkdm/pwrdm ON before a relock ARM: OMAP4: clock data: fix mult and div mask for USB_DPLL ARM: OMAP2+: powerdomain: Wait for powerdomain transition in pwrdm_state_switch() gpio: tegra: Iterate over the correct number of banks gpio: tegra: fix register address calculations for Tegra30 EXYNOS: fix dependency for EXYNOS_CPUFREQ ARM: at91: dt: remove unit-address part for memory nodes ARM: at91: fix check of valid GPIO for SPI and USB USB: ehci-atmel: add needed of.h header file ARM: at91/NAND DT bindings: add comments ARM: at91/at91sam9x5.dtsi: fix NAND ale/cle in DT file USB: ohci-at91: trivial return code name change ...
This commit is contained in:
Linus Torvalds
commit
314489bd4c
71 changed files with 603 additions and 342 deletions
|
|
@ -13,6 +13,7 @@
|
|||
|
||||
#include <linux/clk.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_platform.h>
|
||||
|
||||
/* interface and function clocks */
|
||||
|
|
|
|||
|
|
@ -27,6 +27,10 @@
|
|||
#error "CONFIG_ARCH_AT91 must be defined."
|
||||
#endif
|
||||
|
||||
#define valid_port(index) ((index) >= 0 && (index) < AT91_MAX_USBH_PORTS)
|
||||
#define at91_for_each_port(index) \
|
||||
for ((index) = 0; (index) < AT91_MAX_USBH_PORTS; (index)++)
|
||||
|
||||
/* interface and function clocks; sometimes also an AHB clock */
|
||||
static struct clk *iclk, *fclk, *hclk;
|
||||
static int clocked;
|
||||
|
|
@ -240,26 +244,26 @@ ohci_at91_start (struct usb_hcd *hcd)
|
|||
|
||||
static void ohci_at91_usb_set_power(struct at91_usbh_data *pdata, int port, int enable)
|
||||
{
|
||||
if (port < 0 || port >= 2)
|
||||
if (!valid_port(port))
|
||||
return;
|
||||
|
||||
if (!gpio_is_valid(pdata->vbus_pin[port]))
|
||||
return;
|
||||
|
||||
gpio_set_value(pdata->vbus_pin[port],
|
||||
!pdata->vbus_pin_active_low[port] ^ enable);
|
||||
pdata->vbus_pin_active_low[port] ^ enable);
|
||||
}
|
||||
|
||||
static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port)
|
||||
{
|
||||
if (port < 0 || port >= 2)
|
||||
if (!valid_port(port))
|
||||
return -EINVAL;
|
||||
|
||||
if (!gpio_is_valid(pdata->vbus_pin[port]))
|
||||
return -EINVAL;
|
||||
|
||||
return gpio_get_value(pdata->vbus_pin[port]) ^
|
||||
!pdata->vbus_pin_active_low[port];
|
||||
pdata->vbus_pin_active_low[port];
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -271,9 +275,9 @@ static int ohci_at91_hub_status_data(struct usb_hcd *hcd, char *buf)
|
|||
int length = ohci_hub_status_data(hcd, buf);
|
||||
int port;
|
||||
|
||||
for (port = 0; port < ARRAY_SIZE(pdata->overcurrent_pin); port++) {
|
||||
at91_for_each_port(port) {
|
||||
if (pdata->overcurrent_changed[port]) {
|
||||
if (! length)
|
||||
if (!length)
|
||||
length = 1;
|
||||
buf[0] |= 1 << (port + 1);
|
||||
}
|
||||
|
|
@ -297,11 +301,17 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
|
|||
"ohci_at91_hub_control(%p,0x%04x,0x%04x,0x%04x,%p,%04x)\n",
|
||||
hcd, typeReq, wValue, wIndex, buf, wLength);
|
||||
|
||||
wIndex--;
|
||||
|
||||
switch (typeReq) {
|
||||
case SetPortFeature:
|
||||
if (wValue == USB_PORT_FEAT_POWER) {
|
||||
dev_dbg(hcd->self.controller, "SetPortFeat: POWER\n");
|
||||
ohci_at91_usb_set_power(pdata, wIndex - 1, 1);
|
||||
if (valid_port(wIndex)) {
|
||||
ohci_at91_usb_set_power(pdata, wIndex, 1);
|
||||
ret = 0;
|
||||
}
|
||||
|
||||
goto out;
|
||||
}
|
||||
break;
|
||||
|
|
@ -312,9 +322,9 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
|
|||
dev_dbg(hcd->self.controller,
|
||||
"ClearPortFeature: C_OVER_CURRENT\n");
|
||||
|
||||
if (wIndex == 1 || wIndex == 2) {
|
||||
pdata->overcurrent_changed[wIndex-1] = 0;
|
||||
pdata->overcurrent_status[wIndex-1] = 0;
|
||||
if (valid_port(wIndex)) {
|
||||
pdata->overcurrent_changed[wIndex] = 0;
|
||||
pdata->overcurrent_status[wIndex] = 0;
|
||||
}
|
||||
|
||||
goto out;
|
||||
|
|
@ -323,9 +333,8 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
|
|||
dev_dbg(hcd->self.controller,
|
||||
"ClearPortFeature: OVER_CURRENT\n");
|
||||
|
||||
if (wIndex == 1 || wIndex == 2) {
|
||||
pdata->overcurrent_status[wIndex-1] = 0;
|
||||
}
|
||||
if (valid_port(wIndex))
|
||||
pdata->overcurrent_status[wIndex] = 0;
|
||||
|
||||
goto out;
|
||||
|
||||
|
|
@ -333,15 +342,15 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
|
|||
dev_dbg(hcd->self.controller,
|
||||
"ClearPortFeature: POWER\n");
|
||||
|
||||
if (wIndex == 1 || wIndex == 2) {
|
||||
ohci_at91_usb_set_power(pdata, wIndex - 1, 0);
|
||||
if (valid_port(wIndex)) {
|
||||
ohci_at91_usb_set_power(pdata, wIndex, 0);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
ret = ohci_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength);
|
||||
ret = ohci_hub_control(hcd, typeReq, wValue, wIndex + 1, buf, wLength);
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
|
|
@ -377,18 +386,15 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
|
|||
|
||||
dev_dbg(hcd->self.controller, "GetPortStatus(%d)\n", wIndex);
|
||||
|
||||
if (wIndex == 1 || wIndex == 2) {
|
||||
if (! ohci_at91_usb_get_power(pdata, wIndex-1)) {
|
||||
if (valid_port(wIndex)) {
|
||||
if (!ohci_at91_usb_get_power(pdata, wIndex))
|
||||
*data &= ~cpu_to_le32(RH_PS_PPS);
|
||||
}
|
||||
|
||||
if (pdata->overcurrent_changed[wIndex-1]) {
|
||||
if (pdata->overcurrent_changed[wIndex])
|
||||
*data |= cpu_to_le32(RH_PS_OCIC);
|
||||
}
|
||||
|
||||
if (pdata->overcurrent_status[wIndex-1]) {
|
||||
if (pdata->overcurrent_status[wIndex])
|
||||
*data |= cpu_to_le32(RH_PS_POCI);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -450,14 +456,14 @@ static irqreturn_t ohci_hcd_at91_overcurrent_irq(int irq, void *data)
|
|||
|
||||
/* From the GPIO notifying the over-current situation, find
|
||||
* out the corresponding port */
|
||||
for (port = 0; port < ARRAY_SIZE(pdata->overcurrent_pin); port++) {
|
||||
at91_for_each_port(port) {
|
||||
if (gpio_to_irq(pdata->overcurrent_pin[port]) == irq) {
|
||||
gpio = pdata->overcurrent_pin[port];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (port == ARRAY_SIZE(pdata->overcurrent_pin)) {
|
||||
if (port == AT91_MAX_USBH_PORTS) {
|
||||
dev_err(& pdev->dev, "overcurrent interrupt from unknown GPIO\n");
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
|
@ -467,7 +473,7 @@ static irqreturn_t ohci_hcd_at91_overcurrent_irq(int irq, void *data)
|
|||
/* When notified of an over-current situation, disable power
|
||||
on the corresponding port, and mark this port in
|
||||
over-current. */
|
||||
if (! val) {
|
||||
if (!val) {
|
||||
ohci_at91_usb_set_power(pdata, port, 0);
|
||||
pdata->overcurrent_status[port] = 1;
|
||||
pdata->overcurrent_changed[port] = 1;
|
||||
|
|
@ -492,7 +498,7 @@ static u64 at91_ohci_dma_mask = DMA_BIT_MASK(32);
|
|||
static int __devinit ohci_at91_of_init(struct platform_device *pdev)
|
||||
{
|
||||
struct device_node *np = pdev->dev.of_node;
|
||||
int i, ret, gpio;
|
||||
int i, gpio;
|
||||
enum of_gpio_flags flags;
|
||||
struct at91_usbh_data *pdata;
|
||||
u32 ports;
|
||||
|
|
@ -514,48 +520,17 @@ static int __devinit ohci_at91_of_init(struct platform_device *pdev)
|
|||
if (!of_property_read_u32(np, "num-ports", &ports))
|
||||
pdata->ports = ports;
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
at91_for_each_port(i) {
|
||||
gpio = of_get_named_gpio_flags(np, "atmel,vbus-gpio", i, &flags);
|
||||
pdata->vbus_pin[i] = gpio;
|
||||
if (!gpio_is_valid(gpio))
|
||||
continue;
|
||||
pdata->vbus_pin_active_low[i] = flags & OF_GPIO_ACTIVE_LOW;
|
||||
ret = gpio_request(gpio, "ohci_vbus");
|
||||
if (ret) {
|
||||
dev_warn(&pdev->dev, "can't request vbus gpio %d", gpio);
|
||||
continue;
|
||||
}
|
||||
ret = gpio_direction_output(gpio, !(flags & OF_GPIO_ACTIVE_LOW) ^ 1);
|
||||
if (ret)
|
||||
dev_warn(&pdev->dev, "can't put vbus gpio %d as output %d",
|
||||
!(flags & OF_GPIO_ACTIVE_LOW) ^ 1, gpio);
|
||||
}
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
gpio = of_get_named_gpio_flags(np, "atmel,oc-gpio", i, &flags);
|
||||
pdata->overcurrent_pin[i] = gpio;
|
||||
if (!gpio_is_valid(gpio))
|
||||
continue;
|
||||
ret = gpio_request(gpio, "ohci_overcurrent");
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "can't request overcurrent gpio %d", gpio);
|
||||
continue;
|
||||
}
|
||||
|
||||
ret = gpio_direction_input(gpio);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "can't configure overcurrent gpio %d as input", gpio);
|
||||
continue;
|
||||
}
|
||||
|
||||
ret = request_irq(gpio_to_irq(gpio),
|
||||
ohci_hcd_at91_overcurrent_irq,
|
||||
IRQF_SHARED, "ohci_overcurrent", pdev);
|
||||
if (ret) {
|
||||
gpio_free(gpio);
|
||||
dev_warn(& pdev->dev, "cannot get GPIO IRQ for overcurrent\n");
|
||||
}
|
||||
}
|
||||
at91_for_each_port(i)
|
||||
pdata->overcurrent_pin[i] =
|
||||
of_get_named_gpio_flags(np, "atmel,oc-gpio", i, &flags);
|
||||
|
||||
pdev->dev.platform_data = pdata;
|
||||
|
||||
|
|
@ -574,35 +549,69 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
|
|||
{
|
||||
struct at91_usbh_data *pdata;
|
||||
int i;
|
||||
int gpio;
|
||||
int ret;
|
||||
|
||||
i = ohci_at91_of_init(pdev);
|
||||
|
||||
if (i)
|
||||
return i;
|
||||
ret = ohci_at91_of_init(pdev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
pdata = pdev->dev.platform_data;
|
||||
|
||||
if (pdata) {
|
||||
for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
|
||||
at91_for_each_port(i) {
|
||||
if (!gpio_is_valid(pdata->vbus_pin[i]))
|
||||
continue;
|
||||
gpio_request(pdata->vbus_pin[i], "ohci_vbus");
|
||||
gpio = pdata->vbus_pin[i];
|
||||
|
||||
ret = gpio_request(gpio, "ohci_vbus");
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev,
|
||||
"can't request vbus gpio %d\n", gpio);
|
||||
continue;
|
||||
}
|
||||
ret = gpio_direction_output(gpio,
|
||||
!pdata->vbus_pin_active_low[i]);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev,
|
||||
"can't put vbus gpio %d as output %d\n",
|
||||
gpio, !pdata->vbus_pin_active_low[i]);
|
||||
gpio_free(gpio);
|
||||
continue;
|
||||
}
|
||||
|
||||
ohci_at91_usb_set_power(pdata, i, 1);
|
||||
}
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(pdata->overcurrent_pin); i++) {
|
||||
int ret;
|
||||
|
||||
at91_for_each_port(i) {
|
||||
if (!gpio_is_valid(pdata->overcurrent_pin[i]))
|
||||
continue;
|
||||
gpio_request(pdata->overcurrent_pin[i], "ohci_overcurrent");
|
||||
gpio = pdata->overcurrent_pin[i];
|
||||
|
||||
ret = request_irq(gpio_to_irq(pdata->overcurrent_pin[i]),
|
||||
ret = gpio_request(gpio, "ohci_overcurrent");
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev,
|
||||
"can't request overcurrent gpio %d\n",
|
||||
gpio);
|
||||
continue;
|
||||
}
|
||||
|
||||
ret = gpio_direction_input(gpio);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev,
|
||||
"can't configure overcurrent gpio %d as input\n",
|
||||
gpio);
|
||||
gpio_free(gpio);
|
||||
continue;
|
||||
}
|
||||
|
||||
ret = request_irq(gpio_to_irq(gpio),
|
||||
ohci_hcd_at91_overcurrent_irq,
|
||||
IRQF_SHARED, "ohci_overcurrent", pdev);
|
||||
if (ret) {
|
||||
gpio_free(pdata->overcurrent_pin[i]);
|
||||
dev_warn(& pdev->dev, "cannot get GPIO IRQ for overcurrent\n");
|
||||
gpio_free(gpio);
|
||||
dev_err(&pdev->dev,
|
||||
"can't get gpio IRQ for overcurrent\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -617,14 +626,14 @@ static int ohci_hcd_at91_drv_remove(struct platform_device *pdev)
|
|||
int i;
|
||||
|
||||
if (pdata) {
|
||||
for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
|
||||
at91_for_each_port(i) {
|
||||
if (!gpio_is_valid(pdata->vbus_pin[i]))
|
||||
continue;
|
||||
ohci_at91_usb_set_power(pdata, i, 0);
|
||||
gpio_free(pdata->vbus_pin[i]);
|
||||
}
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(pdata->overcurrent_pin); i++) {
|
||||
at91_for_each_port(i) {
|
||||
if (!gpio_is_valid(pdata->overcurrent_pin[i]))
|
||||
continue;
|
||||
free_irq(gpio_to_irq(pdata->overcurrent_pin[i]), pdev);
|
||||
|
|
|
|||
Loading…
Reference in a new issue