arm64: dts: qcom: msm8916-samsung-j3/j5: Upstreaming

arch/arm64/boot/dts/qcom/msm8916-samsung-j3-common.dtsi

@@ -0,0 +1,101 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include "msm8916-samsung-j5-common.dtsi"
+
+/ {
+	reserved-memory {
+		/delete-node/ tz-apps@85500000;
+
+		/* Additional memory used by Samsung firmware modifications */
+		tz-apps@85800000 {
+			reg = <0x0 0x85800000 0x0 0x800000>;
+			no-map;
+		};
+	};
+
+	reg_vdd_lcd_3p0: regulator-vdd-lcd-3p0 {
+		compatible = "regulator-fixed";
+		regulator-name = "vdd_lcd_3p0";
+		regulator-min-microvolt = <3000000>;
+		regulator-max-microvolt = <3000000>;
+		vin-supply = <&pm8916_l17>;
+
+		gpio = <&tlmm 102 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+
+		pinctrl-0 = <&lcd_3p0_ldo_en_default>;
+		pinctrl-names = "default";
+	};
+
+	reg_vdd_tsp_a: regulator-vdd-tsp-a {
+		compatible = "regulator-fixed";
+		regulator-name = "vdd_tsp_a";
+		regulator-min-microvolt = <3000000>;
+		regulator-max-microvolt = <3000000>;
+
+		gpio = <&tlmm 16 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+
+		pinctrl-0 = <&tsp_ldo_en_default>;
+		pinctrl-names = "default";
+	};
+};
+
+&accelerometer {
+	vdd-supply = <&pm8916_l5>;
+	vddio-supply = <&pm8916_l5>;
+
+	mount-matrix = "0", "-1", "0",
+		       "1", "0", "0",
+		       "0", "0", "-1";
+};
+
+&front_flash_led {
+	status = "disabled";
+};
+
+&gpio_hall_sensor {
+	status = "disabled";
+};
+
+&i2c_muic {
+	/* GPIO pins vary depending on model variant */
+};
+
+&i2c_sensors {
+	/* GPIO pins vary depending on model variant */
+};
+
+&panel {
+	vdd3-supply = <&pm8916_l6>;
+	vci-supply = <&reg_vdd_lcd_3p0>;
+};
+
+&reg_vdd_lcd_1p8 {
+	status = "disabled";
+};
+
+&reg_vdd_lcd_3p0 {
+	vin-supply = <&pm8916_l17>;
+	gpio = <&tlmm 102 GPIO_ACTIVE_HIGH>;
+};
+
+&touchscreen {
+	vdd-supply = <&reg_vdd_tsp_a>;
+};
+
+&tlmm {
+	lcd_3p0_ldo_en_default: lcd-3p0-ldo-en-default-state {
+		pins = "gpio102";
+		function = "gpio";
+		drive-strength = <2>;
+		bias-disable;
+	};
+
+	tsp_ldo_en_default: tsp-ldo-en-default-state {
+		pins = "gpio16";
+		function = "gpio";
+		drive-strength = <2>;
+		bias-disable;
+	};
+};

arch/arm64/boot/dts/qcom/msm8916-samsung-j3ltetw.dts

@@ -2,48 +2,12 @@
 
 /dts-v1/;
 
-#include "msm8916-samsung-j5-common.dtsi"
+#include "msm8916-samsung-j3-common.dtsi"
 
 / {
 	model = "Samsung Galaxy J3 (2016) (SM-J320YZ)";
 	compatible = "samsung,j3ltetw", "qcom,msm8916";
 	chassis-type = "handset";
-
-	reserved-memory {
-		/delete-node/ tz-apps@85500000;
-
-		/* Additional memory used by Samsung firmware modifications */
-		tz-apps@85a00000 {
-			reg = <0x0 0x85a00000 0x0 0x600000>;
-			no-map;
-		};
-	};
-
-	reg_vdd_tsp_a: regulator-vdd-tsp-a {
-		compatible = "regulator-fixed";
-		regulator-name = "vdd_tsp_a";
-		regulator-min-microvolt = <3000000>;
-		regulator-max-microvolt = <3000000>;
-
-		gpio = <&tlmm 16 GPIO_ACTIVE_HIGH>;
-		enable-active-high;
-
-		pinctrl-0 = <&tsp_ldo_en_default>;
-		pinctrl-names = "default";
-	};
-};
-
-&accelerometer {
-	vdd-supply = <&pm8916_l5>;
-	vddio-supply = <&pm8916_l5>;
-
-	mount-matrix = "0", "-1", "0",
-		       "1", "0", "0",
-		       "0", "0", "-1";
-};
-
-&gpio_hall_sensor {
-	status = "disabled";
 };
 
 &i2c_muic {
@@ -52,42 +16,16 @@
 };
 
 &i2c_sensors {
+	/* I2C2 */
 	sda-gpios = <&tlmm 6 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
 	scl-gpios = <&tlmm 7 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
 };
 
