clk: rockchip: rk3288: fix up the clk register for hclk_vio

[firefly-linux-kernel-4.4.55.git] / drivers / usb / gadget / configfs.c

diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index 8c527eb2289c832eaee1dc44eb0500b9ff3f8207..54849fe9cb01ed8c6b64ebfc3c3e08edd243af89 100644 (file)
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -13,7 +13,6 @@
 #include <linux/platform_device.h>
 #include <linux/kdev_t.h>
 #include <linux/usb/ch9.h>
-#include "u_fs.h"
 
 #ifdef CONFIG_USB_CONFIGFS_F_ACC
 extern int acc_ctrlrequest(struct usb_composite_dev *cdev,
@@ -21,6 +20,18 @@ extern int acc_ctrlrequest(struct usb_composite_dev *cdev,
 void acc_disconnect(void);
 #endif
 static struct class *android_class;
+static struct device *android_device;
+static int index;
+
+struct device *create_function_device(char *name)
+{
+       if (android_device && !IS_ERR(android_device))
+               return device_create(android_class, android_device,
+                       MKDEV(0, index++), NULL, name);
+       else
+               return ERR_PTR(-EINVAL);
+}
+EXPORT_SYMBOL_GPL(create_function_device);
 #endif
 
 int check_user_usb_string(const char *name,
@@ -1420,19 +1431,22 @@ static void android_work(struct work_struct *data)
        spin_unlock_irqrestore(&cdev->lock, flags);
 
        if (status[0]) {
-               kobject_uevent_env(&gi->dev->kobj, KOBJ_CHANGE, connected);
+               kobject_uevent_env(&android_device->kobj,
+                                       KOBJ_CHANGE, connected);
                pr_info("%s: sent uevent %s\n", __func__, connected[0]);
                uevent_sent = true;
        }
 
        if (status[1]) {
-               kobject_uevent_env(&gi->dev->kobj, KOBJ_CHANGE, configured);
+               kobject_uevent_env(&android_device->kobj,
+                                       KOBJ_CHANGE, configured);
                pr_info("%s: sent uevent %s\n", __func__, configured[0]);
                uevent_sent = true;
        }
 
        if (status[2]) {
-               kobject_uevent_env(&gi->dev->kobj, KOBJ_CHANGE, disconnected);
+               kobject_uevent_env(&android_device->kobj,
+                                       KOBJ_CHANGE, disconnected);
                pr_info("%s: sent uevent %s\n", __func__, disconnected[0]);
                uevent_sent = true;
        }
@@ -1529,6 +1543,7 @@ static const struct usb_gadget_driver configfs_driver_template = {
        .unbind         = configfs_composite_unbind,
 #ifdef CONFIG_USB_CONFIGFS_UEVENT
        .setup          = android_setup,
+       .reset          = android_disconnect,
        .disconnect     = android_disconnect,
 #else
        .setup          = composite_setup,
@@ -1545,6 +1560,89 @@ static const struct usb_gadget_driver configfs_driver_template = {
        },
 };
 
+#ifdef CONFIG_USB_CONFIGFS_UEVENT
+static ssize_t state_show(struct device *pdev, struct device_attribute *attr,
+                       char *buf)
+{
+       struct gadget_info *dev = dev_get_drvdata(pdev);
+       struct usb_composite_dev *cdev;
+       char *state = "DISCONNECTED";
+       unsigned long flags;
+
+       if (!dev)
+               goto out;
+
+       cdev = &dev->cdev;
+
+       if (!cdev)
+               goto out;
+
+       spin_lock_irqsave(&cdev->lock, flags);
+       if (cdev->config)
+               state = "CONFIGURED";
+       else if (dev->connected)
+               state = "CONNECTED";
+       spin_unlock_irqrestore(&cdev->lock, flags);
+out:
+       return sprintf(buf, "%s\n", state);
+}
+
+static DEVICE_ATTR(state, S_IRUGO, state_show, NULL);
+
+static struct device_attribute *android_usb_attributes[] = {
+       &dev_attr_state,
+       NULL
+};
+
+static int android_device_create(struct gadget_info *gi)
+{
+       struct device_attribute **attrs;
+       struct device_attribute *attr;
+
+       INIT_WORK(&gi->work, android_work);
+       android_device = device_create(android_class, NULL,
+                               MKDEV(0, 0), NULL, "android0");
+       if (IS_ERR(android_device))
+               return PTR_ERR(android_device);
+
+       dev_set_drvdata(android_device, gi);
+
+       attrs = android_usb_attributes;
+       while ((attr = *attrs++)) {
+               int err;
+
+               err = device_create_file(android_device, attr);
+               if (err) {
+                       device_destroy(android_device->class,
+                                      android_device->devt);
+                       return err;
+               }
+       }
+
+       return 0;
+}
+
+static void android_device_destroy(void)
+{
+       struct device_attribute **attrs;
+       struct device_attribute *attr;
+
+       attrs = android_usb_attributes;
+       while ((attr = *attrs++))
+               device_remove_file(android_device, attr);
+       device_destroy(android_device->class, android_device->devt);
+}
+#else
+static inline int android_device_create(struct gadget_info *gi)
+{
+       return 0;
+}
+
+static inline void android_device_destroy(void)
+{
+}
+#endif
+
 static struct config_group *gadgets_make(
                struct config_group *group,
                const char *name)
@@ -1554,7 +1652,6 @@ static struct config_group *gadgets_make(
        gi = kzalloc(sizeof(*gi), GFP_KERNEL);
        if (!gi)
                return ERR_PTR(-ENOMEM);
-
        gi->group.default_groups = gi->default_groups;
        gi->group.default_groups[0] = &gi->functions_group;
        gi->group.default_groups[1] = &gi->configs_group;
@@ -1590,18 +1687,16 @@ static struct config_group *gadgets_make(
        gi->composite.gadget_driver.function = kstrdup(name, GFP_KERNEL);
        gi->composite.name = gi->composite.gadget_driver.function;
 
-#ifdef CONFIG_USB_CONFIGFS_UEVENT
-       INIT_WORK(&gi->work, android_work);
-       gi->dev = device_create(android_class, NULL,
-                               MKDEV(0, 0), NULL, "android0");
-#endif
-
        if (!gi->composite.gadget_driver.function)
                goto err;
 
+       if (android_device_create(gi) < 0)
+               goto err;
+
        config_group_init_type_name(&gi->group, name,
                                &gadget_root_type);
        return &gi->group;
+
 err:
        kfree(gi);
        return ERR_PTR(-ENOMEM);
@@ -1610,6 +1705,7 @@ err:
 static void gadgets_drop(struct config_group *group, struct config_item *item)
 {
        config_item_put(item);
+       android_device_destroy();
 }
 
 static struct configfs_group_operations gadgets_ops = {
@@ -1636,7 +1732,9 @@ void unregister_gadget_item(struct config_item *item)
 {
        struct gadget_info *gi = to_gadget_info(item);
 
+       mutex_lock(&gi->lock);
        unregister_gadget(gi);
+       mutex_unlock(&gi->lock);
 }
 EXPORT_SYMBOL_GPL(unregister_gadget_item);
 
@@ -1661,5 +1759,10 @@ module_init(gadget_cfs_init);
 static void __exit gadget_cfs_exit(void)
 {
        configfs_unregister_subsystem(&gadget_subsys);
+#ifdef CONFIG_USB_CONFIGFS_UEVENT
+       if (!IS_ERR(android_class))
+               class_destroy(android_class);
+#endif
+
 }
 module_exit(gadget_cfs_exit);