7d5f1dbda1
Some patches were part of other linux-mainline kernel versions but are not anymore part of the current 4.19.76. Move 0001-Enable-uart3-for-NanoPi-Neo-Air-used-by-BT.patch in linux-mainline_4.19.76.bbappend to avoid error patching file arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts Hunk #2 FAILED at 162. 1 out of 2 hunks FAILED -- rejects in file arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts Place all patches from Armbian in a separate directory and do all the Balena specific operations in linux-mainline_%.bbappend only. Changelog-entry: Remove unused patches and cleanup Signed-off-by: Vicentiu Galanopulo <vicentiu@balena.io>
54 lines
1.5 KiB
Diff
54 lines
1.5 KiB
Diff
From b77e60c6a2797ada240b1d42b896b70853e2b1af Mon Sep 17 00:00:00 2001
|
|
From: Quentin Schulz <quentin.schulz@free-electrons.com>
|
|
Date: Thu, 10 Aug 2017 09:40:21 +0200
|
|
Subject: [PATCH 24/82] mfd: axp20x: add regulator-userspace-consumer to mfd
|
|
cells of AXP813
|
|
|
|
Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
|
|
---
|
|
drivers/mfd/axp20x.c | 15 +++++++++++++++
|
|
1 file changed, 15 insertions(+)
|
|
|
|
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
|
|
index ac8da970bdfe..95f36a7e3cd4 100644
|
|
--- a/drivers/mfd/axp20x.c
|
|
+++ b/drivers/mfd/axp20x.c
|
|
@@ -24,6 +24,7 @@
|
|
#include <linux/pm_runtime.h>
|
|
#include <linux/regmap.h>
|
|
#include <linux/regulator/consumer.h>
|
|
+#include <linux/regulator/userspace-consumer.h>
|
|
#include <linux/mfd/axp20x.h>
|
|
#include <linux/mfd/core.h>
|
|
#include <linux/of_device.h>
|
|
@@ -771,6 +772,16 @@ static const struct mfd_cell axp809_cells[] = {
|
|
},
|
|
};
|
|
|
|
+static struct regulator_bulk_data vcc_vb = {
|
|
+ .supply = "vcc-vb",
|
|
+};
|
|
+
|
|
+static struct regulator_userspace_consumer_data vcc_vb_data = {
|
|
+ .name = "vcc-vb",
|
|
+ .num_supplies = 1,
|
|
+ .supplies = &vcc_vb,
|
|
+};
|
|
+
|
|
static const struct mfd_cell axp813_cells[] = {
|
|
{
|
|
.name = "axp221-pek",
|
|
@@ -790,6 +801,10 @@ static const struct mfd_cell axp813_cells[] = {
|
|
}, {
|
|
.name = "axp20x-usb-power-supply",
|
|
.of_compatible = "x-powers,axp813-usb-power-supply",
|
|
+ }, {
|
|
+ .name = "reg-userspace-consumer",
|
|
+ .platform_data = &vcc_vb_data,
|
|
+ .pdata_size = sizeof(vcc_vb_data),
|
|
}, {
|
|
.name = "axp20x-ac-power-supply",
|
|
.of_compatible = "x-powers,axp813-ac-power-supply",
|
|
--
|
|
2.20.1
|
|
|