Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1fdfb2d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iio: qcom-spmi-adc5: Fix HW settle time table naming for ADC5 lite"

parents 619b2385 7f652274

drivers/iio/adc/qcom-spmi-adc5.c

+1 −1
Original line number Diff line number Diff line
@@ -951,7 +951,7 @@ static const struct adc5_data adc5_data_pmic5_lite = { 
	.full_scale_code_cur = 5000,

	.adc_chans = adc5_chans_pmic,

	.decimation = (unsigned int []) {250, 420, 840},

	.hw_settle_2 = (unsigned int []) {15, 100, 200, 300, 400, 500, 600, 700,

	.hw_settle_1 = (unsigned int []) {15, 100, 200, 300, 400, 500, 600, 700,

					800, 900, 1, 2, 4, 6, 8, 10},

};

drivers/pinctrl/qcom/pinctrl-spmi-gpio.c

+1 −0
Original line number Diff line number Diff line
@@ -1162,6 +1162,7 @@ static const struct of_device_id pmic_gpio_of_match[] = { 
	{ .compatible = "qcom,pmd9650-gpio", .data = (void *) 12 },

	{ .compatible = "qcom,pm7325-gpio", .data = (void *) 10 },

	{ .compatible = "qcom,pm7325b-gpio", .data = (void *) 8 },

	{ .compatible = "qcom,pm2250-gpio", .data = (void *) 10 },

	{ },

};