Unverified Commit aff39a02 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

New boards, the Radxa ROCK S0, Radxa ZERO 3W/3E, CM3588 NAS solution
and Neardi LBA3368.

Interesting core changes: dropping of the rk3399pro dtsi - Dragan dug
through available information, boards and found out that the pcie-stuff
described in the existing rk3399pro dtsi is actually not true and the
file can go away.

And also a bit of reorganizing of rk3588 dtsi files. There are number
of rk3588 variants in existence that select between two sets of
peripherals and also multiple sets of operating points. So the change
sorts it differently so that we stop including one soc-variant into
others and also make room for the operating points.

The rk3308 got io domains, a number of additions to the rk3308-rock-pi-s
board (wifi, io-domains, otp, ethernet, uart, sdmmc).

And then there are of course the usual set of new additions like
rk3588 pcie endpoint support and individual peripherals for boards.

* tag 'v6.11-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (42 commits)
  arm64: dts: rockchip: Delete the SoC variant dtsi for RK3399Pro
  arm64: dts: rockchip: Fix mic-in-differential usage on rk3568-evb1-v10
  arm64: dts: rockchip: Fix mic-in-differential usage on rk3566-roc-pc
  arm64: dts: rockchip: Drop invalid mic-in-differential on rk3568-rock-3a
  arm64: dts: rockchip: Add rock5b overlays for PCIe endpoint mode
  arm64: dts: rockchip: Add PCIe endpoint mode support
  arm64: dts: rockchip: Increase VOP clk rate on RK3328
  arm64: dts: rockchip: add gpio-line-names to radxa-zero-3
  arm64: dts: rockchip: Split GPU OPPs of RK3588 and RK3588j
  arm64: dts: rockchip: Add OPP data for CPU cores on RK3588j
  arm64: dts: rockchip: Add OPP data for CPU cores on RK3588
  arm64: dts: rockchip: Add CPU/memory regulator coupling for 2 RK3588 boards
  arm64: dts: rockchip: fix mmc aliases for Radxa ZERO 3E/3W
  arm64: dts: rockchip: Add Neardi LBA3368 board
  dt-bindings: arm: rockchip: Add Neardi LBA3368
  dt-bindings: vendor-prefixes: Add Neardi Technology
  arm64: dts: rockchip: Enable PinePhone Pro vibrator
  arm64: dts: rockchip: Enable PinePhone Pro IMU sensor
  arm64: dts: rockchip: Add Pinephone Pro support for GPIO LEDs
  arm64: dts: rockchip: Enable SPI flash on PinePhone Pro
  ...

Link: https://lore.kernel.org/r/4901395.GXAFRqVoOG@diego


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 24c7b964 9417909e

Documentation/devicetree/bindings/arm/rockchip.yaml

+24 −0
Original line number Diff line number Diff line
@@ -248,6 +248,13 @@ properties: 
          - const: friendlyarm,nanopc-t6

          - const: rockchip,rk3588



      - description: FriendlyElec CM3588-based boards

        items:

          - enum:

              - friendlyarm,cm3588-nas

          - const: friendlyarm,cm3588

          - const: rockchip,rk3588



      - description: GameForce Chi

        items:

          - const: gameforce,chi
@@ -627,6 +634,11 @@ properties: 
          - const: mqmaker,miqi

          - const: rockchip,rk3288



      - description: Neardi LBA3368

        items:

          - const: neardi,lba3368

          - const: rockchip,rk3368



      - description: Netxeon R89 board

        items:

          - const: netxeon,r89
@@ -814,6 +826,18 @@ properties: 
          - const: radxa,rock-5b

          - const: rockchip,rk3588



      - description: Radxa ROCK S0

        items:

          - const: radxa,rock-s0

          - const: rockchip,rk3308



      - description: Radxa ZERO 3W/3E

        items:

          - enum:

              - radxa,zero-3e

              - radxa,zero-3w

          - const: rockchip,rk3566



      - description: Rikomagic MK808 v1

        items:

          - const: rikomagic,mk808

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -997,6 +997,8 @@ patternProperties: 
    description: MYIR Tech Limited

  "^national,.*":

    description: National Semiconductor

  "^neardi,.*":

    description: Shanghai Neardi Technology Co., Ltd.

  "^nec,.*":

    description: NEC LCD Technologies, Ltd.

  "^neonode,.*":

arch/arm64/boot/dts/rockchip/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-ringneck-haikou.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb.dtb

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-pi-s.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-s0.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a95x-z2.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-anbernic-rg351m.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-anbernic-rg351v.dtb
@@ -27,6 +28,7 @@ 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-lba3368.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-lion-haikou.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
@@ -90,6 +92,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-x55.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-radxa-cm3-io.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-radxa-zero-3e.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-radxa-zero-3w.dtb

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-rock-3c.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-blade.dtb
@@ -118,12 +122,15 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6a-io.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6a-wifi.dtbo

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6b-io.dtb

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-friendlyelec-cm3588-nas.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-jaguar.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-ok3588-c.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-orangepi-5-plus.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-quartzpro64.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b-pcie-ep.dtbo

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b-pcie-srns.dtbo

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-tiger-haikou.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-toybrick-x0.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-turing-rk1.dtb

arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts

+74 −7
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ aliases { 
		ethernet0 = &gmac;

		mmc0 = &emmc;

		mmc1 = &sdmmc;

		mmc2 = &sdio;

	};



	chosen {
@@ -136,11 +137,25 @@ &emmc { 


&gmac {

	clock_in_out = "output";

	phy-handle = <&rtl8201f>;

	phy-supply = <&vcc_io>;

	snps,reset-gpio = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;

	snps,reset-active-low;

	snps,reset-delays-us = <0 50000 50000>;

	status = "okay";



	mdio {

		compatible = "snps,dwmac-mdio";

		#address-cells = <1>;

		#size-cells = <0>;



		rtl8201f: ethernet-phy@1 {

			compatible = "ethernet-phy-ieee802.3-c22";

			reg = <1>;

			pinctrl-names = "default";

			pinctrl-0 = <&mac_rst>;

			reset-assert-us = <20000>;

			reset-deassert-us = <50000>;

			reset-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;

		};

	};

};



&gpio0 {
@@ -209,10 +224,40 @@ &i2c1 { 
	status = "okay";

};



&io_domains {

	vccio0-supply = <&vcc_io>;

	vccio1-supply = <&vcc_io>;

	vccio2-supply = <&vcc_io>;

	vccio3-supply = <&vcc_io>;

	vccio4-supply = <&vcc_1v8>;

	vccio5-supply = <&vcc_io>;

	status = "okay";

};



&pinctrl {

	pinctrl-names = "default";

	pinctrl-0 = <&rtc_32k>;



	bluetooth {

		bt_reg_on: bt-reg-on {

			rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		bt_wake_host: bt-wake-host {

			rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;

		};



		host_wake_bt: host-wake-bt {

			rockchip,pins = <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	gmac {

		mac_rst: mac-rst {

			rockchip,pins = <0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	leds {

		green_led_gio: green-led-gpio {

			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -256,15 +301,31 @@ &sdio { 
	cap-sd-highspeed;

	cap-sdio-irq;

	keep-power-in-suspend;

	max-frequency = <1000000>;

	max-frequency = <100000000>;

	mmc-pwrseq = <&sdio_pwrseq>;

	no-mmc;

	no-sd;

	non-removable;

	sd-uhs-sdr104;

	sd-uhs-sdr50;

	vmmc-supply = <&vcc_io>;

	vqmmc-supply = <&vcc_1v8>;

	status = "okay";



	rtl8723ds: wifi@1 {

		reg = <1>;

		interrupt-parent = <&gpio0>;

		interrupts = <RK_PA0 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "host-wake";

		pinctrl-names = "default";

		pinctrl-0 = <&wifi_host_wake>;

	};

};



&sdmmc {

	cap-mmc-highspeed;

	cap-sd-highspeed;

	disable-wp;

	vmmc-supply = <&vcc_io>;

	status = "okay";

};
@@ -283,16 +344,22 @@ u2phy_otg: otg-port { 
};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_xfer>;

	status = "okay";

};



&uart4 {

	uart-has-rtscts;

	status = "okay";



	bluetooth {

		compatible = "realtek,rtl8723bs-bt";

		device-wake-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;

		compatible = "realtek,rtl8723ds-bt";

		device-wake-gpios = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;

		enable-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;

		host-wake-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&bt_reg_on &bt_wake_host &host_wake_bt>;

	};

};

arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts

0 → 100644
+293 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)



/dts-v1/;



#include <dt-bindings/leds/common.h>

#include "rk3308.dtsi"



/ {

	model = "Radxa ROCK S0";

	compatible = "radxa,rock-s0", "rockchip,rk3308";



	aliases {

		ethernet0 = &gmac;

		mmc0 = &emmc;

		mmc1 = &sdmmc;

		mmc2 = &sdio;

	};



	chosen {

		stdout-path = "serial0:1500000n8";

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&pwr_led>;



		led-green {

			color = <LED_COLOR_ID_GREEN>;

			default-state = "on";

			function = LED_FUNCTION_HEARTBEAT;

			gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";

		};

	};



	vdd_log: regulator-1v04-vdd-log {

		compatible = "regulator-fixed";

		regulator-name = "vdd_log";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <1040000>;

		regulator-max-microvolt = <1040000>;

		vin-supply = <&vcc5v0_sys>;

	};



	vcc_ddr: regulator-1v5-vcc-ddr {

		compatible = "regulator-fixed";

		regulator-name = "vcc_ddr";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <1500000>;

		regulator-max-microvolt = <1500000>;

		vin-supply = <&vcc5v0_sys>;

	};



	vcc_1v8: regulator-1v8-vcc {

		compatible = "regulator-fixed";

		regulator-name = "vcc_1v8";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&vcc_io>;

	};



	vcc_io: regulator-3v3-vcc-io {

		compatible = "regulator-fixed";

		regulator-name = "vcc_io";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vcc5v0_sys>;

	};



	vcc5v0_sys: regulator-5v0-vcc-sys {

		compatible = "regulator-fixed";

		regulator-name = "vcc5v0_sys";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};



	vdd_core: regulator-vdd-core {

		compatible = "pwm-regulator";

		pwms = <&pwm0 0 5000 1>;

		pwm-supply = <&vcc5v0_sys>;

		regulator-name = "vdd_core";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <827000>;

		regulator-max-microvolt = <1340000>;

		regulator-settling-time-up-us = <250>;

	};



	sdio_pwrseq: sdio-pwrseq {

		compatible = "mmc-pwrseq-simple";

		pinctrl-names = "default";

		pinctrl-0 = <&wifi_reg_on>;

		reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;

	};

};



&cpu0 {

	cpu-supply = <&vdd_core>;

};



&emmc {

	cap-mmc-highspeed;

	no-sd;

	no-sdio;

	non-removable;

	pinctrl-names = "default";

	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_pwren>;

	vmmc-supply = <&vcc_io>;

	status = "okay";

};



&gmac {

	clock_in_out = "output";

	phy-handle = <&rtl8201f>;

	phy-supply = <&vcc_io>;

	status = "okay";



	mdio {

		compatible = "snps,dwmac-mdio";

		#address-cells = <1>;

		#size-cells = <0>;



		rtl8201f: ethernet-phy@1 {

			compatible = "ethernet-phy-ieee802.3-c22";

			reg = <1>;

			pinctrl-names = "default";

			pinctrl-0 = <&mac_rst>;

			reset-assert-us = <20000>;

			reset-deassert-us = <50000>;

			reset-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;

		};

	};

};



&io_domains {

	vccio0-supply = <&vcc_io>;

	vccio1-supply = <&vcc_io>;

	vccio2-supply = <&vcc_io>;

	vccio3-supply = <&vcc_io>;

	vccio4-supply = <&vcc_1v8>;

	vccio5-supply = <&vcc_io>;

	status = "okay";

};



&pinctrl {

	pinctrl-names = "default";

	pinctrl-0 = <&rtc_32k>;



	bluetooth {

		bt_reg_on: bt-reg-on {

			rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		bt_wake_host: bt-wake-host {

			rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;

		};



		host_wake_bt: host-wake-bt {

			rockchip,pins = <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	gmac {

		mac_rst: mac-rst {

			rockchip,pins = <0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	leds {

		pwr_led: pwr-led {

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

		};

	};



	wifi {

		wifi_reg_on: wifi-reg-on {

			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		wifi_wake_host: wifi-wake-host {

			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;

		};

	};

};



&pwm0 {

	pinctrl-names = "default";

	pinctrl-0 = <&pwm0_pin_pull_down>;

	status = "okay";

};



&saradc {

	vref-supply = <&vcc_1v8>;

	status = "okay";

};



&sdio {

	#address-cells = <1>;

	#size-cells = <0>;

	cap-sd-highspeed;

	cap-sdio-irq;

	keep-power-in-suspend;

	max-frequency = <50000000>;

	mmc-pwrseq = <&sdio_pwrseq>;

	no-mmc;

	no-sd;

	non-removable;

	vmmc-supply = <&vcc_io>;

	vqmmc-supply = <&vcc_1v8>;

	status = "okay";



	brcmf: wifi@1 {

		compatible = "brcm,bcm43430a1-fmac", "brcm,bcm4329-fmac";

		reg = <1>;

		interrupt-parent = <&gpio0>;

		interrupts = <RK_PA0 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "host-wake";

		pinctrl-names = "default";

		pinctrl-0 = <&wifi_wake_host>;

	};

};



&sdmmc {

	cap-mmc-highspeed;

	cap-sd-highspeed;

	disable-wp;

	vmmc-supply = <&vcc_io>;

	status = "okay";

};



&u2phy {

	status = "okay";

};



&u2phy_host {

	status = "okay";

};



&u2phy_otg {

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_xfer>;

	status = "okay";

};



&uart4 {

	uart-has-rtscts;

	status = "okay";



	bluetooth {

		compatible = "brcm,bcm43430a1-bt";

		clocks = <&cru SCLK_RTC32K>;

		clock-names = "lpo";

		interrupt-parent = <&gpio4>;

		interrupts = <RK_PB4 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "host-wakeup";

		device-wakeup-gpios = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;

		shutdown-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&bt_reg_on &bt_wake_host &host_wake_bt>;

		vbat-supply = <&vcc_io>;

		vddio-supply = <&vcc_1v8>;

	};

};



&usb_host_ehci {

	status = "okay";

};



&usb_host_ohci {

	status = "okay";

};



&usb20_otg {

	dr_mode = "peripheral";

	status = "okay";

};



&wdt {

	status = "okay";

};