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

Commit 4fda1e73 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.14-rockchip-dts64-1' of... 

Merge tag 'v4.14-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt64

Pull "Rockchip dts64 changes for 4.14" from Heiko Stübner:

64bit Rockchip devicetree changes containing fixes for pinctrl typos
and the use of keep-power-in-suspend in non-sdio nodes as well as the
removal of the deprecated num-slots property from dwmmc nodes.

rk3328 gets support for spdif, io-domains and usb (including enablement
of usb on the evaluation board), while rk3368 gains support for spdif.

The biggest chunk of course aims for the rk3399 with a number of pcie
changes, support for the mali gpu, a new power-domain, sdmmc support
on the firefly board and dynamic-power-coefficients.

The gru family also gets support for their quite central pwm regulators
using the newly introduced vctrl regulator types.

* tag 'v4.14-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: update dynamic-power-coefficient for rk3399
  arm64: dts: rockchip: add rk3328 spdif node
  arm64: dts: rockchip: add rk3368 spdif node
  arm64: dts: rockchip: enable sdmmc controller on rk3399-firefly
  arm64: dts: rockchip: Add rk3328 io-domain node
  arm64: dts: rockchip: kill pcie_clkreqn and pcie_clkreqnb for rk3399
  arm64: dts: rockchip: change clkreq mode for rk3399-firefly
  arm64: dts: rockchip: enable the GPU for RK3399-GRU
  arm64: dts: rockchip: add ARM Mali GPU node for RK3399 SoCs
  dt-bindings: gpu: add the RK3399 mali for rockchip specifics
  arm64: dts: rockchip: remove abused keep-power-in-suspend
  arm64: dts: rockchip: remove num-slots from all platforms
  arm64: dts: rockchip: change clkreq mode for rk3399-evb
  arm64: dts: rockchip: add SdioAudio pd control for rk3399
  arm64: dts: rockchip: enable usb2 for RK3328 evaluation board
  arm64: dts: rockchip: add usb2 nodes for RK3328 SoCs
  arm64: dts: rockchip: set rk3399 dynamic CPU power coefficients
  arm64: dts: rockchip: Use vctrl regulators for dynamic CPU voltages on Gru/Kevin
  arm64: dts: rockchip: Update CPU regulator voltage ranges for Gru
  arm64: dts: rockchip: fix typo in mmc pinctrl
parents 77dcb02f 45a995c0

Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ Required properties: 
  * which must be preceded by one of the following vendor specifics:

  * which must be preceded by one of the following vendor specifics:

    + "amlogic,meson-gxm-mali"

    + "amlogic,meson-gxm-mali"

    + "rockchip,rk3288-mali"

    + "rockchip,rk3288-mali"

    + "rockchip,rk3399-mali"





- reg : Physical base address of the device and length of the register area.

- reg : Physical base address of the device and length of the register area.

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

+24 −0
Original line number Original line Diff line number Diff line
@@ -55,3 +55,27 @@ 
&uart2 {

&uart2 {

	status = "okay";

	status = "okay";

};

};



&u2phy {

	status = "okay";

};



&u2phy_host {

	status = "okay";

};



&u2phy_otg {

	status = "okay";

};



&usb20_otg {

	status = "okay";

};



&usb_host0_ehci {

	status = "okay";

};



&usb_host0_ohci {

	status = "okay";

};

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

