Update sunxi-next patches to 4.6.1

armbian · Jun 1, 2016 · c788fc3 · c788fc3
1 parent 3477065
commit c788fc3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 166 deletions.
diff --git a/patch/kernel/sunxi-next/axp20x-sysfs-interface.patch b/patch/kernel/sunxi-next/axp20x-sysfs-interface.patch
@@ -1,24 +1,24 @@
 diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
-index 9842199..c313710 100644
+index a57d6e9..51b34f6 100644
 --- a/drivers/mfd/axp20x.c
 +++ b/drivers/mfd/axp20x.c
-@@ -26,6 +26,7 @@
+@@ -27,6 +27,7 @@
+ #include <linux/mfd/core.h>
  #include <linux/of_device.h>
- #include <linux/of_irq.h>
  #include <linux/acpi.h>
 +#include <linux/delay.h>
 
  #define AXP20X_OFF	0x80
 
-@@ -70,6 +71,7 @@ static const struct regmap_range axp20x_volatile_ranges[] = {
+@@ -72,6 +73,7 @@ static const struct regmap_range axp20x_volatile_ranges[] = {
  	regmap_reg_range(AXP20X_IRQ1_EN, AXP20X_IRQ5_STATE),
  	regmap_reg_range(AXP20X_ACIN_V_ADC_H, AXP20X_IPSOUT_V_HIGH_L),
  	regmap_reg_range(AXP20X_GPIO20_SS, AXP20X_GPIO3_CTRL),
 +	regmap_reg_range(AXP20X_CHRG_CC_31_24, AXP20X_DISCHRG_CC_7_0),
  	regmap_reg_range(AXP20X_FG_RES, AXP20X_RDC_L),
  };
 
-@@ -606,6 +608,611 @@ static void axp20x_power_off(void)
+@@ -582,6 +584,611 @@ static void axp20x_power_off(void)
  		     AXP20X_OFF);
  }
 
@@ -627,28 +627,28 @@ index 9842199..c313710 100644
 +	axp20x_sysfs_remove_subgroup(subsystems.ac, &axp20x_group_ac);
 +}
 +
- static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
+ int axp20x_match_device(struct axp20x_dev *axp20x)
  {
- 	const struct acpi_device_id *acpi_id;
-@@ -711,6 +1318,10 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
+ 	struct device *dev = axp20x->dev;
+@@ -669,6 +1276,10 @@ int axp20x_device_probe(struct axp20x_dev *axp20x)
  		pm_power_off = axp20x_power_off;
  	}
 
 +	if (axp20x->variant == AXP209_ID || axp20x->variant == AXP202_ID) {
 +		axp20x_sysfs_init(axp20x);
 +	}
 +
- 	dev_info(&i2c->dev, "AXP20X driver loaded\n");
+ 	dev_info(axp20x->dev, "AXP20X driver loaded\n");
 
  	return 0;
-@@ -720,6 +1331,10 @@ static int axp20x_i2c_remove(struct i2c_client *i2c)
- {
- 	struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
+@@ -682,6 +1293,10 @@ int axp20x_device_remove(struct axp20x_dev *axp20x)
+ 		pm_power_off = NULL;
+ 	}
 
 +	if (axp20x->variant == AXP209_ID || axp20x->variant == AXP202_ID) {
 +		axp20x_sysfs_exit(axp20x);
 +	}
 +
- 	if (axp20x == axp20x_pm_power_off) {
- 		axp20x_pm_power_off = NULL;
- 		pm_power_off = NULL;
+ 	mfd_remove_devices(axp20x->dev);
+ 	regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
+
diff --git a/patch/kernel/sunxi-next/crypto_ss_corruption_fix.patch b/patch/kernel/sunxi-next/crypto_ss_corruption_fix.patch
diff --git a/patch/kernel/sunxi-next/stmmac-fix-v4.5.patch b/patch/kernel/sunxi-next/stmmac-fix-v4.5.patch