mirror of
https://github.com/linux-sunxi/meta-sunxi.git
synced 2026-04-09 22:30:01 +02:00
Compare commits
71 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
eaa81c64b9 | ||
|
cabb64ab12 | ||
|
|
d7b7bc10b1 | ||
|
|
561c1211f8 | ||
|
|
ef3adc7f53 | ||
|
|
57aeb9103d | ||
|
|
3c1d2b073b | ||
|
|
5e74f7e4d7 | ||
|
|
2acdec5212 | ||
|
|
9b81e35f15 | ||
|
|
820f782db6 | ||
|
|
1c14532fed | ||
|
|
992691c2bc | ||
|
|
d58e8c36d7 | ||
|
|
dcd6baa7cf | ||
|
|
e828ec13be | ||
|
|
2998db9ab3 | ||
|
|
3d4bcd1c54 | ||
|
|
682a3dffc7 | ||
|
|
363feb2ce8 | ||
|
a34349d67b | ||
|
|
a00dc47b24 | ||
|
a03d4270a1 | ||
|
|
ca60ffbc53 | ||
|
ab9690a0c1 | ||
|
|
f2f4c6a0bc | ||
|
|
0724baeaaf | ||
|
|
c877916982 | ||
|
|
dbf43ca34a | ||
|
|
80c3f3ee74 | ||
|
|
4145ca429f | ||
|
|
3d37166570 | ||
|
|
cfd534a0e0 | ||
|
|
43d1e49c0e | ||
|
|
dabffb137c | ||
|
|
2f6e00210b | ||
|
|
5a5ca0e05b | ||
|
9f2f369549 | ||
|
|
0825f43fe2 | ||
|
187cd6d342 | ||
|
|
2e9fc04500 | ||
|
|
a997050889 | ||
|
|
9c47e507e3 | ||
|
|
a2d3d5ffab | ||
|
|
42f4ad510d | ||
|
|
a83a18e526 | ||
|
33d7e2bb51 | ||
|
2a408a1350 | ||
|
|
31519e547e | ||
|
|
a2e503b82e | ||
|
|
4a04ddfb3e | ||
|
|
20e638ef5f | ||
|
|
322843f576 | ||
|
|
f70de55509 | ||
|
|
2f84e8ff67 | ||
|
|
3429331a8c | ||
|
05ff172139 | ||
|
|
608ae0cc0f | ||
|
|
f8aeeaeddb | ||
|
|
b756926593 | ||
|
|
197bc04dac | ||
|
|
4afe6a0b17 | ||
|
|
9edbede7bc | ||
|
|
2f291239fe | ||
|
|
0c874c99f7 | ||
|
|
916ecc0e9d | ||
|
|
17b8e40209 | ||
|
|
c19b5742bd | ||
|
|
0437a1df6b | ||
|
|
96453886e2 | ||
|
|
10173513ea |
@@ -14,4 +14,4 @@ LAYERVERSION_sunxi = "1"
|
||||
|
||||
LAYERDEPENDS_sunxi = "core meta-python meta-arm"
|
||||
|
||||
LAYERSERIES_COMPAT_sunxi = "honister kirkstone langdale mickledore nanbield scarthgap"
|
||||
LAYERSERIES_COMPAT_sunxi = "styhead"
|
||||
|
||||
@@ -11,7 +11,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
|
||||
XSERVER = "xserver-xorg \
|
||||
xf86-input-evdev \
|
||||
xf86-input-mouse \
|
||||
xf86-input-libinput"
|
||||
xf86-input-keyboard"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
|
||||
PREFERRED_VERSION_linux-mainline ?= "6.6.%"
|
||||
|
||||
@@ -35,5 +35,5 @@ EXTRA_OEMAKE:append:sun50i = " BL31=${DEPLOY_DIR_IMAGE}/bl31.bin SCP=/dev/null"
|
||||
do_compile:sun50i[depends] += "trusted-firmware-a:do_deploy"
|
||||
|
||||
do_compile:append:sunxi() {
|
||||
${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
|
||||
${B}/tools/mkimage -C none -A arm -T script -d ${UNPACKDIR}/boot.cmd ${UNPACKDIR}/${UBOOT_ENV_BINARY}
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
olinuxino-a20lime2
|
||||
/home/marek/data/projects/kas/sources/meta-sunxi/recipes-devtools/python/files/olinuxino-a20lime2
|
||||
@@ -16,7 +16,7 @@ S = "${WORKDIR}/pyA20-${PV}"
|
||||
inherit setuptools3
|
||||
|
||||
do_compile:prepend() {
|
||||
cp ${WORKDIR}/mapping.h ${S}/pyA20/gpio/mapping.h
|
||||
cp ${UNPACKDIR}/mapping.h ${S}/pyA20/gpio/mapping.h
|
||||
}
|
||||
|
||||
SRC_URI[md5sum] = "cab03b4931199804603d1074f6d8f48f"
|
||||
|
||||
@@ -20,7 +20,7 @@ CFLAGS += " -I${STAGING_INCDIR}/xorg "
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${datadir}/X11/xorg.conf.d
|
||||
install -m 0644 ${WORKDIR}/20-fbturbo.conf ${D}${datadir}/X11/xorg.conf.d
|
||||
install -m 0644 ${UNPACKDIR}/20-fbturbo.conf ${D}${datadir}/X11/xorg.conf.d
|
||||
}
|
||||
|
||||
FILES:${PN} += "${datadir}/X11/xorg.conf.d/20-fbturbo.conf"
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
From aba276a0dabae7dac88a22b5a48488058ab9048c Mon Sep 17 00:00:00 2001
|
||||
From: OpenEmbedded <oe.patch@oe>
|
||||
Date: Wed, 11 Feb 2026 17:02:49 +0900
|
||||
Subject: [PATCH] Fixed pmic error
|
||||
|
||||
When kernel is boot, rsb would not probe and initialize axp806 pmic correctly.
|
||||
|
||||
Upstream revert it to use i2c bus instream rsb.
|
||||
|
||||
Signed-off-by: OpenEmbedded <oe.patch@oe>
|
||||
---
|
||||
.../dts/allwinner/sun50i-h6-orangepi.dtsi | 25 ++++++++++---------
|
||||
1 file changed, 13 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
|
||||
index 92745128f..e34dbb992 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
|
||||
@@ -32,7 +32,7 @@ hdmi_con_in: endpoint {
|
||||
};
|
||||
};
|
||||
|
||||
- ext_osc32k: ext_osc32k_clk {
|
||||
+ ext_osc32k: ext-osc32k-clk {
|
||||
#clock-cells = <0>;
|
||||
compatible = "fixed-clock";
|
||||
clock-frequency = <32768>;
|
||||
@@ -94,6 +94,7 @@ hdmi_out_con: endpoint {
|
||||
&mmc0 {
|
||||
vmmc-supply = <®_cldo1>;
|
||||
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
|
||||
+ disable-wp;
|
||||
bus-width = <4>;
|
||||
status = "okay";
|
||||
};
|
||||
@@ -112,20 +113,12 @@ &pio {
|
||||
vcc-pg-supply = <®_aldo1>;
|
||||
};
|
||||
|
||||
-&r_ir {
|
||||
- status = "okay";
|
||||
-};
|
||||
-
|
||||
-&r_pio {
|
||||
- vcc-pm-supply = <®_bldo3>;
|
||||
-};
|
||||
-
|
||||
-&r_rsb {
|
||||
+&r_i2c {
|
||||
status = "okay";
|
||||
|
||||
- axp805: pmic@745 {
|
||||
+ axp805: pmic@36 {
|
||||
compatible = "x-powers,axp805", "x-powers,axp806";
|
||||
- reg = <0x745>;
|
||||
+ reg = <0x36>;
|
||||
interrupt-parent = <&r_intc>;
|
||||
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
|
||||
interrupt-controller;
|
||||
@@ -240,6 +233,14 @@ sw {
|
||||
};
|
||||
};
|
||||
|
||||
+&r_ir {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&r_pio {
|
||||
+ vcc-pm-supply = <®_bldo3>;
|
||||
+};
|
||||
+
|
||||
&rtc {
|
||||
clocks = <&ext_osc32k>;
|
||||
};
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -3,6 +3,8 @@ From: Marek Belisko <marek.belisko@open-nandra.com>
|
||||
Date: Tue, 24 Oct 2023 10:40:52 +0200
|
||||
Subject: [PATCH] dts: orangepi-zero: Add wifi support
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
|
||||
---
|
||||
.../allwinner/sun8i-h2-plus-orangepi-zero.dts | 46 +++++++++++++++----
|
||||
|
||||
@@ -3,6 +3,8 @@ From: Marek Belisko <marek.belisko@open-nandra.com>
|
||||
Date: Tue, 24 Oct 2023 10:42:36 +0200
|
||||
Subject: [PATCH] dts:nanopi-neo-air: Add camera support
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
|
||||
---
|
||||
.../dts/allwinner/sun8i-h3-nanopi-neo-air.dts | 85 +++++++++++++++++++
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
From d547db3a6067b670995f7479cf6cec49ac09ef94 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Choi <afewgoodman.choi@gmail.com>
|
||||
Date: Tue, 24 Feb 2026 14:33:42 +0900
|
||||
Subject: [PATCH] dts orange pi one plus Add Enable Ethernet
|
||||
|
||||
1. Add compatible to specifiy RTL8211.
|
||||
This was fixed in U-boot.
|
||||
|
||||
https://patchwork.ozlabs.org/project/uboot/patch/20230711003957.658805-2-retpolanne@posteo.net/#3148293
|
||||
|
||||
2. Add reset pin definition(PD14) for RTL8211.
|
||||
reset pin is required for if up/down function.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Mark Choi <afewgoodman.choi@gmail.com>
|
||||
---
|
||||
.../boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
|
||||
index 29a081e72..769716c0e 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
|
||||
@@ -37,7 +37,11 @@ &emac {
|
||||
|
||||
&mdio {
|
||||
ext_rgmii_phy: ethernet-phy@1 {
|
||||
- compatible = "ethernet-phy-ieee802.3-c22";
|
||||
+ compatible = "ethernet-phy-id001c.c915", "ethernet-phy-ieee802.3-c22";
|
||||
reg = <1>;
|
||||
+ reset-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */
|
||||
+ reset-assert-us = <10000>;
|
||||
+ reset-deassert-us = <50000>;
|
||||
+
|
||||
};
|
||||
};
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -6,6 +6,8 @@ Subject: [PATCH] dts: allwinner: bananapi-m2-zero: Enforce consistent MMC
|
||||
|
||||
Enforce MMC number (sometimes the order was wrong and the device does not boot).
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
|
||||
---
|
||||
arch/arm/boot/dts/allwinner/sun8i-h2-plus-bananapi-m2-zero.dts | 3 +++
|
||||
|
||||
@@ -3,6 +3,8 @@ From: Marek Belisko <marek.belisko@open-nandra.com>
|
||||
Date: Thu, 11 May 2023 11:18:33 +0200
|
||||
Subject: [PATCH] bananapi-m64: Consistent nodes for mmc devices
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 3 +++
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
From 071808589900d4f2f5407a8a638466e75bb35a61 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Sack <asac@pantacor.com>
|
||||
Date: Thu, 12 Jun 2025 08:43:13 +0000
|
||||
Subject: [PATCH] clk-config: fixup of_property_for_each_u32 after landing of
|
||||
914ef7d1a702c510d0b59151a9623f9d20c69d2a
|
||||
|
||||
---
|
||||
drivers/clk/clk-conf.c | 8 +++-----
|
||||
1 file changed, 3 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/clk/clk-conf.c b/drivers/clk/clk-conf.c
|
||||
index 70b0fdd63..602383b96 100644
|
||||
--- a/drivers/clk/clk-conf.c
|
||||
+++ b/drivers/clk/clk-conf.c
|
||||
@@ -16,9 +16,7 @@
|
||||
static int __set_clk_flags(struct device_node *node)
|
||||
{
|
||||
struct of_phandle_args clkspec;
|
||||
- struct property *prop;
|
||||
int i, index = 0, rc;
|
||||
- const __be32 *cur;
|
||||
struct clk *clk;
|
||||
u32 nr_cells;
|
||||
|
||||
@@ -31,11 +29,11 @@ static int __set_clk_flags(struct device_node *node)
|
||||
clkspec.np = node;
|
||||
clkspec.args_count = nr_cells;
|
||||
|
||||
- of_property_for_each_u32(node, "protected-clocks", prop, cur, clkspec.args[0]) {
|
||||
+ of_property_for_each_u32(node, "protected-clocks", clkspec.args[0]) {
|
||||
/* read the remainder of the clock specifier */
|
||||
for (i = 1; i < nr_cells; ++i) {
|
||||
- cur = of_prop_next_u32(prop, cur, &clkspec.args[i]);
|
||||
- if (!cur) {
|
||||
+ _it.item = of_prop_next_u32(_it.prop, _it.item, &clkspec.args[i]);
|
||||
+ if (!_it.item) {
|
||||
pr_err("clk: invalid value of protected-clocks"
|
||||
" property at %pOF\n", node);
|
||||
return -EINVAL;
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -0,0 +1,142 @@
|
||||
From 91b69779e0875e58d8973b2938a1cc4b7a1c455b Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Karlman <jonas@kwiboo.se>
|
||||
Date: Sun, 25 Mar 2018 22:17:06 +0200
|
||||
Subject: [PATCH 22/44] ASoC: hdmi-codec: fix channel allocation
|
||||
|
||||
---
|
||||
sound/soc/codecs/hdmi-codec.c | 113 ++++++++++++++++------------------
|
||||
1 file changed, 52 insertions(+), 61 deletions(-)
|
||||
|
||||
--- a/sound/soc/codecs/hdmi-codec.c
|
||||
+++ b/sound/soc/codecs/hdmi-codec.c
|
||||
@@ -194,78 +194,69 @@ static const struct snd_pcm_chmap_elem h
|
||||
*/
|
||||
static const struct hdmi_codec_cea_spk_alloc hdmi_codec_channel_alloc[] = {
|
||||
{ .ca_id = 0x00, .n_ch = 2,
|
||||
- .mask = FL | FR},
|
||||
- /* 2.1 */
|
||||
- { .ca_id = 0x01, .n_ch = 4,
|
||||
- .mask = FL | FR | LFE},
|
||||
- /* Dolby Surround */
|
||||
+ .mask = FL | FR },
|
||||
+ { .ca_id = 0x03, .n_ch = 4,
|
||||
+ .mask = FL | FR | LFE | FC },
|
||||
{ .ca_id = 0x02, .n_ch = 4,
|
||||
.mask = FL | FR | FC },
|
||||
- /* surround51 */
|
||||
+ { .ca_id = 0x01, .n_ch = 4,
|
||||
+ .mask = FL | FR | LFE },
|
||||
{ .ca_id = 0x0b, .n_ch = 6,
|
||||
- .mask = FL | FR | LFE | FC | RL | RR},
|
||||
- /* surround40 */
|
||||
- { .ca_id = 0x08, .n_ch = 6,
|
||||
- .mask = FL | FR | RL | RR },
|
||||
- /* surround41 */
|
||||
- { .ca_id = 0x09, .n_ch = 6,
|
||||
- .mask = FL | FR | LFE | RL | RR },
|
||||
- /* surround50 */
|
||||
+ .mask = FL | FR | LFE | FC | RL | RR },
|
||||
{ .ca_id = 0x0a, .n_ch = 6,
|
||||
.mask = FL | FR | FC | RL | RR },
|
||||
- /* 6.1 */
|
||||
- { .ca_id = 0x0f, .n_ch = 8,
|
||||
- .mask = FL | FR | LFE | FC | RL | RR | RC },
|
||||
- /* surround71 */
|
||||
+ { .ca_id = 0x09, .n_ch = 6,
|
||||
+ .mask = FL | FR | LFE | RL | RR },
|
||||
+ { .ca_id = 0x08, .n_ch = 6,
|
||||
+ .mask = FL | FR | RL | RR },
|
||||
+ { .ca_id = 0x07, .n_ch = 6,
|
||||
+ .mask = FL | FR | LFE | FC | RC },
|
||||
+ { .ca_id = 0x06, .n_ch = 6,
|
||||
+ .mask = FL | FR | FC | RC },
|
||||
+ { .ca_id = 0x05, .n_ch = 6,
|
||||
+ .mask = FL | FR | LFE | RC },
|
||||
+ { .ca_id = 0x04, .n_ch = 6,
|
||||
+ .mask = FL | FR | RC },
|
||||
{ .ca_id = 0x13, .n_ch = 8,
|
||||
.mask = FL | FR | LFE | FC | RL | RR | RLC | RRC },
|
||||
- /* others */
|
||||
- { .ca_id = 0x03, .n_ch = 8,
|
||||
- .mask = FL | FR | LFE | FC },
|
||||
- { .ca_id = 0x04, .n_ch = 8,
|
||||
- .mask = FL | FR | RC},
|
||||
- { .ca_id = 0x05, .n_ch = 8,
|
||||
- .mask = FL | FR | LFE | RC },
|
||||
- { .ca_id = 0x06, .n_ch = 8,
|
||||
- .mask = FL | FR | FC | RC },
|
||||
- { .ca_id = 0x07, .n_ch = 8,
|
||||
- .mask = FL | FR | LFE | FC | RC },
|
||||
- { .ca_id = 0x0c, .n_ch = 8,
|
||||
- .mask = FL | FR | RC | RL | RR },
|
||||
- { .ca_id = 0x0d, .n_ch = 8,
|
||||
- .mask = FL | FR | LFE | RL | RR | RC },
|
||||
- { .ca_id = 0x0e, .n_ch = 8,
|
||||
- .mask = FL | FR | FC | RL | RR | RC },
|
||||
- { .ca_id = 0x10, .n_ch = 8,
|
||||
- .mask = FL | FR | RL | RR | RLC | RRC },
|
||||
- { .ca_id = 0x11, .n_ch = 8,
|
||||
- .mask = FL | FR | LFE | RL | RR | RLC | RRC },
|
||||
+ { .ca_id = 0x1f, .n_ch = 8,
|
||||
+ .mask = FL | FR | LFE | FC | RL | RR | FLC | FRC },
|
||||
{ .ca_id = 0x12, .n_ch = 8,
|
||||
.mask = FL | FR | FC | RL | RR | RLC | RRC },
|
||||
- { .ca_id = 0x14, .n_ch = 8,
|
||||
- .mask = FL | FR | FLC | FRC },
|
||||
- { .ca_id = 0x15, .n_ch = 8,
|
||||
- .mask = FL | FR | LFE | FLC | FRC },
|
||||
- { .ca_id = 0x16, .n_ch = 8,
|
||||
- .mask = FL | FR | FC | FLC | FRC },
|
||||
- { .ca_id = 0x17, .n_ch = 8,
|
||||
- .mask = FL | FR | LFE | FC | FLC | FRC },
|
||||
- { .ca_id = 0x18, .n_ch = 8,
|
||||
- .mask = FL | FR | RC | FLC | FRC },
|
||||
- { .ca_id = 0x19, .n_ch = 8,
|
||||
- .mask = FL | FR | LFE | RC | FLC | FRC },
|
||||
- { .ca_id = 0x1a, .n_ch = 8,
|
||||
- .mask = FL | FR | RC | FC | FLC | FRC },
|
||||
- { .ca_id = 0x1b, .n_ch = 8,
|
||||
- .mask = FL | FR | LFE | RC | FC | FLC | FRC },
|
||||
- { .ca_id = 0x1c, .n_ch = 8,
|
||||
- .mask = FL | FR | RL | RR | FLC | FRC },
|
||||
- { .ca_id = 0x1d, .n_ch = 8,
|
||||
- .mask = FL | FR | LFE | RL | RR | FLC | FRC },
|
||||
{ .ca_id = 0x1e, .n_ch = 8,
|
||||
.mask = FL | FR | FC | RL | RR | FLC | FRC },
|
||||
- { .ca_id = 0x1f, .n_ch = 8,
|
||||
- .mask = FL | FR | LFE | FC | RL | RR | FLC | FRC },
|
||||
+ { .ca_id = 0x11, .n_ch = 8,
|
||||
+ .mask = FL | FR | LFE | RL | RR | RLC | RRC },
|
||||
+ { .ca_id = 0x1d, .n_ch = 8,
|
||||
+ .mask = FL | FR | LFE | RL | RR | FLC | FRC },
|
||||
+ { .ca_id = 0x10, .n_ch = 8,
|
||||
+ .mask = FL | FR | RL | RR | RLC | RRC },
|
||||
+ { .ca_id = 0x1c, .n_ch = 8,
|
||||
+ .mask = FL | FR | RL | RR | FLC | FRC },
|
||||
+ { .ca_id = 0x0f, .n_ch = 8,
|
||||
+ .mask = FL | FR | LFE | FC | RL | RR | RC },
|
||||
+ { .ca_id = 0x1b, .n_ch = 8,
|
||||
+ .mask = FL | FR | LFE | RC | FC | FLC | FRC },
|
||||
+ { .ca_id = 0x0e, .n_ch = 8,
|
||||
+ .mask = FL | FR | FC | RL | RR | RC },
|
||||
+ { .ca_id = 0x1a, .n_ch = 8,
|
||||
+ .mask = FL | FR | RC | FC | FLC | FRC },
|
||||
+ { .ca_id = 0x0d, .n_ch = 8,
|
||||
+ .mask = FL | FR | LFE | RL | RR | RC },
|
||||
+ { .ca_id = 0x19, .n_ch = 8,
|
||||
+ .mask = FL | FR | LFE | RC | FLC | FRC },
|
||||
+ { .ca_id = 0x0c, .n_ch = 8,
|
||||
+ .mask = FL | FR | RC | RL | RR },
|
||||
+ { .ca_id = 0x18, .n_ch = 8,
|
||||
+ .mask = FL | FR | RC | FLC | FRC },
|
||||
+ { .ca_id = 0x17, .n_ch = 8,
|
||||
+ .mask = FL | FR | LFE | FC | FLC | FRC },
|
||||
+ { .ca_id = 0x16, .n_ch = 8,
|
||||
+ .mask = FL | FR | FC | FLC | FRC },
|
||||
+ { .ca_id = 0x15, .n_ch = 8,
|
||||
+ .mask = FL | FR | LFE | FLC | FRC },
|
||||
+ { .ca_id = 0x14, .n_ch = 8,
|
||||
+ .mask = FL | FR | FLC | FRC },
|
||||
};
|
||||
|
||||
struct hdmi_codec_priv {
|
||||
@@ -0,0 +1,49 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Holland <samuel@sholland.org>
|
||||
Date: Mon, 30 Dec 2019 12:39:31 -0600
|
||||
Subject: [PATCH] Revert "clk: qcom: Support 'protected-clocks' property"
|
||||
|
||||
Now that protected-clocks is handled in the clk core, this
|
||||
driver-specific implementation is redundant.
|
||||
|
||||
This reverts commit b181b3b801da8893c8eb706e448dd5111b02de60.
|
||||
|
||||
Signed-off-by: Samuel Holland <samuel@sholland.org>
|
||||
---
|
||||
drivers/clk/qcom/common.c | 18 ------------------
|
||||
1 file changed, 18 deletions(-)
|
||||
|
||||
--- a/drivers/clk/qcom/common.c
|
||||
+++ b/drivers/clk/qcom/common.c
|
||||
@@ -194,22 +194,6 @@ int qcom_cc_register_sleep_clk(struct de
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(qcom_cc_register_sleep_clk);
|
||||
|
||||
-/* Drop 'protected-clocks' from the list of clocks to register */
|
||||
-static void qcom_cc_drop_protected(struct device *dev, struct qcom_cc *cc)
|
||||
-{
|
||||
- struct device_node *np = dev->of_node;
|
||||
- struct property *prop;
|
||||
- const __be32 *p;
|
||||
- u32 i;
|
||||
-
|
||||
- of_property_for_each_u32(np, "protected-clocks", prop, p, i) {
|
||||
- if (i >= cc->num_rclks)
|
||||
- continue;
|
||||
-
|
||||
- cc->rclks[i] = NULL;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
static struct clk_hw *qcom_cc_clk_hw_get(struct of_phandle_args *clkspec,
|
||||
void *data)
|
||||
{
|
||||
@@ -272,8 +256,6 @@ int qcom_cc_really_probe(struct platform
|
||||
cc->rclks = rclks;
|
||||
cc->num_rclks = num_clks;
|
||||
|
||||
- qcom_cc_drop_protected(dev, cc);
|
||||
-
|
||||
for (i = 0; i < num_clk_hws; i++) {
|
||||
ret = devm_clk_hw_register(dev, clk_hws[i]);
|
||||
if (ret)
|
||||
@@ -2,9 +2,11 @@
|
||||
#
|
||||
|
||||
patch clk-Implement-protected-clocks-for-all-OF-clock-prov.patch
|
||||
patch Revert-clk-qcom-Support-protected-clocks-property.patch
|
||||
patch rtc-sun6i-Allow-RTC-wakeup-after-shutdown.patch
|
||||
patch firmware-arm_scpi-Support-unidirectional-mailbox-cha.patch
|
||||
patch arm64-dts-allwinner-h6-Add-SCPI-protocol.patch
|
||||
patch ASoC-hdmi-codec-fix-channel-allocation.patch
|
||||
patch arm64-dts-h6-deinterlace.patch
|
||||
patch HACK-h6-Add-HDMI-sound-card.patch
|
||||
patch arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch
|
||||
@@ -14,6 +16,5 @@ patch arm64-dts-allwinner-h6-Fix-Cedrus-IOMMU-again.patch
|
||||
patch iommu-sun50i-Allow-page-sizes-multiple-of-4096.patch
|
||||
patch OrangePi-3-LTS-support.patch
|
||||
patch arm64-dts-allwinner-Enforce-consistent-MMC-numbering.patch
|
||||
patch 0001-clk-config-fixup-of_property_for_each_u32-after-land.patch
|
||||
|
||||
kconf hardware orange-pi-3lts.cfg
|
||||
kconf harware orange-pi-3lts.cfg
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
|
||||
SRC_URI:append:orange-pi-one-plus = " file://axp20x.cfg"
|
||||
SRC_URI:append:orange-pi-one-plus = " file://patches/0001-dts-allwinner-Orangepi-one-plus-Fixed-pmic-error.patch"
|
||||
SRC_URI:append:orange-pi-one-plus = " file://patches/0002-dts-orange-pi-one-plus-Add-Enable-Ethernet.patch"
|
||||
|
||||
@@ -45,8 +45,8 @@ do_configure:prepend() {
|
||||
#
|
||||
# logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used
|
||||
#
|
||||
if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then
|
||||
install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
|
||||
if [ -e ${UNPACKDIR}/logo_linux_clut224.ppm ]; then
|
||||
install -m 0644 ${UNPACKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
|
||||
kernel_conf_variable LOGO y
|
||||
kernel_conf_variable LOGO_LINUX_CLUT224 y
|
||||
fi
|
||||
|
||||
@@ -2,7 +2,8 @@ DESCRIPTION = "UWE5622 Wifi firmware"
|
||||
LICENSE = "CC0-1.0"
|
||||
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a8067e55da801e4a1"
|
||||
|
||||
S = "${WORKDIR}"
|
||||
S = "${WORKDIR}/sources"
|
||||
UNPACKDIR = "${S}"
|
||||
|
||||
COMPATIBLE_MACHINE = "(orange-pi-zero2|orange-pi-3lts)"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user