Unverified Commit c5003718 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.11-rockchip-dts32-1' of... 

Merge tag 'v6.11-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt

More attention for the rk3128 soc (dsi, i2c, spdif, sfc), hdmi-sound
for a rk3066a board and some minor cleanups.

* tag 'v6.11-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add #sound-dai-cells to hdmi node on rk3128
  ARM: dts: rockchip: add #sound-dai-cells to hdmi node no rk3036
  ARM: dts: rockchip: enable hdmi_sound and i2s0 for mk808 hdmi
  ARM: dts: rockchip: Add SFC for RK3128
  ARM: dts: rockchip: add hdmi-sound node to rk3066a
  ARM: dts: rockchip: Add spdif node for RK3128
  ARM: dts: rockchip: Add i2s nodes for RK3128
  ARM: dts: rockchip: Add DSI for RK3128
  ARM: dts: rockchip: Add D-PHY for RK3128
  dt-bindings: clock: rk3128: Add PCLK_MIPIPHY

Link: https://lore.kernel.org/r/2187283.irdbgypaU6@diego


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents aff39a02 313da6f6

arch/arm/boot/dts/rockchip/rk3036.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ hdmi: hdmi@20034000 { 
		rockchip,grf = <&grf>;

		pinctrl-names = "default";

		pinctrl-0 = <&hdmi_ctl>;

		#sound-dai-cells = <0>;

		status = "disabled";



		ports {

arch/arm/boot/dts/rockchip/rk3066a-mk808.dts

+8 −0
Original line number Diff line number Diff line
@@ -143,6 +143,14 @@ hdmi_out_con: endpoint { 
	};

};



&hdmi_sound {

	status = "okay";

};



&i2s0 {

	status = "okay";

};



&mmc0 {

	bus-width = <4>;

	cap-mmc-highspeed;

arch/arm/boot/dts/rockchip/rk3066a.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -53,6 +53,22 @@ display-subsystem { 
		ports = <&vop0_out>, <&vop1_out>;

	};



	hdmi_sound: hdmi-sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "HDMI";

		simple-audio-card,format = "i2s";

		simple-audio-card,mclk-fs = <256>;

		status = "disabled";



		simple-audio-card,codec {

			sound-dai = <&hdmi>;

		};



		simple-audio-card,cpu {

			sound-dai = <&i2s0>;

		};

	};



	sram: sram@10080000 {

		compatible = "mmio-sram";

		reg = <0x10080000 0x10000>;

arch/arm/boot/dts/rockchip/rk3128.dtsi

+128 −0
Original line number Diff line number Diff line
@@ -216,6 +216,8 @@ power-domain@RK3128_PD_VIO { 
					 <&cru ACLK_LCDC0>,

					 <&cru HCLK_LCDC0>,

					 <&cru PCLK_MIPI>,

					 <&cru PCLK_MIPIPHY>,

					 <&cru SCLK_MIPI_24M>,

					 <&cru ACLK_RGA>,

					 <&cru HCLK_RGA>,

					 <&cru ACLK_VIO0>,
@@ -275,6 +277,43 @@ vop_out_hdmi: endpoint@0 { 
				reg = <0>;

				remote-endpoint = <&hdmi_in_vop>;

			};



			vop_out_dsi: endpoint@1 {

				reg = <1>;

				remote-endpoint = <&dsi_in_vop>;

			};

		};

	};



	dsi: dsi@10110000 {

		compatible = "rockchip,rk3128-mipi-dsi", "snps,dw-mipi-dsi";

		reg = <0x10110000 0x4000>;

		interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru PCLK_MIPI>;

		clock-names = "pclk";

		phys = <&dphy>;

		phy-names = "dphy";

		power-domains = <&power RK3128_PD_VIO>;

		resets = <&cru SRST_VIO_MIPI_DSI>;

		reset-names = "apb";

		rockchip,grf = <&grf>;

		status = "disabled";



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			dsi_in: port@0 {

				reg = <0>;



				dsi_in_vop: endpoint {

					remote-endpoint = <&vop_out_dsi>;

				};

			};



			dsi_out: port@1 {

				reg = <1>;

			};

		};

	};
