Attachment 13798 Details for Bug 31444 – adjustment of defconfig-x86_64-desktop

[patch] adjustment of defconfig-x86_64-desktop

defconfig-x86_64-desktop.patch (text/plain), 5.68 KB, created by christian barranco on 2023-04-29 08:19:41 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: christian barranco

Created: 2023-04-29 08:19:41 CEST

Size: 5.68 KB

patch

obsolete

>--- defconfig-x86_64-desktop-original	2023-04-27 16:13:51.000000000 +0200
>+++ defconfig-x86_64-desktop.surface	2023-04-28 19:56:43.612134768 +0200
>@@ -4286,7 +4286,6 @@ CONFIG_TOUCHSCREEN_SIS_I2C=m
> CONFIG_TOUCHSCREEN_ST1232=m
> CONFIG_TOUCHSCREEN_STMFTS=m
> CONFIG_TOUCHSCREEN_SUR40=m
>-CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
> # CONFIG_TOUCHSCREEN_SX8654 is not set
> CONFIG_TOUCHSCREEN_TPS6507X=m
> CONFIG_TOUCHSCREEN_ZET6223=m
>@@ -4350,7 +4349,6 @@ CONFIG_INPUT_CMA3000=m
> CONFIG_INPUT_CMA3000_I2C=m
> CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
> CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
>-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
> CONFIG_INPUT_DRV260X_HAPTICS=m
> CONFIG_INPUT_DRV2665_HAPTICS=m
> CONFIG_INPUT_DRV2667_HAPTICS=m
>@@ -5034,8 +5032,6 @@ CONFIG_CHARGER_CROS_USBPD=m
> CONFIG_CHARGER_CROS_PCHG=m
> # CONFIG_CHARGER_BD99954 is not set
> CONFIG_CHARGER_WILCO=m
>-CONFIG_BATTERY_SURFACE=m
>-CONFIG_CHARGER_SURFACE=m
> # CONFIG_BATTERY_UG3105 is not set
> CONFIG_HWMON=y
> CONFIG_HWMON_VID=m
>@@ -5653,7 +5649,6 @@ CONFIG_REGULATOR_TPS6524X=m
> CONFIG_REGULATOR_TPS6586X=m
> CONFIG_REGULATOR_TPS65910=m
> CONFIG_REGULATOR_TPS65912=m
>-CONFIG_REGULATOR_TPS68470=m
> CONFIG_REGULATOR_TWL4030=m
> CONFIG_REGULATOR_WM831X=m
> CONFIG_REGULATOR_WM8350=m
>@@ -6003,8 +5998,6 @@ CONFIG_DVB_BUDGET_CORE=m
> CONFIG_DVB_BUDGET=m
> CONFIG_DVB_BUDGET_CI=m
> CONFIG_DVB_BUDGET_AV=m
>-CONFIG_VIDEO_IPU3_CIO2=m
>-CONFIG_CIO2_BRIDGE=y
> CONFIG_RADIO_ADAPTERS=m
> CONFIG_RADIO_MAXIRADIO=m
> CONFIG_RADIO_SAA7706H=m
>@@ -6225,17 +6218,14 @@ CONFIG_VIDEO_OV4689=m
> # CONFIG_VIDEO_OV5648 is not set
> # CONFIG_VIDEO_OV5670 is not set
> # CONFIG_VIDEO_OV5675 is not set
>-CONFIG_VIDEO_OV5693=m
> CONFIG_VIDEO_OV5695=m
> CONFIG_VIDEO_OV6650=m
>-CONFIG_VIDEO_OV7251=m
> CONFIG_VIDEO_OV7640=m
> CONFIG_VIDEO_OV7670=m
> CONFIG_VIDEO_OV772X=m
> CONFIG_VIDEO_OV7740=m
> # CONFIG_VIDEO_OV8856 is not set
> # CONFIG_VIDEO_OV8858 is not set
>-CONFIG_VIDEO_OV8865=m
> CONFIG_VIDEO_OV9640=m
> # CONFIG_VIDEO_OV9650 is not set
> CONFIG_VIDEO_OV9734=m
>@@ -7808,16 +7798,6 @@ CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
> CONFIG_AMD_SFH_HID=m
> # end of AMD SFH HID Support
> 
>-#
>-# Surface System Aggregator Module HID support
>-#
>-CONFIG_SURFACE_HID=m
>-CONFIG_SURFACE_KBD=m
>-# end of Surface System Aggregator Module HID support
>-
>-CONFIG_SURFACE_HID_CORE=m
>-CONFIG_HID_IPTS=m
>-CONFIG_HID_ITHC=m
> CONFIG_USB_OHCI_LITTLE_ENDIAN=y
> CONFIG_USB_SUPPORT=y
> CONFIG_USB_COMMON=y
>@@ -8846,13 +8826,11 @@ CONFIG_AD2S1210=m
> 
> # CONFIG_FB_SM750 is not set
> CONFIG_STAGING_MEDIA=y
>-# CONFIG_INTEL_ATOMISP is not set
> CONFIG_DVB_AV7110_IR=y
> CONFIG_DVB_AV7110=m
> CONFIG_DVB_AV7110_OSD=y
> CONFIG_DVB_BUDGET_PATCH=m
> CONFIG_DVB_SP8870=m
>-CONFIG_VIDEO_IPU3_IMGU=m
> # CONFIG_STAGING_MEDIA_DEPRECATED is not set
> CONFIG_LTE_GDM724X=m
> # CONFIG_FB_TFT is not set
>@@ -8906,22 +8884,6 @@ CONFIG_MLXREG_HOTPLUG=m
> CONFIG_MLXREG_IO=m
> CONFIG_MLXREG_LC=m
> CONFIG_NVSW_SN2201=m
>-CONFIG_SURFACE_PLATFORMS=y
>-CONFIG_SURFACE3_WMI=m
>-CONFIG_SURFACE_3_POWER_OPREGION=m
>-CONFIG_SURFACE_ACPI_NOTIFY=m
>-CONFIG_SURFACE_AGGREGATOR_CDEV=m
>-CONFIG_SURFACE_AGGREGATOR_HUB=m
>-CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
>-CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH=m
>-CONFIG_SURFACE_DTX=m
>-CONFIG_SURFACE_GPE=m
>-CONFIG_SURFACE_HOTPLUG=m
>-CONFIG_SURFACE_PLATFORM_PROFILE=m
>-CONFIG_SURFACE_PRO3_BUTTON=m
>-CONFIG_SURFACE_AGGREGATOR=m
>-CONFIG_SURFACE_AGGREGATOR_BUS=y
>-# CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION is not set
> CONFIG_X86_PLATFORM_DEVICES=y
> CONFIG_ACPI_WMI=m
> CONFIG_WMI_BMOF=m
>@@ -8989,7 +8951,6 @@ CONFIG_INTEL_ATOMISP2_PDX86=y
> CONFIG_INTEL_ATOMISP2_PM=m
> # CONFIG_INTEL_IFS is not set
> CONFIG_INTEL_SAR_INT1092=m
>-CONFIG_INTEL_SKL_INT3472=m
> CONFIG_INTEL_PMC_CORE=y
> CONFIG_INTEL_PMT_CLASS=m
> CONFIG_INTEL_PMT_TELEMETRY=m
>@@ -9070,7 +9031,6 @@ CONFIG_COMMON_CLK_WM831X=m
> CONFIG_COMMON_CLK_SI5351=m
> # CONFIG_COMMON_CLK_SI544 is not set
> # CONFIG_COMMON_CLK_CDCE706 is not set
>-CONFIG_COMMON_CLK_TPS68470=m
> CONFIG_COMMON_CLK_CS2000_CP=m
> CONFIG_CLK_TWL6040=m
> CONFIG_COMMON_CLK_PALMAS=m
>@@ -9639,7 +9599,6 @@ CONFIG_ADJD_S311=m
> # CONFIG_AL3010 is not set
> CONFIG_AL3320A=m
> CONFIG_APDS9300=m
>-CONFIG_APDS9960=m
> # CONFIG_AS73211 is not set
> CONFIG_BH1750=m
> CONFIG_BH1780=m
>@@ -11310,6 +11269,83 @@ CONFIG_MEMTEST=y
> # CONFIG_HYPERV_TESTING is not set
> # end of Kernel Testing and Coverage
> 
>+##
>+## Surface Aggregator Module
>+##
>+CONFIG_SURFACE_AGGREGATOR=m
>+# CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION is not set
>+CONFIG_SURFACE_AGGREGATOR_BUS=y
>+CONFIG_SURFACE_AGGREGATOR_CDEV=m
>+CONFIG_SURFACE_AGGREGATOR_HUB=m
>+CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
>+CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH=m
>+
>+CONFIG_SURFACE_ACPI_NOTIFY=m
>+CONFIG_SURFACE_DTX=m
>+CONFIG_SURFACE_PLATFORM_PROFILE=m
>+
>+CONFIG_SURFACE_HID=m
>+CONFIG_SURFACE_KBD=m
>+
>+CONFIG_BATTERY_SURFACE=m
>+CONFIG_CHARGER_SURFACE=m
>+
>+##
>+## Surface Hotplug
>+##
>+CONFIG_SURFACE_HOTPLUG=m
>+
>+##
>+## IPTS and ITHC touchscreen
>+##
>+## This only enables the user interface for IPTS/ITHC data.
>+## For the touchscreen to work, you need to install iptsd.
>+##
>+CONFIG_HID_IPTS=m
>+CONFIG_HID_ITHC=m
>+
>+##
>+## Cameras: IPU3
>+##
>+CONFIG_VIDEO_DW9719=m
>+CONFIG_VIDEO_IPU3_IMGU=m
>+CONFIG_VIDEO_IPU3_CIO2=m
>+CONFIG_CIO2_BRIDGE=y
>+CONFIG_INTEL_SKL_INT3472=m
>+CONFIG_REGULATOR_TPS68470=m
>+CONFIG_COMMON_CLK_TPS68470=m
>+
>+##
>+## Cameras: Sensor drivers
>+##
>+CONFIG_VIDEO_OV5693=m
>+CONFIG_VIDEO_OV7251=m
>+CONFIG_VIDEO_OV8865=m
>+
>+##
>+## Surface 3: atomisp causes problems (see issue #1095). Disable it for now.
>+##
>+# CONFIG_INTEL_ATOMISP is not set
>+
>+##
>+## ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
>+##
>+CONFIG_APDS9960=m
>+
>+##
>+## For Intel Thread Director (Alder-Lake)
>+##
>+CONFIG_IPC_CLASSES=y
>+
>+##
>+## Other Drivers
>+##
>+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
>+CONFIG_SURFACE_3_POWER_OPREGION=m
>+CONFIG_SURFACE_PRO3_BUTTON=m
>+CONFIG_SURFACE_GPE=m
>+CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
>+
> #
> # Rust hacking
> #

