Verified Commit 6b8c4e71 authored by Dan Johansen's avatar Dan Johansen
Browse files

Update to 5.14.0


And update all the patches
Add patches for Quartz64/RK356X support
Add patch for Radxa Zero support
And update the config
Signed-off-by: Dan Johansen's avatarDan Johansen <strit@manjaro.org>
parent 9eff2128
Pipeline #4563 passed with stage
in 99 minutes and 30 seconds
......@@ -33,4 +33,4 @@ package:
paths:
- ./*.pkg.tar.*
expire_in: 1 week
From 7adafff1263378f964dbd66ea2ab849fdad5e588 Mon Sep 17 00:00:00 2001
From: Dan Johansen <strit@manjaro.org>
Date: Mon, 28 Dec 2020 16:14:40 +0100
Subject: [PATCH] revert: arm64: dts: allwinner: a64: Add I2S2 node
---
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index 51cc30e84e26..dc238814013c 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -846,20 +846,6 @@ i2s1: i2s@1c22400 {
status = "disabled";
};
- i2s2: i2s@1c22800 {
- #sound-dai-cells = <0>;
- compatible = "allwinner,sun50i-a64-i2s",
- "allwinner,sun8i-h3-i2s";
- reg = <0x01c22800 0x400>;
- interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&ccu CLK_BUS_I2S2>, <&ccu CLK_I2S2>;
- clock-names = "apb", "mod";
- resets = <&ccu RST_BUS_I2S2>;
- dma-names = "rx", "tx";
- dmas = <&dma 27>, <&dma 27>;
- status = "disabled";
- };
-
dai: dai@1c22c00 {
#sound-dai-cells = <0>;
compatible = "allwinner,sun50i-a64-codec-i2s";
--
2.29.2
This diff is collapsed.
From 81547abb93e469951875dde8dcbda39deeaaef15 Mon Sep 17 00:00:00 2001
From: Dan Johansen <strit@manjaro.org>
Date: Mon, 10 May 2021 17:29:00 +0200
Subject: [PATCH] arm64: dts: rockchip: add usb3 node to roc-cc/rock64
---
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 5 +++++
arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
index a05732b59f38..6546d32cc7e6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
@@ -371,6 +371,11 @@ &usb_host0_ohci {
status = "okay";
};
+&usbdrd3 {
+ dr_mode = "host";
+ status = "okay";
+};
+
&vop {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
index 3bef1f39bc6e..59a192ca3e60 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
@@ -389,6 +389,11 @@ &usb_host0_ohci {
status = "okay";
};
+&usbdrd3 {
+ dr_mode = "host";
+ status = "okay";
+};
+
&vop {
status = "okay";
};
--
2.31.1
From 48a4212084beda1f5ce2e4aa8344c015ea3a8e52 Mon Sep 17 00:00:00 2001
From: Dan Johansen <strit@manjaro.org>
Date: Tue, 14 Apr 2020 13:28:11 +0200
Subject: [PATCH] arm64 dts rockchip modify pcie node rockpro64
---
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
index 9bca25801260..b7ed487e8c57 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
@@ -98,6 +98,8 @@ vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
vcc3v3_pcie: vcc3v3-pcie-regulator {
compatible = "regulator-fixed";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
enable-active-high;
gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
@@ -526,10 +528,11 @@ &io_domains {
&pcie0 {
ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
num-lanes = <4>;
+ max-link-speed = <2>;
pinctrl-names = "default";
pinctrl-0 = <&pcie_perst>;
- vpcie12v-supply = <&vcc12v_dcin>;
vpcie3v3-supply = <&vcc3v3_pcie>;
+ bus-scan-delay-ms = <1000>;
status = "okay";
};
--
2.26.0
This diff is collapsed.
This diff is collapsed.
From b5cc760b358a868691f1fcb479b3f83c6af455f4 Mon Sep 17 00:00:00 2001
From 28eb6bdff81f3c858826223ef9a91dd95a5becc0 Mon Sep 17 00:00:00 2001
From: Dan Johansen <strit@manjaro.org>
Date: Wed, 20 May 2020 21:56:30 +0200
Subject: [PATCH] arm64-dts-allwinner-add-hdmi-sound-to-pine-devices
Date: Mon, 12 Jul 2021 11:17:18 +0200
Subject: [PATCH] arm64/dts/allwinner: add hdmi sound to pine devices
Signed-off-by: Dan Johansen <strit@manjaro.org>
---
.../boot/dts/allwinner/sun50i-a64-pine64.dts | 8 +++++
.../dts/allwinner/sun50i-a64-pinebook.dts | 8 +++++
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 35 ++++++++++++++++++-
3 files changed, 50 insertions(+), 1 deletion(-)
.../dts/allwinner/sun50i-a64-pine64-lts.dts | 8 +++++++
.../boot/dts/allwinner/sun50i-a64-pine64.dts | 8 +++++++
.../dts/allwinner/sun50i-a64-pinebook.dts | 8 +++++++
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 21 ++++++++++++++++++-
4 files changed, 44 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
index 596a25907432..d37b17914937 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
@@ -20,6 +20,14 @@ led {
};
};
+&i2s2 {
+ status = "okay";
+};
+
&mmc0 {
broken-cd; /* card detect is broken on *some* boards */
};
+
+&sound_hdmi {
+ status = "okay";
+};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
index 2165f238af13..379663c8915c 100644
index 2accb5ddf783..17886709b6b4 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
@@ -107,6 +107,10 @@ &i2c1_pins {
......@@ -36,10 +57,10 @@ index 2165f238af13..379663c8915c 100644
&spdif {
status = "disabled";
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
index 64b1c54f87c0..901f6a441dfd 100644
index 34e67f5f8297..129d675c1a99 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
@@ -139,6 +139,10 @@ &mixer0 {
@@ -137,6 +137,10 @@ &mixer0 {
status = "okay";
};
......@@ -50,7 +71,7 @@ index 64b1c54f87c0..901f6a441dfd 100644
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
@@ -402,6 +406,10 @@ tcon0_out_anx6345: endpoint {
@@ -399,6 +403,10 @@ tcon0_out_anx6345: endpoint {
};
};
......@@ -62,44 +83,22 @@ index 64b1c54f87c0..901f6a441dfd 100644
pinctrl-names = "default";
pinctrl-0 = <&uart0_pb_pins>;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index c26cc1fcaffd..44d834e6a6f3 100644
index 6ddb717f2f98..393350fb20a0 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -136,7 +136,7 @@ sound: sound {
simple-audio-card,format = "i2s";
simple-audio-card,frame-master = <&cpudai>;
simple-audio-card,bitclock-master = <&cpudai>;
- simple-audio-card,mclk-fs = <128>;
+ simple-audio-card,mclk-fs = <256>;
simple-audio-card,aux-devs = <&codec_analog>;
simple-audio-card,routing =
"Left DAC", "AIF1 Slot 0 Left",
@@ -1129,6 +1129,7 @@ deinterlace: deinterlace@1e00000 {
};
@@ -147,7 +147,7 @@ simple-audio-card,dai-link@0 {
format = "i2s";
frame-master = <&link0_cpu>;
bitclock-master = <&link0_cpu>;
- mclk-fs = <128>;
+ mclk-fs = <256>;
hdmi: hdmi@1ee0000 {
+ #sound-dai-cells = <0>;
compatible = "allwinner,sun50i-a64-dw-hdmi",
"allwinner,sun8i-a83t-dw-hdmi";
reg = <0x01ee0000 0x10000>;
@@ -1172,6 +1173,38 @@ hdmi_phy: hdmi-phy@1ef0000 {
#phy-cells = <0>;
link0_cpu: cpu {
sound-dai = <&dai>;
@@ -900,6 +900,24 @@ i2s2: i2s@1c22800 {
status = "disabled";
};
+ i2s2: i2s@1c22800 {
+ #sound-dai-cells = <0>;
+ compatible = "allwinner,sun8i-h3-i2s";
+ reg = <0x01c22800 0x400>;
+ interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_I2S2>, <&ccu CLK_I2S2>;
+ clock-names = "apb", "mod";
+ dmas = <&dma 27>;
+ resets = <&ccu RST_BUS_I2S2>;
+ dma-names = "tx";
+ allwinner,playback-channels = <8>;
+ status = "disabled";
+ };
+
+ sound_hdmi: sound_hdmi {
+ compatible = "simple-audio-card";
+ simple-audio-card,format = "i2s";
......@@ -118,9 +117,17 @@ index c26cc1fcaffd..44d834e6a6f3 100644
+ };
+ };
+
rtc: rtc@1f00000 {
compatible = "allwinner,sun50i-a64-rtc",
"allwinner,sun8i-h3-rtc";
dai: dai@1c22c00 {
#sound-dai-cells = <0>;
compatible = "allwinner,sun50i-a64-codec-i2s";
@@ -1197,6 +1215,7 @@ deinterlace: deinterlace@1e00000 {
};
hdmi: hdmi@1ee0000 {
+ #sound-dai-cells = <0>;
compatible = "allwinner,sun50i-a64-dw-hdmi",
"allwinner,sun8i-a83t-dw-hdmi";
reg = <0x01ee0000 0x10000>;
--
2.26.2
2.32.0
This revets 103a5348c22c3fca8b96c735a9e353b8a0801842
Revert is required hack to get ap6256 wifi working ok on Amlogic.
Propper fix will be added soon...
Milion thx for Neil Armstrong for helping with this!
diff -Naur linux-5.13.5-old/drivers/mmc/host/meson-gx-mmc.c linux-5.13.5-new/drivers/mmc/host/meson-gx-mmc.c
--- linux-5.13.5-old/drivers/mmc/host/meson-gx-mmc.c 2021-07-25 14:37:37.000000000 +0200
+++ linux-5.13.5-new/drivers/mmc/host/meson-gx-mmc.c 2021-07-26 14:45:59.626665204 +0200
@@ -165,7 +165,6 @@
unsigned int bounce_buf_size;
void *bounce_buf;
- void __iomem *bounce_iomem_buf;
dma_addr_t bounce_dma_addr;
struct sd_emmc_desc *descs;
dma_addr_t descs_dma_addr;
@@ -746,47 +745,6 @@
writel(start, host->regs + SD_EMMC_START);
}
-/* local sg copy to buffer version with _to/fromio usage for dram_access_quirk */
-static void meson_mmc_copy_buffer(struct meson_host *host, struct mmc_data *data,
- size_t buflen, bool to_buffer)
-{
- unsigned int sg_flags = SG_MITER_ATOMIC;
- struct scatterlist *sgl = data->sg;
- unsigned int nents = data->sg_len;
- struct sg_mapping_iter miter;
- unsigned int offset = 0;
-
- if (to_buffer)
- sg_flags |= SG_MITER_FROM_SG;
- else
- sg_flags |= SG_MITER_TO_SG;
-
- sg_miter_start(&miter, sgl, nents, sg_flags);
-
- while ((offset < buflen) && sg_miter_next(&miter)) {
- unsigned int len;
-
- len = min(miter.length, buflen - offset);
-
- /* When dram_access_quirk, the bounce buffer is a iomem mapping */
- if (host->dram_access_quirk) {
- if (to_buffer)
- memcpy_toio(host->bounce_iomem_buf + offset, miter.addr, len);
- else
- memcpy_fromio(miter.addr, host->bounce_iomem_buf + offset, len);
- } else {
- if (to_buffer)
- memcpy(host->bounce_buf + offset, miter.addr, len);
- else
- memcpy(miter.addr, host->bounce_buf + offset, len);
- }
-
- offset += len;
- }
-
- sg_miter_stop(&miter);
-}
-
static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd)
{
struct meson_host *host = mmc_priv(mmc);
@@ -830,7 +788,8 @@
if (data->flags & MMC_DATA_WRITE) {
cmd_cfg |= CMD_CFG_DATA_WR;
WARN_ON(xfer_bytes > host->bounce_buf_size);
- meson_mmc_copy_buffer(host, data, xfer_bytes, true);
+ sg_copy_to_buffer(data->sg, data->sg_len,
+ host->bounce_buf, xfer_bytes);
dma_wmb();
}
@@ -999,7 +958,8 @@
if (meson_mmc_bounce_buf_read(data)) {
xfer_bytes = data->blksz * data->blocks;
WARN_ON(xfer_bytes > host->bounce_buf_size);
- meson_mmc_copy_buffer(host, data, xfer_bytes, false);
+ sg_copy_from_buffer(data->sg, data->sg_len,
+ host->bounce_buf, xfer_bytes);
}
next_cmd = meson_mmc_get_next_command(cmd);
@@ -1219,7 +1179,7 @@
* instead of the DDR memory
*/
host->bounce_buf_size = SD_EMMC_SRAM_DATA_BUF_LEN;
- host->bounce_iomem_buf = host->regs + SD_EMMC_SRAM_DATA_BUF_OFF;
+ host->bounce_buf = host->regs + SD_EMMC_SRAM_DATA_BUF_OFF;
host->bounce_dma_addr = res->start + SD_EMMC_SRAM_DATA_BUF_OFF;
} else {
/* data bounce buffer */
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment