Commit 8e2d1136 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Support for the rk3399-based Pinebook Pro, eDP support and power-tree for
the rk3399 evaluation board, a big number of fixes for issues found by
checking against the new yaml dt-bindings.
And on the smaller side, fixes for network transfers, the mute gpio
on rk3328 gets actually described and one lvds fix on the px30 and
the rk3399-hugsun board gets IR and power led.

* tag 'v5.7-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (27 commits)
  arm64: dts: rockchip: Add Hugsun X99 power led
  arm64: dts: rockchip: Add Hugsun X99 IR receiver
  arm64: dts: rockchip: remove clock-names property from 'generic-ohci' nodes
  arm64: dts: rockchip: remove clock-names property from 'generic-ehci' nodes
  arm64: dts: rockchip: remove properties from spdif node RK3399 Excavator
  arm64: dts: add bus to rockchip amba nodenames
  arm64: dts: rockchip: replace clock-freq-min-max by max-frequency
  arm64: dts: rockchip: fix vqmmc-supply property name for rk3399 puma
  arm64: dts: remove no-emmc from mmc node for Rockchip PX5 EVB
  arm64: dts: rockchip: remove rockchip,grf from vop nodes for px30
  arm64: dts: rockchip: remove max-freq from &spi1 node for Hugsun X99
  arm64: dts: rockchip: fix compatible property for rk3399-evb
  arm64: dts: rockchip: Add initial support for Pinebook Pro
  dt-bindings: Add doc for Pine64 Pinebook Pro
  arm64: dts: rockchip: Enable eDP display on rk3399 evb
  arm64: dts: rockchip: remove enable-gpio of backlight on rk3399 evb
  arm64: dts: rockchip: Add pmic dt tree for rk3399 evb
  arm64: dts: rockchip: remove dvs2 pinctrl for pmic on rk3399 evb
  arm64: dts: rockchip: fix px30 lvds ports
  arm64: dts: rockchip: Add txpbl node for RK3399/RK3328
  ...

Link: https://lore.kernel.org/r/27799037.pT45f1LVdF@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 20d9c47b 68c33366

Documentation/devicetree/bindings/arm/rockchip.yaml

+5 −0
Original line number Diff line number Diff line
@@ -402,6 +402,11 @@ properties: 
          - const: phytec,rk3288-phycore-som

          - const: rockchip,rk3288



      - description: Pine64 PinebookPro

        items:

          - const: pine64,pinebook-pro

          - const: rockchip,rk3399



      - description: Pine64 Rock64

        items:

          - const: pine64,rock64

arch/arm64/boot/dts/rockchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb

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

+15 −17
Original line number Diff line number Diff line
@@ -413,14 +413,16 @@ 


		lvds: lvds {

			compatible = "rockchip,px30-lvds";

			#address-cells = <1>;

			#size-cells = <0>;

			phys = <&dsi_dphy>;

			phy-names = "dphy";

			rockchip,grf = <&grf>;

			rockchip,output = "lvds";

			status = "disabled";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					#address-cells = <1>;
@@ -438,6 +440,7 @@ 
				};

			};

		};

	};



	uart1: serial@ff158000 {

		compatible = "rockchip,px30-uart", "snps,dw-apb-uart";
@@ -700,7 +703,7 @@ 
		clock-names = "pclk", "timer";

	};



	amba {

	amba: bus {

		compatible = "simple-bus";

		#address-cells = <2>;

		#size-cells = <2>;
@@ -870,7 +873,6 @@ 
		g-np-tx-fifo-size = <16>;

		g-rx-fifo-size = <280>;

		g-tx-fifo-size = <256 128 128 64 32 16>;

		g-use-dma;

		phys = <&u2phy_otg>;

		phy-names = "usb2-phy";

		power-domains = <&power PX30_PD_USB>;
@@ -882,7 +884,6 @@ 
		reg = <0x0 0xff340000 0x0 0x10000>;

		interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru HCLK_HOST>;

		clock-names = "usbhost";

		phys = <&u2phy_host>;

		phy-names = "usb";

		power-domains = <&power PX30_PD_USB>;
@@ -894,7 +895,6 @@ 
		reg = <0x0 0xff350000 0x0 0x10000>;

		interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru HCLK_HOST>;

		clock-names = "usbhost";

		phys = <&u2phy_host>;

		phy-names = "usb";

		power-domains = <&power PX30_PD_USB>;
@@ -1031,7 +1031,6 @@ 
		reset-names = "axi", "ahb", "dclk";

		iommus = <&vopb_mmu>;

		power-domains = <&power PX30_PD_VO>;

		rockchip,grf = <&grf>;

		status = "disabled";



		vopb_out: port {
@@ -1073,7 +1072,6 @@ 
		reset-names = "axi", "ahb", "dclk";

		iommus = <&vopl_mmu>;

		power-domains = <&power PX30_PD_VO>;

		rockchip,grf = <&grf>;

		status = "disabled";



		vopl_out: port {

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

+5 −5
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 


		cpu0: cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a35", "arm,armv8";

			compatible = "arm,cortex-a35";

			reg = <0x0 0x0>;

			enable-method = "psci";

			clocks = <&cru ARMCLK>;
@@ -53,7 +53,7 @@ 


		cpu1: cpu@1 {

			device_type = "cpu";

			compatible = "arm,cortex-a35", "arm,armv8";

			compatible = "arm,cortex-a35";

			reg = <0x0 0x1>;

			enable-method = "psci";

			operating-points-v2 = <&cpu0_opp_table>;
@@ -63,7 +63,7 @@ 


		cpu2: cpu@2 {

			device_type = "cpu";

			compatible = "arm,cortex-a35", "arm,armv8";

			compatible = "arm,cortex-a35";

			reg = <0x0 0x2>;

			enable-method = "psci";

			operating-points-v2 = <&cpu0_opp_table>;
@@ -73,7 +73,7 @@ 


		cpu3: cpu@3 {

			device_type = "cpu";

			compatible = "arm,cortex-a35", "arm,armv8";

			compatible = "arm,cortex-a35";

			reg = <0x0 0x3>;

			enable-method = "psci";

			operating-points-v2 = <&cpu0_opp_table>;
@@ -513,7 +513,7 @@ 
		status = "disabled";

	};



	amba {

	amba: bus {

		compatible = "simple-bus";

		#address-cells = <2>;

		#size-cells = <2>;

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

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
};



&codec {

	mute-gpios = <&grf_gpio 0 GPIO_ACTIVE_LOW>;

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE