Merge tag 'mips_5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / qcom / sdm630-sony-xperia-nile.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
index 7d33a75..849900e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
@@ -93,7 +93,6 @@
                input-name = "gpio-keys";
                #address-cells = <1>;
                #size-cells = <0>;
-               autorepeat;
 
                camera_focus {
                        label = "Camera Focus";
@@ -158,10 +157,36 @@
        };
 };
 
+&adsp_pil {
+       firmware-name = "adsp.mdt";
+};
+
 &blsp_i2c1 {
        status = "okay";
 
-       /* Synaptics touchscreen */
+       touchscreen: synaptics-rmi4-i2c@70 {
+               compatible = "syna,rmi4-i2c";
+               reg = <0x70>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               interrupts-extended = <&tlmm 45 0x2008>;
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&ts_int_active &ts_lcd_id_active>;
+
+               syna,reset-delay-ms = <200>;
+               syna,startup-delay-ms = <220>;
+
+               rmi4-f01@1 {
+                       reg = <0x01>;
+                       syna,nosleep-mode = <1>;
+               };
+
+               rmi4-f11@11 {
+                       reg = <0x11>;
+                       syna,sensor-type = <1>;
+               };
+       };
 };
 
 &blsp_i2c2 {
@@ -308,6 +333,7 @@
                        regulator-enable-ramp-delay = <250>;
                        regulator-ramp-delay = <0>;
                        regulator-allow-set-load;
+                       regulator-system-load = <800000>;
                };
 
                vreg_l6b_3p3: l6 {
@@ -537,9 +563,28 @@
        vqmmc-supply = <&vreg_l8a_1p8>;
 };
 
+&sdhc_2 {
+       status = "okay";
+
+       vmmc-supply = <&vreg_l5b_29p5>;
+       vqmmc-supply = <&vreg_l2b_2p95>;
+};
+
 &tlmm {
        gpio-reserved-ranges = <8 4>;
 
+       ts_int_active: ts-int-active {
+               pins = "gpio45";
+               drive-strength = <8>;
+               bias-pull-up;
+       };
+
+       ts_lcd_id_active: ts-lcd-id-active {
+               pins = "gpio56";
+               drive-strength = <8>;
+               bias-disable;
+       };
+
        imx300_vana_default: imx300-vana-default {
                pins = "gpio50";
                function = "gpio";