sunxi-6.2 Series Fixes (#5379)
This commit is contained in:
AGM1968
GitHub
parent
1c4d394d88
commit
a2628bea9e
@ -1,8 +1,46 @@
|
||||
From 49ebdb69e5aa1f581bec7c5752de72b19fa8ccb6 Mon Sep 17 00:00:00 2001
|
||||
From: AGM1968 <AGM1968@users.noreply.github.com>
|
||||
Date: Mon, 26 Jun 2023 14:29:56 +0000
|
||||
Subject: [PATCH] Temp_fix mailbox
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
||||
|
||||
Signed-off-by: AGM1968 <AGM1968@users.noreply.github.com>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
||||
index 53f4c1f66..3c3b3e933 100644
|
||||
index 2f73f937aaf0..c7940fd3623a 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
||||
@@ -720,6 +720,7 @@ &mmc1 {
|
||||
@@ -42,7 +42,7 @@ bat: battery {
|
||||
resistance-temp-table = <20 150>;
|
||||
ocv-capacity-celsius = <20>;
|
||||
ocv-capacity-table-0 =
|
||||
- <4334000 100>,
|
||||
+ <4334000 100>,
|
||||
<4319700 99>,
|
||||
<4304300 98>,
|
||||
<4292200 97>,
|
||||
@@ -144,7 +144,7 @@ bat: battery {
|
||||
<3393500 1>,
|
||||
<3256000 0>;
|
||||
x-powers,ocv-capacity-table =
|
||||
- <0xc0 0>,
|
||||
+ <0xc0 0>,
|
||||
<0xc1 1>,
|
||||
<0xc2 1>,
|
||||
<0xc3 2>,
|
||||
@@ -191,7 +191,7 @@ ppkb_battery: keyboard-battery {
|
||||
factory-internal-resistance-micro-ohms = <120000>;
|
||||
ocv-capacity-celsius = <20>;
|
||||
ocv-capacity-table-0 =
|
||||
- <4147328 100>,
|
||||
+ <4147328 100>,
|
||||
<4132636 99>,
|
||||
<4121720 98>,
|
||||
<4110905 97>,
|
||||
@@ -748,6 +748,7 @@ &mmc1 {
|
||||
non-removable;
|
||||
post-power-on-delay-ms = <1>; /* wifi power is always on */
|
||||
status = "okay";
|
||||
@ -10,3 +48,6 @@ index 53f4c1f66..3c3b3e933 100644
|
||||
|
||||
rtl8723cs: wifi@1 {
|
||||
reg = <1>;
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 06990583634891b1c6d8dfd0388f2272be8918cb Mon Sep 17 00:00:00 2001
|
||||
From 5049a970b604afb2be749b1383fc33ce62c36946 Mon Sep 17 00:00:00 2001
|
||||
From: Andre Przywara <andre.przywara@arm.com>
|
||||
Date: Wed, 21 Apr 2021 12:46:43 +0100
|
||||
Subject: [PATCH 10/50] drv:rtc: sun6i: Add Allwinner H616 support
|
||||
Subject: [PATCH] drv:rtc: sun6i: Add Allwinner H616 support
|
||||
|
||||
The H616 RTC changes its day storage to the newly introduced linear day
|
||||
scheme, so pair the new compatible string with this feature flag.
|
||||
@ -10,14 +10,14 @@ for future expansion we must thus ignore any provided clock for now.
|
||||
|
||||
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
|
||||
---
|
||||
drivers/rtc/rtc-sun6i.c | 19 +++++++++++++++++++
|
||||
1 file changed, 19 insertions(+)
|
||||
drivers/rtc/rtc-sun6i.c | 16 ++++++++++++++++
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
|
||||
index 0215900b5..81feda651 100644
|
||||
index afc9efa3c..7dff3e563 100644
|
||||
--- a/drivers/rtc/rtc-sun6i.c
|
||||
+++ b/drivers/rtc/rtc-sun6i.c
|
||||
@@ -396,6 +396,22 @@ static void __init sun50i_h6_rtc_clk_init(struct device_node *node)
|
||||
@@ -389,6 +389,22 @@ static void __init sun50i_h6_rtc_clk_init(struct device_node *node)
|
||||
CLK_OF_DECLARE_DRIVER(sun50i_h6_rtc_clk, "allwinner,sun50i-h6-rtc",
|
||||
sun50i_h6_rtc_clk_init);
|
||||
|
||||
@ -40,15 +40,6 @@ index 0215900b5..81feda651 100644
|
||||
/*
|
||||
* The R40 user manual is self-conflicting on whether the prescaler is
|
||||
* fixed or configurable. The clock diagram shows it as fixed, but there
|
||||
@@ -842,6 +859,8 @@ static const struct of_device_id sun6i_rtc_dt_ids[] = {
|
||||
{ .compatible = "allwinner,sun8i-v3-rtc" },
|
||||
{ .compatible = "allwinner,sun50i-h5-rtc" },
|
||||
{ .compatible = "allwinner,sun50i-h6-rtc" },
|
||||
+ { .compatible = "allwinner,sun50i-h616-rtc",
|
||||
+ .data = (void *)RTC_LINEAR_DAY },
|
||||
{ /* sentinel */ },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, sun6i_rtc_dt_ids);
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 2fb27c5d8d9b30d10e40735812cae0446d48a138 Mon Sep 17 00:00:00 2001
|
||||
From 9c6ff21c04d09ad08748360d75a37d8b6281d0c3 Mon Sep 17 00:00:00 2001
|
||||
From: Andre Przywara <andre.przywara@arm.com>
|
||||
Date: Mon, 14 Jun 2021 23:02:45 +0100
|
||||
Subject: [PATCH 007/153] drv:rtc:sun6i: support RTCs without external LOSCs
|
||||
Subject: [PATCH] drv:rtc:sun6i: support RTCs without external LOSCs
|
||||
|
||||
Some newer Allwinner RTCs (for instance the one in the H616 SoC) lack
|
||||
a pin for an external 32768 Hz oscillator. As a consequence, this LOSC
|
||||
@ -19,18 +19,18 @@ Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
||||
1 file changed, 11 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
|
||||
index 16428e284..fbfd23463 100644
|
||||
index e4db445b7..afc9efa3c 100644
|
||||
--- a/drivers/rtc/rtc-sun6i.c
|
||||
+++ b/drivers/rtc/rtc-sun6i.c
|
||||
@@ -139,6 +139,7 @@ struct sun6i_rtc_clk_data {
|
||||
unsigned int export_iosc : 1;
|
||||
@@ -138,6 +138,7 @@ struct sun6i_rtc_clk_data {
|
||||
unsigned int has_out_clk : 1;
|
||||
unsigned int has_losc_en : 1;
|
||||
unsigned int has_auto_swt : 1;
|
||||
+ unsigned int no_ext_losc : 1;
|
||||
};
|
||||
|
||||
#define RTC_LINEAR_DAY BIT(0)
|
||||
@@ -261,7 +262,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
|
||||
@@ -260,7 +261,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
|
||||
}
|
||||
|
||||
/* Switch to the external, more precise, oscillator, if present */
|
||||
@ -39,7 +39,7 @@ index 16428e284..fbfd23463 100644
|
||||
reg |= SUN6I_LOSC_CTRL_EXT_OSC;
|
||||
if (rtc->data->has_losc_en)
|
||||
reg |= SUN6I_LOSC_CTRL_EXT_LOSC_EN;
|
||||
@@ -287,14 +288,19 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
|
||||
@@ -284,14 +285,19 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
|
||||
}
|
||||
|
||||
parents[0] = clk_hw_get_name(rtc->int_osc);
|
||||
@ -64,5 +64,5 @@ index 16428e284..fbfd23463 100644
|
||||
&init.name);
|
||||
|
||||
--
|
||||
2.35.3
|
||||
2.34.1
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ Signed-of-by: Kamil Trzciński <ayufan@ayufan.eu>
|
||||
create mode 100644 drivers/power/supply/rk818_battery.h
|
||||
|
||||
diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
|
||||
index ca7ad85eb..74344ac88 100644
|
||||
index 05b8a4e54..74344ac88 100644
|
||||
--- a/drivers/mfd/rk808.c
|
||||
+++ b/drivers/mfd/rk808.c
|
||||
@@ -81,12 +81,47 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
|
||||
@ -75,9 +75,11 @@ index ca7ad85eb..74344ac88 100644
|
||||
};
|
||||
|
||||
static const struct regmap_config rk805_regmap_config = {
|
||||
@@ -190,6 +225,8 @@ static const struct mfd_cell rk817s[] = {
|
||||
@@ -189,8 +224,9 @@ static const struct mfd_cell rk817s[] = {
|
||||
};
|
||||
|
||||
static const struct mfd_cell rk818s[] = {
|
||||
- { .name = "rk808-clkout", .id = PLATFORM_DEVID_NONE, },
|
||||
{ .name = "rk808-regulator", .id = PLATFORM_DEVID_NONE, },
|
||||
+ { .name = "rk808-clkout", },
|
||||
+ { .name = "rk818-battery", .of_compatible = "rk818-battery", },
|
||||
@ -3966,5 +3968,4 @@ index b50b2d9d8..1f542f145 100644
|
||||
#define RK818_H5V_EN BIT(0)
|
||||
#define RK818_REF_RDY_CTRL BIT(1)
|
||||
--
|
||||
2.35.3
|
||||
|
||||
2.35.3
|
||||
@ -63,7 +63,7 @@
|
||||
patches.armbian/drv-mfd-axp20x-add-sysfs-interface.patch
|
||||
patches.armbian/drv-spi-spidev-Add-armbian-spi-dev-compatible.patch
|
||||
patches.armbian/drv-spi-spi-sun4i.c-spi-bug-low-on-sck.patch
|
||||
- patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch
|
||||
patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch
|
||||
patches.armbian/drv-nvmem-sunxi_sid-Support-SID-on-H616.patch
|
||||
patches.armbian/drv-thermal-sun8i_thermal-Add-for-H616.patch
|
||||
patches.armbian/drv-iio-adc-axp20x_adc-arm64-dts-axp803-hwmon-enable-thermal.patch
|
||||
|
||||
@ -397,11 +397,11 @@
|
||||
|
||||
########### Fixes applied after megous patches ###################
|
||||
#
|
||||
patches.fixses/Fix-ISO-C90-forbids-mixed-declarations.patch
|
||||
patches.fixses/Fix-warning-multi-line-comment.patch
|
||||
patches.fixses/Fix-warning-unused-variable-delay_us.patch
|
||||
patches.fixses/Fix-depends-only-ARM-eInk-display-FB.patch
|
||||
patches.fixses/Fix-duplicate-nodes-for-sun50i-h5-orangepi-pc2.patch
|
||||
patches.fixes/Fix-ISO-C90-forbids-mixed-declarations.patch
|
||||
patches.fixes/Fix-warning-multi-line-comment.patch
|
||||
patches.fixes/Fix-warning-unused-variable-delay_us.patch
|
||||
patches.fixes/Fix-depends-only-ARM-eInk-display-FB.patch
|
||||
patches.fixes/Fix-duplicate-nodes-for-sun50i-h5-orangepi-pc2.patch
|
||||
|
||||
################################################################################
|
||||
#
|
||||
@ -459,7 +459,7 @@
|
||||
patches.armbian/drv-mfd-axp20x-add-sysfs-interface.patch
|
||||
patches.armbian/drv-spi-spidev-Add-armbian-spi-dev-compatible.patch
|
||||
patches.armbian/drv-spi-spi-sun4i.c-spi-bug-low-on-sck.patch
|
||||
- patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch
|
||||
patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch
|
||||
patches.armbian/drv-nvmem-sunxi_sid-Support-SID-on-H616.patch
|
||||
patches.armbian/drv-thermal-sun8i_thermal-Add-for-H616.patch
|
||||
patches.armbian/drv-iio-adc-axp20x_adc-arm64-dts-axp803-hwmon-enable-thermal.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user