summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/generic
diff options
context:
space:
mode:
Diffstat (limited to 'patches/collateral-evolutions/generic')
-rw-r--r--patches/collateral-evolutions/generic/0001-sysfs-api/INFO36
-rw-r--r--patches/collateral-evolutions/generic/0001-sysfs-api/drivers_bcma.patch35
-rw-r--r--patches/collateral-evolutions/generic/0001-sysfs-api/drivers_media_v4l2-core_v4l2-dev.patch35
-rw-r--r--patches/collateral-evolutions/generic/0001-sysfs-api/drivers_ssb.patch35
-rw-r--r--patches/collateral-evolutions/generic/0001-sysfs-api/net_ieee802154_wpan-class.patch35
-rw-r--r--patches/collateral-evolutions/generic/0001-sysfs-api/net_wireless_sysfs.patch35
-rw-r--r--patches/collateral-evolutions/generic/README1
7 files changed, 212 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/generic/0001-sysfs-api/INFO b/patches/collateral-evolutions/generic/0001-sysfs-api/INFO
new file mode 100644
index 00000000..8539db8b
--- /dev/null
+++ b/patches/collateral-evolutions/generic/0001-sysfs-api/INFO
@@ -0,0 +1,36 @@
+The new attribute sysfs group was added via these commits:
+
+mcgrof@ergon ~/linux (git::master)$ git describe --contains f2f37f58b
+v3.11-rc2~18^2~9
+mcgrof@ergon ~/linux (git::master)$ git describe --contains 3493f69f4
+v3.11-rc2~18^2~2
+
+We backport them with our own respective set of helpers but right now
+this is using old legacy patches, it should be possible to convert all
+this juju legacy backport to SmPL form.
+
+commit f2f37f58b1b933b06d6d84e80a31a1b500fb0db2
+Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Sun Jul 14 16:05:52 2013 -0700
+
+ sysfs.h: add ATTRIBUTE_GROUPS() macro
+
+ To make it easier for driver subsystems to work with attribute groups,
+ create the ATTRIBUTE_GROUPS macro to remove some of the repetitive
+ typing for the most common use for attribute groups.
+
+ Reviewed-by: Guenter Roeck <linux@roeck-us.net>
+ Tested-by: Guenter Roeck <linux@roeck-us.net>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+commit 3493f69f4c4e8703961919a9a56c2d2e6a25b46f
+Author: Oliver Schinagl <oliver@schinagl.nl>
+Date: Sun Jul 14 16:05:59 2013 -0700
+
+ sysfs: add more helper macro's for (bin_)attribute(_groups)
+
+ With the recent changes to sysfs there's various helper macro's.
+ However there's no RW, RO BIN_ helper macro's. This patch adds them.
+
+ Signed-off-by: Oliver Schinagl <oliver@schinagl.nl>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/patches/collateral-evolutions/generic/0001-sysfs-api/drivers_bcma.patch b/patches/collateral-evolutions/generic/0001-sysfs-api/drivers_bcma.patch
new file mode 100644
index 00000000..cc3da6fc
--- /dev/null
+++ b/patches/collateral-evolutions/generic/0001-sysfs-api/drivers_bcma.patch
@@ -0,0 +1,35 @@
+--- a/drivers/bcma/main.c
++++ b/drivers/bcma/main.c
+@@ -60,7 +60,12 @@ static struct attribute *bcma_device_att
+ &dev_attr_class.attr,
+ NULL,
+ };
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)
+ ATTRIBUTE_GROUPS(bcma_device);
++#else
++#define BP_ATTR_GRP_STRUCT device_attribute
++ATTRIBUTE_GROUPS_BACKPORT(bcma_device);
++#endif
+
+ static struct bus_type bcma_bus_type = {
+ .name = "bcma",
+@@ -68,7 +73,11 @@ static struct bus_type bcma_bus_type = {
+ .probe = bcma_device_probe,
+ .remove = bcma_device_remove,
+ .uevent = bcma_device_uevent,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)
+ .dev_groups = bcma_device_groups,
++#else
++ .dev_attrs = bcma_device_dev_attrs,
++#endif
+ };
+
+ static u16 bcma_cc_core_id(struct bcma_bus *bus)
+@@ -482,6 +491,7 @@ static int __init bcma_modinit(void)
+ {
+ int err;
+
++ init_bcma_device_attrs();
+ err = bus_register(&bcma_bus_type);
+ if (err)
+ return err;
diff --git a/patches/collateral-evolutions/generic/0001-sysfs-api/drivers_media_v4l2-core_v4l2-dev.patch b/patches/collateral-evolutions/generic/0001-sysfs-api/drivers_media_v4l2-core_v4l2-dev.patch
new file mode 100644
index 00000000..258144f9
--- /dev/null
+++ b/patches/collateral-evolutions/generic/0001-sysfs-api/drivers_media_v4l2-core_v4l2-dev.patch
@@ -0,0 +1,35 @@
+--- a/drivers/media/v4l2-core/v4l2-dev.c
++++ b/drivers/media/v4l2-core/v4l2-dev.c
+@@ -86,7 +86,12 @@ static struct attribute *video_device_at
+ &dev_attr_index.attr,
+ NULL,
+ };
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
+ ATTRIBUTE_GROUPS(video_device);
++#else
++#define BP_ATTR_GRP_STRUCT device_attribute
++ATTRIBUTE_GROUPS_BACKPORT(video_device);
++#endif
+
+ /*
+ * Active devices
+@@ -221,7 +226,11 @@ static void v4l2_device_release(struct d
+
+ static struct class video_class = {
+ .name = VIDEO_NAME,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
+ .dev_groups = video_device_groups,
++#else
++ .dev_attrs = video_device_dev_attrs,
++#endif
+ };
+
+ struct video_device *video_devdata(struct file *file)
+@@ -1014,6 +1023,7 @@ static int __init videodev_init(void)
+ return ret;
+ }
+
++ init_video_device_attrs();
+ ret = class_register(&video_class);
+ if (ret < 0) {
+ unregister_chrdev_region(dev, VIDEO_NUM_DEVICES);
diff --git a/patches/collateral-evolutions/generic/0001-sysfs-api/drivers_ssb.patch b/patches/collateral-evolutions/generic/0001-sysfs-api/drivers_ssb.patch
new file mode 100644
index 00000000..e9b09134
--- /dev/null
+++ b/patches/collateral-evolutions/generic/0001-sysfs-api/drivers_ssb.patch
@@ -0,0 +1,35 @@
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c
+@@ -399,7 +399,12 @@ static struct attribute *ssb_device_attr
+ &dev_attr_irq.attr,
+ NULL,
+ };
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)
+ ATTRIBUTE_GROUPS(ssb_device);
++#else
++#define BP_ATTR_GRP_STRUCT device_attribute
++ATTRIBUTE_GROUPS_BACKPORT(ssb_device);
++#endif
+
+ static struct bus_type ssb_bustype = {
+ .name = "ssb",
+@@ -410,7 +415,11 @@ static struct bus_type ssb_bustype = {
+ .suspend = ssb_device_suspend,
+ .resume = ssb_device_resume,
+ .uevent = ssb_device_uevent,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)
+ .dev_groups = ssb_device_groups,
++#else
++ .dev_attrs = ssb_device_dev_attrs,
++#endif
+ };
+
+ static void ssb_buses_lock(void)
+@@ -1463,6 +1472,7 @@ static int __init ssb_modinit(void)
+ {
+ int err;
+
++ init_ssb_device_attrs();
+ /* See the comment at the ssb_is_early_boot definition */
+ ssb_is_early_boot = 0;
+ err = bus_register(&ssb_bustype);
diff --git a/patches/collateral-evolutions/generic/0001-sysfs-api/net_ieee802154_wpan-class.patch b/patches/collateral-evolutions/generic/0001-sysfs-api/net_ieee802154_wpan-class.patch
new file mode 100644
index 00000000..8099fabc
--- /dev/null
+++ b/patches/collateral-evolutions/generic/0001-sysfs-api/net_ieee802154_wpan-class.patch
@@ -0,0 +1,35 @@
+--- a/net/ieee802154/wpan-class.c
++++ b/net/ieee802154/wpan-class.c
+@@ -75,7 +75,12 @@ static struct attribute *pmib_attrs[] =
+ &dev_attr_cca_mode.attr,
+ NULL,
+ };
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
+ ATTRIBUTE_GROUPS(pmib);
++#else
++#define BP_ATTR_GRP_STRUCT device_attribute
++ATTRIBUTE_GROUPS_BACKPORT(pmib);
++#endif
+
+ static void wpan_phy_release(struct device *d)
+ {
+@@ -86,7 +91,11 @@ static void wpan_phy_release(struct devi
+ static struct class wpan_phy_class = {
+ .name = "ieee802154",
+ .dev_release = wpan_phy_release,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
+ .dev_groups = pmib_groups,
++#else
++ .dev_attrs = pmib_dev_attrs,
++#endif
+ };
+
+ static DEFINE_MUTEX(wpan_phy_mutex);
+@@ -203,6 +212,7 @@ EXPORT_SYMBOL(wpan_phy_free);
+ static int __init wpan_phy_class_init(void)
+ {
+ int rc;
++ init_pmib_attrs();
+ rc = class_register(&wpan_phy_class);
+ if (rc)
+ goto err;
diff --git a/patches/collateral-evolutions/generic/0001-sysfs-api/net_wireless_sysfs.patch b/patches/collateral-evolutions/generic/0001-sysfs-api/net_wireless_sysfs.patch
new file mode 100644
index 00000000..e6762198
--- /dev/null
+++ b/patches/collateral-evolutions/generic/0001-sysfs-api/net_wireless_sysfs.patch
@@ -0,0 +1,35 @@
+--- a/net/wireless/sysfs.c
++++ b/net/wireless/sysfs.c
+@@ -71,7 +71,12 @@ static struct attribute *ieee80211_attrs
+ &dev_attr_name.attr,
+ NULL,
+ };
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
+ ATTRIBUTE_GROUPS(ieee80211);
++#else
++#define BP_ATTR_GRP_STRUCT device_attribute
++ATTRIBUTE_GROUPS_BACKPORT(ieee80211);
++#endif
+
+ static void wiphy_dev_release(struct device *dev)
+ {
+@@ -151,7 +156,11 @@ struct class ieee80211_class = {
+ .name = "ieee80211",
+ .owner = THIS_MODULE,
+ .dev_release = wiphy_dev_release,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
+ .dev_groups = ieee80211_groups,
++#else
++ .dev_attrs = ieee80211_dev_attrs,
++#endif
+ .dev_uevent = wiphy_uevent,
+ #ifdef CONFIG_PM
+ .suspend = wiphy_suspend,
+@@ -165,6 +174,7 @@ struct class ieee80211_class = {
+
+ int wiphy_sysfs_init(void)
+ {
++ init_ieee80211_attrs();
+ return class_register(&ieee80211_class);
+ }
+
diff --git a/patches/collateral-evolutions/generic/README b/patches/collateral-evolutions/generic/README
new file mode 100644
index 00000000..4797e65d
--- /dev/null
+++ b/patches/collateral-evolutions/generic/README
@@ -0,0 +1 @@
+This holds collateral evolutions that apply to any driver we backport