Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd553821 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.17-rockchip-dts64-1' of... 

Merge tag 'v4.17-rockchip-dts64-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Pull "Rockchip dts64 changes for 4.17" from Heiko Stübner:

The rk3399 gained support its Cadence displayport controller and some
minor additions like pins for 2ch i2s0 and the cif test clocks as well
as a default rate for ACLK_VIO that should be 400MHz according to the TRM.

The rk3328 got uart dmas fixed - a non-critical fix, as nobody was using
that so far.

New boards are the rk3328-based roc-rk3328-cc, the rk3368-based Lion-SOM
+ baseborad from Theobroma Systems and a standalone variant of the Sapphire
board, as a lot of people where using that without the Exkavator baseboard.

Sapphire also saw a lot of small cleanups of things that are not part
of the actual Sapphire board, but the baseboard instead. The rk3399-puma
board got i2s and tsadc support and Gru got its DP node enabled.

* tag 'v4.17-rockchip-dts64-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: remove keep-power-in-suspend from sdhci of rk3399-sapphire
  arm64: dts: rockchip: assign clock rate for ACLK_VIO on rk3399
  arm64: dts: rockchip: add a standalone version of the rk3399 sapphire
  arm64: dts: rockchip: move rk3399-sapphire pwr_btn to daughterboard
  arm64: dts: rockchip: move rk3399-sapphire i2s2 to daughterboard
  arm64: dts: rockchip: move rk3399-sapphire sdio to excavator baseboard
  arm64: dts: rockchip: enable I2S codec on rk3399-puma-haikou
  arm64: dts: rockchip: move i2s0 node from baseboard to SoM on rk3399-puma
  arm64: dts: rockchip: vdd_log on rk3399-sapphire is not an i2c slave
  arm64: dts: rockchip: add Haikou baseboard with RK3368-uQ7 SoM
  arm64: dts: rockchip: add RK3368-uQ7 (Lion) SoM
  dt-bindings: add RK3368-uQ7 SoM and EVK base board
  arm64: dts: rockchip: Fix RK3328 UART DMAs
  arm64: dts: rockchip: enable DP for rk3399-gru
  arm64: dts: rockchip: add cdn-dp node for rk3399.
  arm64: dts: rockchip: add i2s0-2ch-bus pins on rk3399
  arm64: dts: rockchip: enable tsadc on rk3399-puma
  arm64: dts: rockchip: add roc-rk3328-cc board
  arm64: dts: rockchip: Add cif test clocks for rk3399
parents 3eb8d21a 3783f1eb

Documentation/devicetree/bindings/arm/rockchip.txt

+12 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ Rockchip platforms device tree bindings 
    Required root node properties:

      - compatible = "firefly,firefly-rk3399", "rockchip,rk3399";



- Firefly roc-rk3328-cc board:

    Required root node properties:

      - compatible = "firefly,roc-rk3328-cc", "rockchip,rk3328";



- ChipSPARK PopMetal-RK3288 board:

    Required root node properties:

      - compatible = "chipspark,popmetal-rk3288", "rockchip,rk3288";
@@ -181,10 +185,18 @@ Rockchip platforms device tree bindings 
    Required root node properties:

      - compatible = "rockchip,rk3399-evb", "rockchip,rk3399";



- Rockchip RK3399 Sapphire board standalone:

    Required root node properties:

      - compatible = "rockchip,rk3399-sapphire", "rockchip,rk3399";



- Rockchip RK3399 Sapphire Excavator board:

    Required root node properties:

      - compatible = "rockchip,rk3399-sapphire-excavator", "rockchip,rk3399";



- Theobroma Systems RK3368-uQ7 Haikou Baseboard:

    Required root node properties:

      - compatible = "tsd,rk3368-uq7-haikou", "rockchip,rk3368";



- Theobroma Systems RK3399-Q7 Haikou Baseboard:

    Required root node properties:

      - compatible = "tsd,rk3399-q7-haikou", "rockchip,rk3399";

arch/arm64/boot/dts/rockchip/Makefile

+3 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

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

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

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

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
@@ -10,4 +12,5 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb

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

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

arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts

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

/*

 * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd

 */



/dts-v1/;

#include "rk3328.dtsi"



