Commit 20d9c47b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.7-rockchip-dts32-1' of... 

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

Improvements for the rk3288-vyasa board and a lot of cleanups from
verifying devicetrees against new yaml bindings.

* tag 'v5.7-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (25 commits)
  ARM: dts: rockchip: remove #address-cells and #size-cells from i2s nodes
  ARM: dts: rockchip: swap clocks and clock-names values for i2s nodes
  ARM: dts: rockchip: remove clock-names property from 'generic-ohci' nodes
  ARM: dts: rockchip: remove clock-names property from 'generic-ehci' nodes
  ARM: dts: rockchip: swap clocks and clock-names values for spdif nodes
  ARM: dts: rockchip: Keep rk3288-tinker SD card IO powered during reboot
  ARM: dts: rockchip: remove clock-frequency from saradc node rv1108
  ARM: dts: rockchip: fix vref-supply for &saradc node rk3288 firefly reload
  ARM: dts: rockchip: use DMA channels for UARTs for RK3288
  ARM: dts: rockchip: rk3xxx: fix L2 cache-controller nodename
  ARM: dts: rockchip: fix lvds-encoder ports subnode for rk3188-bqedison2qc
  ARM: dts: add bus to rockchip amba nodenames
  ARM: dts: rockchip: remove #dma-cells from dma client nodes for rv1108
  ARM: dts: rockchip: fix rockchip,default-sample-phase property names
  ARM: dts: rockchip: fix vqmmc-supply property name for rk3188-bqedison2qc
  dt-bindings: arm: add Rockchip rk3036-evb board
  dt-bindings: arm: fix Rockchip Kylin board bindings
  ARM: dts: rockchip: add missing model properties
  ARM: dts: rockchip: Add vcc50_hdmi for rk3288-vyasa
  ARM: dts: rockchip: Fix ddc-i2c-bus for rk3288-vyasa
  ...

Link: https://lore.kernel.org/r/7846023.TtVhTo4ACP@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e4a78fd2 9b505cf5

Documentation/devicetree/bindings/arm/rockchip.yaml

+6 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ properties: 


      - description: Rockchip Kylin

        items:

          - const: rockchip,kylin-rk3036

          - const: rockchip,rk3036-kylin

          - const: rockchip,rk3036



      - description: Rockchip PX3 Evaluation board
@@ -468,6 +468,11 @@ properties: 
          - const: rockchip,r88

          - const: rockchip,rk3368



      - description: Rockchip RK3036 Evaluation board

        items:

          - const: rockchip,rk3036-evb

          - const: rockchip,rk3036



      - description: Rockchip RK3228 Evaluation board

        items:

          - const: rockchip,rk3228-evb

arch/arm/boot/dts/rk3036-kylin.dts

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ 
	bus-width = <4>;

	cap-sd-highspeed;

	cap-sdio-irq;

	default-sample-phase = <90>;

	rockchip,default-sample-phase = <90>;

	keep-power-in-suspend;

	mmc-pwrseq = <&sdio_pwrseq>;

	non-removable;

arch/arm/boot/dts/rk3036.dtsi

+3 −5
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
		};

	};



	amba {

	amba: bus {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;
@@ -101,7 +101,7 @@ 
		#clock-cells = <0>;

	};



	bus_intmem@10080000 {

	bus_intmem: sram@10080000 {

		compatible = "mmio-sram";

		reg = <0x10080000 0x2000>;

		#address-cells = <1>;
@@ -263,7 +263,7 @@ 
		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,

			 <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;

		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";

		default-sample-phase = <158>;

		rockchip,default-sample-phase = <158>;

		disable-wp;

		dmas = <&pdma 12>;

		dma-names = "rx-tx";
@@ -281,8 +281,6 @@ 
		compatible = "rockchip,rk3036-i2s", "rockchip,rk3066-i2s";

		reg = <0x10220000 0x4000>;

		interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

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

		clocks = <&cru SCLK_I2S>, <&cru HCLK_I2S>;

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

arch/arm/boot/dts/rk3066a.dtsi

+6 −12
Original line number Diff line number Diff line
@@ -156,14 +156,12 @@ 
		compatible = "rockchip,rk3066-i2s";

		reg = <0x10118000 0x2000>;

		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		pinctrl-names = "default";

		pinctrl-0 = <&i2s0_bus>;

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

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

		dmas = <&dmac1_s 4>, <&dmac1_s 5>;

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

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

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

		rockchip,playback-channels = <8>;

		rockchip,capture-channels = <2>;

		#sound-dai-cells = <0>;
@@ -174,14 +172,12 @@ 
		compatible = "rockchip,rk3066-i2s";

		reg = <0x1011a000 0x2000>;

		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		pinctrl-names = "default";

		pinctrl-0 = <&i2s1_bus>;

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

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

		dmas = <&dmac1_s 6>, <&dmac1_s 7>;

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

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

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

		rockchip,playback-channels = <2>;

		rockchip,capture-channels = <2>;

		#sound-dai-cells = <0>;
@@ -192,14 +188,12 @@ 
		compatible = "rockchip,rk3066-i2s";

		reg = <0x1011c000 0x2000>;

		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		pinctrl-names = "default";

		pinctrl-0 = <&i2s2_bus>;

		clocks = <&cru SCLK_I2S2>, <&cru HCLK_I2S2>;

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

		dmas = <&dmac1_s 9>, <&dmac1_s 10>;

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

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

		clocks = <&cru HCLK_I2S2>, <&cru SCLK_I2S2>;

		rockchip,playback-channels = <2>;

		rockchip,capture-channels = <2>;

		#sound-dai-cells = <0>;

arch/arm/boot/dts/rk3188-bqedison2qc.dts

+17 −12
Original line number Diff line number Diff line
@@ -58,11 +58,14 @@ 


	lvds-encoder {

		compatible = "ti,sn75lvds83", "lvds-encoder";



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;



				lvds_in_vop0: endpoint {

					remote-endpoint = <&vop0_out_lvds>;

				};
@@ -70,11 +73,13 @@ 


			port@1 {

				reg = <1>;



				lvds_out_panel: endpoint {

					remote-endpoint = <&panel_in_lvds>;

				};

			};

		};

	};



	panel {

		compatible = "innolux,ee101ia-01d", "panel-lvds";
@@ -465,7 +470,7 @@ 
	non-removable;

	pinctrl-names = "default";

	pinctrl-0 = <&sd1_clk>, <&sd1_cmd>, <&sd1_bus4>;

	vmmcq-supply = <&vccio_wl>;

	vqmmc-supply = <&vccio_wl>;

	#address-cells = <1>;

	#size-cells = <0>;

	status = "okay";

CRA Git | Maintained and supported by SUSTech CRA and CCSE