arm: dts: rk3288-evb: add ion support

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3288-evb.dtsi

diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index 07f44240c0617b5846202c4aae71fc6c5befe554..41b8eae3304cf3ef1e80d7d9ab5492551928cb60 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2015~2017 Fuzhou Rockchip Electronics Co., Ltd
+ *
  * This file is dual-licensed: you can use it either under the terms
  * of the GPL or the X11 license, at your option. Note that this dual
  * licensing only applies to this file, and not this project as a
@@ -47,9 +49,36 @@
                bootargs = "earlycon=uart8250,mmio32,0xff690000 swiotlb=1";
        };
 
-       memory {
-               device_type = "memory";
-               reg = <0x0 0x80000000>;
+       reserved-memory {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+
+               drm_logo: drm-logo@00000000 {
+                       compatible = "rockchip,drm-logo";
+                       reg = <0x0 0x0>;
+               };
+
+               /* global autoconfigured region for contiguous allocations */
+               linux,cma {
+                       compatible = "shared-dma-pool";
+                       reusable;
+                       size = <0x0 0x2000000>;
+                       linux,cma-default;
+               };
+       };
+
+       ion {
+               compatible = "rockchip,ion";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               cma-heap {
+                       reg = <0x00000000 0x2000000>;
+               };
+
+               system-heap {
+               };
        };
 
        backlight: backlight {
@@ -94,6 +123,58 @@
                pwms = <&pwm0 0 1000000 PWM_POLARITY_INVERTED>;
        };
 
+       rk_key: rockchip-key {
+               compatible = "rockchip,key";
+               status = "okay";
+
+               io-channels = <&saradc 1>;
+
+               vol-up-key {
+                       linux,code = <115>;
+                       label = "volume up";
+                       rockchip,adc_value = <1>;
+               };
+
+               vol-down-key {
+                       linux,code = <114>;
+                       label = "volume down";
+                       rockchip,adc_value = <170>;
+               };
+
+               power-key {
+                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+                       linux,code = <116>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pwrbtn>;
+                       label = "power";
+                       gpio-key,wakeup;
+               };
+
+               menu-key {
+                       linux,code = <59>;
+                       label = "menu";
+                       rockchip,adc_value = <355>;
+               };
+
+               home-key {
+                       linux,code = <102>;
+                       label = "home";
+                       rockchip,adc_value = <746>;
+               };
+
+               back-key {
+                       linux,code = <158>;
+                       label = "back";
+                       rockchip,adc_value = <560>;
+               };
+
+               camera-key {
+                       linux,code = <212>;
+                       label = "camera";
+                       rockchip,adc_value = <450>;
+               };
+       };
+
        panel: panel {
                compatible ="lg,lp079qx1-sp0v", "simple-panel";
                backlight = <&backlight>;
@@ -161,63 +242,6 @@
                #clock-cells = <0>;
        };
 
-       adc-keys {
-               compatible = "adc-keys";
-               io-channels = <&saradc 1>;
-               io-channel-names = "buttons";
-               poll-interval = <100>;
-               keyup-threshold-microvolt = <1800000>;
-
-               button-up {
-                       label = "Volume Up";
-                       linux,code = <KEY_VOLUMEUP>;
-                       press-threshold-microvolt = <100000>;
-               };
-
-               button-down {
-                       label = "Volume Down";
-                       linux,code = <KEY_VOLUMEDOWN>;
-                       press-threshold-microvolt = <300000>;
-               };
-
-               menu {
-                       label = "Menu";
-                       linux,code = <KEY_MENU>;
-                       press-threshold-microvolt = <640000>;
-               };
-
-               esc {
-                       label = "Esc";
-                       linux,code = <KEY_ESC>;
-                       press-threshold-microvolt = <1000000>;
-               };
-
-               home  {
-                       label = "Home";
-                       linux,code = <KEY_HOME>;
-                       press-threshold-microvolt = <1300000>;
-               };
-       };
-
-       gpio-keys {
-               compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               autorepeat;
-
-               pinctrl-names = "default";
-               pinctrl-0 = <&pwrbtn>;
-
-               button@0 {
-                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_POWER>;
-                       label = "GPIO Key Power";
-                       linux,input-type = <1>;
-                       gpio-key,wakeup = <1>;
-                       debounce-interval = <100>;
-               };
-       };
-
        vccadc_ref: vccadc-ref {
                compatible = "regulator-fixed";
                regulator-name = "vcc1v8_sys";
@@ -423,6 +447,20 @@
        };
 };
 
+&i2c4 {
+       status = "okay";
+
+       gsl3673@40 {
+               compatible = "GSL,GSL3673";
+               reg = <0x40>;
+               screen_max_x = <1536>;
+               screen_max_y = <2048>;
+               irq_gpio_number = <&gpio7 6 IRQ_TYPE_LEVEL_LOW>;
+               rst_gpio_number = <&gpio7 5 GPIO_ACTIVE_HIGH>;
+               status = "okay";
+       };
+};
+
 &i2s {
        #sound-dai-cells = <0>;
        status = "okay";
@@ -473,22 +511,10 @@
        status = "okay";
 };
 
-&uart1 {
-       status = "okay";
-};
-
 &uart2 {
        status = "okay";
 };
 
-&uart3 {
-       status = "okay";
-};
-
-&uart4 {
-       status = "okay";
-};
-
 &vpu_service {
        status = "okay";
 };