/ {

	model = "Firefly roc-rk3328-cc";

	compatible = "firefly,roc-rk3328-cc", "rockchip,rk3328";



	chosen {

		stdout-path = "serial2:1500000n8";

	};



	gmac_clkin: external-gmac-clock {

		compatible = "fixed-clock";

		clock-frequency = <125000000>;

		clock-output-names = "gmac_clkin";

		#clock-cells = <0>;

	};



	dc_12v: dc-12v {

		compatible = "regulator-fixed";

		regulator-name = "dc_12v";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

	};



	vcc_sd: sdmmc-regulator {

		compatible = "regulator-fixed";

		gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&sdmmc0m1_gpio>;

		regulator-name = "vcc_sd";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vcc_io>;

	};



	vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&usb20_host_drv>;

		regulator-name = "vcc_host1_5v";

		regulator-always-on;

		vin-supply = <&vcc_sys>;

	};



	vcc_sys: vcc-sys {

		compatible = "regulator-fixed";

		regulator-name = "vcc_sys";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&dc_12v>;

	};



	vcc_phy: vcc-phy-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vcc_phy";

		regulator-always-on;

		regulator-boot-on;

	};

};



&cpu0 {

	cpu-supply = <&vdd_arm>;

};



&emmc {

	bus-width = <8>;

	cap-mmc-highspeed;

	non-removable;

	pinctrl-names = "default";

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

	status = "okay";

};



&gmac2io {

	assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;

	assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>;

	clock_in_out = "input";

	phy-supply = <&vcc_phy>;

	phy-mode = "rgmii";

	pinctrl-names = "default";

	pinctrl-0 = <&rgmiim1_pins>;

	snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;

	snps,reset-active-low;

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

	tx_delay = <0x25>;

	rx_delay = <0x11>;

	status = "okay";

};



&i2c1 {

	status = "okay";



	rk805: pmic@18 {

		compatible = "rockchip,rk805";

		reg = <0x18>;

		interrupt-parent = <&gpio1>;

		interrupts = <24 IRQ_TYPE_LEVEL_LOW>;

		#clock-cells = <1>;

		clock-output-names = "xin32k", "rk805-clkout2";

		gpio-controller;

		#gpio-cells = <2>;

		pinctrl-names = "default";

		pinctrl-0 = <&pmic_int_l>;

		rockchip,system-power-controller;

		wakeup-source;



		vcc1-supply = <&vcc_sys>;

		vcc2-supply = <&vcc_sys>;

		vcc3-supply = <&vcc_sys>;

		vcc4-supply = <&vcc_sys>;

		vcc5-supply = <&vcc_io>;

		vcc6-supply = <&vcc_io>;



		regulators {

			vdd_logic: DCDC_REG1 {

				regulator-name = "vdd_logic";

				regulator-min-microvolt = <712500>;

				regulator-max-microvolt = <1450000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1000000>;

				};

			};



			vdd_arm: DCDC_REG2 {

				regulator-name = "vdd_arm";

				regulator-min-microvolt = <712500>;

				regulator-max-microvolt = <1450000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <950000>;

				};

			};



			vcc_ddr: DCDC_REG3 {

				regulator-name = "vcc_ddr";

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

				};

			};



			vcc_io: DCDC_REG4 {

				regulator-name = "vcc_io";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <3300000>;

				};

			};



			vcc_18: LDO_REG1 {

				regulator-name = "vcc_18";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1800000>;

				};

			};



			vcc18_emmc: LDO_REG2 {

				regulator-name = "vcc18_emmc";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1800000>;

				};

			};



			vdd_10: LDO_REG3 {

				regulator-name = "vdd_10";

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1000000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1000000>;

				};

			};

		};

	};

};



