[PATCH 5/7] ARM: dts: rockchip: rk3588s-u-boot: add pcie2x1l2 with PHY

[Jonas Karlman]

Hi Eugen,

On 2023-04-17 11:19, Eugen Hristev wrote:
> From: Joseph Chen <chenjh at rock-chips.com>
> 
> Add the node for pciE 2x1l 2 device together with the corresponding
> combphy.
> 
> Signed-off-by: Joseph Chen <chenjh at rock-chips.com>
> [eugen.hristev at collabora.com: moved to -u-boot.dtsi, minor
> adaptations]
> Signed-off-by: Eugen Hristev <eugen.hristev at collabora.com>
> ---
>  arch/arm/dts/rk3588s-u-boot.dtsi | 73 ++++++++++++++++++++++++++++++++
>  1 file changed, 73 insertions(+)
> 
> diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi
> index f23112bf7ab6..17348c8f9789 100644
> --- a/arch/arm/dts/rk3588s-u-boot.dtsi
> +++ b/arch/arm/dts/rk3588s-u-boot.dtsi
> @@ -4,6 +4,7 @@
>   */
>  
>  #include "rockchip-u-boot.dtsi"
> +#include <dt-bindings/phy/phy.h>
>  
>  / {
>  	dmc {
> @@ -58,6 +59,11 @@
>  		reg = <0x0 0xfd58a000 0x0 0x2000>;
>  	};
>  
> +	pipe_phy0_grf: syscon at fd5bc000 {
> +		compatible = "rockchip,pipe-phy-grf", "syscon";
> +		reg = <0x0 0xfd5bc000 0x0 0x100>;
> +	};
> +
>  	usb2phy2_grf: syscon at fd5d8000 {
>  		compatible = "rockchip,rk3588-usb2phy-grf", "syscon",
>  			     "simple-mfd";
> @@ -104,6 +110,58 @@
>  		};
>  	};
>  
> +	pcie2x1l2: pcie at fe190000 {
> +		compatible = "rockchip,rk3588-pcie", "snps,dw-pcie";
> +		#address-cells = <3>;
> +		#size-cells = <2>;
> +		bus-range = <0x40 0x4f>;
> +		clocks = <&cru ACLK_PCIE_1L2_MSTR>, <&cru ACLK_PCIE_1L2_SLV>,
> +			 <&cru ACLK_PCIE_1L2_DBI>, <&cru PCLK_PCIE_1L2>,
> +			 <&cru CLK_PCIE_AUX4>;
> +		clock-names = "aclk_mst", "aclk_slv",
> +			      "aclk_dbi", "pclk", "aux";
> +		device_type = "pci";
> +		interrupts = <GIC_SPI 253 IRQ_TYPE_LEVEL_HIGH 0>,
> +			     <GIC_SPI 252 IRQ_TYPE_LEVEL_HIGH 0>,
> +			     <GIC_SPI 251 IRQ_TYPE_LEVEL_HIGH 0>,
> +			     <GIC_SPI 250 IRQ_TYPE_LEVEL_HIGH 0>,
> +			     <GIC_SPI 249 IRQ_TYPE_LEVEL_HIGH 0>;
> +		interrupt-names = "sys", "pmc", "msg", "legacy", "err";
> +		#interrupt-cells = <1>;
> +		interrupt-map-mask = <0 0 0 7>;
> +		interrupt-map = <0 0 0 1 &pcie2x1l2_intc 0>,
> +				<0 0 0 2 &pcie2x1l2_intc 1>,
> +				<0 0 0 3 &pcie2x1l2_intc 2>,
> +				<0 0 0 4 &pcie2x1l2_intc 3>;
> +		linux,pci-domain = <4>;
> +		num-ib-windows = <8>;
> +		num-ob-windows = <8>;
> +		max-link-speed = <2>;
> +		msi-map = <0x4000 &gic 0x4000 0x1000>;
> +		num-lanes = <1>;
> +		phys = <&combphy0_ps PHY_TYPE_PCIE>;
> +		phy-names = "pcie-phy";
> +		power-domains = <&power RK3588_PD_PHP>;
> +		ranges = <0x00000800 0x0 0xf4000000 0x0 0xf4000000 0x0 0x100000
> +			  0x81000000 0x0 0xf4100000 0x0 0xf4100000 0x0 0x100000
> +			  0x82000000 0x0 0xf4200000 0x0 0xf4200000 0x0 0xe00000
> +			  0xc3000000 0xa 0x00000000 0xa 0x00000000 0x0 0x40000000>;
> +		reg = <0xa 0x41000000 0x0 0x400000>,
> +		      <0x0 0xfe190000 0x0 0x10000>;
> +		reg-names = "pcie-dbi", "pcie-apb";

These reg-names are not fully compatible with the mainline linux binding
for the rk3568 variant, see [1]. Please use the reg-names as defined in
the mainline binding: dbi and apb.

In a pending patch to fix pcie/nvme on rk3568 I am planing to change to
get reg addr by name instead of index, as part of the fix to use correct
cfg_base.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml#n37

Regards,
Jonas

> +		resets = <&cru SRST_PCIE4_POWER_UP>;
> +		reset-names = "pipe";
> +		status = "disabled";
> +
> +		pcie2x1l2_intc: legacy-interrupt-controller {
> +			interrupt-controller;
> +			#address-cells = <0>;
> +			#interrupt-cells = <1>;
> +			interrupt-parent = <&gic>;
> +			interrupts = <GIC_SPI 250 IRQ_TYPE_EDGE_RISING 0>;
> +		};
> +	};
> +
>  	sfc: spi at fe2b0000 {
>  		compatible = "rockchip,sfc";
>  		reg = <0x0 0xfe2b0000 0x0 0x4000>;
> @@ -128,6 +186,21 @@
>  			reg = <0x07 0x10>;
>  		};
>  	};
> +
> +	combphy0_ps: phy at fee00000 {
> +		compatible = "rockchip,rk3588-naneng-combphy";
> +		reg = <0x0 0xfee00000 0x0 0x100>;
> +		#phy-cells = <1>;
> +		clocks = <&cru CLK_REF_PIPE_PHY0>, <&cru PCLK_PCIE_COMBO_PIPE_PHY0>;
> +		clock-names = "refclk", "apbclk";
> +		assigned-clocks = <&cru CLK_REF_PIPE_PHY0>;
> +		assigned-clock-rates = <100000000>;
> +		resets = <&cru SRST_P_PCIE2_PHY0>, <&cru SRST_REF_PIPE_PHY0>;
> +		reset-names = "combphy-apb", "combphy";
> +		rockchip,pipe-grf = <&php_grf>;
> +		rockchip,pipe-phy-grf = <&pipe_phy0_grf>;
> +		status = "disabled";
> +	};
>  };
>  
>  &xin24m {