71 Commits

Author SHA1 Message Date
Marek Belisko
eaa81c64b9 Merge pull request #443 from okaestne/chore/kernel-cleanup
chore: clean up old kernel versions and fix KERNEL_DEVICETREE handling
2025-04-05 23:04:32 +02:00
Oliver Kästner
cabb64ab12 linux-mainline: fix spacing with KERNEL_FEATURES:prepend
Prepends should always end with a space char. Fix that by just turning
it into an append. Change the second prepend to an append for
consistency.

Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>
2025-03-31 12:31:50 +02:00
Oliver Kästner
d7b7bc10b1 ap6212: add missing leading space to append
Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>
2025-03-31 12:31:50 +02:00
Marek Belisko
561c1211f8 Merge pull request #444 from okaestne/feat/linux-6.6.85
linux-mainline: bump to 6.6.85
2025-03-31 12:21:15 +02:00
Oliver Kästner
ef3adc7f53 linux-mainline: bump to 6.6.85
Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>
2025-03-30 00:56:00 +01:00
Oliver Kästner
57aeb9103d chore: drop stale kmeta
drop kmeta for older and removed kernel versions

Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>
2025-03-27 23:52:14 +01:00
Oliver Kästner
3c1d2b073b fix handling KERNEL_DEVICETREE with allwinner/ prefix
Since linux 6.5, .dts files live in vendor subdirs. Fix all
`KERNEL_DEVICETREE` definitions to contain the `allwinner` subdir as
prefix and drop code that previously added the prefix on demand.
On the other hand, drop the prefix for `BOOT_IMAGE_FILES`, which
searches the .dtb within `DEPLOY_DIR`.

Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>
2025-03-24 18:26:14 +01:00
Oliver Kästner
5e74f7e4d7 chore: drop linux-mainline pre-v6.5 patches
Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>
2025-03-24 18:26:14 +01:00
Oliver Kästner
2acdec5212 chore: drop linux-mainline v6.5.11
Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>
2025-03-24 18:26:14 +01:00
Oliver Kästner
9b81e35f15 chore: drop linux-mainline v6.1.9
Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>
2025-03-24 18:26:14 +01:00
Oliver Kästner
820f782db6 chore: drop linux-mainline v5.15.91
Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>
2025-03-24 18:26:14 +01:00
Marek Belisko
1c14532fed Merge pull request #441 from okaestne/feat/ap6212-bt
ap6212: enable bluetooth support
2025-03-21 11:06:38 +01:00
Oliver Kästner
992691c2bc ap6212: enable bluetooth support 2025-03-21 00:39:11 +01:00
Marek Belisko
d58e8c36d7 Merge pull request #440 from okaestne/feat/machine-feature-wifi-bt
feat: add MACHINE_FEATURE wifi and bluetooth for AP6212 and AP6330 boards
2025-03-17 21:33:07 +01:00
Oliver Kästner
dcd6baa7cf feat: add MACHINE_FEATURE wifi and bluetooth for AP6212 and AP6330 boards
Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>
2025-03-17 21:03:59 +01:00
Marek Belisko
e828ec13be Merge pull request #439 from okaestne/fix/opi0-dts-mmc
linux-mainline: dts: orangepi-zero: add mmc aliases for consistent enumeration
2025-03-17 09:00:57 +01:00
Oliver Kästner
2998db9ab3 linux-mainline: dts: orangepi-zero: add mmc aliases for consistent enumeration
This fixes random boot failures.
Same workaround as in the other patches.

Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>
2025-03-16 23:56:47 +01:00
Marek Belisko
3d4bcd1c54 Merge pull request #437 from okaestne/master
Add BananaPi M2 Berry support
2025-01-20 09:22:56 +01:00
Oliver Kästner
682a3dffc7 Add BananaPi M2 Berry support
Add `bananapi-m2-berry` machine conf and enable WiFi for it.
2025-01-19 01:24:09 +01:00
Marek Belisko
363feb2ce8 Merge pull request #435 from linux-sunxi/fix-u-boot-loadaddr
sunxi64.inc: Fix wrong UBOOT_LOADADDRESS variable value
2025-01-07 22:15:54 +01:00
Marek Belisko
a34349d67b sunxi64.inc: Fix wrong UBOOT_LOADADDRESS variable value
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
2025-01-07 10:02:40 +01:00
Marek Belisko
a00dc47b24 Merge pull request #432 from stgloorious/stgloor/mmc-alias
recipes-kernel/linux-mainline: add MMC alias for Olinuxino A20
2025-01-01 20:17:20 +01:00
Stefan Gloor
a03d4270a1 recipes-kernel/linux-mainline: add MMC alias for Olinuxino A20
Add patch that adds MMC aliases to device tree for consistent
enumeration of SD cards.