&pinctrl {

	pmic {

		pmic_int_l: pmic-int-l {

			rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;

		};

	};



	usb2 {

		usb20_host_drv: usb20-host-drv {

			rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

};



&sdmmc {

	bus-width = <4>;

	cap-mmc-highspeed;

	cap-sd-highspeed;

	disable-wp;

	max-frequency = <150000000>;

	pinctrl-names = "default";

	pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>;

	vmmc-supply = <&vcc_sd>;

	status = "okay";

};



&tsadc {

	status = "okay";

};



&u2phy {

	status = "okay";

};



&u2phy_host {

	status = "okay";

};



&u2phy_otg {

	status = "okay";

};



&uart2 {

	status = "okay";

};



&usb20_otg {

	status = "okay";

};



&usb_host0_ehci {

	status = "okay";

};



&usb_host0_ohci {

	status = "okay";

};

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

+3 −3
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ 
		clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;

		clock-names = "baudclk", "apb_pclk";

		dmas = <&dmac 2>, <&dmac 3>;

		#dma-cells = <2>;

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

		pinctrl-names = "default";

		pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;

		reg-io-width = <4>;
@@ -333,7 +333,7 @@ 
		clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;

		clock-names = "sclk_uart", "pclk_uart";

		dmas = <&dmac 4>, <&dmac 5>;

		#dma-cells = <2>;

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

		pinctrl-names = "default";

		pinctrl-0 = <&uart1_xfer &uart1_cts &uart1_rts>;

		reg-io-width = <4>;
@@ -348,7 +348,7 @@ 
		clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>;

		clock-names = "baudclk", "apb_pclk";

		dmas = <&dmac 6>, <&dmac 7>;

		#dma-cells = <2>;

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

		pinctrl-names = "default";

		pinctrl-0 = <&uart2m1_xfer>;

		reg-io-width = <4>;

arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts

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

/*

 * Copyright (c) 2018 Theobroma Systems Design und Consulting GmbH

 */



/dts-v1/;

#include "rk3368-lion.dtsi"



/ {

	model = "Theobroma Systems RK3368-uQ7 Baseboard";

	compatible = "tsd,rk3368-lion-haikou", "rockchip,rk3368";



	chosen {

		stdout-path = "serial0:115200n8";

	};



	i2cmux2 {

		i2c@0 {

			eeprom: eeprom@50 {

				compatible = "atmel,24c01";

				pagesize = <8>;

				reg = <0x50>;

			};

		};

	};



	leds {

		pinctrl-0 = <&led_pins_module>, <&led_sd_haikou>;



		sd-card-led {

			label = "sd_card_led";

			gpios = <&gpio0 RK_PD2 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "mmc0";

		};

	};



	dc_12v: dc-12v {

		compatible = "regulator-fixed";

		regulator-name = "dc_12v";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

	};



	vcc3v3_baseboard: vcc3v3-baseboard {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3_baseboard";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&dc_12v>;

	};



	vcc5v0_otg: vcc5v0-otg-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&otg_vbus_drv>;

		regulator-name = "vcc5v0_otg";

		regulator-always-on;

	};

};



&sdmmc {

	bus-width = <4>;

	cap-mmc-highspeed;

	cap-sd-highspeed;

	cd-gpios = <&gpio2 RK_PB3 GPIO_ACTIVE_LOW>;

	disable-wp;

	max-frequency = <25000000>;

	pinctrl-names = "default";

	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;

	rockchip,default-sample-phase = <90>;

	vmmc-supply = <&vcc3v3_baseboard>;

	status = "okay";

};



&spi2 {

	cs-gpios = <0>, <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>;

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;

	status = "okay";

};



&usb_otg {

	dr_mode = "otg";

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;

	status = "okay";

};



&uart1 {

	/* alternate function of GPIO5/6 */

	status = "disabled";

};



&pinctrl {

	pinctrl-names = "default";

	pinctrl-0 = <&haikou_pin_hog>;



	hog {

		haikou_pin_hog: haikou-pin-hog {

			rockchip,pins =

				/* LID_BTN */

				<RK_GPIO3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>,

				/* BATLOW# */

				<RK_GPIO0 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>,

				/* SLP_BTN# */

				<RK_GPIO3 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>,

				/* BIOS_DISABLE# */

				<RK_GPIO3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;

		};

	};



	leds {

		led_sd_haikou: led-sd-gpio {

			rockchip,pins =

				<RK_GPIO0 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	sdmmc {

		sdmmc_cd_gpio: sdmmc-cd-gpio {

			rockchip,pins =

				<RK_GPIO2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	usb_otg {

		otg_vbus_drv: otg-vbus-drv {

			rockchip,pins =

				<RK_GPIO0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

};