Commit 13c4068f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

New board, the Khadas Edge 2L. Newly added peripherals are the
OTP nvmem controllers for RK3528, RK3562 and RK3566/8, SPDIF on RK3576.
The RK3566/8 SoCs now also control the Pipe-clocks on their PCIe
controllers and UFSHC controller on RK3576 got an additional reset line.

Apart from that are of course individual board changes and fixes for
older issues that are not specific to the current development cycle.

* tag 'v7.1-rockchip-dts64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

: (44 commits)
  arm64: dts: rockchip: configure hdmirx in Rock 5 ITX
  arm64: dts: rockchip: assign pipe clock to rk356x PCIe lanes
  arm64: dts: rockchip: Add mphy reset to ufshc node
  arm64: dts: rockchip: Enable OTP controller for RK3528
  arm64: dts: rockchip: Enable OTP controller for RK356x
  arm64: dts: rockchip: Enable OTP controller for RK3562
  arm64: dts: rockchip: Enable PCIe CLKREQ# for RK3588 on Rock 5b-5bp-5t series
  arm64: dts: rockchip: add SD/eMMC aliases for ArmSom Sige5
  arm64: dts: rockchip: Add SPDIF nodes to RK3576 device tree
  arm64: dts: rockchip: Add Khadas Edge 2L board
  dt-bindings: arm: rockchip: Add Khadas Edge 2L board
  arm64: dts: rockchip: Fix RK3562 EVB2 model name
  arm64: dts: rockchip: Correct Joystick Axes on Gameforce Ace
  arm64: dts: rockchip: Correct Fan Supply for Gameforce Ace
  Revert "arm64: dts: rockchip: add SPDIF audio to Beelink A1"
  arm64: dts: rockchip: Fix Bluetooth stability on LCKFB TaiShan Pi
  arm64: dts: rockchip: enable vicap dvp on wolfvision pf5 io expander
  arm64: dts: rockchip: Add analog audio switches to RK3576 EVB1
  arm64: dts: rockchip: Enable GPU on rk3566-pinenote
  arm64: dts: rockchip: Make Jaguar PCIe-refclk pin use pull-up config
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 44b5179e 6cb4ec63

Documentation/devicetree/bindings/arm/rockchip.yaml

+5 −0
Original line number Diff line number Diff line
@@ -754,6 +754,11 @@ properties: 
          - const: khadas,edge2

          - const: rockchip,rk3588s



      - description: Khadas Edge-2L series boards

        items:

          - const: khadas,edge-2l

          - const: rockchip,rk3576



      - description: Kobol Helios64

        items:

          - const: kobol,helios64

arch/arm64/boot/dts/rockchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-armsom-sige5-v1.2-wifibt.dtbo 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-evb1-v10.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-evb1-v10-pcie1.dtbo

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-evb2-v10.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-khadas-edge-2l.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-luckfox-omni3576.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-nanopi-m5.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-nanopi-r76s.dtb

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

+0 −23
Original line number Diff line number Diff line
@@ -58,24 +58,6 @@ ir-receiver { 
		gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>;

		linux,rc-map-name = "rc-beelink-gs1";

	};



	spdif_dit: spdif-dit {

		compatible = "linux,spdif-dit";

		#sound-dai-cells = <0>;

	};



	spdif_sound: spdif-sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "SPDIF";



		simple-audio-card,cpu {

			sound-dai = <&spdif>;

		};



		simple-audio-card,codec {

			sound-dai = <&spdif_dit>;

		};

	};

};



&analog_sound {
@@ -343,11 +325,6 @@ &sdmmc { 
	status = "okay";

};



&spdif {

	pinctrl-0 = <&spdifm0_tx>;

	status = "okay";

};



&tsadc {

	rockchip,hw-tshut-mode = <0>;

	rockchip,hw-tshut-polarity = <0>;

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

+47 −0
Original line number Diff line number Diff line
@@ -1190,6 +1190,53 @@ sdmmc: mmc@ffc30000 { 
			status = "disabled";

		};



		otp: efuse@ffce0000 {

			compatible = "rockchip,rk3528-otp";

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

			clocks = <&cru CLK_USER_OTPC_NS>, <&cru PCLK_OTPC_NS>,

				 <&cru CLK_SBPI_OTPC_NS>;

			clock-names = "otp", "apb_pclk", "sbpi";

			resets = <&cru SRST_USER_OTPC_NS>, <&cru SRST_P_OTPC_NS>,

				 <&cru SRST_SBPI_OTPC_NS>;

			reset-names = "otp", "apb", "sbpi";



			nvmem-layout {

				compatible = "fixed-layout";

				#address-cells = <1>;

				#size-cells = <1>;



				cpu_code: cpu-code@2 {

					reg = <0x02 0x2>;

				};



				otp_cpu_version: cpu-version@8 {

					reg = <0x08 0x1>;

					bits = <3 3>;

				};



				otp_id: id@a {

					reg = <0x0a 0x10>;

				};



				cpu_leakage: cpu-leakage@1a {

					reg = <0x1a 0x1>;

				};



				logic_leakage: logic-leakage@1b {

					reg = <0x1b 0x1>;

				};



				gpu_leakage: gpu-leakage@1c {

					reg = <0x1c 0x1>;

				};



				tsadc_trim: tsadc-trim@44 {

					reg = <0x44 0x2>;

					bits = <0 10>;

				};

			};

		};



		dmac: dma-controller@ffd60000 {

			compatible = "arm,pl330", "arm,primecell";

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

arch/arm64/boot/dts/rockchip/rk3562-evb2-v10.dts

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include "rk3562.dtsi"



/ {

	model = "Rockchip RK3562 EVB V20 Board";

	model = "Rockchip RK3562 EVB2 V10 Board";

	compatible = "rockchip,rk3562-evb2-v10", "rockchip,rk3562";



	chosen: chosen {