[kernel] merge commit '7da2d60f0c..e90c925691'

Signed-off-by: hmz007 <hmz007@gmail.com>
Change-Id: I8385dbe61d6bc7fb5f6761415cb1e50899ce50b3

kernel-6.1/arch/arm64/boot/dts/rockchip/rk3576.dtsi

@@ -4479,7 +4479,7 @@
 				<0 0 0 2 &pcie1_intc 1>,
 				<0 0 0 3 &pcie1_intc 2>,
 				<0 0 0 4 &pcie1_intc 3>;
-		linux,pci-domain = <0>;
+		linux,pci-domain = <1>;
 		num-ib-windows = <8>;
 		num-viewport = <8>;
 		num-ob-windows = <2>;

kernel-6.1/drivers/gpu/arm/valhall/mali_kbase_core_linux.c

@@ -4535,12 +4535,10 @@ static int kbase_device_suspend(struct device *dev)
 	kbase_platform_rk_enable_regulator(kbdev);
 #endif
 
-#ifdef KBASE_PM_RUNTIME
 	if (kbdev->is_runtime_resumed) {
 		if (kbdev->pm.backend.callback_power_runtime_off)
 			kbdev->pm.backend.callback_power_runtime_off(kbdev);
 	}
-#endif /* KBASE_PM_RUNTIME */
 
 	return 0;
 }
@@ -4561,12 +4559,10 @@ static int kbase_device_resume(struct device *dev)
 	if (!kbdev)
 		return -ENODEV;
 
-#ifdef KBASE_PM_RUNTIME
 	if (kbdev->is_runtime_resumed) {
 		if (kbdev->pm.backend.callback_power_runtime_on)
 			kbdev->pm.backend.callback_power_runtime_on(kbdev);
 	}
-#endif /* KBASE_PM_RUNTIME */
 
 	kbase_pm_resume(kbdev);
 

kernel-6.1/drivers/mmc/host/sdhci-of-dwcmshc.c

@@ -421,10 +421,11 @@ static void dwcmshc_rk3568_set_clock(struct sdhci_host *host, unsigned int clock
 
 	sdhci_set_clock(host, clock);
 
-	/* Disable cmd conflict check */
+	/* Disable cmd conflict check and disable internal clock gate */
 	reg = dwc_priv->vendor_specific_area1 + DWCMSHC_HOST_CTRL3;
 	extra = sdhci_readl(host, reg);
 	extra &= ~BIT(0);
+	extra |= BIT(4);
 	sdhci_writel(host, extra, reg);
 
 	/* Disable output clock while config DLL */

kernel-6.1/drivers/tty/serdev/core.c

@@ -527,6 +527,8 @@ static int of_serdev_register_devices(struct serdev_controller *ctrl)
 	for_each_available_child_of_node(ctrl->dev.of_node, node) {
 		if (!of_get_property(node, "compatible", NULL))
 			continue;
+		if (of_property_read_bool(node, "no-serdev"))
+			continue;
 
 		dev_dbg(&ctrl->dev, "adding child %pOF\n", node);