--- defconfig-x86_64-desktop-original	2023-04-27 16:13:51.000000000 +0200
+++ defconfig-x86_64-desktop.surface	2023-04-28 19:56:43.612134768 +0200
@@ -4286,7 +4286,6 @@ CONFIG_TOUCHSCREEN_SIS_I2C=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_STMFTS=m
 CONFIG_TOUCHSCREEN_SUR40=m
-CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
 # CONFIG_TOUCHSCREEN_SX8654 is not set
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_TOUCHSCREEN_ZET6223=m
@@ -4350,7 +4349,6 @@ CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
 CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
 CONFIG_INPUT_DRV260X_HAPTICS=m
 CONFIG_INPUT_DRV2665_HAPTICS=m
 CONFIG_INPUT_DRV2667_HAPTICS=m
@@ -5034,8 +5032,6 @@ CONFIG_CHARGER_CROS_USBPD=m
 CONFIG_CHARGER_CROS_PCHG=m
 # CONFIG_CHARGER_BD99954 is not set
 CONFIG_CHARGER_WILCO=m
-CONFIG_BATTERY_SURFACE=m
-CONFIG_CHARGER_SURFACE=m
 # CONFIG_BATTERY_UG3105 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
@@ -5653,7 +5649,6 @@ CONFIG_REGULATOR_TPS6524X=m
 CONFIG_REGULATOR_TPS6586X=m
 CONFIG_REGULATOR_TPS65910=m
 CONFIG_REGULATOR_TPS65912=m
