Commit db49e22a authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'v5.1-rockchip-dts64-1' of...

Merge tag 'v5.1-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

New boards are the Rock Pi 4, NanoPC-T4 and NanoPi-M4, with the last
two being part of a family and sharing bigger parts of the devicetree.
rk3328 got sound-related upgrades and a wider patch drops mmc display-wp
fields from nodes which shouldn't use it.

* tag 'v5.1-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: clean up the abuse of disable-wp
  arm64: dts: rockchip: 'Fix' nanopi4 uSD card detect
  arm64: dts: rockchip: Add NanoPC-T4 IR receiver
  arm64: dts: rockchip: Refine nanopi4 differences
  arm64: dts: rockchip: Add DT for NanoPi M4
  arm64: dts: rockchip: add ROCK Pi 4 DTS support
  arm64: dts: rockchip: Add devicetree for NanoPC-T4
  arm64: dts: rockchip: enable analog audio node for rock64
  arm64: dts: rockchip: move rk3328 #sound-dai-cells to the soc dtsi
  arm64: dts: rockchip: add rk3328 ACODEC node
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 77ab2ebf 79164c99
...@@ -92,6 +92,13 @@ properties: ...@@ -92,6 +92,13 @@ properties:
- const: firefly,roc-rk3399-pc - const: firefly,roc-rk3399-pc
- const: rockchip,rk3399 - const: rockchip,rk3399
- description: FriendlyElec NanoPi4 series boards
items:
- enum:
- friendlyarm,nanopc-t4
- friendlyarm,nanopi-m4
- const: rockchip,rk3399
- description: GeekBuying GeekBox - description: GeekBuying GeekBox
items: items:
- const: geekbuying,geekbox - const: geekbuying,geekbox
...@@ -322,6 +329,11 @@ properties: ...@@ -322,6 +329,11 @@ properties:
- const: radxa,rock - const: radxa,rock
- const: rockchip,rk3188 - const: rockchip,rk3188
- description: Radxa ROCK Pi 4
items:
- const: radxa,rockpi4
- const: rockchip,rk3399
- description: Radxa Rock2 Square - description: Radxa Rock2 Square
items: items:
- const: radxa,rock2-square - const: radxa,rock2-square
......
...@@ -16,8 +16,11 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb ...@@ -16,8 +16,11 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb
......
...@@ -66,7 +66,8 @@ vcc_sys: vcc-sys { ...@@ -66,7 +66,8 @@ vcc_sys: vcc-sys {
sound { sound {
compatible = "audio-graph-card"; compatible = "audio-graph-card";
label = "rockchip,rk3328"; label = "rockchip,rk3328";
dais = <&spdif_p0>; dais = <&i2s1_p0
&spdif_p0>;
}; };
spdif-dit { spdif-dit {
...@@ -81,6 +82,16 @@ dit_p0_0: endpoint { ...@@ -81,6 +82,16 @@ dit_p0_0: endpoint {
}; };
}; };
&codec {
status = "okay";
port@0 {
codec_p0_0: endpoint {
remote-endpoint = <&i2s1_p0_0>;
};
};
};
&cpu0 { &cpu0 {
cpu-supply = <&vdd_arm>; cpu-supply = <&vdd_arm>;
}; };
...@@ -243,6 +254,18 @@ regulator-state-mem { ...@@ -243,6 +254,18 @@ regulator-state-mem {
}; };
}; };
&i2s1 {
status = "okay";
i2s1_p0: port {
i2s1_p0_0: endpoint {
dai-format = "i2s";
mclk-fs = <256>;
remote-endpoint = <&codec_p0_0>;
};
};
};
&io_domains { &io_domains {
status = "okay"; status = "okay";
...@@ -290,7 +313,6 @@ &sdmmc { ...@@ -290,7 +313,6 @@ &sdmmc {
&spdif { &spdif {
pinctrl-0 = <&spdifm0_tx>; pinctrl-0 = <&spdifm0_tx>;
status = "okay"; status = "okay";
#sound-dai-cells = <0>;
spdif_p0: port { spdif_p0: port {
spdif_p0_0: endpoint { spdif_p0_0: endpoint {
......
...@@ -184,6 +184,7 @@ i2s0: i2s@ff000000 { ...@@ -184,6 +184,7 @@ i2s0: i2s@ff000000 {
clock-names = "i2s_clk", "i2s_hclk"; clock-names = "i2s_clk", "i2s_hclk";
dmas = <&dmac 11>, <&dmac 12>; dmas = <&dmac 11>, <&dmac 12>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
#sound-dai-cells = <0>;
status = "disabled"; status = "disabled";
}; };
...@@ -195,6 +196,7 @@ i2s1: i2s@ff010000 { ...@@ -195,6 +196,7 @@ i2s1: i2s@ff010000 {
clock-names = "i2s_clk", "i2s_hclk"; clock-names = "i2s_clk", "i2s_hclk";
dmas = <&dmac 14>, <&dmac 15>; dmas = <&dmac 14>, <&dmac 15>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
#sound-dai-cells = <0>;
status = "disabled"; status = "disabled";
}; };
...@@ -206,6 +208,7 @@ i2s2: i2s@ff020000 { ...@@ -206,6 +208,7 @@ i2s2: i2s@ff020000 {
clock-names = "i2s_clk", "i2s_hclk"; clock-names = "i2s_clk", "i2s_hclk";
dmas = <&dmac 0>, <&dmac 1>; dmas = <&dmac 0>, <&dmac 1>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
#sound-dai-cells = <0>;
status = "disabled"; status = "disabled";
}; };
...@@ -219,6 +222,7 @@ spdif: spdif@ff030000 { ...@@ -219,6 +222,7 @@ spdif: spdif@ff030000 {
dma-names = "tx"; dma-names = "tx";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spdifm2_tx>; pinctrl-0 = <&spdifm2_tx>;
#sound-dai-cells = <0>;
status = "disabled"; status = "disabled";
}; };
...@@ -672,6 +676,16 @@ hdmi_in_vop: endpoint { ...@@ -672,6 +676,16 @@ hdmi_in_vop: endpoint {
}; };
}; };
codec: codec@ff410000 {
compatible = "rockchip,rk3328-codec";
reg = <0x0 0xff410000 0x0 0x1000>;
clocks = <&cru PCLK_ACODECPHY>, <&cru SCLK_I2S1>;
clock-names = "pclk", "mclk";
rockchip,grf = <&grf>;
#sound-dai-cells = <0>;
status = "disabled";
};
hdmiphy: phy@ff430000 { hdmiphy: phy@ff430000 {
compatible = "rockchip,rk3328-hdmi-phy"; compatible = "rockchip,rk3328-hdmi-phy";
reg = <0x0 0xff430000 0x0 0x10000>; reg = <0x0 0xff430000 0x0 0x10000>;
......
...@@ -116,7 +116,6 @@ vcc_sys: vcc-sys-regulator { ...@@ -116,7 +116,6 @@ vcc_sys: vcc-sys-regulator {
&emmc { &emmc {
bus-width = <8>; bus-width = <8>;
cap-mmc-highspeed; cap-mmc-highspeed;
disable-wp;
mmc-pwrseq = <&emmc_pwrseq>; mmc-pwrseq = <&emmc_pwrseq>;
non-removable; non-removable;
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -78,7 +78,6 @@ &emmc { ...@@ -78,7 +78,6 @@ &emmc {
bus-width = <8>; bus-width = <8>;
cap-mmc-highspeed; cap-mmc-highspeed;
clock-frequency = <150000000>; clock-frequency = <150000000>;
disable-wp;
non-removable; non-removable;
vmmc-supply = <&vcc_io>; vmmc-supply = <&vcc_io>;
vqmmc-supply = <&vcc18_flash>; vqmmc-supply = <&vcc18_flash>;
......
...@@ -139,7 +139,6 @@ &cpu_b3 { ...@@ -139,7 +139,6 @@ &cpu_b3 {
&emmc { &emmc {
bus-width = <8>; bus-width = <8>;
clock-frequency = <150000000>; clock-frequency = <150000000>;
disable-wp;
mmc-hs200-1_8v; mmc-hs200-1_8v;
non-removable; non-removable;
vmmc-supply = <&vcc33_io>; vmmc-supply = <&vcc33_io>;
......
...@@ -161,7 +161,6 @@ vdd_10: vdd-10-regulator { ...@@ -161,7 +161,6 @@ vdd_10: vdd-10-regulator {
&emmc { &emmc {
bus-width = <8>; bus-width = <8>;
cap-mmc-highspeed; cap-mmc-highspeed;
disable-wp;
mmc-pwrseq = <&emmc_pwrseq>; mmc-pwrseq = <&emmc_pwrseq>;
mmc-hs200-1_2v; mmc-hs200-1_2v;
mmc-hs200-1_8v; mmc-hs200-1_8v;
......
...@@ -48,7 +48,6 @@ &emmc { ...@@ -48,7 +48,6 @@ &emmc {
bus-width = <8>; bus-width = <8>;
cap-mmc-highspeed; cap-mmc-highspeed;
clock-frequency = <150000000>; clock-frequency = <150000000>;
disable-wp;
mmc-hs200-1_8v; mmc-hs200-1_8v;
no-sdio; no-sdio;
no-sd; no-sd;
......
...@@ -149,7 +149,6 @@ vdd_10: vdd-10-regulator { ...@@ -149,7 +149,6 @@ vdd_10: vdd-10-regulator {
&emmc { &emmc {
bus-width = <8>; bus-width = <8>;
cap-mmc-highspeed; cap-mmc-highspeed;
disable-wp;
mmc-pwrseq = <&emmc_pwrseq>; mmc-pwrseq = <&emmc_pwrseq>;
non-removable; non-removable;
pinctrl-names = "default"; pinctrl-names = "default";
......
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* FriendlyElec NanoPC-T4 board device tree source
*
* Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd.
* (http://www.friendlyarm.com)
*
* Copyright (c) 2018 Collabora Ltd.
*/
/dts-v1/;
#include "rk3399-nanopi4.dtsi"
/ {
model = "FriendlyElec NanoPC-T4";
compatible = "friendlyarm,nanopc-t4", "rockchip,rk3399";
vcc12v0_sys: vcc12v0-sys {
compatible = "regulator-fixed";
regulator-always-on;
regulator-boot-on;
regulator-max-microvolt = <12000000>;
regulator-min-microvolt = <12000000>;
regulator-name = "vcc12v0_sys";
};
vcc5v0_host0: vcc5v0-host0 {
compatible = "regulator-fixed";
regulator-always-on;
regulator-boot-on;
regulator-name = "vcc5v0_host0";
vin-supply = <&vcc5v0_sys>;
};
adc-keys {
compatible = "adc-keys";
io-channels = <&saradc 1>;
io-channel-names = "buttons";
keyup-threshold-microvolt = <1800000>;
poll-interval = <100>;
recovery {
label = "Recovery";
linux,code = <KEY_VENDOR>;
press-threshold-microvolt = <18000>;
};
};
ir-receiver {
compatible = "gpio-ir-receiver";
gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&ir_rx>;
};
};
&pinctrl {
ir {
ir_rx: ir-rx {
/* external pullup to VCC3V3_SYS, despite being 1.8V :/ */
rockchip,pins = <0 RK_PA6 RK_FUNC_1 &pcfg_pull_none>;
};
};
};
&sdhci {
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
};
&u2phy0_host {
phy-supply = <&vcc5v0_host0>;
};
&u2phy1_host {
phy-supply = <&vcc5v0_host0>;
};
&vcc5v0_sys {
vin-supply = <&vcc12v0_sys>;
};
&vcc3v3_sys {
vin-supply = <&vcc12v0_sys>;
};
&vbus_typec {
enable-active-high;
gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
vin-supply = <&vcc5v0_sys>;
};
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* FriendlyElec NanoPi M4 board device tree source
*
* Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd.
* (http://www.friendlyarm.com)
*
* Copyright (c) 2018 Collabora Ltd.
* Copyright (c) 2019 Arm Ltd.
*/
/dts-v1/;
#include "rk3399-nanopi4.dtsi"
/ {
model = "FriendlyElec NanoPi M4";
compatible = "friendlyarm,nanopi-m4", "rockchip,rk3399";
vdd_5v: vdd-5v {
compatible = "regulator-fixed";
regulator-name = "vdd_5v";
regulator-always-on;
regulator-boot-on;
};
vcc5v0_core: vcc5v0-core {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_core";
regulator-always-on;
regulator-boot-on;
vin-supply = <&vdd_5v>;
};
vcc5v0_usb1: vcc5v0-usb1 {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_usb1";
regulator-always-on;
regulator-boot-on;
vin-supply = <&vcc5v0_sys>;
};
vcc5v0_usb2: vcc5v0-usb2 {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_usb2";
regulator-always-on;
regulator-boot-on;
vin-supply = <&vcc5v0_sys>;
};
};
&vcc3v3_sys {
vin-supply = <&vcc5v0_core>;
};
&u2phy0_host {
phy-supply = <&vcc5v0_usb1>;
};
&u2phy1_host {
phy-supply = <&vcc5v0_usb2>;
};
&vbus_typec {
regulator-always-on;
vin-supply = <&vdd_5v>;
};
This diff is collapsed.
This diff is collapsed.
...@@ -219,7 +219,6 @@ &sdio0 { ...@@ -219,7 +219,6 @@ &sdio0 {
cap-sd-highspeed; cap-sd-highspeed;
cap-sdio-irq; cap-sdio-irq;
clock-frequency = <50000000>; clock-frequency = <50000000>;
disable-wp;
keep-power-in-suspend; keep-power-in-suspend;
max-frequency = <50000000>; max-frequency = <50000000>;
mmc-pwrseq = <&sdio_pwrseq>; mmc-pwrseq = <&sdio_pwrseq>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment