diff --git a/patch/kernel/archive/rk322x-6.1/01-linux-1000-drm-rockchip.patch b/patch/kernel/archive/rk322x-6.1/01-linux-1000-drm-rockchip.patch index c25acbe4fe..034262ff8a 100644 --- a/patch/kernel/archive/rk322x-6.1/01-linux-1000-drm-rockchip.patch +++ b/patch/kernel/archive/rk322x-6.1/01-linux-1000-drm-rockchip.patch @@ -1514,15 +1514,15 @@ index 66fee351f4a7..d6d8f3335813 100644 err_bind: drm_encoder_cleanup(encoder); err_disable_clk: -@@ -719,7 +763,7 @@ static void dw_hdmi_rockchip_unbind(struct device *dev, struct device *master, +@@ -639,7 +870,7 @@ static void dw_hdmi_rockchip_unbind(struct device *dev, struct device *master, { struct rockchip_hdmi *hdmi = dev_get_drvdata(dev); - dw_hdmi_unbind(hdmi->hdmi); + dw_hdmi_remove(hdmi->hdmi); + drm_encoder_cleanup(&hdmi->encoder.encoder); clk_disable_unprepare(hdmi->ref_clk); - regulator_disable(hdmi->avdd_1v8); From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jonas Karlman diff --git a/patch/kernel/archive/rockchip-6.1/01-linux-1000-drm-rockchip.patch b/patch/kernel/archive/rockchip-6.1/01-linux-1000-drm-rockchip.patch index c25acbe4fe..034262ff8a 100644 --- a/patch/kernel/archive/rockchip-6.1/01-linux-1000-drm-rockchip.patch +++ b/patch/kernel/archive/rockchip-6.1/01-linux-1000-drm-rockchip.patch @@ -1514,15 +1514,15 @@ index 66fee351f4a7..d6d8f3335813 100644 err_bind: drm_encoder_cleanup(encoder); err_disable_clk: -@@ -719,7 +763,7 @@ static void dw_hdmi_rockchip_unbind(struct device *dev, struct device *master, +@@ -639,7 +870,7 @@ static void dw_hdmi_rockchip_unbind(struct device *dev, struct device *master, { struct rockchip_hdmi *hdmi = dev_get_drvdata(dev); - dw_hdmi_unbind(hdmi->hdmi); + dw_hdmi_remove(hdmi->hdmi); + drm_encoder_cleanup(&hdmi->encoder.encoder); clk_disable_unprepare(hdmi->ref_clk); - regulator_disable(hdmi->avdd_1v8); From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jonas Karlman diff --git a/patch/kernel/archive/rockchip-6.1/1012-ARM-DTSI-rk3288-Fixed-the-SPDIF-node-address.patch b/patch/kernel/archive/rockchip-6.1/1012-ARM-DTSI-rk3288-Fixed-the-SPDIF-node-address.patch deleted file mode 100644 index 2c791cb435..0000000000 --- a/patch/kernel/archive/rockchip-6.1/1012-ARM-DTSI-rk3288-Fixed-the-SPDIF-node-address.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a0602b2724893de7ac9b4190a7a6bb66458da2d5 Mon Sep 17 00:00:00 2001 -From: Myy Miouyouyou -Date: Thu, 19 Oct 2017 21:54:37 +0200 -Subject: [PATCH 17/28] ARM: DTSI: rk3288.dtsi: Fixed the SPDIF node address - -Now, the typo is only in the name of the node itself, not in the -actual registers addresses definition. - -Still, this ought to be fixed one day ! - -Signed-off-by: Myy Miouyouyou ---- - arch/arm/boot/dts/rk3288.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi -index 125f8835..e5d3d3c9 100644 ---- a/arch/arm/boot/dts/rk3288.dtsi -+++ b/arch/arm/boot/dts/rk3288.dtsi -@@ -922,7 +922,7 @@ - status = "disabled"; - }; - -- spdif: sound@ff88b0000 { -+ spdif: sound@ff8b0000 { - compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif"; - reg = <0x0 0xff8b0000 0x0 0x10000>; - #sound-dai-cells = <0>; --- -2.11.0 - diff --git a/patch/kernel/archive/rockchip-6.1/4016-workaround-broadcom-bt-serdev.patch b/patch/kernel/archive/rockchip-6.1/4016-workaround-broadcom-bt-serdev.patch index b4dd331948..8f641846c3 100644 --- a/patch/kernel/archive/rockchip-6.1/4016-workaround-broadcom-bt-serdev.patch +++ b/patch/kernel/archive/rockchip-6.1/4016-workaround-broadcom-bt-serdev.patch @@ -12,15 +12,16 @@ diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c index 1b9743b7f..b274f1cdd 100644 --- a/drivers/bluetooth/btbcm.c +++ b/drivers/bluetooth/btbcm.c -@@ -87,7 +87,7 @@ int btbcm_check_bdaddr(struct hci_dev *hdev) - !bacmp(&bda->bdaddr, BDADDR_BCM43341B)) { - bt_dev_info(hdev, "BCM: Using default device address (%pMR)", - &bda->bdaddr); -- set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks); -+ //set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks); +@@ -129,7 +129,7 @@ int btbcm_check_bdaddr(struct hci_dev *hdev) + if (btbcm_set_bdaddr_from_efi(hdev) != 0) { + bt_dev_info(hdev, "BCM: Using default device address (%pMR)", + &bda->bdaddr); +- set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks); ++ //set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks); + } } - kfree_skb(skb); + -- 2.25.1