From 26de57fe61a0597aaed2020dee52e97788e581b0 Mon Sep 17 00:00:00 2001 From: Wu Liangqing Date: Tue, 23 Jun 2020 15:28:26 +0800 Subject: [PATCH] arm64: dts: rk3368a-817-tablet: adaptive bnd board Change-Id: I46ae95deff7308fd2a386aa20558563c45eff6b6 Signed-off-by: Wu Liangqing --- .../dts/rockchip/rk3368a-817-tablet-bnd.dts | 66 ++++--------------- .../boot/dts/rockchip/rk3368a-817-tablet.dts | 2 + 2 files changed, 13 insertions(+), 55 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts index 67605ad64b70..e931646a6c5c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts @@ -37,8 +37,7 @@ compatible = "pwm-backlight"; pwms = <&pwm0 0 25000 1>; brightness-levels = < - 0 1 2 3 4 5 6 7 - 8 9 10 11 12 13 14 15 + 10 10 10 11 12 13 14 15 16 16 16 16 16 16 16 16 17 17 17 17 17 17 17 17 18 18 18 18 18 18 18 18 @@ -274,8 +273,8 @@ reg = <0>; backlight = <&backlight>; enable-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; - back-gpios = <&gpio2 RK_PC3 GPIO_ACTIVE_HIGH>; - reset-gpios = <&gpio3 RK_PC4 GPIO_ACTIVE_LOW>; + /* back-gpios = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; */ + reset-gpios = <&gpio3 RK_PB1 GPIO_ACTIVE_LOW>; prepare-delay-ms = <8>; enable-delay-ms = <3>; reset-delay-ms = <50>; @@ -678,7 +677,7 @@ status = "okay"; gc0312: gc0312@21 { - status = "disabled"; + status = "okay"; compatible = "galaxycore,gc0312"; reg = <0x21>; clocks = <&cru SCLK_VIP_OUT>; @@ -702,7 +701,7 @@ }; gc2145: gc2145@3c { - status = "disabled"; + status = "okay"; compatible = "galaxycore,gc2145"; reg = <0x3c>; clocks = <&cru SCLK_VIP_OUT>; @@ -754,40 +753,13 @@ &i2c4 { status = "okay"; - mpu6500@68 { - status = "disabled"; - compatible = "invensense,mpu6500"; - pinctrl-names = "default"; - pinctrl-0 = <&mpu6500_irq_gpio>; - reg = <0x68>; - irq-gpio = <&gpio3 14 IRQ_TYPE_EDGE_RISING>; - mpu-int_config = <0x10>; - mpu-level_shifter = <0>; - mpu-orientation = <1 0 0 0 1 0 0 0 1>; - orientation-x= <1>; - orientation-y= <0>; - orientation-z= <1>; - support-hw-poweroff = <1>; - mpu-debug = <1>; - }; - - sensor@4c { - status = "okay"; - compatible = "gs_mc3230"; - reg = <0x4c>; - type = ; - irq_enable = <0>; - poll_delay_ms = <30>; - layout = <9>; - reprobe_en = <1>; - irq-gpio = <&gpio3 RK_PB6 IRQ_TYPE_LEVEL_LOW>; - }; - - sensor@18 { + sc7a30: sc7a30@18 { status = "okay"; compatible = "gs_sc7a30"; reg = <0x18>; type = ; + pinctrl-names = "default"; + pinctrl-0 = <&sc7a30_irq_gpio>; irq-gpio = <&gpio3 RK_PB6 IRQ_TYPE_LEVEL_LOW>; irq_enable = <0>; poll_delay_ms = <30>; @@ -795,17 +767,6 @@ reprobe_en = <1>; }; - sensor@10 { - status = "okay"; - compatible = "light_cm3218"; - pinctrl-names = "default"; - pinctrl-0 = <&cm3218_irq_gpio>; - reg = <0x10>; - type = ; - irq-gpio = <&gpio3 15 IRQ_TYPE_EDGE_FALLING>; - irq_enable = <1>; - poll_delay_ms = <30>; - }; }; &i2s_8ch { @@ -935,18 +896,12 @@ }; }; - mpu6500 { - mpu6500_irq_gpio: mpu6500-irq-gpio { + sc7a30 { + sc7a30_irq_gpio: sc7a30_irq_gpio { rockchip,pins = <3 14 RK_FUNC_GPIO &pcfg_pull_none>; }; }; - cm3218 { - cm3218_irq_gpio: cm3218-irq-gpio { - rockchip,pins = <3 15 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - dc_det { dc_irq_gpio: dc-irq-gpio { rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_up>; @@ -1064,6 +1019,7 @@ num-slots = <1>; pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; + vmmc-supply = <&vcc_sd>; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts index c7faec478b57..93fdc6f6307f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts @@ -1244,6 +1244,7 @@ &rockchip_suspend { status = "okay"; + Rockchip,sleep-debug-en = <1>; rockchip,sleep-mode-config = < (0 | RKPM_SLP_ARMOFF @@ -1276,6 +1277,7 @@ card-detect-delay = <200>; disable-wp; num-slots = <1>; + vmmc-supply = <&vcc_sd>; pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; status = "disabled";