Skip to content

Max 6.x #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ppy2 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Max 6.x #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a0f7989
Fix MCLKOUT clock routing for kernel 6.1 audio artifacts
ppy2 Nov 8, 2025
82a49c5
Fix external clock mode for kernel 6.1
ppy2 Nov 8, 2025
c00a248
Fix USB audio support for kernel 6.1
ppy2 Nov 10, 2025
5fec7ef
Update kernel patch with USB2PHY fixes for kernel 6.1
ppy2 Nov 10, 2025
606748c
Comprehensive I2S TDM driver cleanup and code quality improvements
ppy2 Nov 10, 2025
af91aa6
Comprehensive I2S audio improvements and PCM EXT mode fix
ppy2 Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,897 changes: 3,897 additions & 0 deletions buildroot/output/build/linux-custom/sound/soc/rockchip/rockchip_i2s_tdm.c
View file
Open in desktop

Large diffs are not rendered by default.

1,177 changes: 724 additions & 453 deletions ext_tree/board/luckfox/config/linux.config
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ext_tree/board/luckfox/dts_max/rv1106.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1476,7 +1476,7 @@ mmc0 {
snps,dis-tx-ipgap-linecheck-quirk;
snps,usb2-gadget-lpm-disable;
snps,usb2-lpm-disable;
status = "disabled";
status = "okay";
};
};

Expand Down
1 change: 1 addition & 0 deletions ext_tree/board/luckfox/dts_max/rv1106_512_ext-ipc.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ i2s0_8ch: i2s@ffae0000 {

assigned-clocks = <&cru CLK_I2S0_8CH_TX>, <&cru CLK_I2S0_8CH_RX>;
assigned-clock-parents = <&i2s0_mclkin>, <&i2s0_mclkin>;
assigned-clock-rates = <0>, <0>;
my,mclk_external;

dmas = <&dmac 22>, <&dmac 21>;
Expand Down
1 change: 1 addition & 0 deletions ext_tree/board/luckfox/dts_max/rv1106_ext-ipc.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ i2s0_8ch: i2s@ffae0000 {

assigned-clocks = <&cru CLK_I2S0_8CH_TX>, <&cru CLK_I2S0_8CH_RX>;
assigned-clock-parents = <&i2s0_mclkin>, <&i2s0_mclkin>;
assigned-clock-rates = <0>, <0>;
my,mclk_external;

dmas = <&dmac 22>, <&dmac 21>;
Expand Down
12 changes: 6 additions & 6 deletions ext_tree/board/luckfox/dts_max/rv1106_pll-ipc.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
clocks = <&cru MCLK_I2S0_8CH_TX>, <&cru MCLK_I2S0_8CH_RX>, <&cru HCLK_I2S0>,
<&cru CLK_I2S0_8CH_TX_SRC>, <&cru CLK_I2S0_8CH_RX_SRC>,
<&cru PLL_GPLL>, <&cru PLL_GPLL>;

clock-names = "mclk_tx", "mclk_rx", "hclk",
"mclk_tx_src", "mclk_rx_src",
"mclk_root0", "mclk_root1";

rockchip,mclk-calibrate;

assigned-clocks = <&cru PLL_GPLL>, <&cru CLK_I2S0_8CH_TX_SRC>, <&cru CLK_I2S0_8CH_RX_SRC>, <&cru I2S0_8CH_MCLKOUT>;
assigned-clock-parents = <0>, <&cru PLL_GPLL>, <&cru PLL_GPLL>, <&cru CLK_I2S0_8CH_TX_SRC>;
assigned-clock-rates = <983040000>, <0>, <0>, <0>;
rockchip,mclk-calibrate;
rockchip,no-fractional-divider;
assigned-clocks = <&cru PLL_GPLL>, <&cru CLK_I2S0_8CH_TX_SRC>, <&cru CLK_I2S0_8CH_RX_SRC>, <&cru CLK_I2S0_8CH_TX>, <&cru I2S0_8CH_MCLKOUT>;
assigned-clock-parents = <0>, <&cru PLL_GPLL>, <&cru PLL_GPLL>, <&cru CLK_I2S0_8CH_TX_SRC>, <&cru MCLK_I2S0_8CH_TX>;
assigned-clock-rates = <983040000>, <0>, <0>, <0>, <0>;
dmas = <&dmac 22>, <&dmac 21>;
dma-names = "tx", "rx";
resets = <&cru SRST_M_I2S0_8CH_TX>, <&cru SRST_M_I2S0_8CH_RX>;
Expand Down
2 changes: 1 addition & 1 deletion ext_tree/board/luckfox/scripts/post-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -ve

MAINDIR=`pwd`

export LINUX_DIR=`ls -d output/build/linux-main`
export LINUX_DIR=`ls -d output/build/linux-custom`

# Copy kernel and DTB to binaries
cp $LINUX_DIR/arch/arm/boot/zImage $BINARIES_DIR/
Expand Down
12 changes: 5 additions & 7 deletions ext_tree/configs/luckfox_pico_max_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Buildroot -g95f5f12a-dirty Configuration
# Buildroot v1.6.1-10-g5fec7ef3-dirty Configuration
#
BR2_HAVE_DOT_CONFIG=y
BR2_EXTERNAL_NAMES="ext_tree"
Expand Down Expand Up @@ -443,14 +443,12 @@ BR2_LINUX_KERNEL=y
# BR2_LINUX_KERNEL_LATEST_CIP_VERSION is not set
# BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION is not set
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
# BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
# BR2_LINUX_KERNEL_CUSTOM_HG is not set
# BR2_LINUX_KERNEL_CUSTOM_SVN is not set
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ppy2/ale-linux-rv1106.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="main"
# BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES is not set
BR2_LINUX_KERNEL_VERSION="main"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/armbian/linux-rockchip/archive/refs/heads/rk-6.1-rkr6.1.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="../ext_tree/patches/linux_rv1106.patch"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
# BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG is not set
Expand Down
4 changes: 2 additions & 2 deletions ext_tree/package/librespot/librespot.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

LIBRESPOT_VERSION = $(call qstrip,$(or $(BR2_PACKAGE_LIBRESPOT_VERSION),v0.7.1))
#LIBRESPOT_VERSION = $(call qstrip,$(or $(BR2_PACKAGE_LIBRESPOT_VERSION),master))
#LIBRESPOT_VERSION = $(call qstrip,$(or $(BR2_PACKAGE_LIBRESPOT_VERSION),v0.7.1))
LIBRESPOT_VERSION = $(call qstrip,$(or $(BR2_PACKAGE_LIBRESPOT_VERSION),84a3302168b8b25d44f1b313ca20155959f553e0))
LIBRESPOT_SITE = https://github.com/librespot-org/librespot.git
LIBRESPOT_SITE_METHOD = git

Expand Down
Loading