-CONFIG_REGULATOR_TPS68470=m
 CONFIG_REGULATOR_TWL4030=m
 CONFIG_REGULATOR_WM831X=m
 CONFIG_REGULATOR_WM8350=m
@@ -6003,8 +5998,6 @@ CONFIG_DVB_BUDGET_CORE=m
 CONFIG_DVB_BUDGET=m
 CONFIG_DVB_BUDGET_CI=m
 CONFIG_DVB_BUDGET_AV=m
-CONFIG_VIDEO_IPU3_CIO2=m
-CONFIG_CIO2_BRIDGE=y
 CONFIG_RADIO_ADAPTERS=m
 CONFIG_RADIO_MAXIRADIO=m
 CONFIG_RADIO_SAA7706H=m
@@ -6225,17 +6218,14 @@ CONFIG_VIDEO_OV4689=m
 # CONFIG_VIDEO_OV5648 is not set
 # CONFIG_VIDEO_OV5670 is not set
 # CONFIG_VIDEO_OV5675 is not set
-CONFIG_VIDEO_OV5693=m
 CONFIG_VIDEO_OV5695=m
 CONFIG_VIDEO_OV6650=m
-CONFIG_VIDEO_OV7251=m
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_OV772X=m
 CONFIG_VIDEO_OV7740=m
 # CONFIG_VIDEO_OV8856 is not set
 # CONFIG_VIDEO_OV8858 is not set
-CONFIG_VIDEO_OV8865=m
 CONFIG_VIDEO_OV9640=m
 # CONFIG_VIDEO_OV9650 is not set
 CONFIG_VIDEO_OV9734=m
@@ -7808,16 +7798,6 @@ CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
 CONFIG_AMD_SFH_HID=m
 # end of AMD SFH HID Support
 
-#
-# Surface System Aggregator Module HID support
-#
-CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_KBD=m
-# end of Surface System Aggregator Module HID support
-
-CONFIG_SURFACE_HID_CORE=m
-CONFIG_HID_IPTS=m
-CONFIG_HID_ITHC=m
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -8846,13 +8826,11 @@ CONFIG_AD2S1210=m
 
 # CONFIG_FB_SM750 is not set
 CONFIG_STAGING_MEDIA=y
-# CONFIG_INTEL_ATOMISP is not set
 CONFIG_DVB_AV7110_IR=y
 CONFIG_DVB_AV7110=m
 CONFIG_DVB_AV7110_OSD=y
 CONFIG_DVB_BUDGET_PATCH=m
 CONFIG_DVB_SP8870=m
-CONFIG_VIDEO_IPU3_IMGU=m
 # CONFIG_STAGING_MEDIA_DEPRECATED is not set
 CONFIG_LTE_GDM724X=m
 # CONFIG_FB_TFT is not set
@@ -8906,22 +8884,6 @@ CONFIG_MLXREG_HOTPLUG=m
 CONFIG_MLXREG_IO=m
 CONFIG_MLXREG_LC=m
 CONFIG_NVSW_SN2201=m
-CONFIG_SURFACE_PLATFORMS=y
-CONFIG_SURFACE3_WMI=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_ACPI_NOTIFY=m
-CONFIG_SURFACE_AGGREGATOR_CDEV=m
-CONFIG_SURFACE_AGGREGATOR_HUB=m
-CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
-CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH=m
-CONFIG_SURFACE_DTX=m
-CONFIG_SURFACE_GPE=m
-CONFIG_SURFACE_HOTPLUG=m
-CONFIG_SURFACE_PLATFORM_PROFILE=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_AGGREGATOR=m
-CONFIG_SURFACE_AGGREGATOR_BUS=y
-# CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACPI_WMI=m
 CONFIG_WMI_BMOF=m
@@ -8989,7 +8951,6 @@ CONFIG_INTEL_ATOMISP2_PDX86=y
 CONFIG_INTEL_ATOMISP2_PM=m
 # CONFIG_INTEL_IFS is not set
 CONFIG_INTEL_SAR_INT1092=m
