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>
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From ea6865e1bfc1a1ac72fe95be42abb88b47413363 Mon Sep 17 00:00:00 2001
|
|
From: Oskari Lemmela <oskari@lemmela.net>
|
|
Date: Tue, 23 Oct 2018 21:53:29 +0300
|
|
Subject: [PATCH 111/146] mfd: axp20x: Add AC power supply cell for AXP813
|
|
|
|
As axp20x-ac-power-supply now supports AXP813, add a cell for it.
|
|
|
|
Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
|
|
Reviewed-by: Quentin Schulz <quentin.schulz@bootlin.com>
|
|
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
|
|
Tested-by: Vasily Khoruzhick <anarsoul@gmail.com>
|
|
|
|
Changed-by: Igor@armbian
|
|
---
|
|
drivers/mfd/axp20x.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
|
|
index 0be511dd93d0..dfc3cff1d08b 100644
|
|
--- a/drivers/mfd/axp20x.c
|
|
+++ b/drivers/mfd/axp20x.c
|
|
@@ -805,8 +805,13 @@ static const struct mfd_cell axp813_cells[] = {
|
|
.name = "axp813-adc",
|
|
.of_compatible = "x-powers,axp813-adc",
|
|
}, {
|
|
- .name = "axp20x-battery-power-supply",
|
|
- .of_compatible = "x-powers,axp813-battery-power-supply",
|
|
+ .name = "axp20x-battery-power-supply",
|
|
+ .of_compatible = "x-powers,axp813-battery-power-supply",
|
|
+ }, {
|
|
+ .name = "axp20x-ac-power-supply",
|
|
+ .of_compatible = "x-powers,axp813-ac-power-supply",
|
|
+ .num_resources = ARRAY_SIZE(axp20x_ac_power_supply_resources),
|
|
+ .resources = axp20x_ac_power_supply_resources,
|
|
}, {
|
|
.name = "axp20x-usb-power-supply",
|
|
.of_compatible = "x-powers,axp813-usb-power-supply",
|
|
|
|
--
|
|
2.17.1
|
|
|