Unverified Commit 73a4ccf9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

New board the Radxa Rock Pi S, enablement of graphics support and hdmi-audio
on rk356x in general plus necessary board-specific changes on Rock-3A,
Quartz64-A, rk3568-evb, BPI-R2-Pro.

A number of additional peripherals on BPI-R2-Pro (gpu, thermal, rtc) and
PCIe2x1 support on rk3568 and enablement on Quart64-A as well as a number
of additional peripherals to this board (sfc node, sdr-104 support, fan).

And finally touch panel support for rockpro64 and some misc dt cleanups
(node names for dtschema and styling).

* tag 'v5.20-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (27 commits)
  arm64: dts: rockchip: enable hdmi tx audio on rock-3a
  arm64: dts: rockchip: enable hdmi tx audio on rk3568-evb1-v10
  arm64: dts: rockchip: align gpio-key node names with dtschema
  arm64: dts: rockchip: rock-pi-s add more peripherals
  arm64: dts: rockchip: add ROCK Pi S DTS support
  dt-bindings: arm: rockchip: Add Radxa ROCK Pi S
  arm64: dts: rockchip: Add missing space around regulator-name on rk3368-orion-r68
  arm64: dts: rockchip: enable the gpu on BPI-R2-Pro
  arm64: dts: rockchip: configure thermal shutdown for BPI-R2-Pro
  arm64: dts: rockchip: Enable HDMI audio on BPI R2 Pro
  arm64: dts: rockchip: enable vop2 and hdmi tx on BPI-R2-Pro
  arm64: dts: rockchip: set display regulators to always-on on BPI-R2-Pro
  arm64: dts: rockchip: add RTC to BPI-R2 Pro
  arm64: dts: rockchip: Enable HDMI audio on Quartz64 A
  arm64: dts: rockchip: Add HDMI audio nodes to rk356x
  arm64: dts: rockchip: adjust whitespace around '='
  arm64: dts: rockchip: enable vop2 and hdmi tx on rock-3a
  arm64: dts: rockchip: enable vop2 and hdmi tx on quartz64a
  arm64: dts: rockchip: rk3568-evb: Enable VOP2 and hdmi
  arm64: dts: rockchip: rk356x: Add HDMI nodes
  ...

Link: https://lore.kernel.org/r/40088956.J2Yia2DhmK@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9b47c574 9eee552f

Documentation/devicetree/bindings/arm/rockchip.yaml

+5 −0
Original line number Diff line number Diff line
@@ -554,6 +554,11 @@ properties: 
          - const: vamrs,rk3399pro-vmarc-som

          - const: rockchip,rk3399pro



      - description: Radxa ROCK Pi S

        items:

          - const: radxa,rockpis

          - const: rockchip,rk3308



      - description: Radxa Rock2 Square

        items:

          - const: radxa,rock2-square