+94 −0
Original line number Original line Diff line number Diff line
@@ -156,12 +156,30 @@ 
		clock-output-names = "xin24m";

		clock-output-names = "xin24m";

	};

	};





	spdif: spdif@ff030000 {

		compatible = "rockchip,rk3328-spdif";

		reg = <0x0 0xff030000 0x0 0x1000>;

		interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;

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

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

		dmas = <&dmac 10>;

		dma-names = "tx";

		pinctrl-names = "default";

		pinctrl-0 = <&spdifm2_tx>;

		status = "disabled";

	};



	grf: syscon@ff100000 {

	grf: syscon@ff100000 {

		compatible = "rockchip,rk3328-grf", "syscon", "simple-mfd";

		compatible = "rockchip,rk3328-grf", "syscon", "simple-mfd";

		reg = <0x0 0xff100000 0x0 0x1000>;

		reg = <0x0 0xff100000 0x0 0x1000>;

		#address-cells = <1>;

		#address-cells = <1>;

		#size-cells = <1>;

		#size-cells = <1>;





		io_domains: io-domains {

			compatible = "rockchip,rk3328-io-voltage-domain";

			status = "disabled";

		};



		power: power-controller {

		power: power-controller {

			compatible = "rockchip,rk3328-power-controller";

			compatible = "rockchip,rk3328-power-controller";

			#power-domain-cells = <1>;

			#power-domain-cells = <1>;
@@ -372,6 +390,43 @@ 
			<32768>;

			<32768>;

	};

	};





	usb2phy_grf: syscon@ff450000 {

		compatible = "rockchip,rk3328-usb2phy-grf", "syscon",

			     "simple-mfd";

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

		#address-cells = <1>;

		#size-cells = <1>;



		u2phy: usb2-phy@100 {

			compatible = "rockchip,rk3328-usb2phy";

			reg = <0x100 0x10>;

			clocks = <&xin24m>;

			clock-names = "phyclk";

			clock-output-names = "usb480m_phy";

			#clock-cells = <0>;

			assigned-clocks = <&cru USB480M>;

			assigned-clock-parents = <&u2phy>;

			status = "disabled";



			u2phy_otg: otg-port {

				#phy-cells = <0>;

				interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-names = "otg-bvalid", "otg-id",

						  "linestate";

				status = "disabled";

			};



			u2phy_host: host-port {

				#phy-cells = <0>;

				interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-names = "linestate";

				status = "disabled";

			};

		};

	};



	sdmmc: dwmmc@ff500000 {

	sdmmc: dwmmc@ff500000 {

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

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

		reg = <0x0 0xff500000 0x0 0x4000>;

		reg = <0x0 0xff500000 0x0 0x4000>;
@@ -424,6 +479,45 @@ 
		status = "disabled";

		status = "disabled";

	};

	};





	usb20_otg: usb@ff580000 {

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

			     "snps,dwc2";

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

		interrupts = <GIC_SPI 23 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;

		phys = <&u2phy_otg>;

		phy-names = "usb2-phy";

		status = "disabled";

	};



	usb_host0_ehci: usb@ff5c0000 {

		compatible = "generic-ehci";

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

		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru HCLK_HOST0>, <&u2phy>;

		clock-names = "usbhost", "utmi";

		phys = <&u2phy_host>;

		phy-names = "usb";

		status = "disabled";

	};



	usb_host0_ohci: usb@ff5d0000 {

		compatible = "generic-ohci";

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

		interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru HCLK_HOST0>, <&u2phy>;

		clock-names = "usbhost", "utmi";

		phys = <&u2phy_host>;

		phy-names = "usb";

		status = "disabled";

	};



	gic: interrupt-controller@ff811000 {

	gic: interrupt-controller@ff811000 {

		compatible = "arm,gic-400";

		compatible = "arm,gic-400";

		#interrupt-cells = <3>;

		#interrupt-cells = <3>;

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -156,7 +156,6 @@ 
	disable-wp;

	disable-wp;

	mmc-pwrseq = <&emmc_pwrseq>;

	mmc-pwrseq = <&emmc_pwrseq>;

	non-removable;

	non-removable;

	num-slots = <1>;

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;

	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;

	status = "okay";

	status = "okay";

arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts

+0 −1
Original line number Original line Diff line number Diff line
@@ -117,7 +117,6 @@ 
	clock-frequency = <150000000>;

	clock-frequency = <150000000>;

	disable-wp;

	disable-wp;

	non-removable;

	non-removable;

	num-slots = <1>;

	vmmc-supply = <&vcc_io>;

	vmmc-supply = <&vcc_io>;

	vqmmc-supply = <&vcc18_flash>;

	vqmmc-supply = <&vcc18_flash>;

	pinctrl-names = "default";

	pinctrl-names = "default";