-&panel {
-	vdd3-supply = <&pm8916_l6>;
-	vci-supply = <&reg_vdd_lcd_3p0>;
-};
-
-&reg_vdd_lcd_3p0 {
-	vin-supply = <&pm8916_l17>;
-	gpio = <&tlmm 102 GPIO_ACTIVE_HIGH>;
-	status = "okay";
-};
-
-&touchscreen {
-	vdd-supply = <&reg_vdd_tsp_a>;
-};
-
-&tlmm {
-	tsp_ldo_en_default: tsp-ldo-en-default-state {
-		pins = "gpio16";
-		function = "gpio";
-		drive-strength = <2>;
-		bias-disable;
-	};
-};
-
-&lcd_3p0_ldo_en_default {
-	pins = "gpio102";
-};
-
 &muic_i2c_default {
 	pins = "gpio0", "gpio1";
 };
 
 &sensors_i2c_default {
+	/* I2C2 */
 	pins = "gpio6", "gpio7";
 };

arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi

@@ -6,6 +6,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/leds/common.h>
 
 / {
 	aliases {
@@ -26,6 +27,22 @@
 		};
 	};
 
+	front_flash_led: led-controller {
+		compatible = "kinetic,ktd2692";
+
+		led {
+			function = LED_FUNCTION_FLASH;
+			color = <LED_COLOR_ID_WHITE>;
+
+			led-max-microamp = <300000>;
+			flash-max-microamp = <1500000>;
+			flash-max-timeout-us = <1835000>;
+
+			pinctrl-0 = <&vtcam_flash_en_default>;
+			pinctrl-names = "default";
+		};
+	};
+
 	gpio_hall_sensor: gpio-hall-sensor {
 		compatible = "gpio-keys";
 
@@ -121,24 +138,8 @@
 
 		enable-active-high;
 
-		pinctrl-names = "default";
 		pinctrl-0 = <&lcd_1p8_ldo_en_default>;
-
-		status = "disabled";
-	};
-
-	reg_vdd_lcd_3p0: regulator-vdd-lcd-3p0 {
-		compatible = "regulator-fixed";
-		regulator-name = "vdd_lcd_3p0";
-		regulator-min-microvolt = <3000000>;
-		regulator-max-microvolt = <3000000>;
-
-		enable-active-high;
-
 		pinctrl-names = "default";
-		pinctrl-0 = <&lcd_3p0_ldo_en_default>;
-
-		status = "disabled";
 	};
 };
 
@@ -175,9 +176,9 @@
 };
 
 &mdss_dsi0 {
-	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <&mdss_default>;
 	pinctrl-1 = <&mdss_sleep>;
+	pinctrl-names = "default", "sleep";
 
 	panel: panel@0 {
 		reg = <0>;
@@ -300,27 +301,20 @@
 		bias-pull-up;
 	};
 
-	lcd_1p8_ldo_en_default: lcd-1p8-ldo-en-default-state {
+	jack_default: jack-default-state {
+		pins = "gpio110";
 		function = "gpio";
-
 		drive-strength = <2>;
 		bias-disable;
 	};
 
-	lcd_3p0_ldo_en_default: lcd-3p0-ldo-en-default-state {
+	lcd_1p8_ldo_en_default: lcd-1p8-ldo-en-default-state {
 		function = "gpio";
 
 		drive-strength = <2>;
 		bias-disable;
 	};
 
-	jack_default: jack-default-state {
-		pins = "gpio110";
-		function = "gpio";
-		drive-strength = <2>;
-		bias-disable;
-	};
-
 	mdss_default: mdss-default-state {
 		pins = "gpio25";
 		function = "gpio";
@@ -375,4 +369,10 @@
 		drive-strength = <2>;
 		bias-disable;
 	};
+
+	vtcam_flash_en_default: vtcam-flash-en-default-state {
+		function = "gpio";
+		drive-strength = <2>;
+		bias-disable;
+	};
 };

arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts

@@ -19,6 +19,10 @@
 	status = "disabled";
 };
 
+&front_flash_led {
+	ctrl-gpios = <&tlmm 50 GPIO_ACTIVE_HIGH>;
+};
+
 &panel {
 	vdd3-supply = <&reg_vdd_lcd_1p8>;
 	vci-supply = <&pm8916_l17>;
@@ -30,7 +34,6 @@
 
 &reg_vdd_lcd_1p8 {
 	gpio = <&tlmm 16 GPIO_ACTIVE_HIGH>;
-	status = "okay";
 };
 
 &touchscreen {
@@ -44,3 +47,7 @@
 &lcd_1p8_ldo_en_default {
 	pins = "gpio16";
 };
+
+&vtcam_flash_en_default {
+	pins = "gpio50";
+};