Merge pull request #2 from duhansysl/duhan_6.1

Merge duhan_test into duhan_6.1
duhansysl · Aug 9, 2024 · 89d560b · 89d560b
2 parents 6086d69 + d3d3f90
commit 89d560b
Show file tree

Hide file tree

Showing 21 changed files with 2,540 additions and 59 deletions.
diff --git a/arch/arm64/boot/dts/exynos/exynos9810-crownlte_eur_open_26.dts b/arch/arm64/boot/dts/exynos/exynos9810-crownlte_eur_open_26.dts
@@ -12911,16 +12911,25 @@
 
 	haptic {
 		status = "okay";
-		haptic,max_timeout = <0x2710>;
-		haptic,multi_frequency = <0x7>;
-		haptic,duty = <0x9ede 0xbebc 0x9896 0x7270 0x7f27 0x90f4 0x90f4>;
-		haptic,period = <0xbf68 0xfe50 0xcb73 0x9896 0xa98a 0x9896 0x9896>;
+		haptic,max_timeout = <10000>;
+		/* for multi-frequency */
+		haptic,multi_frequency = <7>;
+		haptic,frequency = <1595 1200 1500 2000 1800 2000 2000>;
+		/* frequency     alert low   mid   high  0     press release */
+		haptic,duty   = <40527 54036 43228 32421 36023 37108 37108>;
+		haptic,period = <48828 65104 52083 39062 43402 39062 39062>;
 		haptic,reg2 = <0x82>;
-		haptic,pwm_id = <0x1>;
+		haptic,pwm_id = <1>;
 		haptic,regulator_name = "VDD_MOTOR_3P3";
-		haptic,normal_ratio = <0x4b>;
-		haptic,overdrive_ratio = <0x5f>;
-		haptic,type = "LINEAR_1040";
+		haptic,normal_ratio = <83>;
+		haptic,overdrive_ratio = <95>;
+		haptic,high_temp_ratio = <60>;
+		haptic,high_temp_ref = <55>;
+		pwms = <0xffffffff 0x00 0xf4240 0x00>;
+		haptic,motor_type = "LINEAR_1040";
+		samsung,steps = <6>;
+		samsung,intensities = <0 3000 4000 6000 8000 10000>;
+		samsung,haptic_intensities = <0 2000 4000 6000 8000 10000>;
 	};
 
 	sound {

diff --git a/arch/arm64/boot/dts/exynos/exynos9810-crownlte_kor_26.dts b/arch/arm64/boot/dts/exynos/exynos9810-crownlte_kor_26.dts
@@ -13015,16 +13015,25 @@
 
 	haptic {
 		status = "okay";
-		haptic,max_timeout = <0x2710>;
-		haptic,multi_frequency = <0x7>;
-		haptic,duty = <0x9ede 0xbebc 0x9896 0x7270 0x7f27 0x90f4 0x90f4>;
-		haptic,period = <0xbf68 0xfe50 0xcb73 0x9896 0xa98a 0x9896 0x9896>;
+		haptic,max_timeout = <10000>;
+		/* for multi-frequency */
+		haptic,multi_frequency = <7>;
+		haptic,frequency = <1595 1200 1500 2000 1800 2000 2000>;
+		/* frequency     alert low   mid   high  0     press release */
+		haptic,duty   = <40527 54036 43228 32421 36023 37108 37108>;
+		haptic,period = <48828 65104 52083 39062 43402 39062 39062>;
 		haptic,reg2 = <0x82>;
-		haptic,pwm_id = <0x1>;
+		haptic,pwm_id = <1>;
 		haptic,regulator_name = "VDD_MOTOR_3P3";
-		haptic,normal_ratio = <0x4b>;
-		haptic,overdrive_ratio = <0x5f>;
-		haptic,type = "LINEAR_1040";
+		haptic,normal_ratio = <83>;
+		haptic,overdrive_ratio = <95>;
+		haptic,high_temp_ratio = <60>;
+		haptic,high_temp_ref = <55>;
+		pwms = <0xffffffff 0x00 0xf4240 0x00>;
+		haptic,motor_type = "LINEAR_1040";
+		samsung,steps = <6>;
+		samsung,intensities = <0 3000 4000 6000 8000 10000>;
+		samsung,haptic_intensities = <0 2000 4000 6000 8000 10000>;
 	};
 
 	sound {

diff --git a/arch/arm64/boot/dts/exynos/exynos9810-star2lte_eur_open_26.dts b/arch/arm64/boot/dts/exynos/exynos9810-star2lte_eur_open_26.dts
@@ -12877,16 +12877,25 @@
 
 	haptic {
 		status = "okay";
-		haptic,max_timeout = <0x2710>;
-		haptic,multi_frequency = <0x7>;
-		haptic,duty = <0x9ede 0xbebc 0x9896 0x7270 0x7f27 0x90f4 0x90f4>;
-		haptic,period = <0xbf68 0xfe50 0xcb73 0x9896 0xa98a 0x9896 0x9896>;
+		haptic,max_timeout = <10000>;
+		/* for multi-frequency */
+		haptic,multi_frequency = <7>;
+		haptic,frequency = <1595 1200 1500 2000 1800 2000 2000>;
+		/* frequency     alert low   mid   high  0     press release */
+		haptic,duty   = <36621 48828 39062 29296 32551 37108 37108>;
+		haptic,period = <48828 65104 52083 39062 43402 39062 39062>;
 		haptic,reg2 = <0x82>;
-		haptic,pwm_id = <0x1>;
+		haptic,pwm_id = <1>;
 		haptic,regulator_name = "VDD_MOTOR_3P3";
-		haptic,normal_ratio = <0x4b>;
-		haptic,overdrive_ratio = <0x5f>;
-		haptic,type = "LINEAR_1040";
+		haptic,normal_ratio = <75>;
+		haptic,overdrive_ratio = <95>;
+		haptic,high_temp_ratio = <60>;
+		haptic,high_temp_ref = <55>;
+		pwms = <0xffffffff 0x00 0xf4240 0x00>;
+		haptic,motor_type = "LINEAR_1040";
+		samsung,steps = <6>;
+		samsung,intensities = <0 3000 4000 6000 8000 10000>;
+		samsung,haptic_intensities = <0 2000 4000 6000 8000 10000>;
 	};
 
 	sound {

diff --git a/arch/arm64/boot/dts/exynos/exynos9810-star2lte_kor_26.dts b/arch/arm64/boot/dts/exynos/exynos9810-star2lte_kor_26.dts
@@ -12961,16 +12961,25 @@
 
 	haptic {
 		status = "okay";
-		haptic,max_timeout = <0x2710>;
-		haptic,multi_frequency = <0x7>;
-		haptic,duty = <0x9ede 0xbebc 0x9896 0x7270 0x7f27 0x90f4 0x90f4>;
-		haptic,period = <0xbf68 0xfe50 0xcb73 0x9896 0xa98a 0x9896 0x9896>;
+		haptic,max_timeout = <10000>;
+		/* for multi-frequency */
+		haptic,multi_frequency = <7>;
+		haptic,frequency = <1595 1200 1500 2000 1800 2000 2000>;
+		/* frequency     alert low   mid   high  0     press release */
+		haptic,duty   = <36621 48828 39062 29296 32551 37108 37108>;
+		haptic,period = <48828 65104 52083 39062 43402 39062 39062>;
 		haptic,reg2 = <0x82>;
-		haptic,pwm_id = <0x1>;
+		haptic,pwm_id = <1>;
 		haptic,regulator_name = "VDD_MOTOR_3P3";
-		haptic,normal_ratio = <0x4b>;
-		haptic,overdrive_ratio = <0x5f>;
-		haptic,type = "LINEAR_1040";
+		haptic,normal_ratio = <75>;
+		haptic,overdrive_ratio = <95>;
+		haptic,high_temp_ratio = <60>;
+		haptic,high_temp_ref = <55>;
+		pwms = <0xffffffff 0x00 0xf4240 0x00>;
+		haptic,motor_type = "LINEAR_1040";
+		samsung,steps = <6>;
+		samsung,intensities = <0 3000 4000 6000 8000 10000>;
+		samsung,haptic_intensities = <0 2000 4000 6000 8000 10000>;
 	};
 
 	sound {

diff --git a/arch/arm64/boot/dts/exynos/exynos9810-starlte_eur_open_26.dts b/arch/arm64/boot/dts/exynos/exynos9810-starlte_eur_open_26.dts
@@ -12940,16 +12940,25 @@
 
 	haptic {
 		status = "okay";
-		haptic,max_timeout = <0x2710>;
-		haptic,multi_frequency = <0x7>;
-		haptic,duty = <0x9ede 0xbebc 0x9896 0x7270 0x7f27 0x90f4 0x90f4>;
-		haptic,period = <0xbf68 0xfe50 0xcb73 0x9896 0xa98a 0x9896 0x9896>;
+		haptic,max_timeout = <10000>;
+		/* for multi-frequency */
+		haptic,multi_frequency = <7>;
+		haptic,frequency = <1595 1200 1500 2000 1800 2000 2000>;
+		/* frequency     alert low   mid   high  0     press release */
+		haptic,duty   = <34179 45572 36458 27343 30381 37108 37108>;
+		haptic,period = <48828 65104 52083 39062 43402 39062 39062>;
 		haptic,reg2 = <0x82>;
-		haptic,pwm_id = <0x1>;
+		haptic,pwm_id = <1>;
 		haptic,regulator_name = "VDD_MOTOR_3P3";
-		haptic,normal_ratio = <0x4b>;
-		haptic,overdrive_ratio = <0x5f>;
-		haptic,type = "LINEAR_1040";
+		haptic,normal_ratio = <70>;
+		haptic,overdrive_ratio = <95>;
+		haptic,high_temp_ratio = <60>;
+		haptic,high_temp_ref = <55>;
+		pwms = <0xffffffff 0x00 0xf4240 0x00>;
+		haptic,motor_type = "LINEAR_1040";
+		samsung,steps = <6>;
+		samsung,intensities = <0 3000 4000 6000 8000 10000>;
+		samsung,haptic_intensities = <0 2000 4000 6000 8000 10000>;
 	};
 
 	sound {

diff --git a/arch/arm64/boot/dts/exynos/exynos9810-starlte_kor_26.dts b/arch/arm64/boot/dts/exynos/exynos9810-starlte_kor_26.dts
@@ -12998,16 +12998,25 @@
 
 	haptic {
 		status = "okay";
-		haptic,max_timeout = <0x2710>;
-		haptic,multi_frequency = <0x7>;
-		haptic,duty = <0x9ede 0xbebc 0x9896 0x7270 0x7f27 0x90f4 0x90f4>;
-		haptic,period = <0xbf68 0xfe50 0xcb73 0x9896 0xa98a 0x9896 0x9896>;
+		haptic,max_timeout = <10000>;
+		/* for multi-frequency */
+		haptic,multi_frequency = <7>;
+		haptic,frequency = <1595 1200 1500 2000 1800 2000 2000>;
+		/* frequency     alert low   mid   high  0     press release */
+		haptic,duty   = <34179 45572 36458 27343 30381 37108 37108>;
+		haptic,period = <48828 65104 52083 39062 43402 39062 39062>;
 		haptic,reg2 = <0x82>;
-		haptic,pwm_id = <0x1>;
+		haptic,pwm_id = <1>;
 		haptic,regulator_name = "VDD_MOTOR_3P3";
-		haptic,normal_ratio = <0x4b>;
-		haptic,overdrive_ratio = <0x5f>;
-		haptic,type = "LINEAR_1040";
+		haptic,normal_ratio = <70>;
+		haptic,overdrive_ratio = <95>;
+		haptic,high_temp_ratio = <60>;
+		haptic,high_temp_ref = <55>;
+		pwms = <0xffffffff 0x00 0xf4240 0x00>;
+		haptic,motor_type = "LINEAR_1040";
+		samsung,steps = <6>;
+		samsung,intensities = <0 3000 4000 6000 8000 10000>;
+		samsung,haptic_intensities = <0 2000 4000 6000 8000 10000>;
 	};
 
 	sound {

diff --git a/arch/arm64/configs/exynos9810_defconfig b/arch/arm64/configs/exynos9810_defconfig
@@ -622,7 +622,7 @@ CONFIG_COREDUMP=y
 CONFIG_COMPAT=y
 CONFIG_KEYS_COMPAT=y
 CONFIG_KUSER_HELPERS=y
-# CONFIG_COMPAT_VDSO is not set
+CONFIG_COMPAT_VDSO=y
 CONFIG_CROSS_COMPILE_ARM32=""
 
 #
@@ -5216,8 +5216,13 @@ CONFIG_TRUSTONIC_TRUSTED_UI_FB_BLANK=y
 # CONFIG_SECURE_OS_SUPPORT_MCT_DISABLE is not set
 CONFIG_TRUSTED_UI_TOUCH_ENABLE=y
 # CONFIG_TEE is not set
-CONFIG_MOTOR_DRV_MAX77705=y
-CONFIG_SEC_HAPTIC=y
+# CONFIG_MOTOR_DRV_MAX77865 is not set
+# CONFIG_MOTOR_DRV_MAX77705 is not set
+# CONFIG_SEC_HAPTIC is not set
+CONFIG_MAX77705_VIBRATOR=y
+# CONFIG_MAX77705_VIB_FOLD_MODEL is not set
+CONFIG_SEC_VIBRATOR=y
+CONFIG_SEC_VIB_NOTIFIER=y
 CONFIG_SENSORS_FINGERPRINT=y
 # CONFIG_SENSORS_FPRINT_SECURE is not set
 # CONFIG_SENSORS_FINGERPRINT_32BITS_PLATFORM_ONLY is not set

diff --git a/arch/arm64/configs/star2lte_defconfig b/arch/arm64/configs/star2lte_defconfig
@@ -33,5 +33,5 @@ CONFIG_CHARGER_MAX77865=y
 # CONFIG_SENSORS_SSP_LIGHT_MAX_GAIN_2BYTE is not set
 CONFIG_SENSORS_SSP_STAR=y
 # CONFIG_SENSORS_SSP_CROWN is not set
-CONFIG_MOTOR_DRV_MAX77865=y
+# CONFIG_MOTOR_DRV_MAX77865 is not set
 
diff --git a/arch/arm64/configs/starlte_defconfig b/arch/arm64/configs/starlte_defconfig
@@ -33,4 +33,4 @@ CONFIG_CHARGER_MAX77865=y
 # CONFIG_SENSORS_SSP_LIGHT_MAX_GAIN_2BYTE is not set
 CONFIG_SENSORS_SSP_STAR=y
 # CONFIG_SENSORS_SSP_CROWN is not set
-CONFIG_MOTOR_DRV_MAX77865=y
+# CONFIG_MOTOR_DRV_MAX77865 is not set
diff --git a/drivers/Kconfig b/drivers/Kconfig
@@ -232,6 +232,8 @@ source "drivers/tee/Kconfig"
 
 source "drivers/motor/Kconfig"
 
+source "drivers/vibrator/Kconfig"
+
 source "drivers/fingerprint/Kconfig"
 
 source "drivers/gator_5.27/Kconfig"

diff --git a/drivers/Makefile b/drivers/Makefile
@@ -200,6 +200,9 @@ obj-$(CONFIG_GPS_BCMxxxxx)	+= gps/
 # Motor
 obj-y	+= motor/
 
+# Vibrator
+obj-y += vibrator/
+
 # CCIC
 obj-y	+= ccic/
 

diff --git a/drivers/input/touchscreen/sec_ts/sec_ts.h b/drivers/input/touchscreen/sec_ts/sec_ts.h
@@ -979,7 +979,7 @@ extern int get_lcd_attached(char *mode);
 extern int get_lcd_info(char *arg);
 #endif
 
-#if defined(CONFIG_MOTOR_DRV_MAX77865) || defined(CONFIG_SS_VIBRATOR)
+#if defined(CONFIG_MOTOR_DRV_MAX77705) || defined(CONFIG_MAX77705_VIBRATOR)
 extern int haptic_homekey_press(void);
 extern int haptic_homekey_release(void);
 #else

diff --git a/drivers/input/touchscreen/sec_ts/y771/sec_ts.h b/drivers/input/touchscreen/sec_ts/y771/sec_ts.h
@@ -1043,7 +1043,7 @@ extern int get_lcd_attached(char *mode);
 extern int get_lcd_info(char *arg);
 #endif
 
-#if defined(CONFIG_MOTOR_DRV_MAX77705) || defined(CONFIG_MOTOR_DRV_MAX77865) || defined(CONFIG_SS_VIBRATOR)
+#if defined(CONFIG_MOTOR_DRV_MAX77705) || defined(CONFIG_MAX77705_VIBRATOR)
 extern int haptic_homekey_press(void);
 extern int haptic_homekey_release(void);
 #else

diff --git a/drivers/mfd/max77705.c b/drivers/mfd/max77705.c
@@ -64,7 +64,7 @@ static struct mfd_cell max77705_devs[] = {
 #if defined(CONFIG_CHARGER_MAX77705)
 	{ .name = "max77705-charger", },
 #endif
-#if defined(CONFIG_MOTOR_DRV_MAX77705)
+#if defined(CONFIG_MOTOR_DRV_MAX77705) || defined(CONFIG_MAX77705_VIBRATOR)
 	{ .name = "max77705-haptic", },
 #endif /* CONFIG_MAX77705_HAPTIC */
 #if defined(CONFIG_LEDS_MAX77705_RGB)

diff --git a/drivers/vibrator/Kconfig b/drivers/vibrator/Kconfig
@@ -0,0 +1,34 @@
+config MAX77705_VIBRATOR
+	tristate "Maxim MAX77705 vibrator"
+	default n
+	depends on MFD_MAX77705
+	help
+	  If you say yes here you will get support for the
+	  motor of Maxim MAX77705 PMIC.
+	  To enable this driver, MFD_MAX77705 should be enabled and
+	  MFD_MAX77705 calls this driver.
+
+config MAX77705_VIB_FOLD_MODEL
+	tristate "get support for folder status "
+	default n
+	depends on MAX77705_VIBRATOR
+	help
+	  If you enable this feature,
+	  you will get event for folder status
+	  through event_cmd sysfs
+
+config SEC_VIBRATOR
+	tristate "sec vibrator"
+	default n
+	help
+	  If you say yes here you will get support for the
+	  sec vibrator driver
+
+config SEC_VIB_NOTIFIER
+	tristate "use sec vibrator notifier"
+	default n
+	depends on SEC_VIBRATOR
+	help
+	  Enable notifier functions to get motor enable status
+	  and timeout value by register notifiy
+	  If you unsure, please select n
diff --git a/drivers/vibrator/Makefile b/drivers/vibrator/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the vibrator driver ICs with vibrator driver
+#
+
+obj-$(CONFIG_MAX77705_VIBRATOR)        += max77705_vibrator.o
+obj-$(CONFIG_SEC_VIBRATOR) += sec_vibrator.o