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.

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

kernel: bump 5.19 to 5.19.3 #9983

Merged
merged 1 commit into from
Aug 22, 2022
Merged

kernel: bump 5.19 to 5.19.3 #9983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 include/kernel-5.19
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.19 = .2
LINUX_KERNEL_HASH-5.19.2 = 48e40a1f5501ec6c40e3c86d3d5319200b688f2d9360f72833084d74801fe63d
LINUX_VERSION-5.19 = .3
LINUX_KERNEL_HASH-5.19.3 = 513bd672066f5fb22e5739aae3eed60c75c4accc9ba365d1060c4e4225442721
14 changes: 7 additions & 7 deletions ...linux/rockchip/patches-5.19/0029-arm64-dts-rockchip-enable-hdmi-tx-audio-on-rock-3a.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ Signed-off-by: Heiko Stuebner <[email protected]>

--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
@@ -196,6 +196,10 @@
};
@@ -200,6 +200,10 @@
status = "okay";
};

+&hdmi_sound {
Expand All @@ -26,14 +26,14 @@ Signed-off-by: Heiko Stuebner <[email protected]>
&i2c0 {
status = "okay";

@@ -436,6 +440,10 @@
};
@@ -441,6 +445,10 @@
};

+&i2s0_8ch {
&i2s0_8ch {
+ status = "okay";
+};
+
&i2s1_8ch {
rockchip,trcm-sync-tx-only;
+&i2s0_8ch {
status = "okay";
};

33 changes: 33 additions & 0 deletions ...nux/rockchip/patches-5.19/0039-drm-rockchip-vop-Don-t-crash-for-invalid-duplicate_s.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
From efaa0a55ce429107697f641921336cc51518693a Mon Sep 17 00:00:00 2001
From: Brian Norris <[email protected]>
Date: Fri, 17 Jun 2022 17:26:52 -0700
Subject: [PATCH 39/51] drm/rockchip: vop: Don't crash for invalid
duplicate_state()

It's possible for users to try to duplicate the CRTC state even when the
state doesn't exist. drm_atomic_helper_crtc_duplicate_state() (and other
users of __drm_atomic_helper_crtc_duplicate_state()) already guard this
with a WARN_ON() instead of crashing, so let's do that here too.

Fixes: 4e257d9eee23 ("drm/rockchip: get rid of rockchip_drm_crtc_mode_config")
Signed-off-by: Brian Norris <[email protected]>
Reviewed-by: Sean Paul <[email protected]>
Reviewed-by: Douglas Anderson <[email protected]>
Signed-off-by: Heiko Stuebner <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/20220617172623.1.I62db228170b1559ada60b8d3e1637e1688424926@changeid
---
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 +++
1 file changed, 3 insertions(+)

--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -1573,6 +1573,9 @@ static struct drm_crtc_state *vop_crtc_d
if (WARN_ON(!crtc->state))
return NULL;

+ if (WARN_ON(!crtc->state))
+ return NULL;
+
rockchip_state = kzalloc(sizeof(*rockchip_state), GFP_KERNEL);
if (!rockchip_state)
return NULL;
16 changes: 8 additions & 8 deletions target/linux/rockchip/patches-5.19/0051-rockchip-add-pci3-for-rock3-a.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,39 +110,39 @@ Signed-off-by: Marty Jones <[email protected]>
status = "okay";
};

@@ -313,6 +358,7 @@
@@ -317,6 +362,7 @@

vdda0v9_image: LDO_REG1 {
regulator-name = "vdda0v9_image";
+ regulator-always-on;
regulator-min-microvolt = <900000>;
regulator-max-microvolt = <900000>;

@@ -349,6 +395,7 @@
@@ -353,6 +399,7 @@
vccio_acodec: LDO_REG4 {
regulator-name = "vccio_acodec";
regulator-always-on;
+ regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;

@@ -407,6 +454,7 @@
@@ -411,6 +458,7 @@

vcca1v8_image: LDO_REG9 {
regulator-name = "vcca1v8_image";
+ regulator-always-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;

@@ -427,6 +475,7 @@
@@ -431,6 +479,7 @@

vcc3v3_sd: SWITCH_REG2 {
regulator-name = "vcc3v3_sd";
+ regulator-always-on;

regulator-state-mem {
regulator-off-in-suspend;
@@ -453,14 +502,30 @@
@@ -461,14 +510,30 @@
rgmii_phy1: ethernet-phy@0 {
compatible = "ethernet-phy-ieee802.3-c22";
reg = <0x0>;
Expand Down Expand Up @@ -178,7 +178,7 @@ Signed-off-by: Marty Jones <[email protected]>
&pinctrl {
ethernet {
eth_phy_rst: eth_phy_rst {
@@ -555,7 +620,7 @@
@@ -563,7 +628,7 @@
};

&usb_host0_xhci {
Expand All @@ -187,7 +187,7 @@ Signed-off-by: Marty Jones <[email protected]>
status = "okay";
};

@@ -581,7 +646,7 @@
@@ -589,7 +654,7 @@
};

&usb2phy0_otg {
Expand All @@ -196,7 +196,7 @@ Signed-off-by: Marty Jones <[email protected]>
status = "okay";
};

@@ -590,12 +655,10 @@
@@ -598,12 +663,10 @@
};

&usb2phy1_host {
Expand Down