diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-02-18 11:18:58 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-02-18 11:20:31 +0100 |
| commit | e88dc153eed290e786ae89386a82d3065a04e210 (patch) | |
| tree | 9aac787a3a081bb910bee4de3c35eafb0e80f881 /arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | |
| parent | c22ae32d94e7c2dab789a132bca5c21dce3c70fe (diff) | |
| parent | 02260a619efe574d0f6c2a4420b8b76c6802294e (diff) | |
Merge tag 'v5.1-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt
rockpro64 regulator improvements, rock960 improvements (tsadc, wifi, hdmi
audio), nanopi4 bluetooth support and rk3328-roc-cc gmac improvement.
* tag 'v5.1-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
arm64: dts: rockchip: Enable tsadc device on rock960
arm64: dts: rockchip: Add on-board WiFi/BT support for Rock960 boards
arm64: dts: rockchip: fix rk3328-roc-cc gmac2io stability issues
arm64: dts: rockchip: rockpro64 dts add usb regulator
arm64: dts: rockchip: rockpro64 dts remove unused lcd-reset pinmux
arm64: dts: rockchip: rockpro64 dts make regulator more readable
arm64: dts: rockchip: Add nanopi4 bluetooth
arm64: dts: rockchip: enable mali power supply on rk3399-rockpro64
arm64: dts: rockchip: Enable HDMI audio devices on rk3399-rock960
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi index cf6cc4e7d315..d325e117287b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi @@ -218,7 +218,7 @@ rk808: pmic@1b { compatible = "rockchip,rk808"; reg = <0x1b>; - clock-output-names = "xin32k", "rk808-clkout2"; + clock-output-names = "xin32k", "rtc_clko_wifi"; #clock-cells = <1>; interrupt-parent = <&gpio1>; interrupts = <21 IRQ_TYPE_LEVEL_LOW>; @@ -501,7 +501,20 @@ }; }; - sdio-pwrseq { + sdio { + bt_host_wake_l: bt-host-wake-l { + rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + bt_reg_on_h: bt-reg-on-h { + /* external pullup to VCC1V8_PMUPLL */ + rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + bt_wake_l: bt-wake-l { + rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + wifi_reg_on_h: wifi-reg_on-h { rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; }; @@ -620,6 +633,20 @@ pinctrl-names = "default"; pinctrl-0 = <&uart0_xfer &uart0_rts &uart0_cts>; status = "okay"; + + bluetooth { + compatible = "brcm,bcm43438-bt"; + clocks = <&rk808 1>; + clock-names = "lpo"; + device-wakeup-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; + host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; + shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + max-speed = <4000000>; + pinctrl-names = "default"; + pinctrl-0 = <&bt_reg_on_h &bt_host_wake_l &bt_wake_l>; + vbat-supply = <&vcc3v3_sys>; + vddio-supply = <&vcc_1v8>; + }; }; &uart2 { |