Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[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 73be3d6..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,6 +157,10 @@
        };
 };
 
+&adsp_pil {
+       firmware-name = "adsp.mdt";
+};
+
 &blsp_i2c1 {
        status = "okay";
 
@@ -330,6 +333,7 @@
                        regulator-enable-ramp-delay = <250>;
                        regulator-ramp-delay = <0>;
                        regulator-allow-set-load;
+                       regulator-system-load = <800000>;
                };
 
                vreg_l6b_3p3: l6 {
@@ -559,6 +563,13 @@
        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>;