Signed-off-by: Stefan Gloor <code@stefan-gloor.ch>
2025-01-01 16:35:41 +00:00
Marek Belisko
ca60ffbc53 Merge pull request #430 from leon-anavi/master-fix-u-boot-a80
u-boot_%.bbappend: Fix U-Boot for sun9i
2024-12-19 10:40:25 +01:00
Leon Anavi
ab9690a0c1 u-boot_%.bbappend: Fix U-Boot for sun9i
Use a proper fix instead of reverting U-Boot commit ffb0294.
After reporting this issue to the U-Boot mailing list, a patch
that works on Allwinner A80 machines like Merrii A80 Optimus board
was proposed by Andre Przywara:
https://lists.denx.de/pipermail/u-boot/2024-December/575050.html

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
2024-12-14 13:41:31 +02:00
Marek Belisko
f2f4c6a0bc Merge pull request #429 from leon-anavi/master-ap6330
Enable AMPAK AP6330 WiFi and Bluetooth
2024-12-12 08:10:14 +01:00
Leon Anavi
0724baeaaf Enable AMPAK AP6330 WiFi and Bluetooth
Enable AMPAK AP6330 that combines Broadcom Wifi (BCM4330) and
Bluetooth 4.0 (BCM40183) chips for sun9i devices such as Merrii A80
Optimus and Cubieboard 4.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
2024-12-12 01:12:31 +02:00
Marek Belisko
c877916982 Merge pull request #426 from stgloorious/stgloor/setuptools-pr
recipes/devtools: replace distutils3*.bbclass with setuptools3*.bbclass
2024-12-10 08:35:02 +01:00
Stefan Gloor
dbf43ca34a recipes/devtools: replace distutils3*.bbclass with setuptools3*.bbclass
distutils3 is deprecated and its use produces warnings during build:

WARNING: distutils-common-base.bbclass is deprecated, please use setuptools3-base.bbclass instead
WARNING: distutils3-base.bbclass is deprecated, please use setuptools3-base.bbclass instead
WARNING: distutils3.bbclass is deprecated, please use setuptools3.bbclass instead

setuptools3 should be a drop-in replacement.

Signed-off-by: Stefan Gloor <code@stefan-gloor.ch>
2024-12-10 01:02:21 +00:00
Marek Belisko
80c3f3ee74 Merge pull request #425 from leon-anavi/cubieboard4
cubieboard4.conf: Add machine
2024-12-09 22:03:47 +01:00
Leon Anavi
4145ca429f cubieboard4.conf: Add machine
Add machine cubieboard4 for Cubieboard 4 with Allwinner A80 SoC
from the sun9i family with mainline U-Boot and Linux kernel.

Thanks to Lazar Hristov for testing core-image-base on the machine.

Tested-by: Lazar Hristov <lhristov@gmail.com>
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
2024-12-09 22:51:27 +02:00
Marek Belisko
3d37166570 Merge pull request #424 from leon-anavi/merrii-a80-optimus
Add Merrii A80 Optimus board
2024-12-09 21:00:38 +01:00
Leon Anavi
cfd534a0e0 u-boot_%.bbappend: Fix for sun9i
Temporary revert commit ffb0294 from 12 Nov 2023 for device with
Allwinner A80 SoC (aka sun9i):

sunxi: board: simplify early PMIC setup conditions

On Merrii A80 Optimus this git commit causes U-Boot to hang at:

