Commit db49e22a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Documentation/devicetree/bindings/arm/rockchip.yaml

+12 −0
Original line number Diff line number Diff line
@@ -92,6 +92,13 @@ properties: 
          - const: firefly,roc-rk3399-pc

          - const: rockchip,rk3399



      - description: FriendlyElec NanoPi4 series boards

        items:

          - enum:

              - friendlyarm,nanopc-t4

              - friendlyarm,nanopi-m4

          - const: rockchip,rk3399



      - description: GeekBuying GeekBox

        items:

          - const: geekbuying,geekbox
@@ -322,6 +329,11 @@ properties: 
          - const: radxa,rock

          - const: rockchip,rk3188



      - description: Radxa ROCK Pi 4

        items:

          - const: radxa,rockpi4

          - const: rockchip,rk3399



      - description: Radxa Rock2 Square

        items:

          - const: radxa,rock2-square

arch/arm64/boot/dts/rockchip/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -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-scarlet-inx.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-roc-pc.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb

arch/arm64/boot/dts/rockchip/rk3328-rock64.dts

+24 −2
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ 
	sound {

		compatible = "audio-graph-card";

		label = "rockchip,rk3328";

		dais = <&spdif_p0>;

		dais = <&i2s1_p0

			&spdif_p0>;

	};



	spdif-dit {
@@ -81,6 +82,16 @@ 
	};

};



&codec {

	status = "okay";



	port@0 {

		codec_p0_0: endpoint {

			remote-endpoint = <&i2s1_p0_0>;

		};

	};

};



&cpu0 {

	cpu-supply = <&vdd_arm>;

};
@@ -243,6 +254,18 @@ 
	};

};



&i2s1 {

	status = "okay";



	i2s1_p0: port {

		i2s1_p0_0: endpoint {

			dai-format = "i2s";

			mclk-fs = <256>;

			remote-endpoint = <&codec_p0_0>;

		};

	};

};



&io_domains {

	status = "okay";
@@ -290,7 +313,6 @@ 
&spdif {

	pinctrl-0 = <&spdifm0_tx>;

	status = "okay";

	#sound-dai-cells = <0>;



	spdif_p0: port {

		spdif_p0_0: endpoint {

arch/arm64/boot/dts/rockchip/rk3328.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ 
		clock-names = "i2s_clk", "i2s_hclk";

		dmas = <&dmac 11>, <&dmac 12>;

		dma-names = "tx", "rx";

		#sound-dai-cells = <0>;

		status = "disabled";

	};
@@ -195,6 +196,7 @@ 
		clock-names = "i2s_clk", "i2s_hclk";

		dmas = <&dmac 14>, <&dmac 15>;

		dma-names = "tx", "rx";

		#sound-dai-cells = <0>;

		status = "disabled";

	};
@@ -206,6 +208,7 @@ 
		clock-names = "i2s_clk", "i2s_hclk";

		dmas = <&dmac 0>, <&dmac 1>;

		dma-names = "tx", "rx";

		#sound-dai-cells = <0>;

		status = "disabled";

	};
@@ -219,6 +222,7 @@ 
		dma-names = "tx";

		pinctrl-names = "default";

		pinctrl-0 = <&spdifm2_tx>;

		#sound-dai-cells = <0>;

		status = "disabled";

	};
@@ -672,6 +676,16 @@ 
		};

	};



	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 {

		compatible = "rockchip,rk3328-hdmi-phy";

		reg = <0x0 0xff430000 0x0 0x10000>;

arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ 
&emmc {

	bus-width = <8>;

	cap-mmc-highspeed;

	disable-wp;

	mmc-pwrseq = <&emmc_pwrseq>;

	non-removable;

	pinctrl-names = "default";

CRA Git | Maintained and supported by SUSTech CRA and CCSE