linux-openmoko-2.6.32: fix usbhost patch

* no change in resulting source -> no PR change

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

2 files changed, 192 insertions, 192 deletions

diff --git a/recipes/linux/linux-openmoko-2.6.32/0003-usbhost.patch.patch b/recipes/linux/linux-openmoko-2.6.32/0003-usbhost.patch.patch
index 80b05eac18..57f16cc45e 100644
--- a/recipes/linux/linux-openmoko-2.6.32/0003-usbhost.patch.patch
+++ b/recipes/linux/linux-openmoko-2.6.32/0003-usbhost.patch.patch
@@ -1,4 +1,4 @@
-From 1000aee5e65dc824e02aafe2a70ad5b3f0d44d2d Mon Sep 17 00:00:00 2001
+From 826e24dffc09992103b12c2623ae64e30549475a Mon Sep 17 00:00:00 2001
 From: Radek Polak <psonek2@seznam.cz>
 Date: Fri, 9 Apr 2010 09:17:28 +0200
 Subject: [PATCH 03/14] usbhost.patch
@@ -14,10 +14,12 @@ echo host > /sys/devices/platform/s3c2410-ohci/usb_mode
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- arch/arm/mach-s3c2442/Makefile     |    1 +
- arch/arm/mach-s3c2442/mach-gta02.c |   50 ++++++++++++++++++++++++++++++++++-
- drivers/usb/host/ohci-s3c2410.c    |   48 ++++++++++++++++++++++++++++++++++
- 3 files changed, 97 insertions(+), 2 deletions(-)
+ arch/arm/mach-s3c2442/Makefile           |    1 +
+ arch/arm/mach-s3c2442/gta02-pm-usbhost.c |  174 ++++++++++++++++++++++++++++++
+ arch/arm/mach-s3c2442/mach-gta02.c       |   50 ++++++++-
+ drivers/usb/host/ohci-s3c2410.c          |   48 ++++++++
+ 4 files changed, 271 insertions(+), 2 deletions(-)
+ create mode 100644 arch/arm/mach-s3c2442/gta02-pm-usbhost.c
 
 diff --git a/arch/arm/mach-s3c2442/Makefile b/arch/arm/mach-s3c2442/Makefile
 index 6247ca0..3e7145c 100644
@@ -31,6 +33,186 @@ index 6247ca0..3e7145c 100644
  	gta02-pm-wlan.o
  # Machine support
  