Starting kernel ...

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
2024-12-09 19:14:03 +02:00
Leon Anavi
43d1e49c0e sun9i/defconfig: Default kernel defconfig
Add a default Linux kernel defconfig for devices from the sun9i
family with Allwinner A80 SoC such as Merrii A80 Optimus board.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
2024-12-09 18:54:19 +02:00
Leon Anavi
dabffb137c merrii-a80-optimus.conf: Add machine
Add machine merrii-a80-optimus for Merrii A80 Optimus development
board that is supported by U-Boot and mainline Linux kernel.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
2024-12-09 18:51:14 +02:00
Leon Anavi
2f6e00210b sun9i.inc: Add SoC family sun9i
Create SoC family sun9i for machines with Allwinner A80 that are
supported by mainline U-Boot and mainline Linux kernel.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
2024-12-09 18:03:21 +02:00
Marek Belisko
5a5ca0e05b Merge pull request #422 from gye976/master
recipes-graphics/mesa: Fix bitbake parsing error
2024-11-04 09:38:30 +01:00
Gyeyoung Baek
9f2f369549 recipes-graphics/mesa: Fix bitbake parsing error
there was the following error,

ERROR: No recipes in default available for:
  /home/gye/yocto/meta-sunxi/recipes-graphics/mesa/mesa-gl_%.bbappend
  /home/gye/yocto/meta-sunxi/recipes-graphics/mesa/mesa_%.bbappend

so i renamed mesa_%.bbappend to mesa.bbappend,
and mesa-gl_%.bbappend to mesa-gl.bbappend
2024-10-31 18:57:33 +09:00
Marek Belisko
0825f43fe2 Merge pull request #419 from ovpanait/master
u-boot: apply ttyS3 patch only for mangopi-mq-t-tt13 builds
2024-10-17 21:56:52 +02:00
Ovidiu Panait
187cd6d342 u-boot: apply ttyS3 patch only for mangopi-mq-t-tt13 builds
For all boards except mangopi-mq-t-tt13, switch back the serial console to
ttyS0. Apply the ttyS3 patch added in commit [1] only when building for the
mangopi-mq-t-tt13 board.

Boot tested on orangepi-zero2 board - the kernel logs are again printed to
the debug serial console.

    [1] 9edbede7bc ("u-boot: Fix console for mangopi-mq-r-tt13 board")

Signed-off-by: Ovidiu Panait <ovidiu.panait.oss@gmail.com>
2024-10-17 22:34:36 +03:00
Marek Belisko
2e9fc04500 Merge pull request #417 from leon-anavi/xradio-firmware-branch
xradio-firmware: Add branch to SRC_URI
2024-08-20 14:24:50 +02:00
Leon Anavi
a997050889 xradio-firmware: Add branch to SRC_URI
Explicitly specify a branch parameter and fix the warning:

