Unverified Commit 286c1d1c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.1-rockchip-dts64-2' of... 

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

RK3399-Nanopi-R4S-enterprise as variant board, Gru-Scarlet SKU variants,
DSI support for rk356x, display-gamma-control for rk3399, display
output for quartz64-b and rk3566-roc-pc, hdmi supplies for rk3399-roc-pc,
some pinctrl improvements for the px30-evb and a number of changes to
bring rk3399 rock4 and rock-pi4 structure closer to names used in schematics.

* tag 'v6.1-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: use pin constant for reset-gpios on px30-evb
  arm64: dts: rockchip: add pinctrl for mipi-pdn pin on px30-evb
  arm64: dts: rockchip: set max drive-strength for cif_clkout_m0 on px30-evb
  arm64: dts: rockchip: add avdd-0v9-supply and avdd-1v8-supply on rk3399 rock 4c and pi4
  arm64: dts: rockchip: sort nodes/properties on rk3399-rock-4
  arm64: dts: rockchip: fix regulator name on rk3399-rock-4
  arm64: dts: rockchip: sort nodes/properties on rk3399-rock-4c-plus
  arm64: dts: rockchip: fix regulator structure on rk3399-rock-4c-plus
  arm64: dts: rockchip: connect vcca_1v8 to APIO5_VDD on rk3399-rock-4c-plus
  arm64: dts: rockchip: Add DSI and DSI-DPHY nodes to rk356x
  arm64: dts: rockchip: Enable HDMI and GPU on quartz64-b
  arm64: dts: rockchip: Add RK3399 NanoPi R4S Enterprise Edition
  dt-bindings: Add doc for FriendlyARM NanoPi R4S Enterprise Edition
  arm64: dts: rockchip: add i2s0 I2S/PDM/TDM 8ch controller to px30
  arm64: dts: rockchip: Add HDMI supplies on rk3399-roc-pc
  arm64: dts: rockchip: Support gru-scarlet sku{2,4} variants
  dt-bindings: arm: rockchip: Add gru-scarlet sku{2,4} variants
  arm64: dts: rockchip: enable gamma control on RK3399
  arm64: dts: rockchip: Enable video output on rk3566-roc-pc

Link: https://lore.kernel.org/r/38114097.10thIPus4b@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 01c65733 19d4aaf6

Documentation/devicetree/bindings/arm/rockchip.yaml

+27 −1
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ properties: 
              - friendlyarm,nanopi-m4b

              - friendlyarm,nanopi-neo4

              - friendlyarm,nanopi-r4s

              - friendlyarm,nanopi-r4s-enterprise

          - const: rockchip,rk3399



      - description: GeekBuying GeekBox
@@ -373,30 +374,55 @@ properties: 
          - const: google,gru

          - const: rockchip,rk3399



      - description: Google Scarlet - Innolux display (Acer Chromebook Tab 10)

      - description: |

          Google Scarlet - Innolux display (Acer Chromebook Tab 10 and more)

        items:

          - const: google,scarlet-rev15-sku2

          - const: google,scarlet-rev15-sku4

          - const: google,scarlet-rev15-sku6

          - const: google,scarlet-rev15

          - const: google,scarlet-rev14-sku2

          - const: google,scarlet-rev14-sku4

          - const: google,scarlet-rev14-sku6

          - const: google,scarlet-rev14

          - const: google,scarlet-rev13-sku2

          - const: google,scarlet-rev13-sku4

          - const: google,scarlet-rev13-sku6

          - const: google,scarlet-rev13

          - const: google,scarlet-rev12-sku2

          - const: google,scarlet-rev12-sku4

          - const: google,scarlet-rev12-sku6

          - const: google,scarlet-rev12

          - const: google,scarlet-rev11-sku2

          - const: google,scarlet-rev11-sku4

          - const: google,scarlet-rev11-sku6

          - const: google,scarlet-rev11

          - const: google,scarlet-rev10-sku2

          - const: google,scarlet-rev10-sku4

          - const: google,scarlet-rev10-sku6

          - const: google,scarlet-rev10

          - const: google,scarlet-rev9-sku2

          - const: google,scarlet-rev9-sku4

          - const: google,scarlet-rev9-sku6

          - const: google,scarlet-rev9

          - const: google,scarlet-rev8-sku2

          - const: google,scarlet-rev8-sku4

          - const: google,scarlet-rev8-sku6

          - const: google,scarlet-rev8

          - const: google,scarlet-rev7-sku2

          - const: google,scarlet-rev7-sku4

          - const: google,scarlet-rev7-sku6

          - const: google,scarlet-rev7

          - const: google,scarlet-rev6-sku2

          - const: google,scarlet-rev6-sku4

          - const: google,scarlet-rev6-sku6

          - const: google,scarlet-rev6

          - const: google,scarlet-rev5-sku2

          - const: google,scarlet-rev5-sku4

          - const: google,scarlet-rev5-sku6

          - const: google,scarlet-rev5

          - const: google,scarlet-rev4-sku2

          - const: google,scarlet-rev4-sku4

          - const: google,scarlet-rev4-sku6

          - const: google,scarlet-rev4

          - const: google,scarlet

