Unverified Commit 0ddc52da authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

This contains the parts that were originally meant for 5.15 + some
new thing:

New boards: Firefly roc-rk3399-pc-pls and rk3328-pc; Scarlet-Dumo
tablet variant; Rock Pi 4 A+, B+; Pine64 Quartz64-A (rk3566-based)

Big additions for the rk3568: tsadc; saradc; gpio-support; gmac 1+2;
watchdog; pmu; io-domains and enabling these new things on the
rk3568-evb.

Addition of the rk3566 - a variant of the rk3568 with slightly less
peripherals.

SFC (serial flash controller) for rk3308 and px30 (including the
Odroid Go2)

Support for the rk3399's second image signal processor and its coresight
component. And camera + vpu support on px30.

A number of smaller additions to multiple boards (Rock Pi 4, Pinebook Pro
and helios64, lion-haikou, Odroid-Go2) and cleanups in some parts.

* tag 'v5.16-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (65 commits)
  arm64: dts: rockchip: add phandles to muxed i2c buses on rk3368-lion
  arm64: dts: rockchip: define iodomains for rk3368-lion
  arm64: dts: rockchip: fix LDO_REG4 / LDO_REG7 confusion on rk3368-lion
  arm64: dts: rockchip: align operating-points table name with dtschema
  arm64: dts: rockchip: hook up camera on px30-evb
  arm64: dts: rockchip: add isp node for px30
  arm64: dts: rockchip: add Coresight debug range for RK3399
  arm64: dts: rockchip: Correct regulator for USB host on Odroid-Go2
  arm64: dts: rockchip: fix PCI reg address warning on rk3399-gru
  arm64: dts: rockchip: add saradc to rk3568-evb1-v10
  arm64: dts: rockchip: Fix GPU register width for RK3328
  arm64: dts: rockchip: Re-add interrupt-names for RK3399's vpu
  arm64: dts: rockchip: add missing rockchip,grf property to rk356x
  arm64: dts: rockchip: add RK3399 Gru gpio-line-names
  arm64: dts: rockchip: Enable SFC for Odroid Go Advance
  arm64: dts: rockchip: Add SFC to RK3308
  arm64: dts: rockchip: Add SFC to PX30
  arm64: dts: rockchip: add thermal support to Quartz64 Model A
  arm64: dts: rockchip: add rk3568 tsadc nodes
  arm64: dts: rockchip: add rk356x gpio debounce clocks
  ...

Link: https://lore.kernel.org/r/4439872.CQOukoFCf9@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents db554515 5a73d7ca

Documentation/devicetree/bindings/arm/rockchip.yaml

+47 −1
Original line number Diff line number Diff line
@@ -115,6 +115,11 @@ properties: 
          - const: firefly,roc-rk3328-cc

          - const: rockchip,rk3328



      - description: Firefly ROC-RK3328-PC

        items:

          - const: firefly,roc-rk3328-pc

          - const: rockchip,rk3328



      - description: Firefly ROC-RK3399-PC

        items:

          - enum:
@@ -122,6 +127,12 @@ properties: 
              - firefly,roc-rk3399-pc-mezzanine

          - const: rockchip,rk3399



      - description: Firefly ROC-RK3399-PC-PLUS

        items:

          - enum:

              - firefly,roc-rk3399-pc-plus

          - const: rockchip,rk3399



      - description: FriendlyElec NanoPi R2S

        items:

          - const: friendlyarm,nanopi-r2s
@@ -287,6 +298,34 @@ properties: 
          - const: google,veyron

          - const: rockchip,rk3288



      - description: Google Scarlet - Dumo (ASUS Chromebook Tablet CT100)

        items:

          - const: google,scarlet-rev15-sku0

          - const: google,scarlet-rev15

          - const: google,scarlet-rev14-sku0

          - const: google,scarlet-rev14

          - const: google,scarlet-rev13-sku0

          - const: google,scarlet-rev13

          - const: google,scarlet-rev12-sku0

          - const: google,scarlet-rev12

          - const: google,scarlet-rev11-sku0

          - const: google,scarlet-rev11

          - const: google,scarlet-rev10-sku0

          - const: google,scarlet-rev10

          - const: google,scarlet-rev9-sku0

          - const: google,scarlet-rev9

          - const: google,scarlet-rev8-sku0

          - const: google,scarlet-rev8

          - const: google,scarlet-rev7-sku0

          - const: google,scarlet-rev7

          - const: google,scarlet-rev6-sku0

          - const: google,scarlet-rev6

          - const: google,scarlet-rev5-sku0

          - const: google,scarlet-rev5

          - const: google,scarlet

          - const: google,gru

          - const: rockchip,rk3399



      - description: Google Scarlet - Kingdisplay (Acer Chromebook Tab 10)

        items:

          - const: google,scarlet-rev15-sku7
@@ -455,16 +494,23 @@ properties: 
          - const: pine64,rockpro64

          - const: rockchip,rk3399



      - description: Pine64 Quartz64 Model A

        items:

          - const: pine64,quartz64-a

          - const: rockchip,rk3566



      - description: Radxa Rock

        items:

          - const: radxa,rock

          - const: rockchip,rk3188



      - description: Radxa ROCK Pi 4A/B/C

      - description: Radxa ROCK Pi 4A/A+/B/B+/C

        items:

          - enum:

              - radxa,rockpi4a

              - radxa,rockpi4a-plus

              - radxa,rockpi4b

              - radxa,rockpi4b-plus

              - radxa,rockpi4c

          - const: radxa,rockpi4

          - const: rockchip,rk3399

Documentation/devicetree/bindings/arm/rockchip/pmu.yaml

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ select: 
          - rockchip,rk3066-pmu

          - rockchip,rk3288-pmu

          - rockchip,rk3399-pmu

          - rockchip,rk3568-pmu



  required:

    - compatible
@@ -35,6 +36,7 @@ properties: 
          - rockchip,rk3066-pmu

          - rockchip,rk3288-pmu

          - rockchip,rk3399-pmu

          - rockchip,rk3568-pmu

      - const: syscon

      - const: simple-mfd

arch/arm64/boot/dts/rockchip/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-lion-haikou.dtb
@@ -24,6 +25,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-dumo.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-hugsun-x99.dtb
@@ -42,8 +44,11 @@ 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

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a-plus.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b-plus.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.dtb

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb
@@ -51,4 +56,5 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb

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

+52 −0
Original line number Diff line number Diff line
@@ -114,6 +114,10 @@ &cpu3 { 
	cpu-supply = <&vdd_arm>;

};



&csi_dphy {

	status = "okay";

};



&display_subsystem {

	status = "okay";

};
@@ -428,6 +432,36 @@ sensor@4c { 
	};

};



&i2c2 {

	status = "okay";



	clock-frequency = <100000>;



	/* These are relatively safe rise/fall times; TODO: measure */

	i2c-scl-falling-time-ns = <50>;

	i2c-scl-rising-time-ns = <300>;



	ov5695: ov5695@36 {

		compatible = "ovti,ov5695";

		reg = <0x36>;

		avdd-supply = <&vcc2v8_dvp>;

		clocks = <&cru SCLK_CIF_OUT>;

		clock-names = "xvclk";

		dvdd-supply = <&vcc1v5_dvp>;

		dovdd-supply = <&vcc1v8_dvp>;

		pinctrl-names = "default";

		pinctrl-0 = <&cif_clkout_m0>;

		reset-gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;



		port {

			ucam_out: endpoint {

				remote-endpoint = <&mipi_in_ucam>;

				data-lanes = <1 2>;

			};

		};

	};

};



&i2s1_2ch {

	status = "okay";

};
@@ -443,6 +477,24 @@ &io_domains { 
	vccio6-supply = <&vccio_flash>;

};



&isp {

	status = "okay";



	ports {

		port@0 {

			mipi_in_ucam: endpoint@0 {

				reg = <0>;

				data-lanes = <1 2>;

				remote-endpoint = <&ucam_out>;

			};

		};

	};

};



&isp_mmu {

	status = "okay";

};



