Skip to content
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.

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

Prepare 15.0.rc1 #3907

Merged
merged 56 commits into from
Mar 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
07e1ced
Pin awscli to older version to work around R2 issues (#3803)
sairon Jan 17, 2025
267679b
Bump OS to development version 15.0.dev0
sairon Jan 17, 2025
219d7ec
Fix artifacts index job by downgrading awscli (#3805)
sairon Jan 17, 2025
a9af9c8
Bump docker/build-push-action from 6.11.0 to 6.12.0 (#3809)
dependabot[bot] Jan 20, 2025
a7cdebf
Bump Buildroot to 2024.02.10 (#3811)
sairon Jan 21, 2025
64ee535
Enable USB-SD convertor on AMD/Xilinx Kria KD240 platform (#3812)
michalsimek Jan 21, 2025
ca02ed0
Add check for tainted kernel to automatic tests (#3814)
sairon Jan 21, 2025
235d7e0
Linux: Update kernel to 6.6.73 (#3813)
sairon Jan 21, 2025
af7b36e
Fix linux-pam trying to include disabled pam_lastlog.so on login (#3815)
sairon Jan 21, 2025
48bf9b5
Move rauc.db to boot partition (#3810)
sairon Jan 21, 2025
8233cb9
Fix kernel tainted test (#3818)
sairon Jan 21, 2025
da08a45
Bump OS to release version 14.2
sairon Jan 27, 2025
4fb83d5
Merge branch 'main' into dev
sairon Jan 27, 2025
f51d6b0
Bump actions/stale from 9.0.0 to 9.1.0 (#3835)
dependabot[bot] Jan 27, 2025
c6218aa
Bump docker/build-push-action from 6.12.0 to 6.13.0 (#3836)
dependabot[bot] Jan 27, 2025
7eccef8
Change Cadence i2c and Zynq GPIO from modules to built-in drivers (#3…
michalsimek Jan 28, 2025
4919e4e
Use Python 3.13 for the build and artifacts index jobs (#3840)
sairon Jan 28, 2025
fbd5c2c
Update generic-x86-64 Linux kernel to 6.12 (#3767)
nijave Jan 28, 2025
f9776ab
Update OVA to Linux 6.12 (#3845)
sairon Jan 30, 2025
ffca0b3
Fix RPi 5 getting stuck in bootloader after some reboots (#3842)
sairon Jan 30, 2025
f56130a
Revert kernel patch causing USB 3 and PCIe breakage on ODROID-M1/M1S …
sairon Jan 30, 2025
9a760a2
Update all platforms to latest stable Linux 6.12 (#3850)
sairon Feb 3, 2025
c63f9ec
Allow boot from USB and NVMe on ODROID-M1 (#3852)
rpardini Feb 3, 2025
b5b2f5d
Remove USB stack patches working around obsoleted Z-Wave devices issu…
sairon Feb 4, 2025
47309b4
Backport upstream patch to fix downstream patch collision in RPi 6.6 …
sairon Feb 4, 2025
1d5e86a
Disable UAS via usb-storage.quirks on RPi for JMicron JMS578 (#3857)
sairon Feb 4, 2025
aafe82f
RaspberryPi: Update kernel to 6.6.74 - stable_20250127 (#3860)
sairon Feb 4, 2025
0ac5f02
Linux: Update kernel to 6.12.12 (#3859)
sairon Feb 4, 2025
2dda7a0
Enable Intel 40 Gigabit ethernet driver module for x86-64 and OVA (#3…
sairon Feb 4, 2025
970cd4d
Fix order of patches for Yellow (#3862)
sairon Feb 5, 2025
072ba9b
Bump docker/setup-buildx-action from 3.8.0 to 3.9.0 (#3869)
dependabot[bot] Feb 10, 2025
43d26c8
Linux: Update kernel to 6.12.13 (#3868)
sairon Feb 10, 2025
5fcf293
Update firmware for Intel Wi-Fi 6/6E/7 cards, bump linux-firmware to …
sairon Feb 12, 2025
3a666bb
Use EROFS LZMA compression of firmware on x86 instead of per-file ZST…
sairon Feb 14, 2025
22ed386
Linux: Update kernel to 6.12.14 (#3881)
sairon Feb 18, 2025
dc7b693
Update U-Boot to 2025.01 (#3878)
sairon Feb 18, 2025
d42e34f
Make swap size configurable (#3882)
sairon Feb 19, 2025
1b51199
Allow overriding sysctl parameters via /etc/sysctl.d files (#3883)
sairon Feb 19, 2025
e455669
Move swappiness config to 15-swappiness.conf (#3884)
sairon Feb 19, 2025
4ab51e7
Remove unnecessary and invalid e2scrub removal from post-build (#3886)
sairon Feb 20, 2025
e158fbc
Use auditd to process AppArmor/audit logs (#3885)
sairon Feb 20, 2025
664ae4e
Remove unnecessary GRUB userspace tools and other files (#3887)
sairon Feb 20, 2025
8531e7b
Remove all info pages in post-build script (#3888)
sairon Feb 20, 2025
56e3a37
Fix RAUC tryboot handler set-state idempotency, add more checks (#3891)
sairon Feb 24, 2025
ea40984
Linux: Update kernel to 6.12.16 (#3892)
sairon Feb 24, 2025
f032cd5
Bump docker/build-push-action from 6.13.0 to 6.14.0 (#3894)
dependabot[bot] Feb 24, 2025
714ca8a
Drop kernel patch for fixed ODROID-M1/M1S kernel regression (#3895)
sairon Feb 24, 2025
bdcc2b9
Improve log clarity and fix typos (#3896)
pisanvs Feb 25, 2025
f590556
Bump buildroot to 2024.02.11 (#3897)
sairon Feb 25, 2025
b3ce713
Disable linux-firmware zstd compression (#3898)
sairon Feb 25, 2025
40ef226
Update linux-firmware to 20250211 (#3901)
sairon Feb 26, 2025
15be152
Update Docker to v28.0.1 (#3902)
sairon Feb 26, 2025
e801d40
Bump BlueZ to v5.79 (#3903)
sairon Feb 26, 2025
6b904ab
Linux: Update kernel to 6.12.17 (#3905)
sairon Feb 28, 2025
a4cbf82
Bump os-agent to v1.7.1 (#3906)
sairon Feb 28, 2025
b2aa96c
Bump OS to pre-release version 15.0.rc1
sairon Mar 3, 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
4 changes: 2 additions & 2 deletions .github/workflows/artifacts-index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ on:
required: true

env:
PYTHON_VERSION: "3.10"
PYTHON_VERSION: "3.13"

jobs:
build-index:
Expand All @@ -49,7 +49,7 @@ jobs:
python-version: ${{ env.PYTHON_VERSION }}

- name: Install AWS CLI
run: pip install awscli
run: pip install 'awscli<1.37.0'

- name: Create build index
env:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
default: true

env:
PYTHON_VERSION: "3.10"
PYTHON_VERSION: "3.13"

jobs:
prepare:
Expand Down Expand Up @@ -136,15 +136,15 @@ jobs:
}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.8.0
uses: docker/setup-buildx-action@v3.9.0
- name: Log in to the GitHub container registry
uses: docker/login-action@v3.3.0
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and Push
uses: docker/build-push-action@v6.12.0
uses: docker/build-push-action@v6.14.0
id: build_haos_builder
with:
context: .
Expand Down Expand Up @@ -199,7 +199,7 @@ jobs:

- name: Install AWS CLI
if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build == 'true' }}
run: pip install awscli
run: pip install 'awscli<1.37.0'

- name: Set version suffix
if: ${{ github.event_name != 'release' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
# - No PRs marked as no-stale or pinned
# - No issues marked as no-stale, help-wanted or pinned
- name: 90 days stale issues & PRs policy
uses: actions/stale@v9.0.0
uses: actions/stale@v9.1.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 90
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \

# Build tools
RUN apt-get update && apt-get install -y --no-install-recommends \
automake \
bash \
bc \
binutils \
Expand All @@ -30,6 +31,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
file \
git \
graphviz \
help2man \
jq \
make \
ncurses-dev \
Expand All @@ -43,6 +45,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
rsync \
skopeo \
sudo \
texinfo \
unzip \
vim \
wget \
Expand Down
38 changes: 19 additions & 19 deletions Documentation/kernel.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@

| Board | Version |
|-------|---------|
| Open Virtual Appliance | 6.6.73 |
| Raspberry Pi | 6.6.62 |
| Raspberry Pi 0-W | 6.6.62 |
| Raspberry Pi 2 | 6.6.62 |
| Raspberry Pi 3 | 6.6.62 |
| Raspberry Pi 4 | 6.6.62 |
| Raspberry Pi 5 | 6.6.62 |
| Home Assistant Yellow | 6.6.62 |
| Home Assistant Green | 6.6.73 |
| Tinker Board | 6.6.73 |
| ODROID-C2 | 6.6.73 |
| ODROID-C4 | 6.6.73 |
| ODROID-M1 | 6.6.73 |
| ODROID-M1S | 6.6.73 |
| ODROID-N2 | 6.6.73 |
| ODROID-XU4 | 6.6.73 |
| Generic aarch64 | 6.6.73 |
| Generic x86-64 | 6.6.73 |
| Khadas VIM3 | 6.6.73 |
| Open Virtual Appliance | 6.12.17 |
| Raspberry Pi | 6.6.74 |
| Raspberry Pi 0-W | 6.6.74 |
| Raspberry Pi 2 | 6.6.74 |
| Raspberry Pi 3 | 6.6.74 |
| Raspberry Pi 4 | 6.6.74 |
| Raspberry Pi 5 | 6.6.74 |
| Home Assistant Yellow | 6.6.74 |
| Home Assistant Green | 6.12.17 |
| Tinker Board | 6.12.17 |
| ODROID-C2 | 6.12.17 |
| ODROID-C4 | 6.12.17 |
| ODROID-M1 | 6.12.17 |
| ODROID-M1S | 6.12.17 |
| ODROID-N2 | 6.12.17 |
| ODROID-XU4 | 6.12.17 |
| Generic aarch64 | 6.12.17 |
| Generic x86-64 | 6.12.17 |
| Khadas VIM3 | 6.12.17 |
2 changes: 1 addition & 1 deletion buildroot
Submodule buildroot updated 283 files
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,18 @@ CONFIG_FB_HYPERV=y
CONFIG_I6300ESB_WDT=y

# GPIO support
CONFIG_GPIO_ZYNQ=m
CONFIG_GPIO_ZYNQ=y
CONFIG_GPIO_PCA9570=y

# PHY drivers
CONFIG_PHY_XILINX_ZYNQMP=y

# USB support
# TODO: change to `CONFIG_USB_ONBOARD_DEV` in 6.12
CONFIG_USB_ONBOARD_HUB=y
CONFIG_USB_ONBOARD_DEV=y
CONFIG_USB_ONBOARD_DEV_USB5744=y

# i2c support
CONFIG_I2C_CADENCE=y

# 1-wire
CONFIG_W1_MASTER_AMD_AXI=m
13 changes: 0 additions & 13 deletions buildroot-external/board/asus/tinker/kernel.config
Original file line number Diff line number Diff line change
Expand Up @@ -392,9 +392,6 @@ CONFIG_VLAN_8021Q=m
CONFIG_VLAN_8021Q_GVRP=y
CONFIG_VLAN_8021Q_MVRP=y
CONFIG_ATALK=m
CONFIG_DEV_APPLETALK=m
CONFIG_IPDDP=m
CONFIG_IPDDP_ENCAP=y
CONFIG_6LOWPAN=m
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_HTB=m
Expand Down Expand Up @@ -450,7 +447,6 @@ CONFIG_NET_ACT_GACT=m
CONFIG_GACT_PROB=y
CONFIG_NET_ACT_MIRRED=m
CONFIG_NET_ACT_SAMPLE=m
CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_SIMP=m
Expand Down Expand Up @@ -647,9 +643,6 @@ CONFIG_ATH10K_USB=m
CONFIG_WCN36XX=m
CONFIG_AT76C50X_USB=m
CONFIG_BRCMFMAC=m
CONFIG_HOSTAP=y
CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_FIRMWARE_NVRAM=y
# CONFIG_WLAN_VENDOR_MARVELL is not set
CONFIG_MT7601U=m
# CONFIG_WLAN_VENDOR_MICROCHIP is not set
Expand All @@ -667,9 +660,7 @@ CONFIG_RTL8192CU=m
CONFIG_RTL8XXXU=m
# CONFIG_WLAN_VENDOR_ST is not set
# CONFIG_WLAN_VENDOR_TI is not set
CONFIG_USB_ZD1201=m
CONFIG_ZD1211RW=m
CONFIG_USB_NET_RNDIS_WLAN=m
CONFIG_NET_FAILOVER=m
CONFIG_INPUT_MATRIXKMAP=y
CONFIG_INPUT_JOYDEV=y
Expand Down Expand Up @@ -1495,15 +1486,13 @@ CONFIG_CUSE=m
CONFIG_OVERLAY_FS=y
CONFIG_FSCACHE=y
CONFIG_FSCACHE_STATS=y
CONFIG_CACHEFILES=y
CONFIG_ISO9660_FS=m
CONFIG_JOLIET=y
CONFIG_ZISOFS=y
CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
CONFIG_NTFS_FS=m
CONFIG_NTFS_RW=y
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_ECRYPT_FS=m
Expand All @@ -1527,7 +1516,6 @@ CONFIG_NFS_SWAP=y
CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_2=y
CONFIG_ROOT_NFS=y
CONFIG_NFS_FSCACHE=y
CONFIG_NFSD=m
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
Expand Down Expand Up @@ -1571,7 +1559,6 @@ CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_ARC4=m
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CFB=m
CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_LRW=m
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b4d676729c5bee4b9adb85362f6f2e32f833b6c2 Mon Sep 17 00:00:00 2001
From 675fbbc309e4f7c805cf4fbd7c463cfc8308b54e Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Wed, 17 Feb 2021 19:55:41 +0100
Subject: [PATCH] Revert "ARM: dts: rockchip: use DMA channels for UARTs for
Expand All @@ -10,10 +10,10 @@ This reverts commit 3425fe335c29310f6628faf9a7947d07f32d8962.
1 file changed, 8 deletions(-)

diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
index cb9cdaddffd4..51f1273d6beb 100644
index 3f1d640afafae..becf3abd8367f 100644
--- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
@@ -378,8 +378,6 @@ uart0: serial@ff180000 {
@@ -387,8 +387,6 @@ uart0: serial@ff180000 {
reg-io-width = <4>;
clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
clock-names = "baudclk", "apb_pclk";
Expand All @@ -22,7 +22,7 @@ index cb9cdaddffd4..51f1273d6beb 100644
pinctrl-names = "default";
pinctrl-0 = <&uart0_xfer>;
status = "disabled";
@@ -393,8 +391,6 @@ uart1: serial@ff190000 {
@@ -402,8 +400,6 @@ uart1: serial@ff190000 {
reg-io-width = <4>;
clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
clock-names = "baudclk", "apb_pclk";
Expand All @@ -31,7 +31,7 @@ index cb9cdaddffd4..51f1273d6beb 100644
pinctrl-names = "default";
pinctrl-0 = <&uart1_xfer>;
status = "disabled";
@@ -421,8 +417,6 @@ uart3: serial@ff1b0000 {
@@ -430,8 +426,6 @@ uart3: serial@ff1b0000 {
reg-io-width = <4>;
clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>;
clock-names = "baudclk", "apb_pclk";
Expand All @@ -40,7 +40,7 @@ index cb9cdaddffd4..51f1273d6beb 100644
pinctrl-names = "default";
pinctrl-0 = <&uart3_xfer>;
status = "disabled";
@@ -436,8 +430,6 @@ uart4: serial@ff1c0000 {
@@ -445,8 +439,6 @@ uart4: serial@ff1c0000 {
reg-io-width = <4>;
clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>;
clock-names = "baudclk", "apb_pclk";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 02c7d9bb23f497993d52f5a41341ed955e6a2745 Mon Sep 17 00:00:00 2001
From 37b4467356113f17f55066aef54db55b64daa030 Mon Sep 17 00:00:00 2001
From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
Date: Mon, 5 Nov 2018 22:15:14 +0100
Subject: [PATCH] ARM: DTS: rk3288-tinker: Defining the SPI interface
Expand All @@ -18,7 +18,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
1 file changed, 19 insertions(+)

diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
index 09618bb7d872..30430d2e64b9 100644
index 09618bb7d872c..30430d2e64b93 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
@@ -483,6 +483,25 @@ &sdio0 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From bf7869033cf3caa50912cbdfa548428a6571c104 Mon Sep 17 00:00:00 2001
From 1a15fc7f6a241895a31b00c1f324d358d408a610 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Fri, 4 Sep 2020 21:57:55 +0200
Subject: [PATCH] ARM: dts: rockchip: enable I2C1/4 on rk3288-tinker
Expand All @@ -11,7 +11,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
index 30430d2e64b9..395afc2b2283 100644
index 30430d2e64b93..395afc2b2283c 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
@@ -342,10 +342,18 @@ regulator-state-mem {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From a0ef6a86e96920a9cf703d8c65d0126494037d37 Mon Sep 17 00:00:00 2001
From d6c44c231fc4518ad69bb7870a193bb10c563f2a Mon Sep 17 00:00:00 2001
From: Myy Miouyouyou <myy@miouyouyou.fr>
Date: Thu, 19 Oct 2017 21:24:47 +0200
Subject: [PATCH] RK3288: DTSI: rk3288.dtsi: Add missing SPI2 pinctrl
Expand All @@ -14,10 +14,10 @@ Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
index 51f1273d6beb..d8663928bfe2 100644
index becf3abd8367f..e78fa883b9841 100644
--- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
@@ -311,7 +311,7 @@ spi2: spi@ff130000 {
@@ -320,7 +320,7 @@ spi2: spi@ff130000 {
dma-names = "tx", "rx";
interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e828e0fc2be98e5ad20c93981681505fc97b063b Mon Sep 17 00:00:00 2001
From dfb0232e9fae1267d04247aaf171739038c1659e Mon Sep 17 00:00:00 2001
From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
Date: Mon, 5 Nov 2018 20:16:05 +0100
Subject: [PATCH] ARM: DTSI: rk3288-tinker: Improving the CPU max voltage
Expand All @@ -11,7 +11,7 @@ Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
index 395afc2b2283..c7e79e594720 100644
index 395afc2b2283c..c7e79e5947206 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
@@ -184,7 +184,7 @@ vdd_cpu: DCDC_REG1 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ad1ffd6be5f54a0871e3c303602548687dfe0ffc Mon Sep 17 00:00:00 2001
From 4955695e410289df07258b00290d4028c3ac8fb1 Mon Sep 17 00:00:00 2001
From: Myy Miouyouyou <myy@miouyouyou.fr>
Date: Sun, 7 Jan 2018 01:52:44 +0100
Subject: [PATCH] drivers: mmc: dw-mci-rockchip: Handle ASUS Tinkerboard reboot
Expand All @@ -21,7 +21,7 @@ Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
1 file changed, 66 insertions(+)

diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
index b07190ba4b7a..0badaa1b404e 100644
index f96260fd143b4..fa779ce8fb661 100644
--- a/drivers/mmc/host/dw_mmc-rockchip.c
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
@@ -12,6 +12,11 @@
Expand All @@ -36,7 +36,7 @@ index b07190ba4b7a..0badaa1b404e 100644
#include "dw_mmc.h"
#include "dw_mmc-pltfm.h"

@@ -340,6 +345,66 @@ static const struct of_device_id dw_mci_rockchip_match[] = {
@@ -527,6 +532,66 @@ static const struct of_device_id dw_mci_rockchip_match[] = {
};
MODULE_DEVICE_TABLE(of, dw_mci_rockchip_match);

Expand Down Expand Up @@ -103,7 +103,7 @@ index b07190ba4b7a..0badaa1b404e 100644
static int dw_mci_rockchip_probe(struct platform_device *pdev)
{
const struct dw_mci_drv_data *drv_data;
@@ -367,6 +432,7 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev)
@@ -554,6 +619,7 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev)
}

pm_runtime_put_autosuspend(&pdev->dev);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 4e6c3d013c847f199664a3075934f5ca52d8cba4 Mon Sep 17 00:00:00 2001
From 74227462bbe9236dca234dd24cce4191fa71bdf9 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Tue, 10 May 2022 22:57:26 +0200
Subject: [PATCH] ARM: dts: rockchip: Add Bluetooth to rk3288-tinker
Expand All @@ -12,7 +12,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
1 file changed, 26 insertions(+)

diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
index c7e79e594720..5d261fae6e72 100644
index c7e79e5947206..5d261fae6e72a 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
@@ -386,6 +386,20 @@ bl_en: bl-en {
Expand Down
Loading