Commit 71acc94c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v5.6-rockchip-dts64-2' of... 

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

DSI display for px30 evaluation board and a number of cleanups
accross multiple socs.

* tag 'v5.6-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Kill off "simple-panel" compatibles
  arm64: dts: rockchip: rename dwmmc node names to mmc
  arm64: dts: rockchip: hook up the px30-evb dsi display
  arm64: dts: rockchip: Enable sdio0 and uart0 on rk3399-roc-pc-mezzanine
  arm64: dts: rockchip: add reg property to brcmf sub-nodes
  arm64: dts: rockchip: fix dwmmc clock name for rk3308
  arm64: dts: rockchip: fix dwmmc clock name for px30

Link: https://lore.kernel.org/r/7641353.lIegmeFAIi@phil


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b744f098 62b5efc9

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

+32 −0
Original line number Diff line number Diff line
@@ -112,6 +112,38 @@ 
	status = "okay";

};



&dsi {

	status = "okay";



	ports {

		mipi_out: port@1 {

			reg = <1>;



			mipi_out_panel: endpoint {

				remote-endpoint = <&mipi_in_panel>;

			};

		};

	};



	panel@0 {

		compatible = "xinpeng,xpp055c272";

		reg = <0>;

		backlight = <&backlight>;

		iovcc-supply = <&vcc_1v8>;

		vci-supply = <&vcc3v3_lcd>;



		port {

			mipi_in_panel: endpoint {

				remote-endpoint = <&mipi_out_panel>;

			};

		};

	};

};



&dsi_dphy {

	status = "okay";

};



&emmc {

	bus-width = <8>;

	cap-mmc-highspeed;

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

+6 −6
Original line number Diff line number Diff line
@@ -924,13 +924,13 @@ 
		status = "disabled";

	};



	sdmmc: dwmmc@ff370000 {

	sdmmc: mmc@ff370000 {

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

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

		interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,

			 <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;

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

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

		fifo-depth = <0x100>;

		max-frequency = <150000000>;

		pinctrl-names = "default";
@@ -939,13 +939,13 @@ 
		status = "disabled";

	};



	sdio: dwmmc@ff380000 {

	sdio: mmc@ff380000 {

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

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

		interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,

			 <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;

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

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

		fifo-depth = <0x100>;

		max-frequency = <150000000>;

		pinctrl-names = "default";
@@ -954,13 +954,13 @@ 
		status = "disabled";

	};



	emmc: dwmmc@ff390000 {

	emmc: mmc@ff390000 {

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

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

		interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,

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

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

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

		fifo-depth = <0x100>;

		max-frequency = <150000000>;

		pinctrl-names = "default";

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

+6 −6
Original line number Diff line number Diff line
@@ -584,14 +584,14 @@ 
		status = "disabled";

	};



	sdmmc: dwmmc@ff480000 {

	sdmmc: mmc@ff480000 {

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

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

		interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;

		bus-width = <4>;

		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,

			 <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;

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

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

		fifo-depth = <0x100>;

		max-frequency = <150000000>;

		pinctrl-names = "default";
@@ -599,27 +599,27 @@ 
		status = "disabled";

	};



	emmc: dwmmc@ff490000 {

	emmc: mmc@ff490000 {

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

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

		interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;

		bus-width = <8>;

		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,

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

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

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

		fifo-depth = <0x100>;

		max-frequency = <150000000>;

		status = "disabled";

	};



	sdio: dwmmc@ff4a0000 {

	sdio: mmc@ff4a0000 {

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

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

		interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;

		bus-width = <4>;

		clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,

			 <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;

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

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

		fifo-depth = <0x100>;

		max-frequency = <150000000>;

		pinctrl-names = "default";

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

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

	};



	sdmmc: dwmmc@ff500000 {

	sdmmc: mmc@ff500000 {

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

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

		interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
@@ -866,7 +866,7 @@ 
		status = "disabled";

	};



	sdio: dwmmc@ff510000 {

	sdio: mmc@ff510000 {

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

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

		interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
@@ -878,7 +878,7 @@ 
		status = "disabled";

	};



	emmc: dwmmc@ff520000 {

	emmc: mmc@ff520000 {

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

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

		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;

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

+3 −3
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ 
		#clock-cells = <0>;

	};



	sdmmc: dwmmc@ff0c0000 {

	sdmmc: mmc@ff0c0000 {

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

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

		max-frequency = <150000000>;
@@ -218,7 +218,7 @@ 
		status = "disabled";

	};



	sdio0: dwmmc@ff0d0000 {

	sdio0: mmc@ff0d0000 {

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

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

		max-frequency = <150000000>;
@@ -232,7 +232,7 @@ 
		status = "disabled";

	};



	emmc: dwmmc@ff0f0000 {

	emmc: mmc@ff0f0000 {

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

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

		max-frequency = <150000000>;