From 1908837527db45c4b4f216ed7c31095feeb015da Mon Sep 17 00:00:00 2001 From: Jacob Chen Date: Wed, 19 Jul 2017 16:15:35 +0800 Subject: [PATCH] ARM: dts: sync tinker board dts Sync our kernel with asus to reduce rebase work. origin: https://github.com/TinkerBoard/debian_kernel/blob/linux4.4-rk3288/arch/arm/boot/dts/rk3288-miniarm.dts with dmc and camera nodes deleted Change-Id: I7e699ca57465c03f41acb4ae47e5e70794118489 Signed-off-by: Jacob Chen --- arch/arm/boot/dts/rk3288-miniarm.dts | 142 ++++++++++++++++++++++++++- 1 file changed, 137 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-miniarm.dts b/arch/arm/boot/dts/rk3288-miniarm.dts index 6d3eb0a0b05b..b746ad79b291 100644 --- a/arch/arm/boot/dts/rk3288-miniarm.dts +++ b/arch/arm/boot/dts/rk3288-miniarm.dts @@ -39,6 +39,7 @@ */ /dts-v1/; +#include #include "rk3288.dtsi" / { @@ -49,6 +50,27 @@ reg = <0x0 0x0 0x0 0x80000000>; }; + wireless-bluetooth { + compatible = "bluetooth-platdata"; + uart_rts_gpios = <&gpio4 19 GPIO_ACTIVE_LOW>; + pinctrl-names = "default","rts_gpio"; + pinctrl-0 = <&uart0_rts>; + pinctrl-1 = <&uart0_gpios>; + BT,reset_gpio = <&gpio4 29 GPIO_ACTIVE_HIGH>; + BT,wake_gpio = <&gpio4 26 GPIO_ACTIVE_HIGH>; + BT,wake_host_irq = <&gpio4 31 GPIO_ACTIVE_HIGH>; + status = "okay"; + }; + + wireless-wlan { + compatible = "wlan-platdata"; + rockchip,grf = <&grf>; + wifi_chip_type = "ap6212"; + sdio_vref = <1800>; + WIFI,host_wake_irq = <&gpio4 30 GPIO_ACTIVE_HIGH>; + status = "okay"; + }; + ext_gmac: external-gmac-clock { compatible = "fixed-clock"; clock-frequency = <125000000>; @@ -56,6 +78,23 @@ #clock-cells = <0>; }; + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + clocks = <&rk808 RK808_CLKOUT1>; + clock-names = "ext_clock"; + pinctrl-names = "default"; + pinctrl-0 = <&chip_enable_h>, <&wifi_enable_h>; + + /* + * On the module itself this is one of these (depending + * on the actual card populated): + * - SDIO_RESET_L_WL_REG_ON + * - PDN (power down when low) + */ + reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>, + <&gpio4 27 GPIO_ACTIVE_LOW>; + }; + gpio-keys { compatible = "gpio-keys"; #address-cells = <1>; @@ -79,14 +118,19 @@ compatible = "gpio-leds"; pwr-led { - gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>; + gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; linux,default-trigger = "default-on"; }; act-led { - gpios=<&gpio2 3 GPIO_ACTIVE_LOW>; + gpios=<&gpio1 24 GPIO_ACTIVE_HIGH>; linux,default-trigger="mmc0"; }; + + led1-led { + gpios=<&gpio1 25 GPIO_ACTIVE_HIGH>; + linux,default-trigger="default-off"; + }; }; sound { @@ -149,6 +193,15 @@ status = "ok"; }; +&dsi0 { + status = "disabled"; + mipi_panel: mipi-panel { + compatible ="asus,tc358762"; + reg = <0>; + status = "okay"; + }; +}; + &gpu { mali-supply = <&vdd_gpu>; status = "okay"; @@ -208,7 +261,7 @@ regulator-always-on; regulator-boot-on; regulator-min-microvolt = <750000>; - regulator-max-microvolt = <1350000>; + regulator-max-microvolt = <1450000>; regulator-name = "vdd_arm"; regulator-ramp-delay = <6000>; regulator-state-mem { @@ -368,6 +421,49 @@ &i2c2 { status = "okay"; + + m24c08@50 { + compatible = "at,24c08"; + reg = <0x50>; + }; +}; + +&i2c1 { + status = "okay"; + + pcm5122: pcm5122@4c { + #sound-dai-cells = <0>; + compatible = "ti,pcm5122"; + reg = <0x4c>; + status = "disabled"; + }; +}; + +&i2c3 { + status = "okay"; +}; + +&i2c4 { + status = "okay"; +}; + +&spi2 { + status = "okay"; + max-freq = <50000000>; + + spidev@0 { + compatible = "rockchip,spi_tinker"; + reg = <0>; + spi-max-frequency = <50000000>; + spi-cpha = <1>; + }; + + spidev@1 { + compatible = "rockchip,spi_tinker"; + reg = <1>; + spi-max-frequency = <50000000>; + spi-cpha = <1>; + }; }; &i2s { @@ -379,13 +475,28 @@ status = "okay"; sdcard-supply = <&vccio_sd>; + wifi-supply = <&vcc_18>; }; -&pwm0 { +&sdio0 { status = "okay"; + clock-frequency = <50000000>; + clock-freq-min-max = <200000 50000000>; + bus-width = <4>; + cap-sd-highspeed; + cap-sdio-irq; + disable-wp; + keep-power-in-suspend; + mmc-pwrseq = <&sdio_pwrseq>; + non-removable; + num-slots = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; + sd-uhs-sdr104; + supports-sdio; }; -&rga { +&pwm0 { status = "okay"; }; @@ -398,6 +509,10 @@ bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr50; + sd-uhs-sdr104; card-detect-delay = <200>; disable-wp; /* wp not hooked up */ num-slots = <1>; @@ -416,6 +531,8 @@ }; &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_xfer>, <&uart0_cts>; status = "okay"; }; @@ -522,6 +639,15 @@ }; }; + sdio-pwrseq { + wifi_enable_h: wifi-enable-h { + rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_none>; + }; + chip_enable_h: chip-enable-h { + rockchip,pins = <4 27 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + sdmmc { /* * Default drive strength isn't enough to achieve even @@ -556,4 +682,10 @@ rockchip,pins = <7 8 RK_FUNC_GPIO &pcfg_pull_none>; }; }; + + wireless-bluetooth { + uart0_gpios: uart0-gpios { + rockchip,pins = <4 19 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; }; -- 2.34.1