+diff --git a/arch/arm/mach-s3c2442/gta02-pm-usbhost.c b/arch/arm/mach-s3c2442/gta02-pm-usbhost.c
+new file mode 100644
+index 0000000..233340a
+--- /dev/null
++++ b/arch/arm/mach-s3c2442/gta02-pm-usbhost.c
+@@ -0,0 +1,174 @@
++/*
++ * USBHOST Management code for the Openmoko Freerunner GSM Phone
++ *
++ * (C) 2007 by Openmoko Inc.
++ * Author: Harald Welte <laforge@openmoko.org>
++ * All rights reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/platform_device.h>
++#include <linux/console.h>
++#include <linux/errno.h>
++#include <linux/interrupt.h>
++#include <linux/delay.h>
++#include <linux/err.h>
++#include <linux/regulator/consumer.h>
++
++#include <mach/gpio.h>
++#include <asm/mach-types.h>
++
++#include <mach/hardware.h>
++
++#include <mach/gta02.h>
++#include <mach/regs-gpio.h>
++#include <mach/regs-gpioj.h>
++
++static struct regulator *gta02_usbhost_regulator;
++
++static ssize_t usbhost_read(struct device *dev, struct device_attribute *attr,
++			char *buf)
++{
++	if (!strcmp(attr->attr.name, "power_on")) {
++		if (regulator_is_enabled(gta02_usbhost_regulator))
++			goto out_1;
++	}
++
++	return strlcpy(buf, "0\n", 3);
++out_1:
++	return strlcpy(buf, "1\n", 3);
++}
++
++static void usbhost_on_off(struct device *dev, int on)
++{
++
++	on = !!on;
++
++	if (on == regulator_is_enabled(gta02_usbhost_regulator))
++		return;
++
++	if (!on) {
++		regulator_disable(gta02_usbhost_regulator);
++		return;
++	}
++
++	regulator_enable(gta02_usbhost_regulator);
++}
++
++static ssize_t usbhost_write(struct device *dev, struct device_attribute *attr,
++			 const char *buf, size_t count)
++{
++	unsigned long on = simple_strtoul(buf, NULL, 10);
++
++	if (!strcmp(attr->attr.name, "power_on")) {
++		usbhost_on_off(dev, on);
++
++		return count;
++	}
++
++	return count;
++}
++
++static DEVICE_ATTR(power_on, 0644, usbhost_read, usbhost_write);
++
++#ifdef CONFIG_PM
++
++static int gta02_usbhost_suspend(struct device *dev)
++{
++	return 0;
++}
++
++static int gta02_usbhost_suspend_late(struct device *dev)
++{
++	return 0;
++}
++
++static int gta02_usbhost_resume(struct device *dev)
++{
++	return 0;
++}
++
++static struct dev_pm_ops gta02_usbhost_pm_ops = {
++	.suspend	= gta02_usbhost_suspend,
++	.suspend_noirq	= gta02_usbhost_suspend_late,
++	.resume		= gta02_usbhost_resume,
++};
++
++#define GTA02_USBHOST_PM_OPS (&gta02_usbhost_pm_ops)
++
++#else
++#define GTA02_USBHOST_PM_OPS NULL
++#endif /* CONFIG_PM */
++
++static struct attribute *gta02_usbhost_sysfs_entries[] = {
++	&dev_attr_power_on.attr,
++	NULL
++};
++
++static struct attribute_group gta02_usbhost_attr_group = {
++	.name	= NULL,
++	.attrs	= gta02_usbhost_sysfs_entries,
++};
++
++static int __init gta02_usbhost_probe(struct platform_device *pdev)
++{
++	int ret;
++
++	gta02_usbhost_regulator = regulator_get_exclusive(&pdev->dev, "USBHOST");
++
++	if (IS_ERR(gta02_usbhost_regulator)) {
++		ret = PTR_ERR(gta02_usbhost_regulator);
++		dev_err(&pdev->dev, "Failed to get regulator: %d\n", ret);
++		return ret;
++	}
++
++	ret = sysfs_create_group(&pdev->dev.kobj, &gta02_usbhost_attr_group);
++	if (ret) {
++		dev_err(&pdev->dev, "Failed to create sysfs entries: %d\n", ret);
++		return ret;
++	}
++
++	return 0;
++}
++
++static int gta02_usbhost_remove(struct platform_device *pdev)
++{
++	usbhost_on_off(&pdev->dev, 0);
++
++	sysfs_remove_group(&pdev->dev.kobj, &gta02_usbhost_attr_group);
++	regulator_put(gta02_usbhost_regulator);
++
++	return 0;
++}
++
++static struct platform_driver gta02_usbhost_driver = {
++	.probe		= gta02_usbhost_probe,
++	.remove		= gta02_usbhost_remove,
++	.driver		= {
++		.name	= "gta02-pm-usbhost",
++		.pm	= GTA02_USBHOST_PM_OPS,
++	},
++};
++
++static int __devinit gta02_usbhost_init(void)
++{
++	return platform_driver_register(&gta02_usbhost_driver);
++}
++module_init(gta02_usbhost_init);
++
++static void gta02_usbhost_exit(void)
++{
++	platform_driver_unregister(&gta02_usbhost_driver);
++}
++module_exit(gta02_usbhost_exit);
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
++MODULE_DESCRIPTION("Openmoko Freerunner USBHOST Power Management");
 diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
 index 0675181..779d6df 100644
 --- a/arch/arm/mach-s3c2442/mach-gta02.c
@@ -229,5 +411,5 @@ index a68af2d..02bd7b0 100644
  	s3c2410_stop_hc(dev);
  	iounmap(hcd->regs);
 -- 
-1.7.1
+1.7.2.2
 
diff --git a/recipes/linux/linux-openmoko-2.6.32/0004-ar6000_delay.patch.patch b/recipes/linux/linux-openmoko-2.6.32/0004-ar6000_delay.patch.patch
index 104a8c8951..88b72da8b1 100644
--- a/recipes/linux/linux-openmoko-2.6.32/0004-ar6000_delay.patch.patch
+++ b/recipes/linux/linux-openmoko-2.6.32/0004-ar6000_delay.patch.patch
@@ -1,4 +1,4 @@
-From c9580261d79d8d1664fbd2da52dcd2148da9ef14 Mon Sep 17 00:00:00 2001
+From 32bc8d519a822c43597bb10c061688bcb5e67a5a Mon Sep 17 00:00:00 2001
 From: Radek Polak <psonek2@seznam.cz>
 Date: Fri, 9 Apr 2010 09:18:02 +0200
 Subject: [PATCH 04/14] ar6000_delay.patch
@@ -8,191 +8,9 @@ patch from https://docs.openmoko.org/trac/ticket/2327 - wifi is working good
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- arch/arm/mach-s3c2442/gta02-pm-usbhost.c |  174 ++++++++++++++++++++++++++++++
- drivers/ar6000/hif/hif2.c                |    2 +
- 2 files changed, 176 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/mach-s3c2442/gta02-pm-usbhost.c
+ drivers/ar6000/hif/hif2.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
 
