From: hero.huang Date: Mon, 27 Mar 2017 05:56:05 +0000 (+0800) Subject: arm64: dts: rockchip: remove device out of board for RK3399 Firefly X-Git-Tag: firefly_0821_release~71 X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=18b2b11c14a714ed3620fb0bd56e8e193a803b47 arm64: dts: rockchip: remove device out of board for RK3399 Firefly Change-Id: I53b7ac3716dc4b005caaba7b8eb6838afa6d0c46 Signed-off-by: hero.huang --- diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts index 4312c67961f0..2af206475438 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts @@ -52,42 +52,9 @@ model = "Rockchip RK3399 Firefly Board (Linux Opensource)"; compatible = "rockchip,rk3399-firefly-linux", "rockchip,rk3399"; - 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 = ; - press-threshold-microvolt = <100000>; - }; - - button-down { - label = "Volume Down"; - linux,code = ; - press-threshold-microvolt = <300000>; - }; - - back { - label = "Back"; - linux,code = ; - press-threshold-microvolt = <985000>; - }; - - menu { - label = "Menu"; - linux,code = ; - press-threshold-microvolt = <1314000>; - }; - }; - backlight: backlight { - status = "okay"; + status = "disabled"; compatible = "pwm-backlight"; - enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; pwms = <&pwm0 0 25000 0>; brightness-levels = < 0 1 2 3 4 5 6 7 @@ -139,10 +106,11 @@ }; edp_panel: edp-panel { - compatible = "lg,lp079qx1-sp0v", "panel-simple"; + status = "disabled"; + compatible = "sharp,lcd-f402", "panel-simple"; backlight = <&backlight>; - power-supply = <&vcc3v3_s0>; - enable-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; + power-supply = <&vcc_lcd>; + enable-gpios = <&gpio4 29 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&lcd_panel_reset>; @@ -337,6 +305,17 @@ regulator-max-microvolt = <1800000>; }; + vcc_lcd: vcc-lcd-regulator { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + enable-active-high; + gpio = <&gpio1 1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&lcd_en>; + regulator-name = "vcc_lcd"; + }; + wireless-wlan { compatible = "wlan-platdata"; rockchip,grf = <&grf>; @@ -435,7 +414,6 @@ #address-cells = <1>; #size-cells = <0>; #sound-dai-cells = <0>; - ddc-i2c-bus = <&i2c3>; status = "okay"; }; @@ -671,15 +649,6 @@ i2c-scl-rising-time-ns = <300>; i2c-scl-falling-time-ns = <15>; - gsl3673: gsl3673@40 { - compatible = "GSL,GSL3673"; - reg = <0x40>; - screen_max_x = <1536>; - screen_max_y = <2048>; - irq_gpio_number = <&gpio1 20 IRQ_TYPE_LEVEL_LOW>; - rst_gpio_number = <&gpio4 22 GPIO_ACTIVE_HIGH>; - }; - rt5640: rt5640@1c { #sound-dai-cells = <0>; compatible = "realtek,rt5640"; @@ -716,20 +685,6 @@ vbus-5v-gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>; status = "okay"; }; - - mpu6500@68 { - status = "okay"; - compatible = "invensense,mpu6500"; - reg = <0x68>; - irq-gpio = <&gpio1 22 IRQ_TYPE_EDGE_RISING>; - mpu-int_config = <0x10>; - mpu-level_shifter = <0>; - mpu-orientation = <0 1 0 1 0 0 0 0 1>; - orientation-x= <1>; - orientation-y= <0>; - orientation-z= <0>; - mpu-debug = <1>; - }; }; &i2s0 { @@ -788,7 +743,11 @@ lcd-panel { lcd_panel_reset: lcd-panel-reset { - rockchip,pins = <4 30 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <4 29 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + lcd_en: lcd-en { + rockchip,pins = <1 1 RK_FUNC_GPIO &pcfg_pull_up>; }; };