pass Q build

Change-Id: Id843bf48ae346e4951fbffe6986b5ba272c9a1f2

diff --git a/AndroidKernel.mk b/AndroidKernel.mk
index 3464df718f5b8878c48bb0bdd3c2485b5721e027..a385e13b554c64b11016e6753a9e23e69dff7157 100644 (file)
--- a/AndroidKernel.mk
+++ b/AndroidKernel.mk
@@ -36,7 +36,7 @@ KERNEL_CROSS_COMPILE := $(CROSS_COMPILE)
 endif
 
 SOONG_GLOBAL_CONFIG := build/soong/cc/config/global.go
-CLANG_VERSION := $(shell  grep "ClangDefaultVersion" $(SOONG_GLOBAL_CONFIG) | grep -o "clang-[0-9][0-9]*")
+CLANG_VERSION := clang-4691093
 CLANG_PATH := prebuilts/clang/host/linux-x86
 CC :=$(PWD)/$(CLANG_PATH)/$(CLANG_VERSION)/bin/clang
 

diff --git a/arch/arm64/boot/dts/exynos/exynos9609-troika_evb.dts b/arch/arm64/boot/dts/exynos/exynos9609-troika_evb.dts
index 17bf48bfef45f5683590be7c6c626845e5bb80d6..c032e7bc4f4e64329dfc303d44d531d5a1224867 100755 (executable)
--- a/arch/arm64/boot/dts/exynos/exynos9609-troika_evb.dts
+++ b/arch/arm64/boot/dts/exynos/exynos9609-troika_evb.dts
@@ -12,7 +12,6 @@
 /dts-v1/;
 /plugin/;
 
-#include "exynos9610-troika-camera.dtsi"
 #include "exynos9610-troika-common.dtsi"
 
 / {

diff --git a/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi
index dc6a2f6879cf5faf2d57954cb39d7f4e05f2aaac..62e2ccab725ec36708e25e8f655e7b2be98d7830 100755 (executable)
--- a/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi
@@ -1226,13 +1226,6 @@
                        samsung,pin-drv = <2>;
                };
 
-               fimc_is_mclk3_in: fimc_is_mclk3_in {
-                       samsung,pins = "gpg3-5";
-                       samsung,pin-function = <0>;
-                       samsung,pin-pud = <0>;
-                       samsung,pin-drv = <2>;
-               };
-
                fimc_is_mclk0_out: fimc_is_mclk0_out {
                        samsung,pins = "gpc2-0";
                        samsung,pin-function = <1>;
@@ -1261,13 +1254,6 @@
                        samsung,pin-drv = <2>;
                };
 
-               fimc_is_mclk3_out: fimc_is_mclk3_out {
-                       samsung,pins = "gpg3-5";
-                       samsung,pin-function = <1>;
-                       samsung,pin-pud = <1>;
-                       samsung,pin-drv = <2>;
-               };
-
                fimc_is_mclk0_fn: fimc_is_mclk0_fn {
                        samsung,pins = "gpc2-0";
                        samsung,pin-function = <2>;
@@ -1296,13 +1282,6 @@
                        samsung,pin-drv = <2>;
                };
 
-               fimc_is_mclk3_fn: fimc_is_mclk3_fn {
-                       samsung,pins = "gpg3-5";
-                       samsung,pin-function = <2>;
-                       samsung,pin-pud = <0>;
-                       samsung,pin-drv = <2>;
-               };
-
                decon_f_te_on: decon_f_te_on {
                        samsung,pins = "gpc2-3";
                        samsung,pin-function = <0xf>;

diff --git a/drivers/hwmon/ntc_thermistor.c b/drivers/hwmon/ntc_thermistor.c
index f4b7a71110ecd9155b618a18caad2fdb1018e1f3..f39434638280117c2a0fec4669667c99cfcfb18a 100755 (executable)
--- a/drivers/hwmon/ntc_thermistor.c
+++ b/drivers/hwmon/ntc_thermistor.c
@@ -294,9 +294,6 @@ static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata)
        } else {
                /* Assume 12 bit ADC with vref at pullup_uv */
                        uv = (pdata->pullup_uv * (s64)raw) >> 12;
-               }
-       } else {
-               uv = (pdata->pullup_uv * (s64)raw) >> 12;
        }
 
        return uv;

diff --git a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.c b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.c
index 203c70ce04b696a73c71d54a0b4d542fdcb49445..bcc05155793cdef3e31831f32cab3e6706b0b58c 100755 (executable)
--- a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.c
+++ b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.c
@@ -3518,19 +3518,6 @@ int set_sensor_info_mfhdr_mode_change(struct fimc_is_sensor_interface *itf,
        return 0;
 }
 
-int request_wb_gain(struct fimc_is_sensor_interface *itf,
-               u32 gr_gain, u32 r_gain, u32 b_gain, u32 gb_gain)
-{
-       return 0;
-}
-
-int set_sensor_info_mfhdr_mode_change(struct fimc_is_sensor_interface *itf,
-               u32 count, u32 *long_expo, u32 *long_again, u32 *long_dgain,
-               u32 *expo, u32 *again, u32 *dgain)
-{
-       return 0;
-}
-
 int init_sensor_interface(struct fimc_is_sensor_interface *itf)
 {
        int ret = 0;

diff --git a/drivers/video/fbdev/exynos/dpu20/dsim.h b/drivers/video/fbdev/exynos/dpu20/dsim.h
index 45d5c07ba5902564cafe6d37ca8a68db0a77e9c8..d34c372f20488be288dfe431a480581ffd910078 100755 (executable)
--- a/drivers/video/fbdev/exynos/dpu20/dsim.h
+++ b/drivers/video/fbdev/exynos/dpu20/dsim.h
@@ -249,7 +249,6 @@ struct dsim_device {
        unsigned int ddi_seq_size;
        unsigned char ddi_seq[512];
        int user_brightness;
-       char ddi_device_type[DSIM_DDI_TYPE_LEN];
 };
 
 struct dsim_lcd_driver {

diff --git a/include/linux/platform_data/ntc_thermistor.h b/include/linux/platform_data/ntc_thermistor.h
index de4a30aafef7c850f9b572daf02653dc662c2672..0f4502a2c9297c5a8c3b5a242d38a29ce459787e 100755 (executable)
--- a/include/linux/platform_data/ntc_thermistor.h
+++ b/include/linux/platform_data/ntc_thermistor.h
@@ -57,7 +57,6 @@ struct ntc_thermistor_platform_data {
        struct iio_channel *chan;
        bool iio_convert_support;
 
-       bool iio_convert_support;
        int (*read_ohm)(void);
 };