-diff --git a/arch/arm/mach-s3c2442/gta02-pm-usbhost.c b/arch/arm/mach-s3c2442/gta02-pm-usbhost.c
-new file mode 100644
-index 0000000..233340a
---- /dev/null
-+++ b/arch/arm/mach-s3c2442/gta02-pm-usbhost.c
-@@ -0,0 +1,174 @@
-+/*
-+ * USBHOST Management code for the Openmoko Freerunner GSM Phone
-+ *
-+ * (C) 2007 by Openmoko Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+#include <linux/console.h>
-+#include <linux/errno.h>
-+#include <linux/interrupt.h>
-+#include <linux/delay.h>
-+#include <linux/err.h>
-+#include <linux/regulator/consumer.h>
-+
-+#include <mach/gpio.h>
-+#include <asm/mach-types.h>
-+
-+#include <mach/hardware.h>
-+
-+#include <mach/gta02.h>
-+#include <mach/regs-gpio.h>
-+#include <mach/regs-gpioj.h>
-+
-+static struct regulator *gta02_usbhost_regulator;
-+
-+static ssize_t usbhost_read(struct device *dev, struct device_attribute *attr,
-+			char *buf)
-+{
-+	if (!strcmp(attr->attr.name, "power_on")) {
-+		if (regulator_is_enabled(gta02_usbhost_regulator))
-+			goto out_1;
-+	}
-+
-+	return strlcpy(buf, "0\n", 3);
-+out_1:
-+	return strlcpy(buf, "1\n", 3);
-+}
-+
-+static void usbhost_on_off(struct device *dev, int on)
-+{
-+
-+	on = !!on;
-+
-+	if (on == regulator_is_enabled(gta02_usbhost_regulator))
-+		return;
-+
-+	if (!on) {
-+		regulator_disable(gta02_usbhost_regulator);
-+		return;
-+	}
-+
-+	regulator_enable(gta02_usbhost_regulator);
-+}
-+
-+static ssize_t usbhost_write(struct device *dev, struct device_attribute *attr,
-+			 const char *buf, size_t count)
-+{
-+	unsigned long on = simple_strtoul(buf, NULL, 10);
-+
-+	if (!strcmp(attr->attr.name, "power_on")) {
-+		usbhost_on_off(dev, on);
-+
-+		return count;
-+	}
-+
-+	return count;
-+}
-+
-+static DEVICE_ATTR(power_on, 0644, usbhost_read, usbhost_write);
-+
-+#ifdef CONFIG_PM
-+
-+static int gta02_usbhost_suspend(struct device *dev)
-+{
-+	return 0;
-+}
-+
-+static int gta02_usbhost_suspend_late(struct device *dev)
-+{
-+	return 0;
-+}
-+
-+static int gta02_usbhost_resume(struct device *dev)
-+{
-+	return 0;
-+}
-+
-+static struct dev_pm_ops gta02_usbhost_pm_ops = {
-+	.suspend	= gta02_usbhost_suspend,
-+	.suspend_noirq	= gta02_usbhost_suspend_late,
-+	.resume		= gta02_usbhost_resume,
-+};
-+
-+#define GTA02_USBHOST_PM_OPS (&gta02_usbhost_pm_ops)
-+
-+#else
-+#define GTA02_USBHOST_PM_OPS NULL
-+#endif /* CONFIG_PM */
-+
-+static struct attribute *gta02_usbhost_sysfs_entries[] = {
-+	&dev_attr_power_on.attr,
-+	NULL
-+};
-+
-+static struct attribute_group gta02_usbhost_attr_group = {
-+	.name	= NULL,
-+	.attrs	= gta02_usbhost_sysfs_entries,
-+};
-+
-+static int __init gta02_usbhost_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+
-+	gta02_usbhost_regulator = regulator_get_exclusive(&pdev->dev, "USBHOST");
-+
-+	if (IS_ERR(gta02_usbhost_regulator)) {
-+		ret = PTR_ERR(gta02_usbhost_regulator);
-+		dev_err(&pdev->dev, "Failed to get regulator: %d\n", ret);
-+		return ret;
-+	}
-+
-+	ret = sysfs_create_group(&pdev->dev.kobj, &gta02_usbhost_attr_group);
-+	if (ret) {
-+		dev_err(&pdev->dev, "Failed to create sysfs entries: %d\n", ret);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int gta02_usbhost_remove(struct platform_device *pdev)
-+{
-+	usbhost_on_off(&pdev->dev, 0);
-+
-+	sysfs_remove_group(&pdev->dev.kobj, &gta02_usbhost_attr_group);
-+	regulator_put(gta02_usbhost_regulator);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver gta02_usbhost_driver = {
-+	.probe		= gta02_usbhost_probe,
-+	.remove		= gta02_usbhost_remove,
-+	.driver		= {
-+		.name	= "gta02-pm-usbhost",
-+		.pm	= GTA02_USBHOST_PM_OPS,
-+	},
-+};
-+
-+static int __devinit gta02_usbhost_init(void)
-+{
-+	return platform_driver_register(&gta02_usbhost_driver);
-+}
-+module_init(gta02_usbhost_init);
-+
-+static void gta02_usbhost_exit(void)
-+{
-+	platform_driver_unregister(&gta02_usbhost_driver);
-+}
-+module_exit(gta02_usbhost_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION("Openmoko Freerunner USBHOST Power Management");
 diff --git a/drivers/ar6000/hif/hif2.c b/drivers/ar6000/hif/hif2.c
 index 386d96e..90178d0 100644
 --- a/drivers/ar6000/hif/hif2.c
@@ -207,5 +25,5 @@ index 386d96e..90178d0 100644
  	if (ret == A_OK)
  		return 0;
 -- 
-1.7.1
+1.7.2.2