The future default branch used by tools and repositories is
uncertain and we will therefore soon require this is set in
all git urls.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
2024-08-20 15:20:55 +03:00
Marek Belisko
9c47e507e3 Merge pull request #416 from leon-anavi/add-upstream-status
linux-mainline/6.5/*.patch: Add Upstream-Status
2024-08-16 21:31:43 +02:00
Leon Anavi
a2d3d5ffab linux-mainline/6.5/*.patch: Add Upstream-Status
Add Upstream-Status in patches to fix QA issues.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
2024-08-16 19:23:33 +03:00
Marek Belisko
42f4ad510d Merge pull request #411 from ludiazv/new-opizero2
Support for Orange pi zero 2 for 6.6 LTS
2024-06-17 16:05:33 +02:00
Marek Belisko
a83a18e526 Merge pull request #413 from alperak/master
recipes: Switch away from S = WORKDIR and use UNPACKDIR instead of WO…
2024-06-17 16:04:33 +02:00
alperak
33d7e2bb51 recipes: Switch away from S = WORKDIR and use UNPACKDIR instead of WORKDIR
- The layer compability has also been updated in this PR.

* Using S = ${WORKDIR} is no longer supported.

* UNPACKDIR is new contruct for do_unpack things in latest master we should be using that instead of WORKDIR for referencing those files.

* We don't know yet what changes will be needed to stay compatible with final styhead, but we already know that the last changes for UNPACKDIR aren't compatible with scarthgap, nanbield or others.

https://lists.openembedded.org/g/openembedded-architecture/message/2007
https://docs.yoctoproject.org/dev/ref-manual/variables.html?highlight=unpackdir#term-UNPACKDIR

Signed-off-by: alperak <alperyasinak1@gmail.com>
2024-06-05 17:25:20 +03:00
ludiazv
2a408a1350 update opi zero 2 with auto load modules for wifi and bt 2024-05-23 14:28:05 +02:00
ludiazv
31519e547e remove hack for hdmi out 2024-05-23 14:26:00 +02:00
ludiazv
a2e503b82e fix/improve MAC address management 2024-05-23 09:55:55 +02:00
ludiazv
4a04ddfb3e h616 and h618 patches 2024-05-22 14:43:59 +02:00
ludiazv
20e638ef5f add opizero 2 to 6.6 2024-05-22 12:48:55 +02:00
Marek Belisko
322843f576 pya20: Added support for olinuxino-a20lime2-emmc
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
2024-05-13 09:19:55 +02:00
Marek Belisko
f70de55509 Merge pull request #406 from alperak/master
Add Orange Pi Prime machine support
2024-05-09 12:04:53 +02:00
alperak
2f84e8ff67 Add Orange Pi Prime machine support
- Ethernet, WiFi, Bluetooth, USBs are working fine but HDMI is working until U-Boot loading the kernel. Then it stop working.
- Tested with core-image-base and kernel mainline 6.6.28

Signed-off-by: alperak <alperyasinak1@gmail.com>
2024-05-08 22:58:22 +03:00
Marek Belisko
3429331a8c Merge pull request #409 from SaskatoonTechworks/dankm/issues
Fix various Yocto compatibility issues
2024-05-07 22:05:00 +02:00
Dan McGregor
05ff172139 trusted-firmware: Make append machine specific 2024-05-07 10:33:28 -06:00
Dan McGregor
608ae0cc0f xserver-xorg: don't unconditionally add xshmfence
This is only required if dri3 is enabled in the server. It shouldn't
be included unconditionally.

Arguably this should be put in openembedded-core, but for now it's
safe to put here.
2024-05-07 10:26:09 -06:00
Dan McGregor
f8aeeaeddb linux: change licence name
Use SPDX name for the kernel, oe-core changed a long time ago and
now we're throwing licence name warnings.
2024-05-07 10:26:09 -06:00
Dan McGregor
b756926593 linux-firmware: Only add firmware to sunxi machines
It doesn't make sense to unconditionally include these firmware
files on other machines. Gate it on whether we're a sunxi machine.
2024-05-07 10:26:09 -06:00
Marek Belisko
197bc04dac Merge pull request #405 from ludiazv/new-opi3-lts
Basic support for orange pi 3 lts
2024-05-07 13:46:31 +02:00
Marek Belisko
4afe6a0b17 Merge branch 'master' into new-opi3-lts 2024-05-07 13:46:22 +02:00
Marek Belisko
9edbede7bc u-boot: Fix console for mangopi-mq-r-tt13 board
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
2024-05-07 11:39:54 +02:00
Marek Belisko
2f291239fe conf/machine: add support for MangoPi MQ-R T113-S3
Signed-off-by: Leo Soares <leojrfs@gmail.com>
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
2024-05-07 11:39:50 +02:00
ludiazv
0c874c99f7 add preferred kernel version to sunxi64 2024-04-28 01:40:51 +02:00
ludiazv
916ecc0e9d update opi 3lts machine 2024-04-28 01:40:20 +02:00
ludiazv
17b8e40209 add kernel features 2024-04-28 01:39:48 +02:00
ludiazv
c19b5742bd update uwe5622 patches 2024-04-28 01:39:09 +02:00
ludiazv
0437a1df6b add kernel patches for orangepi-3lts for 6.1 6.5 kernels(KMETA) 2024-04-25 23:44:57 +02:00
ludiazv
96453886e2 add wifi uwe driver firmware and kernel support(KMETA) 2024-04-25 23:44:57 +02:00
ludiazv
10173513ea add orange-pi-3lts machine config and u-boot support for this board 2024-04-25 23:44:57 +02:00
18 changed files with 212 additions and 53 deletions

View File

@@ -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"

View File

@@ -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.%"

View File

@@ -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}
}

View File

@@ -1 +1 @@
olinuxino-a20lime2
/home/marek/data/projects/kas/sources/meta-sunxi/recipes-devtools/python/files/olinuxino-a20lime2

View File

@@ -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"

View File

@@ -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"

View File

@@ -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 +++++++++++++++----

View File

@@ -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 +++++++++++++++++++

View File

@@ -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 +++

View File

@@ -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 +++

View File

@@ -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

View File

@@ -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 {

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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)"