update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/pinctrl/intel/pinctrl-cherryview.c
..
..
@@ -945,11 +945,6 @@
945
945
 
946
946
 		break;
947
947
 
948
-	case PIN_CONFIG_DRIVE_OPEN_DRAIN:
949
-		if (!(ctrl1 & CHV_PADCTRL1_ODEN))
950
-			return -EINVAL;
951
-		break;
952
-
953
948
 	case PIN_CONFIG_BIAS_HIGH_IMPEDANCE: {
954
949
 		u32 cfg;
955
950
 
..
..
@@ -958,6 +953,16 @@
958
953
 		if (cfg != CHV_PADCTRL0_GPIOCFG_HIZ)
959
954
 			return -EINVAL;
960
955
 
956
+		break;
957
+
958
+	case PIN_CONFIG_DRIVE_PUSH_PULL:
959
+		if (ctrl1 & CHV_PADCTRL1_ODEN)
960
+			return -EINVAL;
961
+		break;
962
+
963
+	case PIN_CONFIG_DRIVE_OPEN_DRAIN:
964
+		if (!(ctrl1 & CHV_PADCTRL1_ODEN))
965
+			return -EINVAL;
961
966
 		break;
962
967
 	}
963
968
 
..
..
@@ -1620,7 +1625,6 @@
1620
1625
 	const struct intel_pinctrl_soc_data *soc_data;
1621
1626
 	struct intel_community *community;
1622
1627
 	struct device *dev = &pdev->dev;
1623
-	struct acpi_device *adev = ACPI_COMPANION(dev);
1624
1628
 	struct intel_pinctrl *pctrl;
1625
1629
 	acpi_status status;
1626
1630
 	int ret, irq;
..
..
@@ -1683,7 +1687,7 @@
1683
1687
 	if (ret)
1684
1688
 		return ret;
1685
1689
 
1686
-	status = acpi_install_address_space_handler(adev->handle,
1690
+	status = acpi_install_address_space_handler(ACPI_HANDLE(dev),
1687
1691
 					community->acpi_space_id,
1688
1692
 					chv_pinctrl_mmio_access_handler,
1689
1693
 					NULL, pctrl);
..
..
@@ -1700,7 +1704,7 @@
1700
1704
 	struct intel_pinctrl *pctrl = platform_get_drvdata(pdev);
1701
1705
 	const struct intel_community *community = &pctrl->communities[0];
1702
1706
 
1703
-	acpi_remove_address_space_handler(ACPI_COMPANION(&pdev->dev),
1707
+	acpi_remove_address_space_handler(ACPI_HANDLE(&pdev->dev),
1704
1708
 					  community->acpi_space_id,
1705
1709
 					  chv_pinctrl_mmio_access_handler);
1706
1710