arch/arm64/boot/dts/rockchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4b.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4s.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4s-enterprise.dtb

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinephone-pro.dtb

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

+15 −2
Original line number Diff line number Diff line
@@ -450,8 +450,8 @@ ov5695: ov5695@36 { 
		dvdd-supply = <&vcc1v5_dvp>;

		dovdd-supply = <&vcc1v8_dvp>;

		pinctrl-names = "default";

		pinctrl-0 = <&cif_clkout_m0>;

		reset-gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;

		pinctrl-0 = <&cif_clkout_m0 &mipi_pdn>;

		reset-gpios = <&gpio2 RK_PB6 GPIO_ACTIVE_LOW>;



		port {

			ucam_out: endpoint {
@@ -537,6 +537,19 @@ wifi_enable_h: wifi-enable-h { 
				<0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	cif-m0 {

		cif_clkout_m0: cif-clkout-m0 {

			rockchip,pins =

				<2 RK_PB3 1 &pcfg_pull_none_12ma>;

		};

	};



	mipi {

		mipi_pdn: mipi-pdn {

			rockchip,pins = <2 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

};



&pmu_io_domains {

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

+22 −0
Original line number Diff line number Diff line
@@ -365,6 +365,28 @@ uart0: serial@ff030000 { 
		status = "disabled";

	};



	i2s0_8ch: i2s@ff060000 {

		compatible = "rockchip,px30-i2s-tdm";

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

		interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru SCLK_I2S0_TX>, <&cru SCLK_I2S0_RX>, <&cru HCLK_I2S0>;

		clock-names = "mclk_tx", "mclk_rx", "hclk";

		dmas = <&dmac 16>, <&dmac 17>;

		dma-names = "tx", "rx";

		rockchip,grf = <&grf>;

		resets = <&cru SRST_I2S0_TX>, <&cru SRST_I2S0_RX>;

		reset-names = "tx-m", "rx-m";

		pinctrl-names = "default";

		pinctrl-0 = <&i2s0_8ch_sclktx &i2s0_8ch_sclkrx

			     &i2s0_8ch_lrcktx &i2s0_8ch_lrckrx

			     &i2s0_8ch_sdo0 &i2s0_8ch_sdi0

			     &i2s0_8ch_sdo1 &i2s0_8ch_sdi1

			     &i2s0_8ch_sdo2 &i2s0_8ch_sdi2

			     &i2s0_8ch_sdo3 &i2s0_8ch_sdi3>;

		#sound-dai-cells = <0>;

		status = "disabled";

	};



	i2s1_2ch: i2s@ff070000 {

		compatible = "rockchip,px30-i2s", "rockchip,rk3066-i2s";

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

arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-inx.dts

+13 −1
Original line number Diff line number Diff line
@@ -11,17 +11,29 @@ 


/ {

	model = "Google Scarlet";

	compatible = "google,scarlet-rev15-sku6", "google,scarlet-rev15",

	compatible = "google,scarlet-rev15-sku2", "google,scarlet-rev15-sku4",

		     "google,scarlet-rev15-sku6", "google,scarlet-rev15",

		     "google,scarlet-rev14-sku2", "google,scarlet-rev14-sku4",

		     "google,scarlet-rev14-sku6", "google,scarlet-rev14",

		     "google,scarlet-rev13-sku2", "google,scarlet-rev13-sku4",

		     "google,scarlet-rev13-sku6", "google,scarlet-rev13",

		     "google,scarlet-rev12-sku2", "google,scarlet-rev12-sku4",

		     "google,scarlet-rev12-sku6", "google,scarlet-rev12",

		     "google,scarlet-rev11-sku2", "google,scarlet-rev11-sku4",

		     "google,scarlet-rev11-sku6", "google,scarlet-rev11",

		     "google,scarlet-rev10-sku2", "google,scarlet-rev10-sku4",

		     "google,scarlet-rev10-sku6", "google,scarlet-rev10",

		     "google,scarlet-rev9-sku2",  "google,scarlet-rev9-sku4",

		     "google,scarlet-rev9-sku6",  "google,scarlet-rev9",

		     "google,scarlet-rev8-sku2",  "google,scarlet-rev8-sku4",

		     "google,scarlet-rev8-sku6",  "google,scarlet-rev8",

		     "google,scarlet-rev7-sku2",  "google,scarlet-rev7-sku4",

		     "google,scarlet-rev7-sku6",  "google,scarlet-rev7",

		     "google,scarlet-rev6-sku2",  "google,scarlet-rev6-sku4",

		     "google,scarlet-rev6-sku6",  "google,scarlet-rev6",

		     "google,scarlet-rev5-sku2",  "google,scarlet-rev5-sku4",

		     "google,scarlet-rev5-sku6",  "google,scarlet-rev5",

		     "google,scarlet-rev4-sku2",  "google,scarlet-rev4-sku4",

		     "google,scarlet-rev4-sku6",  "google,scarlet-rev4",

		     "google,scarlet", "google,gru", "rockchip,rk3399";

};