Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd

Conflicts:
	drivers/mtd/nand/nand_base.c

1 files changed, 12 insertions, 461 deletions

diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index 53710fadc82d..c54d2f620ce3 100644
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -36,463 +36,15 @@
 static int num_managers;
 static struct omap_overlay_manager *managers;
 
-static ssize_t manager_name_show(struct omap_overlay_manager *mgr, char *buf)
+static inline struct omap_dss_device *dss_mgr_get_device(struct omap_overlay_manager *mgr)
 {
-        return snprintf(buf, PAGE_SIZE, "%s\n", mgr->name);
+        return mgr->output ? mgr->output->device : NULL;
 }
 
-static ssize_t manager_display_show(struct omap_overlay_manager *mgr, char *buf)
-{
-        return snprintf(buf, PAGE_SIZE, "%s\n",
-                        mgr->device ? mgr->device->name : "<none>");
-}
-
-static ssize_t manager_display_store(struct omap_overlay_manager *mgr,
-                const char *buf, size_t size)
-{
-        int r = 0;
-        size_t len = size;
-        struct omap_dss_device *dssdev = NULL;
-
-        int match(struct omap_dss_device *dssdev, void *data)
-        {
-                const char *str = data;
-                return sysfs_streq(dssdev->name, str);
-        }
-
-        if (buf[size-1] == '\n')
-                --len;
-
-        if (len > 0)
-                dssdev = omap_dss_find_device((void *)buf, match);
-
-        if (len > 0 && dssdev == NULL)
-                return -EINVAL;
-
-        if (dssdev)
-                DSSDBG("display %s found\n", dssdev->name);
-
-        if (mgr->device) {
-                r = mgr->unset_device(mgr);
-                if (r) {
-                        DSSERR("failed to unset display\n");
-                        goto put_device;
-                }
-        }
-
-        if (dssdev) {
-                r = mgr->set_device(mgr, dssdev);
-                if (r) {
-                        DSSERR("failed to set manager\n");
-                        goto put_device;
-                }
-
-                r = mgr->apply(mgr);
-                if (r) {
-                        DSSERR("failed to apply dispc config\n");
-                        goto put_device;
-                }
-        }
-
-put_device:
-        if (dssdev)
-                omap_dss_put_device(dssdev);
-
-        return r ? r : size;
-}
-
-static ssize_t manager_default_color_show(struct omap_overlay_manager *mgr,
-                                          char *buf)
-{
-        struct omap_overlay_manager_info info;
-
-        mgr->get_manager_info(mgr, &info);
-
-        return snprintf(buf, PAGE_SIZE, "%#x\n", info.default_color);
-}
-
-static ssize_t manager_default_color_store(struct omap_overlay_manager *mgr,
-                                           const char *buf, size_t size)
-{
-        struct omap_overlay_manager_info info;
-        u32 color;
-        int r;
-
-        r = kstrtouint(buf, 0, &color);
-        if (r)
-                return r;
-
-        mgr->get_manager_info(mgr, &info);
-
-        info.default_color = color;
-
-        r = mgr->set_manager_info(mgr, &info);
-        if (r)
-                return r;
-
-        r = mgr->apply(mgr);
-        if (r)
-                return r;
-
-        return size;
-}
-
-static const char *trans_key_type_str[] = {
-        "gfx-destination",
-        "video-source",
-};
-
-static ssize_t manager_trans_key_type_show(struct omap_overlay_manager *mgr,
-                                           char *buf)
-{
-        enum omap_dss_trans_key_type key_type;
-        struct omap_overlay_manager_info info;
-
-        mgr->get_manager_info(mgr, &info);
-
-        key_type = info.trans_key_type;
-        BUG_ON(key_type >= ARRAY_SIZE(trans_key_type_str));
-
-        return snprintf(buf, PAGE_SIZE, "%s\n", trans_key_type_str[key_type]);
-}
-
-static ssize_t manager_trans_key_type_store(struct omap_overlay_manager *mgr,
-                                            const char *buf, size_t size)
-{
-        enum omap_dss_trans_key_type key_type;
-        struct omap_overlay_manager_info info;
-        int r;
-
-        for (key_type = OMAP_DSS_COLOR_KEY_GFX_DST;
-                        key_type < ARRAY_SIZE(trans_key_type_str); key_type++) {
-                if (sysfs_streq(buf, trans_key_type_str[key_type]))
-                        break;
-        }
-
-        if (key_type == ARRAY_SIZE(trans_key_type_str))
-                return -EINVAL;
-
-        mgr->get_manager_info(mgr, &info);
-
-        info.trans_key_type = key_type;
-
-        r = mgr->set_manager_info(mgr, &info);
-        if (r)
-                return r;
-
-        r = mgr->apply(mgr);
-        if (r)
-                return r;
-
-        return size;
-}
-
-static ssize_t manager_trans_key_value_show(struct omap_overlay_manager *mgr,
-                                            char *buf)
-{
-        struct omap_overlay_manager_info info;
-
-        mgr->get_manager_info(mgr, &info);
-
-        return snprintf(buf, PAGE_SIZE, "%#x\n", info.trans_key);
-}
-
-static ssize_t manager_trans_key_value_store(struct omap_overlay_manager *mgr,
-                                             const char *buf, size_t size)
-{
-        struct omap_overlay_manager_info info;
-        u32 key_value;
-        int r;
-
-        r = kstrtouint(buf, 0, &key_value);
-        if (r)
-                return r;
-
-        mgr->get_manager_info(mgr, &info);
-
-        info.trans_key = key_value;
-
-        r = mgr->set_manager_info(mgr, &info);
-        if (r)
-                return r;
-
-        r = mgr->apply(mgr);
-        if (r)
-                return r;
-
-        return size;
-}
-
-static ssize_t manager_trans_key_enabled_show(struct omap_overlay_manager *mgr,
-                                              char *buf)
-{
-        struct omap_overlay_manager_info info;
-
-        mgr->get_manager_info(mgr, &info);
-
-        return snprintf(buf, PAGE_SIZE, "%d\n", info.trans_enabled);
-}
-
-static ssize_t manager_trans_key_enabled_store(struct omap_overlay_manager *mgr,
-                                               const char *buf, size_t size)
-{
-        struct omap_overlay_manager_info info;
-        bool enable;
-        int r;
-
-        r = strtobool(buf, &enable);
-        if (r)
-                return r;
-
-        mgr->get_manager_info(mgr, &info);
-
-        info.trans_enabled = enable;
-
-        r = mgr->set_manager_info(mgr, &info);
-        if (r)
-                return r;
-
-        r = mgr->apply(mgr);
-        if (r)
-                return r;
-
-        return size;
-}
-
-static ssize_t manager_alpha_blending_enabled_show(
-                struct omap_overlay_manager *mgr, char *buf)
-{
-        struct omap_overlay_manager_info info;
-
-        mgr->get_manager_info(mgr, &info);
-
-        WARN_ON(!dss_has_feature(FEAT_ALPHA_FIXED_ZORDER));
-
-        return snprintf(buf, PAGE_SIZE, "%d\n",
-                info.partial_alpha_enabled);
-}
-
-static ssize_t manager_alpha_blending_enabled_store(
-                struct omap_overlay_manager *mgr,
-                const char *buf, size_t size)
-{
-        struct omap_overlay_manager_info info;
-        bool enable;
-        int r;
-
-        WARN_ON(!dss_has_feature(FEAT_ALPHA_FIXED_ZORDER));
-
-        r = strtobool(buf, &enable);
-        if (r)
-                return r;
-
-        mgr->get_manager_info(mgr, &info);
-
-        info.partial_alpha_enabled = enable;
-
-        r = mgr->set_manager_info(mgr, &info);
-        if (r)
-                return r;
-
-        r = mgr->apply(mgr);
-        if (r)
-                return r;
-
-        return size;
-}
-
-static ssize_t manager_cpr_enable_show(struct omap_overlay_manager *mgr,
-                char *buf)
-{
-        struct omap_overlay_manager_info info;
-
-        mgr->get_manager_info(mgr, &info);
-
-        return snprintf(buf, PAGE_SIZE, "%d\n", info.cpr_enable);
-}
-
-static ssize_t manager_cpr_enable_store(struct omap_overlay_manager *mgr,
-                const char *buf, size_t size)
-{
-        struct omap_overlay_manager_info info;
-        int r;
-        bool enable;
-
-        if (!dss_has_feature(FEAT_CPR))
-                return -ENODEV;
-
-        r = strtobool(buf, &enable);
-        if (r)
-                return r;
-
-        mgr->get_manager_info(mgr, &info);
-
-        if (info.cpr_enable == enable)
-                return size;
-
-        info.cpr_enable = enable;
-
-        r = mgr->set_manager_info(mgr, &info);
-        if (r)
-                return r;
-
-        r = mgr->apply(mgr);
-        if (r)
-                return r;
-
-        return size;
-}
-
-static ssize_t manager_cpr_coef_show(struct omap_overlay_manager *mgr,
-                char *buf)
-{
-        struct omap_overlay_manager_info info;
-
-        mgr->get_manager_info(mgr, &info);
-
-        return snprintf(buf, PAGE_SIZE,
-                        "%d %d %d %d %d %d %d %d %d\n",
-                        info.cpr_coefs.rr,
-                        info.cpr_coefs.rg,
-                        info.cpr_coefs.rb,
-                        info.cpr_coefs.gr,
-                        info.cpr_coefs.gg,
-                        info.cpr_coefs.gb,
-                        info.cpr_coefs.br,
-                        info.cpr_coefs.bg,
-                        info.cpr_coefs.bb);
-}
-
-static ssize_t manager_cpr_coef_store(struct omap_overlay_manager *mgr,
-                const char *buf, size_t size)
-{
-        struct omap_overlay_manager_info info;
-        struct omap_dss_cpr_coefs coefs;
-        int r, i;
-        s16 *arr;
-
-        if (!dss_has_feature(FEAT_CPR))
-                return -ENODEV;
-
-        if (sscanf(buf, "%hd %hd %hd %hd %hd %hd %hd %hd %hd",
-                                &coefs.rr, &coefs.rg, &coefs.rb,
-                                &coefs.gr, &coefs.gg, &coefs.gb,
-                                &coefs.br, &coefs.bg, &coefs.bb) != 9)
-                return -EINVAL;
-
-        arr = (s16[]){ coefs.rr, coefs.rg, coefs.rb,
-                coefs.gr, coefs.gg, coefs.gb,
-                coefs.br, coefs.bg, coefs.bb };
-
-        for (i = 0; i < 9; ++i) {
-                if (arr[i] < -512 || arr[i] > 511)
-                        return -EINVAL;
-        }
-
-        mgr->get_manager_info(mgr, &info);
-
-        info.cpr_coefs = coefs;
-
-        r = mgr->set_manager_info(mgr, &info);
-        if (r)
-                return r;
-
-        r = mgr->apply(mgr);
-        if (r)
-                return r;
-
-        return size;
-}
-
-struct manager_attribute {
-        struct attribute attr;
-        ssize_t (*show)(struct omap_overlay_manager *, char *);
-        ssize_t (*store)(struct omap_overlay_manager *, const char *, size_t);
-};
-
-#define MANAGER_ATTR(_name, _mode, _show, _store) \
-        struct manager_attribute manager_attr_##_name = \
-        __ATTR(_name, _mode, _show, _store)
-
-static MANAGER_ATTR(name, S_IRUGO, manager_name_show, NULL);
-static MANAGER_ATTR(display, S_IRUGO|S_IWUSR,
-                manager_display_show, manager_display_store);
-static MANAGER_ATTR(default_color, S_IRUGO|S_IWUSR,
-                manager_default_color_show, manager_default_color_store);
-static MANAGER_ATTR(trans_key_type, S_IRUGO|S_IWUSR,
-                manager_trans_key_type_show, manager_trans_key_type_store);
-static MANAGER_ATTR(trans_key_value, S_IRUGO|S_IWUSR,
-                manager_trans_key_value_show, manager_trans_key_value_store);
-static MANAGER_ATTR(trans_key_enabled, S_IRUGO|S_IWUSR,
-                manager_trans_key_enabled_show,
-                manager_trans_key_enabled_store);
-static MANAGER_ATTR(alpha_blending_enabled, S_IRUGO|S_IWUSR,
-                manager_alpha_blending_enabled_show,
-                manager_alpha_blending_enabled_store);
-static MANAGER_ATTR(cpr_enable, S_IRUGO|S_IWUSR,
-                manager_cpr_enable_show,
-                manager_cpr_enable_store);
-static MANAGER_ATTR(cpr_coef, S_IRUGO|S_IWUSR,
-                manager_cpr_coef_show,
-                manager_cpr_coef_store);
-
-
-static struct attribute *manager_sysfs_attrs[] = {
-        &manager_attr_name.attr,
-        &manager_attr_display.attr,
-        &manager_attr_default_color.attr,
-        &manager_attr_trans_key_type.attr,
-        &manager_attr_trans_key_value.attr,
-        &manager_attr_trans_key_enabled.attr,
-        &manager_attr_alpha_blending_enabled.attr,
-        &manager_attr_cpr_enable.attr,
-        &manager_attr_cpr_coef.attr,
-        NULL
-};
-
-static ssize_t manager_attr_show(struct kobject *kobj, struct attribute *attr,
-                char *buf)
-{
-        struct omap_overlay_manager *manager;
-        struct manager_attribute *manager_attr;
-
-        manager = container_of(kobj, struct omap_overlay_manager, kobj);
-        manager_attr = container_of(attr, struct manager_attribute, attr);
-
-        if (!manager_attr->show)
-                return -ENOENT;
-
-        return manager_attr->show(manager, buf);
-}
-
-static ssize_t manager_attr_store(struct kobject *kobj, struct attribute *attr,
-                const char *buf, size_t size)
-{
-        struct omap_overlay_manager *manager;
-        struct manager_attribute *manager_attr;
-
-        manager = container_of(kobj, struct omap_overlay_manager, kobj);
-        manager_attr = container_of(attr, struct manager_attribute, attr);
-
-        if (!manager_attr->store)
-                return -ENOENT;
-
-        return manager_attr->store(manager, buf, size);
-}
-
-static const struct sysfs_ops manager_sysfs_ops = {
-        .show = manager_attr_show,
-        .store = manager_attr_store,
-};
-
-static struct kobj_type manager_ktype = {
-        .sysfs_ops = &manager_sysfs_ops,
-        .default_attrs = manager_sysfs_attrs,
-};
-
 static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)
 {
         unsigned long timeout = msecs_to_jiffies(500);
+        struct omap_dss_device *dssdev = mgr->get_device(mgr);
         u32 irq;
         int r;
 
@@ -500,9 +52,9 @@ static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)
         if (r)
                 return r;
 