@@ -360,6 +399,41 @@ usb_host_ohci: usb@101e0000 { 
		status = "disabled";

	};



	i2s_8ch: i2s@10200000 {

		compatible = "rockchip,rk3128-i2s", "rockchip,rk3066-i2s";

		reg = <0x10200000 0x1000>;

		interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru SCLK_I2S0>, <&cru HCLK_I2S_8CH>;

		clock-names = "i2s_clk", "i2s_hclk";

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

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

		#sound-dai-cells = <0>;

		status = "disabled";

	};



	spdif: spdif@10204000 {

		compatible = "rockchip,rk3128-spdif", "rockchip,rk3066-spdif";

		reg = <0x10204000 0x1000>;

		interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru SCLK_SPDIF>, <&cru HCLK_SPDIF>;

		clock-names = "mclk", "hclk";

		dmas = <&pdma 13>;

		dma-names = "tx";

		pinctrl-names = "default";

		pinctrl-0 = <&spdif_tx>;

		#sound-dai-cells = <0>;

		status = "disabled";

	};



	sfc: spi@1020c000 {

		compatible = "rockchip,sfc";

		reg = <0x1020c000 0x8000>;

		interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru SCLK_SFC>, <&cru 479>;

		clock-names = "clk_sfc", "hclk_sfc";

		status = "disabled";

	};



	sdmmc: mmc@10214000 {

		compatible = "rockchip,rk3128-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x10214000 0x4000>;
@@ -408,6 +482,21 @@ emmc: mmc@1021c000 { 
		status = "disabled";

	};



	i2s_2ch: i2s@10220000 {

		compatible = "rockchip,rk3128-i2s", "rockchip,rk3066-i2s";

		reg = <0x10220000 0x1000>;

		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru SCLK_I2S1>, <&cru HCLK_I2S_2CH>;

		clock-names = "i2s_clk", "i2s_hclk";

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

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

		rockchip,playback-channels = <2>;

		pinctrl-names = "default";

		pinctrl-0 = <&i2s_bus>;

		#sound-dai-cells = <0>;

		status = "disabled";

	};



	nfc: nand-controller@10500000 {

		compatible = "rockchip,rk3128-nfc", "rockchip,rk2928-nfc";

		reg = <0x10500000 0x4000>;
@@ -477,6 +566,7 @@ hdmi: hdmi@20034000 { 
		pinctrl-names = "default";

		pinctrl-0 = <&hdmii2c_xfer &hdmi_hpd &hdmi_cec>;

		power-domains = <&power RK3128_PD_VIO>;

		#sound-dai-cells = <0>;

		status = "disabled";



		ports {
@@ -496,6 +586,18 @@ hdmi_out: port@1 { 
		};

	};



	dphy: phy@20038000 {

		compatible = "rockchip,rk3128-dsi-dphy";

		reg = <0x20038000 0x4000>;

		clocks = <&cru SCLK_MIPI_24M>, <&cru PCLK_MIPIPHY>;

		clock-names = "ref", "pclk";

		#phy-cells = <0>;

		power-domains = <&power RK3128_PD_VIO>;

		resets = <&cru SRST_MIPIPHY_P>;

		reset-names = "apb";

		status = "disabled";

	};



	timer0: timer@20044000 {

		compatible = "rockchip,rk3128-timer", "rockchip,rk3288-timer";

		reg = <0x20044000 0x20>;
@@ -1104,6 +1206,32 @@ sdmmc_bus4: sdmmc-bus4 { 
			};

		};



		sfc {

			sfc_bus2: sfc-bus2 {

				rockchip,pins = <1 RK_PD0 3 &pcfg_pull_default>,

						<1 RK_PD1 3 &pcfg_pull_default>;

			};



			sfc_bus4: sfc-bus4 {

				rockchip,pins = <1 RK_PD0 3 &pcfg_pull_default>,

						<1 RK_PD1 3 &pcfg_pull_default>,

						<1 RK_PD2 3 &pcfg_pull_default>,

						<1 RK_PD3 3 &pcfg_pull_default>;

			};



			sfc_clk: sfc-clk {

				rockchip,pins = <2 RK_PA4 3 &pcfg_pull_none>;

			};



			sfc_cs0: sfc-cs0 {

				rockchip,pins = <2 RK_PA2 2 &pcfg_pull_default>;

			};



			sfc_cs1: sfc-cs1 {

				rockchip,pins = <2 RK_PA3 2 &pcfg_pull_default>;

			};

		};



		spdif {

			spdif_tx: spdif-tx {

				rockchip,pins = <3 RK_PD3 1 &pcfg_pull_none>;

include/dt-bindings/clock/rk3128-cru.h

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ 
#define PCLK_GMAC		367

#define PCLK_PMU_PRE		368

#define PCLK_SIM_CARD		369

#define PCLK_MIPIPHY		370



/* hclk gates */

#define HCLK_SPDIF		440