Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22b92921 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.20-rockchip-dts64-2' of... 

Merge tag 'v4.20-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Some additional new boards, the rk3399-based RockPro64 from Pine64, as well
as the Vamrs Rock960. Another big feature is display support including hdmi
and the Innosilicon hdmiphy on the rk3328, right now enabled on the rock64.
The rock64 also got its spi-nor and spdif enabled. On the px30 we can see
dwc2-based usb support now and finally some misc fixes, like for a new dtc
warning, missing address and size cells and microSD fix on sapphire.

* tag 'v4.20-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  arm64: dts: rockchip: enable display nodes on rk3328-rock64
  arm64: dts: rockchip: add rk3328 display nodes
  arm64: dts: rockchip: add Innosilicon hdmi phy node to rk3328
  arm64: dts: rockchip: add missing address and size cells for rk3399 mipi dsi
  arm64: dts: rockchip: Enable SPI NOR flash on Rock64
  arm64: dts: rockchip: add initial dts support for Rockpro64
  arm64: dts: rockchip: enable dwc2-based otg controller on px30-evb
  arm64: dts: rockchip: add dwc2 otg controller on px30
  dt-bindings: usb: dwc2: add description for px30
  arm64: dts: rockchip: Enable SD card detection for Rock960 boards
  arm64: dts: rockchip: Add support for Rock960 board
  dt-bindings: arm: rockchip: Add binding for Rock960 board
  arm64: dts: rockchip: Split out common nodes for Rock960 based boards
  arm64: dts: rockchip: add spdif sound node for rock64
  arm64: dts: rockchip: Fix microSD in rk3399 sapphire board
  arm64: dts: rockchip: Fix I2C bus unit-address error on rk3399-puma-haikou

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f84c9330 e78d53c7

Documentation/devicetree/bindings/arm/rockchip.txt

+8 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ Rockchip platforms device tree bindings 
    Required root node properties:

      - compatible = "vamrs,ficus", "rockchip,rk3399";



- 96boards RK3399 Rock960 (ROCK960 Consumer Edition)

    Required root node properties:

      - compatible = "vamrs,rock960", "rockchip,rk3399";



- Amarula Vyasa RK3288 board

    Required root node properties:

      - compatible = "amarula,vyasa-rk3288", "rockchip,rk3288";
@@ -164,6 +168,10 @@ Rockchip platforms device tree bindings 
    Required root node properties:

    - compatible = "pine64,rock64", "rockchip,rk3328";



- Pine64 RockPro64 board:

    Required root node properties:

    - compatible = "pine64,rockpro64", "rockchip,rk3399";



- Rockchip PX3 Evaluation board:

    Required root node properties:

      - compatible = "rockchip,px3-evb", "rockchip,px3", "rockchip,rk3188";

Documentation/devicetree/bindings/usb/dwc2.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
  - brcm,bcm2835-usb: The DWC2 USB controller instance in the BCM2835 SoC.

  - hisilicon,hi6220-usb: The DWC2 USB controller instance in the hi6220 SoC.

  - rockchip,rk3066-usb: The DWC2 USB controller instance in the rk3066 Soc;

  - "rockchip,px30-usb", "rockchip,rk3066-usb", "snps,dwc2": for px30 Soc;

  - "rockchip,rk3188-usb", "rockchip,rk3066-usb", "snps,dwc2": for rk3188 Soc;

  - "rockchip,rk3288-usb", "rockchip,rk3066-usb", "snps,dwc2": for rk3288 Soc;

  - "lantiq,arx100-usb": The DWC2 USB controller instance in Lantiq ARX SoCs;

arch/arm64/boot/dts/rockchip/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -16,5 +16,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb

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

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

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

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

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

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

arch/arm64/boot/dts/rockchip/px30-evb.dts

+4 −0
Original line number Diff line number Diff line
@@ -206,6 +206,10 @@ 
	status = "okay";

};



&usb20_otg {

	status = "okay";

};



&usb_host0_ehci {

	status = "okay";

};

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

+16 −0
Original line number Diff line number Diff line
@@ -703,6 +703,22 @@ 
			<100000000>, <200000000>;

	};



	usb20_otg: usb@ff300000 {

		compatible = "rockchip,px30-usb", "rockchip,rk3066-usb",

			     "snps,dwc2";

		reg = <0x0 0xff300000 0x0 0x40000>;

		interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru HCLK_OTG>;

		clock-names = "otg";

		dr_mode = "otg";

		g-np-tx-fifo-size = <16>;

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

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

		g-use-dma;

		power-domains = <&power PX30_PD_USB>;

		status = "disabled";

	};



	usb_host0_ehci: usb@ff340000 {

		compatible = "generic-ehci";

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