-CONFIG_INTEL_SKL_INT3472=m
 CONFIG_INTEL_PMC_CORE=y
 CONFIG_INTEL_PMT_CLASS=m
 CONFIG_INTEL_PMT_TELEMETRY=m
@@ -9070,7 +9031,6 @@ CONFIG_COMMON_CLK_WM831X=m
 CONFIG_COMMON_CLK_SI5351=m
 # CONFIG_COMMON_CLK_SI544 is not set
 # CONFIG_COMMON_CLK_CDCE706 is not set
-CONFIG_COMMON_CLK_TPS68470=m
 CONFIG_COMMON_CLK_CS2000_CP=m
 CONFIG_CLK_TWL6040=m
 CONFIG_COMMON_CLK_PALMAS=m
@@ -9639,7 +9599,6 @@ CONFIG_ADJD_S311=m
 # CONFIG_AL3010 is not set
 CONFIG_AL3320A=m
 CONFIG_APDS9300=m
-CONFIG_APDS9960=m
 # CONFIG_AS73211 is not set
 CONFIG_BH1750=m
 CONFIG_BH1780=m
@@ -11310,6 +11269,83 @@ CONFIG_MEMTEST=y
 # CONFIG_HYPERV_TESTING is not set
 # end of Kernel Testing and Coverage
 
+##
+## Surface Aggregator Module
+##
+CONFIG_SURFACE_AGGREGATOR=m
+# CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION is not set
+CONFIG_SURFACE_AGGREGATOR_BUS=y
+CONFIG_SURFACE_AGGREGATOR_CDEV=m
+CONFIG_SURFACE_AGGREGATOR_HUB=m
+CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
+CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH=m
+
+CONFIG_SURFACE_ACPI_NOTIFY=m
+CONFIG_SURFACE_DTX=m
+CONFIG_SURFACE_PLATFORM_PROFILE=m
+
+CONFIG_SURFACE_HID=m
+CONFIG_SURFACE_KBD=m
+
+CONFIG_BATTERY_SURFACE=m
+CONFIG_CHARGER_SURFACE=m
+
+##
+## Surface Hotplug
+##
+CONFIG_SURFACE_HOTPLUG=m
+
+##
+## IPTS and ITHC touchscreen
+##
+## This only enables the user interface for IPTS/ITHC data.
+## For the touchscreen to work, you need to install iptsd.
+##
+CONFIG_HID_IPTS=m
+CONFIG_HID_ITHC=m
+
+##
+## Cameras: IPU3
+##
+CONFIG_VIDEO_DW9719=m
+CONFIG_VIDEO_IPU3_IMGU=m
+CONFIG_VIDEO_IPU3_CIO2=m
+CONFIG_CIO2_BRIDGE=y
+CONFIG_INTEL_SKL_INT3472=m
+CONFIG_REGULATOR_TPS68470=m
+CONFIG_COMMON_CLK_TPS68470=m
+
+##
+## Cameras: Sensor drivers
+##
+CONFIG_VIDEO_OV5693=m
+CONFIG_VIDEO_OV7251=m
+CONFIG_VIDEO_OV8865=m
+
+##
+## Surface 3: atomisp causes problems (see issue #1095). Disable it for now.
+##
+# CONFIG_INTEL_ATOMISP is not set
+
+##
+## ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
+##
+CONFIG_APDS9960=m
+
+##
+## For Intel Thread Director (Alder-Lake)
+##
+CONFIG_IPC_CLASSES=y
+
+##
+## Other Drivers
+##
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
+CONFIG_SURFACE_3_POWER_OPREGION=m
+CONFIG_SURFACE_PRO3_BUTTON=m
+CONFIG_SURFACE_GPE=m
+CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
+
 #
 # Rust hacking
 #

Actions: View | Diff

Attachments on bug 31444: 13659 | 13662 | 13697 | 13698 | 13707 | 13708 | 13709 | 13710 | 13797 | 13798 | 13799 | 13835 | 13836 | 13837 | 13838 | 13839