ARM: dts: rockchip: add voice module boards on RK3308

Add 3 types boards for rk3308 voice modules:

// Only core board:
rk3308-voice-module-board-v10-aarch32.dts // only supports 2ch amic

// There are core board + main board:
rk3308-voice-module-amic-mainboard-v10-aarch32.dts // using max 4ch amic
rk3308-voice-module-pdm-mainboard-v10-aarch32.dts // using max 4ch pdm mic

Change-Id: Ieed43dbc246e03a6579da160281f858668841ec4
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
This commit is contained in:
Xing Zheng
2018-06-13 17:10:12 +08:00
committed by Tao Huang
parent 99023f3df9
commit 671409fa78
6 changed files with 848 additions and 1 deletions

View File

@@ -565,7 +565,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
rk3288-veyron-pinky.dtb \
rk3288-veyron-speedy.dtb \
rk3288-x7811-rk818-dual-dsi.dtb \
rk3308-evb-dmic-i2s-v10-aarch32.dtb
rk3308-evb-dmic-i2s-v10-aarch32.dtb \
rk3308-voice-module-board-v10-aarch32.dtb \
rk3308-voice-module-amic-mainboard-v10-aarch32.dtb \
rk3308-voice-module-pdm-mainboard-v10-aarch32.dtb
dtb-$(CONFIG_ARCH_S3C24XX) += \
s3c2416-smdk2416.dtb
dtb-$(CONFIG_ARCH_S3C64XX) += \

View File

@@ -0,0 +1,18 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd
*/
/dts-v1/;
#include "rk3308-voice-module-v10-aarch32.dtsi"
#include "rk3308-voice-module-mainboard-v10-aarch32.dtsi"
/ {
model = "Rockchip RK3308 Voice Module AMIC Main Board V10 (AArch32)";
compatible = "rockchip,rk3308-voice-module-amic-mainboard-v10-aarch32", "rockchip,rk3308";
};
&is31fl3236 {
reg = <0x3f>;
};

View File

@@ -0,0 +1,37 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd
*/
/dts-v1/;
#include "rk3308-voice-module-v10-aarch32.dtsi"
/ {
model = "Rockchip RK3308 Voice Module Board V10 (AArch32)";
compatible = "rockchip,rk3308-voice-module-board-v10-aarch32", "rockchip,rk3308";
wireless-wlan {
compatible = "wlan-platdata";
rockchip,grf = <&grf>;
pinctrl-names = "default";
pinctrl-0 = <&wifi_wake_host>;
wifi_chip_type = "rtl8189fs";
WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>;
status = "okay";
};
};
&acodec {
status = "okay";
/* ADC5-6 for 2ch capture, loopback to ADC3-4 */
rockchip,adc-grps-route = <2 1 3 0>;
};
&vad {
status = "disabled";
rockchip,audio-src = <&i2s_8ch_2>;
rockchip,mode = <1>;
#sound-dai-cells = <0>;
};

View File

