Merge "ASOC: add support to disable WSA881x temperature sensor"

asoc/codecs/Kbuild

@@ -164,8 +164,10 @@ ifdef CONFIG_SND_SOC_WSA881X_ANALOG
 	WSA881X_ANALOG_OBJS += wsa881x-analog.o
 	WSA881X_ANALOG_OBJS += wsa881x-tables-analog.o
 	WSA881X_ANALOG_OBJS += wsa881x-regmap-analog.o
+ifndef CONFIG_WSA881X_TEMP_SENSOR_DISABLE
 	WSA881X_ANALOG_OBJS += wsa881x-temp-sensor.o
 endif
+endif
 ifdef CONFIG_SND_SOC_MSM_STUB
 	STUB_OBJS += msm_stub.o
 endif

asoc/codecs/wsa881x-temp-sensor.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
-/* Copyright (c) 2015, 2018 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015, 2018, 2020 The Linux Foundation. All rights reserved.
  */
 #ifndef WSA881X_TEMP_SENSOR_H
 #define WSA881X_TEMP_SENSOR_H
@@ -29,7 +29,13 @@ struct wsa881x_tz_priv {
 	int curr_temp;
 };
 
-int wsa881x_get_temp(struct thermal_zone_device *tz_dev, int *temp);
+#ifndef CONFIG_WSA881X_TEMP_SENSOR_DISABLE
 int wsa881x_init_thermal(struct wsa881x_tz_priv *tz_pdata);
 void wsa881x_deinit_thermal(struct thermal_zone_device *tz_dev);
+int wsa881x_get_temp(struct thermal_zone_device *tz_dev, int *temp);
+#else
+int wsa881x_init_thermal(struct wsa881x_tz_priv *tz_pdata){ return 0; }
+void wsa881x_deinit_thermal(struct thermal_zone_device *tz_dev){}
+int wsa881x_get_temp(struct thermal_zone_device *tz_dev, int *temp){ return 0; }
+#endif
 #endif