Merge tag 'omap-for-v5.1/dt-cpsw-phy' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-hirsute-kernel.git] / arch / arm / boot / dts / rk3188-bqedison2qc.dts

diff --git a/arch/arm/boot/dts/rk3188-bqedison2qc.dts b/arch/arm/boot/dts/rk3188-bqedison2qc.dts
index a7477a09fbe8a9b1c25c594f9b18ae46b25c54df..c8b62bbd6a4a496f513768e29c4f52b0965d1c7d 100644 (file)
--- a/arch/arm/boot/dts/rk3188-bqedison2qc.dts
+++ b/arch/arm/boot/dts/rk3188-bqedison2qc.dts
@@ -227,7 +227,6 @@
 &emmc {
        bus-width = <8>;
        cap-mmc-highspeed;
-       disable-wp;
        non-removable;
        pinctrl-names = "default";
        pinctrl-0 = <&emmc_clk &emmc_cmd>;
@@ -408,6 +407,21 @@
 &i2c2 {
        clock-frequency = <400000>;
        status = "okay";
+
+       ft5606: touchscreen@3e {
+               compatible = "edt,edt-ft5506";
+               reg = <0x3e>;
+               interrupt-parent = <&gpio1>;
+               interrupts = <RK_PB7 IRQ_TYPE_EDGE_FALLING>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&tp_int &tp_rst>;
+               reset-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_LOW>;
+               touchscreen-inverted-y;
+               /* hw ts resolution does not match display */
+               touchscreen-size-y = <1024>;
+               touchscreen-size-x = <768>;
+               touchscreen-swapped-x-y;
+       };
 };
 
 &i2c3 {
@@ -446,7 +460,6 @@
 &mmc1 {
        bus-width = <4>;
        cap-sd-highspeed;
-       cap-mmc-highspeed;
        keep-power-in-suspend;
        mmc-pwrseq = <&sdio_pwrseq>;
        non-removable;
@@ -526,7 +539,7 @@
                };
 
                cif1_pdn: cif1-pdn {
-                       rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
+                       rockchip,pins = <3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
                };
 
                cif_avdd_en: cif-avdd-en {