-        if (mgr->device->type == OMAP_DISPLAY_TYPE_VENC)
+        if (dssdev->type == OMAP_DISPLAY_TYPE_VENC)
                 irq = DISPC_IRQ_EVSYNC_ODD;
-        else if (mgr->device->type == OMAP_DISPLAY_TYPE_HDMI)
+        else if (dssdev->type == OMAP_DISPLAY_TYPE_HDMI)
                 irq = DISPC_IRQ_EVSYNC_EVEN;
         else
                 irq = dispc_mgr_get_vsync_irq(mgr->id);
@@ -547,23 +99,24 @@ int dss_init_overlay_managers(struct platform_device *pdev)
                         break;
                 }
 
-                mgr->set_device = &dss_mgr_set_device;
-                mgr->unset_device = &dss_mgr_unset_device;
+                mgr->set_output = &dss_mgr_set_output;
+                mgr->unset_output = &dss_mgr_unset_output;
                 mgr->apply = &omap_dss_mgr_apply;
                 mgr->set_manager_info = &dss_mgr_set_info;
                 mgr->get_manager_info = &dss_mgr_get_info;
                 mgr->wait_for_go = &dss_mgr_wait_for_go;
                 mgr->wait_for_vsync = &dss_mgr_wait_for_vsync;
+                mgr->get_device = &dss_mgr_get_device;
 
                 mgr->caps = 0;
                 mgr->supported_displays =
                         dss_feat_get_supported_displays(mgr->id);
+                mgr->supported_outputs =
+                        dss_feat_get_supported_outputs(mgr->id);
 
                 INIT_LIST_HEAD(&mgr->overlays);
 
-                r = kobject_init_and_add(&mgr->kobj, &manager_ktype,
-                                &pdev->dev.kobj, "manager%d", i);
-
+                r = dss_manager_kobj_init(mgr, pdev);
                 if (r)
                         DSSERR("failed to create sysfs file\n");
         }
@@ -577,9 +130,7 @@ void dss_uninit_overlay_managers(struct platform_device *pdev)
 
         for (i = 0; i < num_managers; ++i) {
                 struct omap_overlay_manager *mgr = &managers[i];
-
-                kobject_del(&mgr->kobj);
-                kobject_put(&mgr->kobj);
+                dss_manager_kobj_uninit(mgr);
         }
 
         kfree(managers);