From 6be2305da83471c442dab83366c25be4dfb38793 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Fri, 14 Aug 2015 13:06:33 +0000 Subject: kernel: update 4.1 to 4.1.5 Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5 Signed-off-by: Jonas Gorski SVN-Revision: 46598 --- .../102-regulator-axp20x-add-support-for-axp22.patch | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'target/linux/sunxi/patches-4.1/102-regulator-axp20x-add-support-for-axp22.patch') diff --git a/target/linux/sunxi/patches-4.1/102-regulator-axp20x-add-support-for-axp22.patch b/target/linux/sunxi/patches-4.1/102-regulator-axp20x-add-support-for-axp22.patch index b2fdb65..cc5bc4f 100644 --- a/target/linux/sunxi/patches-4.1/102-regulator-axp20x-add-support-for-axp22.patch +++ b/target/linux/sunxi/patches-4.1/102-regulator-axp20x-add-support-for-axp22.patch @@ -19,8 +19,6 @@ Signed-off-by: Lee Jones drivers/regulator/axp20x-regulator.c | 96 ++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) -diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c -index 50ae0b5..6468291 100644 --- a/drivers/regulator/axp20x-regulator.c +++ b/drivers/regulator/axp20x-regulator.c @@ -27,8 +27,12 @@ @@ -63,7 +61,7 @@ index 50ae0b5..6468291 100644 #define AXP_DESC_FIXED(_family, _id, _match, _supply, _volt) \ [_family##_##_id] = { \ .name = #_id, \ -@@ -135,6 +159,14 @@ static struct regulator_ops axp20x_ops = { +@@ -135,6 +159,14 @@ static struct regulator_ops axp20x_ops = .is_enabled = regulator_is_enabled_regmap, }; @@ -78,7 +76,7 @@ index 50ae0b5..6468291 100644 static const struct regulator_desc axp20x_regulators[] = { AXP_DESC(AXP20X, DCDC2, "dcdc2", "vin2", 700, 2275, 25, AXP20X_DCDC2_V_OUT, 0x3f, AXP20X_PWR_OUT_CTRL, 0x10), -@@ -152,6 +184,52 @@ static const struct regulator_desc axp20x_regulators[] = { +@@ -152,6 +184,52 @@ static const struct regulator_desc axp20 AXP20X_IO_ENABLED, AXP20X_IO_DISABLED), }; @@ -131,7 +129,7 @@ index 50ae0b5..6468291 100644 static int axp20x_set_dcdc_freq(struct platform_device *pdev, u32 dcdcfreq) { struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent); -@@ -165,6 +243,12 @@ static int axp20x_set_dcdc_freq(struct platform_device *pdev, u32 dcdcfreq) +@@ -165,6 +243,12 @@ static int axp20x_set_dcdc_freq(struct p def = 1500; step = 75; break; @@ -144,7 +142,7 @@ index 50ae0b5..6468291 100644 default: dev_err(&pdev->dev, "Setting DCDC frequency for unsupported AXP variant\n"); -@@ -237,6 +321,14 @@ static int axp20x_set_dcdc_workmode(struct regulator_dev *rdev, int id, u32 work +@@ -237,6 +321,14 @@ static int axp20x_set_dcdc_workmode(stru workmode <<= ffs(mask) - 1; break; @@ -159,7 +157,7 @@ index 50ae0b5..6468291 100644 default: /* should not happen */ WARN_ON(1); -@@ -265,6 +357,10 @@ static int axp20x_regulator_probe(struct platform_device *pdev) +@@ -265,6 +357,10 @@ static int axp20x_regulator_probe(struct regulators = axp20x_regulators; nregulators = AXP20X_REG_ID_MAX; break; -- cgit v1.1