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 db6fcbd..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
@@ -5,9 +5,6 @@
  *                     <angelogioacchino.delregno@somainline.org>
  */
 
-/dts-v1/;
-
-#include "sdm630.dtsi"
 #include "pm660.dtsi"
 #include "pm660l.dtsi"
 #include <dt-bindings/gpio/gpio.h>
@@ -96,7 +93,6 @@
                input-name = "gpio-keys";
                #address-cells = <1>;
                #size-cells = <0>;
-               autorepeat;
 
                camera_focus {
                        label = "Camera Focus";
@@ -151,41 +147,92 @@
                };
        };
 
-       soc {
-               sdhci@c0c4000 {
-                       status = "okay";
+       /*
+        * Until we hook up type-c detection, we
+        * have to stick with this. But it works.
+        */
+       extcon_usb: extcon-usb {
+               compatible = "linux,extcon-usb-gpio";
+               id-gpio = <&tlmm 58 GPIO_ACTIVE_HIGH>;
+       };
+};
 
-                       mmc-ddr-1_8v;
-                       /* SoMC Nile platform's eMMC doesn't support HS200 mode */
-                       mmc-hs400-1_8v;
-               };
+&adsp_pil {
+       firmware-name = "adsp.mdt";
+};
 
-               i2c@c175000 {
-                       status = "okay";
+&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>;
 
-               i2c@c176000 {
-                       status = "okay";
+               pinctrl-names = "default";
+               pinctrl-0 = <&ts_int_active &ts_lcd_id_active>;
 
-                       /* SMB1351 charger */
+               syna,reset-delay-ms = <200>;
+               syna,startup-delay-ms = <220>;
+
+               rmi4-f01@1 {
+                       reg = <0x01>;
+                       syna,nosleep-mode = <1>;
                };
 
-               serial@c1af000 {
-                       status = "okay";
+               rmi4-f11@11 {
+                       reg = <0x11>;
+                       syna,sensor-type = <1>;
                };
+       };
+};
 
-               /* I2C3, 4, 5, 7 and 8 are disabled on this board. */
+&blsp_i2c2 {
+       status = "okay";
 
-               i2c@c1b6000 {
-                       status = "okay";
+       /* SMB1351 charger */
+};
 
-                       /* NXP NFC */
-               };
+/* I2C3, 4, 5, 7 and 8 are disabled on this board. */
+
+&blsp_i2c6 {
+       status = "okay";
+
+       /* NXP NFC */
+};
+
+&blsp1_uart2 {
+       status = "okay";
+
+       /* MSM serial console */
+};
+
+&blsp2_uart1 {
+       status = "okay";
+
+       /* HCI Bluetooth */
+};
+
+&pon {
+       volup {
+               compatible = "qcom,pm8941-resin";
+               interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
+               debounce = <15625>;
+               bias-pull-up;
+               linux,code = <KEY_VOLUMEUP>;
        };
 };
 
+&qusb2phy {
+       status = "okay";
+
+       vdd-supply = <&vreg_l1b_0p925>;
+       vdda-pll-supply = <&vreg_l10a_1p8>;
+       vdda-phy-dpdm-supply = <&vreg_l7b_3p125>;
+};
+
 &rpm_requests {
        pm660l-regulators {
                compatible = "qcom,rpm-pm660l-regulators";
@@ -286,6 +333,7 @@
                        regulator-enable-ramp-delay = <250>;
                        regulator-ramp-delay = <0>;
                        regulator-allow-set-load;
+                       regulator-system-load = <800000>;
                };
 
                vreg_l6b_3p3: l6 {
@@ -502,9 +550,41 @@
        };
 };
 
+&sdhc_1 {
+       status = "okay";
+       supports-cqe;
+
+       /* SoMC Nile platform's eMMC doesn't support HS200 mode */
+       mmc-ddr-1_8v;
+       mmc-hs400-1_8v;
+       mmc-hs400-enhanced-strobe;
+
+       vmmc-supply = <&vreg_l4b_29p5>;
+       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";
@@ -526,3 +606,12 @@
                drive-strength = <2>;
        };
 };
+
+&usb3 {
+       status = "okay";
+};
+
+&usb3_dwc3 {
+       dr_mode = "peripheral";
+       extcon = <&extcon_usb>;
+};