arch/arm64/boot/dts/rockchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-ctouch2-of10.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-edimm2.2.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) += rk3318-a95x-z2.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb

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

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ gpio-keys { 
		pinctrl-names = "default";

		pinctrl-0 = <&pwr_key>;



		power {

		key-power {

			gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			label = "GPIO Key Power";

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

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

/*

 * Copyright (c) 2019 Akash Gajjar <akash@openedev.com>

 * Copyright (c) 2019 Jagan Teki <jagan@openedev.com>

 */



/dts-v1/;

#include "rk3308.dtsi"



/ {

	model = "Radxa ROCK Pi S";

	compatible = "radxa,rockpis", "rockchip,rk3308";



	aliases {

		ethernet0 = &gmac;

		mmc0 = &emmc;

		mmc1 = &sdmmc;

	};



	chosen {

		stdout-path = "serial0:1500000n8";

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&green_led_gio>, <&heartbeat_led_gpio>;



		green-led {

			default-state = "on";

			gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;

			label = "rockpis:green:power";

			linux,default-trigger = "default-on";

		};



		blue-led {

			default-state = "on";

			gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;

			label = "rockpis:blue:user";

			linux,default-trigger = "heartbeat";

		};

	};



	sdio_pwrseq: sdio-pwrseq {

		compatible = "mmc-pwrseq-simple";

		pinctrl-0 = <&wifi_enable_h>;

		pinctrl-names = "default";

		reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;

	};



	vcc_1v8: vcc-1v8 {

		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: 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>;

	};



	vcc_ddr: 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>;

	};



	vcc5v0_otg: vcc5v0-otg {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&otg_vbus_drv>;

		regulator-name = "vcc5v0_otg";

		regulator-always-on;

		vin-supply = <&vcc5v0_sys>;

	};



	vcc5v0_sys: vcc5v0-sys {

		compatible = "regulator-fixed";

		regulator-name = "vcc5v0_sys";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};



	vdd_core: vdd-core {

		compatible = "pwm-regulator";

		pwms = <&pwm0 0 5000 1>;

		pwm-supply = <&vcc5v0_sys>;

		regulator-name = "vdd_core";

		regulator-min-microvolt = <827000>;

		regulator-max-microvolt = <1340000>;

		regulator-init-microvolt = <1015000>;

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

		regulator-always-on;

		regulator-boot-on;

	};



	vdd_log: vdd-log {

		compatible = "regulator-fixed";

		regulator-name = "vdd_log";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <1050000>;

		regulator-max-microvolt = <1050000>;

		vin-supply = <&vcc5v0_sys>;

	};

};



&cpu0 {

	cpu-supply = <&vdd_core>;

};



&emmc {

	bus-width = <4>;

	cap-mmc-highspeed;

	mmc-hs200-1_8v;

	non-removable;

	vmmc-supply = <&vcc_io>;

	status = "okay";

};



&gmac {

	clock_in_out = "output";

	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";

};



&i2c1 {

	status = "okay";

};



&pinctrl {

	pinctrl-names = "default";

	pinctrl-0 = <&rtc_32k>;



	leds {

		green_led_gio: green-led-gpio {

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

		};



		heartbeat_led_gpio: heartbeat-led-gpio {

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

		};

	};



	usb {

		otg_vbus_drv: otg-vbus-drv {

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

		};

	};



	sdio-pwrseq {

		wifi_enable_h: wifi-enable-h {

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

		};



		wifi_host_wake: wifi-host-wake {

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

		};

	};

};



&pwm0 {

	status = "okay";

	pinctrl-0 = <&pwm0_pin_pull_down>;

};



&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 = <1000000>;

	mmc-pwrseq = <&sdio_pwrseq>;

	non-removable;

	sd-uhs-sdr104;

	status = "okay";

};



&sdmmc {

	cap-sd-highspeed;

	status = "okay";

};



&u2phy {

	status = "okay";



	u2phy_host: host-port {

		phy-supply = <&vcc5v0_otg>;

		status = "okay";

	};



	u2phy_otg: otg-port {

		phy-supply = <&vcc5v0_otg>;

		status = "okay";

	};

};



&uart0 {

	status = "okay";

};



&uart4 {

	status = "okay";



	bluetooth {

		compatible = "realtek,rtl8723bs-bt";

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

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

	};

};



&usb_host_ehci {

	status = "okay";

};



&usb_host_ohci {

	status = "okay";

};



&usb20_otg {

	dr_mode = "peripheral";

	status = "okay";

};



&wdt {

	status = "okay";

};

arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts

+16 −16
Original line number Diff line number Diff line
@@ -71,82 +71,82 @@ gpio-keys { 
		 * |------------------------------------------------|

		 */



		sw1 {

		button-sw1 {

			gpios = <&gpio1 RK_PB4 GPIO_ACTIVE_LOW>;

			label = "DPAD-UP";

			linux,code = <BTN_DPAD_UP>;

		};

		sw2 {

		button-sw2 {

			gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_LOW>;

			label = "DPAD-DOWN";

			linux,code = <BTN_DPAD_DOWN>;

		};

		sw3 {

		button-sw3 {

			gpios = <&gpio1 RK_PB6 GPIO_ACTIVE_LOW>;

			label = "DPAD-LEFT";

			linux,code = <BTN_DPAD_LEFT>;

		};

		sw4 {

		button-sw4 {

			gpios = <&gpio1 RK_PB7 GPIO_ACTIVE_LOW>;

			label = "DPAD-RIGHT";

			linux,code = <BTN_DPAD_RIGHT>;

		};

		sw5 {

		button-sw5 {

			gpios = <&gpio1 RK_PA2 GPIO_ACTIVE_LOW>;

			label = "BTN-A";

			linux,code = <BTN_EAST>;

		};

		sw6 {

		button-sw6 {

			gpios = <&gpio1 RK_PA5 GPIO_ACTIVE_LOW>;

			label = "BTN-B";

			linux,code = <BTN_SOUTH>;

		};

		sw7 {

		button-sw7 {

			gpios = <&gpio1 RK_PA6 GPIO_ACTIVE_LOW>;

			label = "BTN-Y";

			linux,code = <BTN_WEST>;

		};

		sw8 {

		button-sw8 {

			gpios = <&gpio1 RK_PA7 GPIO_ACTIVE_LOW>;

			label = "BTN-X";

			linux,code = <BTN_NORTH>;

		};

		sw9 {

		button-sw9 {

			gpios = <&gpio2 RK_PA0 GPIO_ACTIVE_LOW>;

			label = "F1";

			linux,code = <BTN_TRIGGER_HAPPY1>;

		};

		sw10 {

		button-sw10 {

			gpios = <&gpio2 RK_PA1 GPIO_ACTIVE_LOW>;

			label = "F2";

			linux,code = <BTN_TRIGGER_HAPPY2>;

		};

		sw11 {

		button-sw11 {

			gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>;

			label = "F3";

			linux,code = <BTN_TRIGGER_HAPPY3>;

		};

		sw12 {

		button-sw12 {

			gpios = <&gpio2 RK_PA3 GPIO_ACTIVE_LOW>;

			label = "F4";

			linux,code = <BTN_TRIGGER_HAPPY4>;

		};

		sw13 {

		button-sw13 {

			gpios = <&gpio2 RK_PA4 GPIO_ACTIVE_LOW>;

			label = "F5";

			linux,code = <BTN_TRIGGER_HAPPY5>;

		};

		sw14 {

		button-sw14 {

			gpios = <&gpio2 RK_PA5 GPIO_ACTIVE_LOW>;

			label = "F6";

			linux,code = <BTN_TRIGGER_HAPPY6>;

		};

		sw15 {

		button-sw15 {

			gpios = <&gpio2 RK_PA6 GPIO_ACTIVE_LOW>;

			label = "TOP-LEFT";

			linux,code = <BTN_TL>;

		};

		sw16 {

		button-sw16 {

			gpios = <&gpio2 RK_PA7 GPIO_ACTIVE_LOW>;

			label = "TOP-RIGHT";

			linux,code = <BTN_TR>;