@@ -0,0 +1,411 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd
*/
/ {
vcc_sd: vcc-sd {
compatible = "regulator-fixed";
gpio = <&gpio4 RK_PD6 GPIO_ACTIVE_LOW>;
regulator-name = "vcc_sd";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
wireless-bluetooth {
compatible = "bluetooth-platdata";
uart_rts_gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>;
pinctrl-names = "default", "rts_gpio";
pinctrl-0 = <&uart4_rts>;
pinctrl-1 = <&uart4_rts_gpio>;
BT,power_gpio = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
BT,wake_host_irq = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
status = "okay";
};
wireless-wlan {
compatible = "wlan-platdata";
rockchip,grf = <&grf>;
pinctrl-names = "default";
pinctrl-0 = <&wifi_wake_host>;
wifi_chip_type = "rtl8723ds";
WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>;
status = "okay";
};
};
&acodec {
status = "okay";
/* ADC5-8 for 4ch capture, loopback to ADC3-4 */
rockchip,adc-grps-route = <2 3 1 0>;
};
&i2c1 {
clock-frequency = <400000>;
status = "okay";
is31fl3236: led-controller@3c {
compatible = "issi,is31fl3236";
reg = <0x3c>;
#address-cells = <1>;
#size-cells = <0>;
reset-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
status = "okay";
led1: led@1 {
label = "led1";
reg = <1>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <0>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led2: led@2 {
label = "led2";
reg = <2>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <0>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led3: led@3 {
label = "led3";
reg = <3>;
led-max-microamp = <10000>;
linux,default-trigger = "default-on";
};
led4: led@4 {
label = "led4";
reg = <4>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <100>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led5: led@5 {
label = "led5";
reg = <5>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <100>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led6: led@6 {
label = "led6";
reg = <6>;
led-max-microamp = <10000>;
linux,default-trigger = "default-on";
};
led7: led@7 {
label = "led7";
reg = <7>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <200>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led8: led@8 {
label = "led8";
reg = <8>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <200>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led9: led@9 {
label = "led9";
reg = <9>;
led-max-microamp = <10000>;
linux,default-trigger = "default-on";
};
led10: led@10 {
label = "led10";
reg = <10>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <300>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led11: led@11 {
label = "led11";
reg = <11>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <300>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led12: led@12 {
label = "led12";
reg = <12>;
led-max-microamp = <10000>;
linux,default-trigger = "default-on";
};
led13: led@13 {
label = "led13";
reg = <13>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <400>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led14: led@14 {
label = "led14";
reg = <14>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <400>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led15: led@15 {
label = "led15";
reg = <15>;
led-max-microamp = <10000>;
linux,default-trigger = "default-on";
};
led16: led@16 {
label = "led16";
reg = <16>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <500>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led17: led@17 {
label = "led17";
reg = <17>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <500>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led18: led@18 {
label = "led18";
reg = <18>;
led-max-microamp = <10000>;
linux,default-trigger = "default-on";
};
led19: led@19 {
label = "led19";
reg = <19>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <600>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led20: led@20 {
label = "led20";
reg = <20>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <600>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led21: led@21 {
label = "led21";
reg = <21>;
led-max-microamp = <10000>;
linux,default-trigger = "default-on";
};
led22: led@22 {
label = "led22";
reg = <22>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <700>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led23: led@23 {
label = "led23";
reg = <23>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <700>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led124: led@24 {
label = "led24";
reg = <24>;
led-max-microamp = <10000>;
linux,default-trigger = "default-on";
};
led25: led@25 {
label = "led25";
reg = <25>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <800>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led26: led@26 {
label = "led26";
reg = <26>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <800>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led27: led@27 {
label = "led27";
reg = <27>;
led-max-microamp = <10000>;
linux,default-trigger = "default-on";
};
led28: led@28 {
label = "led28";
reg = <28>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <900>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led29: led@29 {
label = "led29";
reg = <29>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <900>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led30: led@30 {
label = "led30";
reg = <30>;
led-max-microamp = <10000>;
linux,default-trigger = "default-on";
};
led31: led@31 {
label = "led31";
reg = <31>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <1000>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led32: led@32 {
label = "led32";
reg = <32>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <1000>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led33: led@33 {
label = "led33";
reg = <33>;
led-max-microamp = <10000>;
linux,default-trigger = "default-on";
};
led34: led@34 {
label = "led34";
reg = <34>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <1100>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led35: led@35 {
label = "led35";
reg = <35>;
led-max-microamp = <10000>;
linux,default-trigger = "timer";
linux,default-trigger-delay-ms = <1100>;
linux,blink-delay-on-ms = <100>;
linux,blink-delay-off-ms = <1200>;
};
led36: led@36 {
label = "led36";
reg = <36>;
led-max-microamp = <10000>;
linux,default-trigger = "default-on";
};
};
};
&sdmmc {
vmmc-supply = <&vcc_sd>;
};
&spdif_tx_sound {
status = "okay";
};
&pinctrl {
pinctrl-names = "default";
pinctrl-0 = <&rtc_32k>;
};
&pwm3 {
status = "okay";
/* Used for IR */
};
&uart4 {
pinctrl-names = "default";
pinctrl-0 = <&uart4_xfer &uart4_cts>;
status = "okay";
};
&vad {
status = "disabled";
rockchip,audio-src = <&i2s_8ch_2>;
rockchip,mode = <1>;
#sound-dai-cells = <0>;
};

View File

@@ -0,0 +1,85 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd
*/
/dts-v1/;
#include "rk3308-voice-module-v10-aarch32.dtsi"
#include "rk3308-voice-module-mainboard-v10-aarch32.dtsi"
/ {
model = "Rockchip RK3308 Voice Module PDM MIC Main Board V10 (AArch32)";
compatible = "rockchip,rk3308-voice-module-pdm-mainboard-v10-aarch32", "rockchip,rk3308";
pdm_i2s_dais: pdm-i2s-dais {
status = "okay";
compatible = "rockchip,multi-dais";
dais = <&pdm_8ch>, <&i2s_8ch_2>;
capture,channel-mapping = <6 2>;
playback,channel-mapping = <0 2>;
bitclock-inversion = <1 0>;
};
pdm-mic-array {
status = "disabled";
compatible = "simple-audio-card";
simple-audio-card,name = "rockchip,pdm-mic-array";
simple-audio-card,cpu {
sound-dai = <&pdm_8ch>;
};
simple-audio-card,codec {
sound-dai = <&dummy_codec>;
};
};
vad-sound {
status = "okay";
compatible = "rockchip,multicodecs-card";
rockchip,card-name = "rockchip,rk3308-vad";
rockchip,cpu = <&pdm_i2s_dais>;
rockchip,codec = <&acodec>, <&vad>;
};
};
&acodec_sound {
status = "disabled";
};
&dummy_codec {
status = "disabled";
#sound-dai-cells = <0>;
};
&i2s_8ch_2 {
status = "okay";
rockchip,no-dmaengine;
#sound-dai-cells = <0>;
};
&pdm_8ch {
status = "okay";
#sound-dai-cells = <0>;
rockchip,no-dmaengine;
pinctrl-names = "default";
pinctrl-0 = <&pdm_m2_clk
&pdm_m2_clkm
&pdm_m2_sdi0
&pdm_m2_sdi1
&pdm_m2_sdi2
&pdm_m2_sdi3>;
};
&pdm_i2s_dais {
status = "okay";
#sound-dai-cells = <0>;
};
&vad {
status = "okay";
rockchip,audio-src = <&pdm_8ch>;
rockchip,det-channel = <0>;
rockchip,mode = <1>;
rockchip,buffer-time-ms = <200>;
#sound-dai-cells = <0>;
};

View File

@@ -0,0 +1,293 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd
*/
#include <dt-bindings/input/input.h>
#include "arm64/rockchip/rk3308.dtsi"
/ {
model = "Rockchip RK3308 Voice Module Board V10";
compatible = "rockchip,rk3308-vmb-v10", "rockchip,rk3308";
chosen {
bootargs = "earlycon=uart8250,mmio32,0xff0c0000 swiotlb=1 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=squashfs rootwait";
};
adc-keys {
compatible = "adc-keys";
io-channels = <&saradc 1>;
io-channel-names = "buttons";
poll-interval = <100>;
keyup-threshold-microvolt = <1800000>;
recovery-key {
linux,code = <KEY_FN>;
label = "recovery";
press-threshold-microvolt = <18000>;
};
};
dummy_codec: dummy-codec {
compatible = "rockchip,dummy-codec";
#sound-dai-cells = <0>;
};
gpio-keys {
compatible = "gpio-keys";
autorepeat;
pinctrl-names = "default";
pinctrl-0 = <&pwr_key>;
power {
gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
label = "GPIO Key Power";
wakeup-source;
debounce-interval = <100>;
};
};
sdio_pwrseq: sdio-pwrseq {
compatible = "mmc-pwrseq-simple";
pinctrl-names = "default";
pinctrl-0 = <&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 = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
};
acodec_sound: acodec-sound {
compatible = "rockchip,multicodecs-card";
rockchip,card-name = "rockchip,rk3308-acodec";
rockchip,codec-hp-det;
rockchip,mclk-fs = <256>;
rockchip,cpu = <&i2s_8ch_2>;
rockchip,codec = <&acodec>;
};
spdif_tx_sound: spdif-tx-sound {
status = "disabled";
compatible = "simple-audio-card";
simple-audio-card,name = "rockchip,spdif-tx-sound";
simple-audio-card,cpu {
sound-dai = <&spdif_tx>;
};
simple-audio-card,codec {
sound-dai = <&dummy_codec>;
};
};
vdd_log: vdd_core: vdd-core {
compatible = "pwm-regulator";
pwms = <&pwm0 0 5000 1>;
regulator-name = "vdd_core";
regulator-min-microvolt = <827000>;
regulator-max-microvolt = <1340000>;
regulator-init-microvolt = <1015000>;
regulator-always-on;
regulator-boot-on;
regulator-settling-time-up-us = <250>;
status = "okay";
};
vdd_1v0: vdd-1v0 {
compatible = "regulator-fixed";
regulator-name = "vdd_1v0";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
};
vccio_sdio: vcc_1v8: vcc-1v8 {
compatible = "regulator-fixed";
regulator-name = "vcc_1v8";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
vin-supply = <&vcc_io>;
};
vcc_ddr: vcc-ddr {
compatible = "regulator-fixed";
regulator-name = "vcc_ddr";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>;
};
vcc_io: vcc-io {
compatible = "regulator-fixed";
regulator-name = "vcc_io";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
vbus_host: vbus-host-regulator {
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&usb_drv>;
regulator-name = "vbus_host";
};
};
&acodec {
status = "disabled";
rockchip,loopback-grp = <1>;
spk-ctl-gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
};
&cpu0 {
cpu-supply = <&vdd_core>;
};
&dmc {
center-supply = <&vdd_log>;
status = "okay";
};
&fiq_debugger {
status = "okay";
};
&io_domains {
status = "okay";
vccio0-supply = <&vcc_io>;
vccio1-supply = <&vcc_io>;
vccio2-supply = <&vcc_1v8>;
vccio3-supply = <&vcc_io>;
vccio4-supply = <&vccio_sdio>;
vccio5-supply = <&vcc_io>;
};
&i2s_8ch_2 {
status = "okay";
};
&nandc {
status = "okay";
};
&ramoops_mem {
reg = <0x0 0x30000 0x0 0x20000>;
};
&ramoops {
record-size = <0x0 0x00000>;
console-size = <0x0 0x20000>;
};
&rockchip_suspend {
rockchip,pwm-regulator-config = <
(0
| RKPM_PWM_REGULATOR
)
>;
status = "okay";
};
&saradc {
status = "okay";
vref-supply = <&vcc_1v8>;
};
&sdio {
max-frequency = <110000000>;
bus-width = <4>;
cap-sd-highspeed;
supports-sdio;
ignore-pm-notify;
keep-power-in-suspend;
non-removable;
mmc-pwrseq = <&sdio_pwrseq>;
sd-uhs-sdr104;
status = "okay";
};
&sdmmc {
bus-width = <4>;
cap-mmc-highspeed;
cap-sd-highspeed;
supports-sd;
card-detect-delay = <300>;
status = "disabled";
};
&pinctrl {
buttons {
pwr_key: pwr-key {
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
usb {
usb_drv: usb-drv {
rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-wlan {
wifi_wake_host: wifi-wake-host {
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};
&pwm0 {
status = "okay";
pinctrl-names = "active";
pinctrl-0 = <&pwm0_pin_pull_down>;
};
&tsadc {
rockchip,hw-tshut-mode = <0>; /* tshut mode 0:CRU 1:GPIO */
rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
status = "okay";
};
&u2phy {
status = "okay";
u2phy_host: host-port {
phy-supply = <&vbus_host>;
status = "okay";
};
u2phy_otg: otg-port {
status = "okay";
};
};
&usb20_otg {
status = "okay";
};
&usb_host0_ehci {
status = "okay";
};
&usb_host0_ohci{
status = "okay";
};