&pinctrl {

	headphone {

		hp_det: hp-det {

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

+116 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ CLUSTER_SLEEP: cluster-sleep { 
		};

	};



	cpu0_opp_table: cpu0-opp-table {

	cpu0_opp_table: opp-table-0 {

		compatible = "operating-points-v2";

		opp-shared;
@@ -864,6 +864,19 @@ dsi_dphy: phy@ff2e0000 { 
		status = "disabled";

	};



	csi_dphy: phy@ff2f0000 {

		compatible = "rockchip,px30-csi-dphy";

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

		clocks = <&cru PCLK_MIPICSIPHY>;

		clock-names = "pclk";

		#phy-cells = <0>;

		power-domains = <&power PX30_PD_VI>;

		resets = <&cru SRST_MIPICSIPHY_P>;

		reset-names = "apb";

		rockchip,grf = <&grf>;

		status = "disabled";

	};



	usb20_otg: usb@ff300000 {

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

			     "snps,dwc2";
@@ -974,6 +987,18 @@ emmc: mmc@ff390000 { 
		status = "disabled";

	};



	sfc: spi@ff3a0000 {

		compatible = "rockchip,sfc";

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

		interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru SCLK_SFC>, <&cru HCLK_SFC>;

		clock-names = "clk_sfc", "hclk_sfc";

		pinctrl-0 = <&sfc_clk &sfc_cs0 &sfc_bus4>;

		pinctrl-names = "default";

		power-domains = <&power PX30_PD_MMC_NAND>;

		status = "disabled";

	};



	nfc: nand-controller@ff3b0000 {

		compatible = "rockchip,px30-nfc";

		reg = <0x0 0xff3b0000 0x0 0x4000>;
@@ -989,7 +1014,7 @@ nfc: nand-controller@ff3b0000 { 
		status = "disabled";

	};



	gpu_opp_table: opp-table2 {

	gpu_opp_table: opp-table-1 {

		compatible = "operating-points-v2";



		opp-200000000 {
@@ -1024,6 +1049,28 @@ gpu: gpu@ff400000 { 
		status = "disabled";

	};



	vpu: video-codec@ff442000 {

		compatible = "rockchip,px30-vpu";

		reg = <0x0 0xff442000 0x0 0x800>;

		interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vepu", "vdpu";

		clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;

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

		iommus = <&vpu_mmu>;

		power-domains = <&power PX30_PD_VPU>;

	};



	vpu_mmu: iommu@ff442800 {

		compatible = "rockchip,iommu";

		reg = <0x0 0xff442800 0x0 0x100>;

		interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;

		clock-names = "aclk", "iface";

		#iommu-cells = <0>;

		power-domains = <&power PX30_PD_VPU>;

	};



	dsi: dsi@ff450000 {

		compatible = "rockchip,px30-mipi-dsi";

		reg = <0x0 0xff450000 0x0 0x10000>;
@@ -1142,6 +1189,47 @@ vopl_mmu: iommu@ff470f00 { 
		status = "disabled";

	};



	isp: isp@ff4a0000 {

		compatible = "rockchip,px30-cif-isp"; /*rk3326-rkisp1*/

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

		interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "isp", "mi", "mipi";

		clocks = <&cru SCLK_ISP>,

			 <&cru ACLK_ISP>,

			 <&cru HCLK_ISP>,

			 <&cru PCLK_ISP>;

		clock-names = "isp", "aclk", "hclk", "pclk";

		iommus = <&isp_mmu>;

		phys = <&csi_dphy>;

		phy-names = "dphy";

		power-domains = <&power PX30_PD_VI>;

		status = "disabled";



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				#address-cells = <1>;

				#size-cells = <0>;

			};

		};

	};



	isp_mmu: iommu@ff4a8000 {

		compatible = "rockchip,iommu";

		reg = <0x0 0xff4a8000 0x0 0x100>;

		interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru ACLK_ISP>, <&cru HCLK_ISP>;

		clock-names = "aclk", "iface";

		power-domains = <&power PX30_PD_VI>;

		rockchip,disable-mmu-reset;

		#iommu-cells = <0>;

	};



	qos_gmac: qos@ff518000 {

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff518000 0x0 0x20>;
@@ -1973,6 +2061,32 @@ flash_bus8: flash-bus8 { 
			};

		};



		sfc {

			sfc_bus4: sfc-bus4 {

				rockchip,pins =

					<1 RK_PA0 3 &pcfg_pull_none>,

					<1 RK_PA1 3 &pcfg_pull_none>,

					<1 RK_PA2 3 &pcfg_pull_none>,

					<1 RK_PA3 3 &pcfg_pull_none>;

			};



			sfc_bus2: sfc-bus2 {

				rockchip,pins =

					<1 RK_PA0 3 &pcfg_pull_none>,

					<1 RK_PA1 3 &pcfg_pull_none>;

			};



			sfc_cs0: sfc-cs0 {

				rockchip,pins =

					<1 RK_PA4 3 &pcfg_pull_none>;

			};



			sfc_clk: sfc-clk {

				rockchip,pins =

					<1 RK_PB1 3 &pcfg_pull_none>;

			};

		};



		lcdc {

			lcdc_rgb_dclk_pin: lcdc-rgb-dclk-pin {

				rockchip,pins =