diff mbox

[2/2] ARM: dts: rockchip: add dts for RK3288-Tinker board

Message ID 1484791919-4665-3-git-send-email-eddie.cai@rock-chips.com (mailing list archive)
State New, archived
Headers show

Commit Message

Eddie Cai Jan. 19, 2017, 2:11 a.m. UTC
This patch add basic support for RK3288-Tinker board. We can boot in to rootfs
with this patch.

Signed-off-by: Eddie Cai <eddie.cai@rock-chips.com>
---
 arch/arm/boot/dts/Makefile          |   1 +
 arch/arm/boot/dts/rk3288-tinker.dts | 556 ++++++++++++++++++++++++++++++++++++
 2 files changed, 557 insertions(+)
 create mode 100644 arch/arm/boot/dts/rk3288-tinker.dts

Comments

Heiko Stübner Jan. 19, 2017, 9:58 a.m. UTC | #1
Hi Eddie,

Am Donnerstag, 19. Januar 2017, 10:11:59 CET schrieb Eddie Cai:
> This patch add basic support for RK3288-Tinker board. We can boot in to
> rootfs with this patch.
> 
> Signed-off-by: Eddie Cai <eddie.cai@rock-chips.com>

looks good in general, just some small question down below.

[...]

> +	/*
> +	 * NOTE: vcc_sd isn't hooked up on v1.0 boards where power comes from
> +	 * vcc_io directly.  Those boards won't be able to power cycle SD cards
> +	 * but it shouldn't hurt to toggle this pin there anyway.
> +	 */

just to clarify, later board will have that pin connected, right?

> +	vcc_sd: sdmmc-regulator {
> +		compatible = "regulator-fixed";
> +		gpio = <&gpio7 11 GPIO_ACTIVE_LOW>;
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&sdmmc_pwr>;
> +		regulator-name = "vcc_sd";
> +		regulator-min-microvolt = <3300000>;
> +		regulator-max-microvolt = <3300000>;
> +		startup-delay-us = <100000>;
> +		vin-supply = <&vcc_io>;
> +	};
> +};

[...]

> +&hdmi {
> +	#address-cells = <1>;
> +	#size-cells = <0>;
> +	#sound-dai-cells = <0>;
> +	ddc-i2c-bus = <&i2c5>;
> +	status = "okay";
> +	/* Don't use vopl for HDMI */
> +	ports {
> +		hdmi_in: port {
> +			/delete-node/ endpoint@1;
> +		};

what is the reason for this? You enable both VOPs below and the linux display 
subsystem should be able to select an appropriate VOP for output just fine on 
its own. So there should be no reason for capping the hdmi's connection to one 
of the vops.

> +	};
> +};

[...]

> +&usb_host0_ehci {
> +	no-relinquish-port;

This seems like an unused/undocumented property

> +	status = "okay";
> +};

[...]

> +&vopl {
> +	status = "okay";
> +	/* Don't use vopl for HDMI */
> +	vopl_out: port {
> +		/delete-node/ endpoint@0;
> +	};

see comment at the hdmi node

> +};


Thanks
Heiko
Shawn Lin Jan. 20, 2017, 2:29 a.m. UTC | #2
On 2017/1/19 10:11, Eddie Cai wrote:
> This patch add basic support for RK3288-Tinker board. We can boot in to rootfs
> with this patch.
>
> Signed-off-by: Eddie Cai <eddie.cai@rock-chips.com>
> ---
>  arch/arm/boot/dts/Makefile          |   1 +
>  arch/arm/boot/dts/rk3288-tinker.dts | 556 ++++++++++++++++++++++++++++++++++++
>  2 files changed, 557 insertions(+)
>  create mode 100644 arch/arm/boot/dts/rk3288-tinker.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 7327250..4fc05b7 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -679,6 +679,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
>  	rk3288-popmetal.dtb \
>  	rk3288-r89.dtb \
>  	rk3288-rock2-square.dtb \
> +	rk3288-tinker.dtb \
>  	rk3288-veyron-brain.dtb \
>  	rk3288-veyron-jaq.dtb \
>  	rk3288-veyron-jerry.dtb \
> diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
> new file mode 100644
> index 0000000..37cb431
> --- /dev/null
> +++ b/arch/arm/boot/dts/rk3288-tinker.dts
> @@ -0,0 +1,556 @@
> +/*
> + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
> + *
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> + *
> + *  a) This file is free software; you can redistribute it and/or
> + *     modify it under the terms of the GNU General Public License as
> + *     published by the Free Software Foundation; either version 2 of the
> + *     License, or (at your option) any later version.
> + *
> + *     This file is distributed in the hope that it will be useful,
> + *     but WITHOUT ANY WARRANTY; without even the implied warranty of
> + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + *     GNU General Public License for more details.
> + *
> + * Or, alternatively,
> + *
> + *  b) Permission is hereby granted, free of charge, to any person
> + *     obtaining a copy of this software and associated documentation
> + *     files (the "Software"), to deal in the Software without
> + *     restriction, including without limitation the rights to use,
> + *     copy, modify, merge, publish, distribute, sublicense, and/or
> + *     sell copies of the Software, and to permit persons to whom the
> + *     Software is furnished to do so, subject to the following
> + *     conditions:
> + *
> + *     The above copyright notice and this permission notice shall be
> + *     included in all copies or substantial portions of the Software.
> + *
> + *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> + *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + *     OTHER DEALINGS IN THE SOFTWARE.
> + */
> +
> +/dts-v1/;
> +
> +#include "rk3288.dtsi"
> +
> +/ {
> +	model = "Rockchip RK3288 Tinker Board";
> +	compatible = "rockchip,rk3288-tinker", "rockchip,rk3288";
> +
> +	memory {
> +		reg = <0x0 0x80000000>;
> +		device_type = "memory";
> +	};
> +
> +	ext_gmac: external-gmac-clock {
> +		compatible = "fixed-clock";
> +		#clock-cells = <0>;
> +		clock-frequency = <125000000>;
> +		clock-output-names = "ext_gmac";
> +	};
> +
> +	gpio-keys {
> +		compatible = "gpio-keys";
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +		autorepeat;
> +
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&pwrbtn>;
> +
> +		button@0 {
> +			gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
> +			linux,code = <116>;
> +			label = "GPIO Key Power";
> +			linux,input-type = <1>;
> +			gpio-key,wakeup = <1>;
> +			debounce-interval = <100>;
> +		};
> +	};
> +
> +	gpio-leds {
> +		compatible = "gpio-leds";
> +
> +		pwr-led {
> +			gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
> +			linux,default-trigger = "default-on";
> +		};
> +
> +		act-led {
> +			gpios=<&gpio2 3 GPIO_ACTIVE_LOW>;
> +			linux,default-trigger="mmc0";
> +		};
> +	};
> +
> +	sound {
> +		compatible = "simple-audio-card";
> +		simple-audio-card,format = "i2s";
> +		simple-audio-card,name = "rockchip,tinker-codec";
> +		simple-audio-card,mclk-fs = <512>;
> +		simple-audio-card,cpu {
> +			sound-dai = <&i2s>;
> +		};
> +		simple-audio-card,codec {
> +			sound-dai = <&hdmi>;
> +		};
> +	};
> +
> +	vcc_sys: vsys-regulator {
> +		compatible = "regulator-fixed";
> +		regulator-name = "vcc_sys";
> +		regulator-min-microvolt = <5000000>;
> +		regulator-max-microvolt = <5000000>;
> +		regulator-always-on;
> +		regulator-boot-on;
> +	};
> +
> +	/*
> +	 * NOTE: vcc_sd isn't hooked up on v1.0 boards where power comes from
> +	 * vcc_io directly.  Those boards won't be able to power cycle SD cards
> +	 * but it shouldn't hurt to toggle this pin there anyway.
> +	 */
> +	vcc_sd: sdmmc-regulator {
> +		compatible = "regulator-fixed";
> +		gpio = <&gpio7 11 GPIO_ACTIVE_LOW>;
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&sdmmc_pwr>;
> +		regulator-name = "vcc_sd";
> +		regulator-min-microvolt = <3300000>;
> +		regulator-max-microvolt = <3300000>;
> +		startup-delay-us = <100000>;
> +		vin-supply = <&vcc_io>;
> +	};
> +};
> +
> +&cpu0 {
> +	cpu0-supply = <&vdd_cpu>;
> +};
> +
> +&gmac {
> +	phy-supply = <&vcc33_lan>;
> +	phy-mode = "rgmii";
> +	clock_in_out = "input";
> +	snps,reset-gpio = <&gpio4 7 0>;
> +	snps,reset-active-low;
> +	snps,reset-delays-us = <0 10000 1000000>;
> +	assigned-clocks = <&cru SCLK_MAC>;
> +	assigned-clock-parents = <&ext_gmac>;
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&rgmii_pins>;
> +	tx_delay = <0x30>;
> +	rx_delay = <0x10>;
> +	status = "ok";
> +};
> +
> +&hdmi {
> +	#address-cells = <1>;
> +	#size-cells = <0>;
> +	#sound-dai-cells = <0>;
> +	ddc-i2c-bus = <&i2c5>;
> +	status = "okay";
> +	/* Don't use vopl for HDMI */
> +	ports {
> +		hdmi_in: port {
> +			/delete-node/ endpoint@1;
> +		};
> +	};
> +};
> +
> +&i2c0 {
> +	status = "okay";
> +	clock-frequency = <400000>;
> +
> +	rk808: pmic@1b {
> +		compatible = "rockchip,rk808";
> +		reg = <0x1b>;
> +		interrupt-parent = <&gpio0>;
> +		interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&pmic_int &global_pwroff &dvs_1 &dvs_2>;
> +		dvs-gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>,
> +				<&gpio0 12 GPIO_ACTIVE_HIGH>;
> +
> +		rockchip,system-power-controller;
> +		wakeup-source;
> +		#clock-cells = <1>;
> +		clock-output-names = "xin32k", "rk808-clkout2";
> +
> +		vcc1-supply = <&vcc_sys>;
> +		vcc2-supply = <&vcc_sys>;
> +		vcc3-supply = <&vcc_sys>;
> +		vcc4-supply = <&vcc_sys>;
> +		vcc6-supply = <&vcc_sys>;
> +		vcc7-supply = <&vcc_sys>;
> +		vcc8-supply = <&vcc_18>;
> +		vcc9-supply = <&vcc_io>;
> +		vcc10-supply = <&vcc_io>;
> +		vcc11-supply = <&vcc_sys>;
> +		vcc12-supply = <&vcc_io>;
> +		vddio-supply = <&vcc18_ldo1>;
> +
> +		regulators {
> +			vdd_cpu: DCDC_REG1 {
> +				regulator-always-on;
> +				regulator-boot-on;
> +				regulator-min-microvolt = <750000>;
> +				regulator-max-microvolt = <1350000>;
> +				regulator-name = "vdd_arm";
> +				regulator-ramp-delay = <6000>;
> +				regulator-state-mem {
> +					regulator-off-in-suspend;
> +				};
> +			};
> +
> +			vdd_gpu: DCDC_REG2 {
> +				regulator-always-on;
> +				regulator-boot-on;
> +				regulator-min-microvolt = <850000>;
> +				regulator-max-microvolt = <1250000>;
> +				regulator-name = "vdd_gpu";
> +				regulator-ramp-delay = <6000>;
> +				regulator-state-mem {
> +					regulator-on-in-suspend;
> +					regulator-suspend-microvolt = <1000000>;
> +				};
> +			};
> +
> +			vcc_ddr: DCDC_REG3 {
> +				regulator-always-on;
> +				regulator-boot-on;
> +				regulator-name = "vcc_ddr";
> +				regulator-state-mem {
> +					regulator-on-in-suspend;
> +				};
> +			};
> +
> +			vcc_io: DCDC_REG4 {
> +				regulator-always-on;
> +				regulator-boot-on;
> +				regulator-min-microvolt = <3300000>;
> +				regulator-max-microvolt = <3300000>;
> +				regulator-name = "vcc_io";
> +				regulator-state-mem {
> +					regulator-on-in-suspend;
> +					regulator-suspend-microvolt = <3300000>;
> +				};
> +			};
> +
> +			vcc18_ldo1: LDO_REG1 {
> +				regulator-always-on;
> +				regulator-boot-on;
> +				regulator-min-microvolt = <1800000>;
> +				regulator-max-microvolt = <1800000>;
> +				regulator-name = "vcc18_ldo1";
> +				regulator-state-mem {
> +					regulator-on-in-suspend;
> +					regulator-suspend-microvolt = <1800000>;
> +				};
> +			};
> +
> +			vcc33_mipi: LDO_REG2 {
> +				regulator-always-on;
> +				regulator-boot-on;
> +				regulator-min-microvolt = <3300000>;
> +				regulator-max-microvolt = <3300000>;
> +				regulator-name = "vcc33_mipi";
> +				regulator-state-mem {
> +					regulator-off-in-suspend;
> +				};
> +			};
> +
> +			vdd_10: LDO_REG3 {
> +				regulator-always-on;
> +				regulator-boot-on;
> +				regulator-min-microvolt = <1000000>;
> +				regulator-max-microvolt = <1000000>;
> +				regulator-name = "vdd_10";
> +				regulator-state-mem {
> +					regulator-on-in-suspend;
> +					regulator-suspend-microvolt = <1000000>;
> +				};
> +			};
> +
> +			vcc18_codec: LDO_REG4 {
> +				regulator-always-on;
> +				regulator-boot-on;
> +				regulator-min-microvolt = <1800000>;
> +				regulator-max-microvolt = <1800000>;
> +				regulator-name = "vcc18_codec";
> +				regulator-state-mem {
> +					regulator-on-in-suspend;
> +					regulator-suspend-microvolt = <1800000>;
> +				};
> +			};
> +
> +			vccio_sd: LDO_REG5 {
> +				regulator-always-on;
> +				regulator-boot-on;


are some other io banks or devices powered by
vccio_sd, so that you mark it as boot-on and always-on?

> +				regulator-min-microvolt = <1800000>;
> +				regulator-max-microvolt = <3300000>;
> +				regulator-name = "vccio_sd";
> +				regulator-state-mem {
> +					regulator-on-in-suspend;
> +					regulator-suspend-microvolt = <3300000>;
> +				};
> +			};
> +
> +			vdd10_lcd: LDO_REG6 {
> +				regulator-always-on;
> +				regulator-boot-on;
> +				regulator-min-microvolt = <1000000>;
> +				regulator-max-microvolt = <1000000>;
> +				regulator-name = "vdd10_lcd";
> +				regulator-state-mem {
> +					regulator-on-in-suspend;
> +					regulator-suspend-microvolt = <1000000>;
> +				};
> +			};
> +
> +			vcc_18: LDO_REG7 {
> +				regulator-always-on;
> +				regulator-boot-on;
> +				regulator-min-microvolt = <1800000>;
> +				regulator-max-microvolt = <1800000>;
> +				regulator-name = "vcc_18";
> +				regulator-state-mem {
> +					regulator-on-in-suspend;
> +					regulator-suspend-microvolt = <1800000>;
> +				};
> +			};
> +
> +			vcc18_lcd: LDO_REG8 {
> +				regulator-always-on;
> +				regulator-boot-on;
> +				regulator-min-microvolt = <1800000>;
> +				regulator-max-microvolt = <1800000>;
> +				regulator-name = "vcc18_lcd";
> +				regulator-state-mem {
> +					regulator-on-in-suspend;
> +					regulator-suspend-microvolt = <1800000>;
> +				};
> +			};
> +
> +			vcc33_sd: SWITCH_REG1 {
> +				regulator-always-on;
> +				regulator-boot-on;
> +				regulator-name = "vcc33_sd";
> +				regulator-state-mem {
> +					regulator-on-in-suspend;
> +				};
> +			};
> +
> +			vcc33_lan: SWITCH_REG2 {
> +				regulator-always-on;
> +				regulator-boot-on;
> +				regulator-name = "vcc33_lan";
> +				regulator-state-mem {
> +					regulator-on-in-suspend;
> +				};
> +			};
> +		};
> +	};
> +};
> +
> +&i2c2 {
> +	status = "okay";
> +};
> +
> +&i2c5 {
> +	status = "okay";
> +};
> +
> +&i2s {
> +	#sound-dai-cells = <0>;
> +	status = "okay";
> +};
> +
> +&io_domains {
> +	status = "okay";
> +
> +	sdcard-supply = <&vccio_sd>;
> +};
> +
> +&pinctrl {
> +	pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {
> +		drive-strength = <8>;
> +	};
> +
> +	pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {
> +		bias-pull-up;
> +		drive-strength = <8>;
> +	};
> +
> +	backlight {
> +		bl_en: bl-en {
> +			rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>;
> +		};
> +	};
> +
> +	buttons {
> +		pwrbtn: pwrbtn {
> +			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
> +		};
> +	};
> +
> +	eth_phy {
> +		eth_phy_pwr: eth-phy-pwr {
> +			rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_none>;
> +		};
> +	};
> +
> +	pmic {
> +		pmic_int: pmic-int {
> +			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO \
> +					&pcfg_pull_up>;
> +		};
> +
> +		dvs_1: dvs-1 {
> +			rockchip,pins = <RK_GPIO0 11 RK_FUNC_GPIO \
> +					&pcfg_pull_down>;
> +		};
> +
> +		dvs_2: dvs-2 {
> +			rockchip,pins = <RK_GPIO0 12 RK_FUNC_GPIO \
> +					&pcfg_pull_down>;
> +		};
> +	};
> +
> +	sdmmc {
> +		/*
> +		 * Default drive strength isn't enough to achieve even
> +		 * high-speed mode on EVB board so bump up to 8ma.
> +		 */
> +		sdmmc_bus4: sdmmc-bus4 {
> +			rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
> +					<6 17 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
> +					<6 18 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
> +					<6 19 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
> +		};
> +
> +		sdmmc_clk: sdmmc-clk {
> +			rockchip,pins = <6 20 RK_FUNC_1 \
> +					&pcfg_pull_none_drv_8ma>;
> +		};
> +
> +		sdmmc_cmd: sdmmc-cmd {
> +			rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
> +		};
> +
> +		sdmmc_pwr: sdmmc-pwr {
> +			rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>;
> +		};
> +	};
> +
> +	usb {
> +		host_vbus_drv: host-vbus-drv {
> +			rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;
> +		};
> +
> +		pwr_3g: pwr-3g {
> +			rockchip,pins = <7 8 RK_FUNC_GPIO &pcfg_pull_none>;
> +		};
> +	};
> +};
> +
> +&pwm0 {
> +	status = "okay";
> +};
> +
> +&saradc {
> +	vref-supply = <&vcc18_ldo1>;
> +	status ="okay";
> +};
> +
> +&sdmmc {
> +	bus-width = <4>;
> +	cap-mmc-highspeed;
> +	cap-sd-highspeed;
> +	card-detect-delay = <200>;
> +	disable-wp;			/* wp not hooked up */
> +	num-slots = <1>;
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
> +	status = "okay";
> +	supports-sd;

This is not upstreamed property. We have no-sdio/no-emmc there to
skip the init sequence.

> +	vmmc-supply = <&vcc_sd>;
> +	vqmmc-supply = <&vccio_sd>;
> +};
> +
> +&tsadc {
> +	rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
> +	rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
> +	status = "okay";
> +};
> +
> +&uart0 {
> +	status = "okay";
> +};
> +
> +&uart1 {
> +	status = "okay";
> +};
> +
> +&uart2 {
> +	status = "okay";
> +};
> +
> +&uart3 {
> +	status = "okay";
> +};
> +
> +&uart4 {
> +	status = "okay";
> +};
> +
> +&usbphy {
> +	status = "okay";
> +};
> +
> +&usb_host0_ehci {
> +	no-relinquish-port;
> +	status = "okay";
> +};
> +
> +&usb_host1 {
> +	status = "okay";
> +};
> +
> +&usb_otg {
> +	status= "okay";
> +};
> +
> +&vopb {
> +	status = "okay";
> +};
> +
> +&vopb_mmu {
> +	status = "okay";
> +};
> +
> +&vopl {
> +	status = "okay";
> +	/* Don't use vopl for HDMI */
> +	vopl_out: port {
> +		/delete-node/ endpoint@0;
> +	};
> +};
> +
> +&vopl_mmu {
> +	status = "okay";
> +};
> +
> +&wdt {
> +	status = "okay";
> +};
> +
>
Eddie Cai Jan. 20, 2017, 7:07 a.m. UTC | #3
2017-01-20 10:29 GMT+08:00 Shawn Lin <shawn.lin@rock-chips.com>:
>
> On 2017/1/19 10:11, Eddie Cai wrote:
>>
>> This patch add basic support for RK3288-Tinker board. We can boot in to rootfs
>> with this patch.
>>
>> Signed-off-by: Eddie Cai <eddie.cai@rock-chips.com>
>> ---
>>  arch/arm/boot/dts/Makefile          |   1 +
>>  arch/arm/boot/dts/rk3288-tinker.dts | 556 ++++++++++++++++++++++++++++++++++++
>>  2 files changed, 557 insertions(+)
>>  create mode 100644 arch/arm/boot/dts/rk3288-tinker.dts
>>
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index 7327250..4fc05b7 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -679,6 +679,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
>>         rk3288-popmetal.dtb \
>>         rk3288-r89.dtb \
>>         rk3288-rock2-square.dtb \
>> +       rk3288-tinker.dtb \
>>         rk3288-veyron-brain.dtb \
>>         rk3288-veyron-jaq.dtb \
>>         rk3288-veyron-jerry.dtb \
>> diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
>> new file mode 100644
>> index 0000000..37cb431
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/rk3288-tinker.dts
>> @@ -0,0 +1,556 @@
>> +/*
>> + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
>> + *
>> + * This file is dual-licensed: you can use it either under the terms
>> + * of the GPL or the X11 license, at your option. Note that this dual
>> + * licensing only applies to this file, and not this project as a
>> + * whole.
>> + *
>> + *  a) This file is free software; you can redistribute it and/or
>> + *     modify it under the terms of the GNU General Public License as
>> + *     published by the Free Software Foundation; either version 2 of the
>> + *     License, or (at your option) any later version.
>> + *
>> + *     This file is distributed in the hope that it will be useful,
>> + *     but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> + *     GNU General Public License for more details.
>> + *
>> + * Or, alternatively,
>> + *
>> + *  b) Permission is hereby granted, free of charge, to any person
>> + *     obtaining a copy of this software and associated documentation
>> + *     files (the "Software"), to deal in the Software without
>> + *     restriction, including without limitation the rights to use,
>> + *     copy, modify, merge, publish, distribute, sublicense, and/or
>> + *     sell copies of the Software, and to permit persons to whom the
>> + *     Software is furnished to do so, subject to the following
>> + *     conditions:
>> + *
>> + *     The above copyright notice and this permission notice shall be
>> + *     included in all copies or substantial portions of the Software.
>> + *
>> + *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>> + *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
>> + *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
>> + *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
>> + *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
>> + *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
>> + *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
>> + *     OTHER DEALINGS IN THE SOFTWARE.
>> + */
>> +
>> +/dts-v1/;
>> +
>> +#include "rk3288.dtsi"
>> +
>> +/ {
>> +       model = "Rockchip RK3288 Tinker Board";
>> +       compatible = "rockchip,rk3288-tinker", "rockchip,rk3288";
>> +
>> +       memory {
>> +               reg = <0x0 0x80000000>;
>> +               device_type = "memory";
>> +       };
>> +
>> +       ext_gmac: external-gmac-clock {
>> +               compatible = "fixed-clock";
>> +               #clock-cells = <0>;
>> +               clock-frequency = <125000000>;
>> +               clock-output-names = "ext_gmac";
>> +       };
>> +
>> +       gpio-keys {
>> +               compatible = "gpio-keys";
>> +               #address-cells = <1>;
>> +               #size-cells = <0>;
>> +               autorepeat;
>> +
>> +               pinctrl-names = "default";
>> +               pinctrl-0 = <&pwrbtn>;
>> +
>> +               button@0 {
>> +                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
>> +                       linux,code = <116>;
>> +                       label = "GPIO Key Power";
>> +                       linux,input-type = <1>;
>> +                       gpio-key,wakeup = <1>;
>> +                       debounce-interval = <100>;
>> +               };
>> +       };
>> +
>> +       gpio-leds {
>> +               compatible = "gpio-leds";
>> +
>> +               pwr-led {
>> +                       gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
>> +                       linux,default-trigger = "default-on";
>> +               };
>> +
>> +               act-led {
>> +                       gpios=<&gpio2 3 GPIO_ACTIVE_LOW>;
>> +                       linux,default-trigger="mmc0";
>> +               };
>> +       };
>> +
>> +       sound {
>> +               compatible = "simple-audio-card";
>> +               simple-audio-card,format = "i2s";
>> +               simple-audio-card,name = "rockchip,tinker-codec";
>> +               simple-audio-card,mclk-fs = <512>;
>> +               simple-audio-card,cpu {
>> +                       sound-dai = <&i2s>;
>> +               };
>> +               simple-audio-card,codec {
>> +                       sound-dai = <&hdmi>;
>> +               };
>> +       };
>> +
>> +       vcc_sys: vsys-regulator {
>> +               compatible = "regulator-fixed";
>> +               regulator-name = "vcc_sys";
>> +               regulator-min-microvolt = <5000000>;
>> +               regulator-max-microvolt = <5000000>;
>> +               regulator-always-on;
>> +               regulator-boot-on;
>> +       };
>> +
>> +       /*
>> +        * NOTE: vcc_sd isn't hooked up on v1.0 boards where power comes from
>> +        * vcc_io directly.  Those boards won't be able to power cycle SD cards
>> +        * but it shouldn't hurt to toggle this pin there anyway.
>> +        */
>> +       vcc_sd: sdmmc-regulator {
>> +               compatible = "regulator-fixed";
>> +               gpio = <&gpio7 11 GPIO_ACTIVE_LOW>;
>> +               pinctrl-names = "default";
>> +               pinctrl-0 = <&sdmmc_pwr>;
>> +               regulator-name = "vcc_sd";
>> +               regulator-min-microvolt = <3300000>;
>> +               regulator-max-microvolt = <3300000>;
>> +               startup-delay-us = <100000>;
>> +               vin-supply = <&vcc_io>;
>> +       };
>> +};
>> +
>> +&cpu0 {
>> +       cpu0-supply = <&vdd_cpu>;
>> +};
>> +
>> +&gmac {
>> +       phy-supply = <&vcc33_lan>;
>> +       phy-mode = "rgmii";
>> +       clock_in_out = "input";
>> +       snps,reset-gpio = <&gpio4 7 0>;
>> +       snps,reset-active-low;
>> +       snps,reset-delays-us = <0 10000 1000000>;
>> +       assigned-clocks = <&cru SCLK_MAC>;
>> +       assigned-clock-parents = <&ext_gmac>;
>> +       pinctrl-names = "default";
>> +       pinctrl-0 = <&rgmii_pins>;
>> +       tx_delay = <0x30>;
>> +       rx_delay = <0x10>;
>> +       status = "ok";
>> +};
>> +
>> +&hdmi {
>> +       #address-cells = <1>;
>> +       #size-cells = <0>;
>> +       #sound-dai-cells = <0>;
>> +       ddc-i2c-bus = <&i2c5>;
>> +       status = "okay";
>> +       /* Don't use vopl for HDMI */
>> +       ports {
>> +               hdmi_in: port {
>> +                       /delete-node/ endpoint@1;
>> +               };
>> +       };
>> +};
>> +
>> +&i2c0 {
>> +       status = "okay";
>> +       clock-frequency = <400000>;
>> +
>> +       rk808: pmic@1b {
>> +               compatible = "rockchip,rk808";
>> +               reg = <0x1b>;
>> +               interrupt-parent = <&gpio0>;
>> +               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
>> +               pinctrl-names = "default";
>> +               pinctrl-0 = <&pmic_int &global_pwroff &dvs_1 &dvs_2>;
>> +               dvs-gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>,
>> +                               <&gpio0 12 GPIO_ACTIVE_HIGH>;
>> +
>> +               rockchip,system-power-controller;
>> +               wakeup-source;
>> +               #clock-cells = <1>;
>> +               clock-output-names = "xin32k", "rk808-clkout2";
>> +
>> +               vcc1-supply = <&vcc_sys>;
>> +               vcc2-supply = <&vcc_sys>;
>> +               vcc3-supply = <&vcc_sys>;
>> +               vcc4-supply = <&vcc_sys>;
>> +               vcc6-supply = <&vcc_sys>;
>> +               vcc7-supply = <&vcc_sys>;
>> +               vcc8-supply = <&vcc_18>;
>> +               vcc9-supply = <&vcc_io>;
>> +               vcc10-supply = <&vcc_io>;
>> +               vcc11-supply = <&vcc_sys>;
>> +               vcc12-supply = <&vcc_io>;
>> +               vddio-supply = <&vcc18_ldo1>;
>> +
>> +               regulators {
>> +                       vdd_cpu: DCDC_REG1 {
>> +                               regulator-always-on;
>> +                               regulator-boot-on;
>> +                               regulator-min-microvolt = <750000>;
>> +                               regulator-max-microvolt = <1350000>;
>> +                               regulator-name = "vdd_arm";
>> +                               regulator-ramp-delay = <6000>;
>> +                               regulator-state-mem {
>> +                                       regulator-off-in-suspend;
>> +                               };
>> +                       };
>> +
>> +                       vdd_gpu: DCDC_REG2 {
>> +                               regulator-always-on;
>> +                               regulator-boot-on;
>> +                               regulator-min-microvolt = <850000>;
>> +                               regulator-max-microvolt = <1250000>;
>> +                               regulator-name = "vdd_gpu";
>> +                               regulator-ramp-delay = <6000>;
>> +                               regulator-state-mem {
>> +                                       regulator-on-in-suspend;
>> +                                       regulator-suspend-microvolt = <1000000>;
>> +                               };
>> +                       };
>> +
>> +                       vcc_ddr: DCDC_REG3 {
>> +                               regulator-always-on;
>> +                               regulator-boot-on;
>> +                               regulator-name = "vcc_ddr";
>> +                               regulator-state-mem {
>> +                                       regulator-on-in-suspend;
>> +                               };
>> +                       };
>> +
>> +                       vcc_io: DCDC_REG4 {
>> +                               regulator-always-on;
>> +                               regulator-boot-on;
>> +                               regulator-min-microvolt = <3300000>;
>> +                               regulator-max-microvolt = <3300000>;
>> +                               regulator-name = "vcc_io";
>> +                               regulator-state-mem {
>> +                                       regulator-on-in-suspend;
>> +                                       regulator-suspend-microvolt = <3300000>;
>> +                               };
>> +                       };
>> +
>> +                       vcc18_ldo1: LDO_REG1 {
>> +                               regulator-always-on;
>> +                               regulator-boot-on;
>> +                               regulator-min-microvolt = <1800000>;
>> +                               regulator-max-microvolt = <1800000>;
>> +                               regulator-name = "vcc18_ldo1";
>> +                               regulator-state-mem {
>> +                                       regulator-on-in-suspend;
>> +                                       regulator-suspend-microvolt = <1800000>;
>> +                               };
>> +                       };
>> +
>> +                       vcc33_mipi: LDO_REG2 {
>> +                               regulator-always-on;
>> +                               regulator-boot-on;
>> +                               regulator-min-microvolt = <3300000>;
>> +                               regulator-max-microvolt = <3300000>;
>> +                               regulator-name = "vcc33_mipi";
>> +                               regulator-state-mem {
>> +                                       regulator-off-in-suspend;
>> +                               };
>> +                       };
>> +
>> +                       vdd_10: LDO_REG3 {
>> +                               regulator-always-on;
>> +                               regulator-boot-on;
>> +                               regulator-min-microvolt = <1000000>;
>> +                               regulator-max-microvolt = <1000000>;
>> +                               regulator-name = "vdd_10";
>> +                               regulator-state-mem {
>> +                                       regulator-on-in-suspend;
>> +                                       regulator-suspend-microvolt = <1000000>;
>> +                               };
>> +                       };
>> +
>> +                       vcc18_codec: LDO_REG4 {
>> +                               regulator-always-on;
>> +                               regulator-boot-on;
>> +                               regulator-min-microvolt = <1800000>;
>> +                               regulator-max-microvolt = <1800000>;
>> +                               regulator-name = "vcc18_codec";
>> +                               regulator-state-mem {
>> +                                       regulator-on-in-suspend;
>> +                                       regulator-suspend-microvolt = <1800000>;
>> +                               };
>> +                       };
>> +
>> +                       vccio_sd: LDO_REG5 {
>> +                               regulator-always-on;
>> +                               regulator-boot-on;
>
>
>
> are some other io banks or devices powered by
> vccio_sd, so that you mark it as boot-on and always-on?

This board do not have emmc, It use SD card to store firmware image.
So have to always on.
>
>
>
>> +                               regulator-min-microvolt = <1800000>;
>> +                               regulator-max-microvolt = <3300000>;
>> +                               regulator-name = "vccio_sd";
>> +                               regulator-state-mem {
>> +                                       regulator-on-in-suspend;
>> +                                       regulator-suspend-microvolt = <3300000>;
>> +                               };
>> +                       };
>> +
>> +                       vdd10_lcd: LDO_REG6 {
>> +                               regulator-always-on;
>> +                               regulator-boot-on;
>> +                               regulator-min-microvolt = <1000000>;
>> +                               regulator-max-microvolt = <1000000>;
>> +                               regulator-name = "vdd10_lcd";
>> +                               regulator-state-mem {
>> +                                       regulator-on-in-suspend;
>> +                                       regulator-suspend-microvolt = <1000000>;
>> +                               };
>> +                       };
>> +
>> +                       vcc_18: LDO_REG7 {
>> +                               regulator-always-on;
>> +                               regulator-boot-on;
>> +                               regulator-min-microvolt = <1800000>;
>> +                               regulator-max-microvolt = <1800000>;
>> +                               regulator-name = "vcc_18";
>> +                               regulator-state-mem {
>> +                                       regulator-on-in-suspend;
>> +                                       regulator-suspend-microvolt = <1800000>;
>> +                               };
>> +                       };
>> +
>> +                       vcc18_lcd: LDO_REG8 {
>> +                               regulator-always-on;
>> +                               regulator-boot-on;
>> +                               regulator-min-microvolt = <1800000>;
>> +                               regulator-max-microvolt = <1800000>;
>> +                               regulator-name = "vcc18_lcd";
>> +                               regulator-state-mem {
>> +                                       regulator-on-in-suspend;
>> +                                       regulator-suspend-microvolt = <1800000>;
>> +                               };
>> +                       };
>> +
>> +                       vcc33_sd: SWITCH_REG1 {
>> +                               regulator-always-on;
>> +                               regulator-boot-on;
>> +                               regulator-name = "vcc33_sd";
>> +                               regulator-state-mem {
>> +                                       regulator-on-in-suspend;
>> +                               };
>> +                       };
>> +
>> +                       vcc33_lan: SWITCH_REG2 {
>> +                               regulator-always-on;
>> +                               regulator-boot-on;
>> +                               regulator-name = "vcc33_lan";
>> +                               regulator-state-mem {
>> +                                       regulator-on-in-suspend;
>> +                               };
>> +                       };
>> +               };
>> +       };
>> +};
>> +
>> +&i2c2 {
>> +       status = "okay";
>> +};
>> +
>> +&i2c5 {
>> +       status = "okay";
>> +};
>> +
>> +&i2s {
>> +       #sound-dai-cells = <0>;
>> +       status = "okay";
>> +};
>> +
>> +&io_domains {
>> +       status = "okay";
>> +
>> +       sdcard-supply = <&vccio_sd>;
>> +};
>> +
>> +&pinctrl {
>> +       pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {
>> +               drive-strength = <8>;
>> +       };
>> +
>> +       pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {
>> +               bias-pull-up;
>> +               drive-strength = <8>;
>> +       };
>> +
>> +       backlight {
>> +               bl_en: bl-en {
>> +                       rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>;
>> +               };
>> +       };
>> +
>> +       buttons {
>> +               pwrbtn: pwrbtn {
>> +                       rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
>> +               };
>> +       };
>> +
>> +       eth_phy {
>> +               eth_phy_pwr: eth-phy-pwr {
>> +                       rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_none>;
>> +               };
>> +       };
>> +
>> +       pmic {
>> +               pmic_int: pmic-int {
>> +                       rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO \
>> +                                       &pcfg_pull_up>;
>> +               };
>> +
>> +               dvs_1: dvs-1 {
>> +                       rockchip,pins = <RK_GPIO0 11 RK_FUNC_GPIO \
>> +                                       &pcfg_pull_down>;
>> +               };
>> +
>> +               dvs_2: dvs-2 {
>> +                       rockchip,pins = <RK_GPIO0 12 RK_FUNC_GPIO \
>> +                                       &pcfg_pull_down>;
>> +               };
>> +       };
>> +
>> +       sdmmc {
>> +               /*
>> +                * Default drive strength isn't enough to achieve even
>> +                * high-speed mode on EVB board so bump up to 8ma.
>> +                */
>> +               sdmmc_bus4: sdmmc-bus4 {
>> +                       rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
>> +                                       <6 17 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
>> +                                       <6 18 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
>> +                                       <6 19 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
>> +               };
>> +
>> +               sdmmc_clk: sdmmc-clk {
>> +                       rockchip,pins = <6 20 RK_FUNC_1 \
>> +                                       &pcfg_pull_none_drv_8ma>;
>> +               };
>> +
>> +               sdmmc_cmd: sdmmc-cmd {
>> +                       rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
>> +               };
>> +
>> +               sdmmc_pwr: sdmmc-pwr {
>> +                       rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>;
>> +               };
>> +       };
>> +
>> +       usb {
>> +               host_vbus_drv: host-vbus-drv {
>> +                       rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;
>> +               };
>> +
>> +               pwr_3g: pwr-3g {
>> +                       rockchip,pins = <7 8 RK_FUNC_GPIO &pcfg_pull_none>;
>> +               };
>> +       };
>> +};
>> +
>> +&pwm0 {
>> +       status = "okay";
>> +};
>> +
>> +&saradc {
>> +       vref-supply = <&vcc18_ldo1>;
>> +       status ="okay";
>> +};
>> +
>> +&sdmmc {
>> +       bus-width = <4>;
>> +       cap-mmc-highspeed;
>> +       cap-sd-highspeed;
>> +       card-detect-delay = <200>;
>> +       disable-wp;                     /* wp not hooked up */
>> +       num-slots = <1>;
>> +       pinctrl-names = "default";
>> +       pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
>> +       status = "okay";
>> +       supports-sd;
>
>
> This is not upstreamed property. We have no-sdio/no-emmc there to
> skip the init sequence.
OK, I will remove it next version
>
>
>> +       vmmc-supply = <&vcc_sd>;
>> +       vqmmc-supply = <&vccio_sd>;
>> +};
>> +
>> +&tsadc {
>> +       rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
>> +       rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
>> +       status = "okay";
>> +};
>> +
>> +&uart0 {
>> +       status = "okay";
>> +};
>> +
>> +&uart1 {
>> +       status = "okay";
>> +};
>> +
>> +&uart2 {
>> +       status = "okay";
>> +};
>> +
>> +&uart3 {
>> +       status = "okay";
>> +};
>> +
>> +&uart4 {
>> +       status = "okay";
>> +};
>> +
>> +&usbphy {
>> +       status = "okay";
>> +};
>> +
>> +&usb_host0_ehci {
>> +       no-relinquish-port;
>> +       status = "okay";
>> +};
>> +
>> +&usb_host1 {
>> +       status = "okay";
>> +};
>> +
>> +&usb_otg {
>> +       status= "okay";
>> +};
>> +
>> +&vopb {
>> +       status = "okay";
>> +};
>> +
>> +&vopb_mmu {
>> +       status = "okay";
>> +};
>> +
>> +&vopl {
>> +       status = "okay";
>> +       /* Don't use vopl for HDMI */
>> +       vopl_out: port {
>> +               /delete-node/ endpoint@0;
>> +       };
>> +};
>> +
>> +&vopl_mmu {
>> +       status = "okay";
>> +};
>> +
>> +&wdt {
>> +       status = "okay";
>> +};
>> +
>>
>
>
> --
> Best Regards
> Shawn Lin
>
Eddie Cai Jan. 20, 2017, 7:10 a.m. UTC | #4
2017-01-19 17:58 GMT+08:00 Heiko Stuebner <heiko@sntech.de>:
> Hi Eddie,
>
> Am Donnerstag, 19. Januar 2017, 10:11:59 CET schrieb Eddie Cai:
>> This patch add basic support for RK3288-Tinker board. We can boot in to
>> rootfs with this patch.
>>
>> Signed-off-by: Eddie Cai <eddie.cai@rock-chips.com>
>
> looks good in general, just some small question down below.
>
> [...]
>
>> +     /*
>> +      * NOTE: vcc_sd isn't hooked up on v1.0 boards where power comes from
>> +      * vcc_io directly.  Those boards won't be able to power cycle SD cards
>> +      * but it shouldn't hurt to toggle this pin there anyway.
>> +      */
>
> just to clarify, later board will have that pin connected, right?
Copy from rk3288-evb.dtsi. forgot to delete it. I will remove it in next version
>
>> +     vcc_sd: sdmmc-regulator {
>> +             compatible = "regulator-fixed";
>> +             gpio = <&gpio7 11 GPIO_ACTIVE_LOW>;
>> +             pinctrl-names = "default";
>> +             pinctrl-0 = <&sdmmc_pwr>;
>> +             regulator-name = "vcc_sd";
>> +             regulator-min-microvolt = <3300000>;
>> +             regulator-max-microvolt = <3300000>;
>> +             startup-delay-us = <100000>;
>> +             vin-supply = <&vcc_io>;
>> +     };
>> +};
>
> [...]
>
>> +&hdmi {
>> +     #address-cells = <1>;
>> +     #size-cells = <0>;
>> +     #sound-dai-cells = <0>;
>> +     ddc-i2c-bus = <&i2c5>;
>> +     status = "okay";
>> +     /* Don't use vopl for HDMI */
>> +     ports {
>> +             hdmi_in: port {
>> +                     /delete-node/ endpoint@1;
>> +             };
>
> what is the reason for this? You enable both VOPs below and the linux display
> subsystem should be able to select an appropriate VOP for output just fine on
> its own. So there should be no reason for capping the hdmi's connection to one
> of the vops.
The VOP big support 4k display. is designed for HDMI  4K display. VOP
little is for other display(eDP, LVDS, Mipi etc)
>
>> +     };
>> +};
>
> [...]
>
>> +&usb_host0_ehci {
>> +     no-relinquish-port;
>
> This seems like an unused/undocumented property
I will remove it in next version
>
>> +     status = "okay";
>> +};
>
> [...]
>
>> +&vopl {
>> +     status = "okay";
>> +     /* Don't use vopl for HDMI */
>> +     vopl_out: port {
>> +             /delete-node/ endpoint@0;
>> +     };
>
> see comment at the hdmi node
>
>> +};
>
>
> Thanks
> Heiko
Shawn Lin Jan. 20, 2017, 7:48 a.m. UTC | #5
On 2017/1/20 15:07, Eddie Cai wrote:
> 2017-01-20 10:29 GMT+08:00 Shawn Lin <shawn.lin@rock-chips.com>:
>>
>> On 2017/1/19 10:11, Eddie Cai wrote:
>>>
>>> This patch add basic support for RK3288-Tinker board. We can boot in to rootfs
>>> with this patch.
>>>
>>> Signed-off-by: Eddie Cai <eddie.cai@rock-chips.com>
>>> ---
>>>  arch/arm/boot/dts/Makefile          |   1 +
>>>  arch/arm/boot/dts/rk3288-tinker.dts | 556 ++++++++++++++++++++++++++++++++++++
>>>  2 files changed, 557 insertions(+)
>>>  create mode 100644 arch/arm/boot/dts/rk3288-tinker.dts
>>>
>>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>>> index 7327250..4fc05b7 100644
>>> --- a/arch/arm/boot/dts/Makefile
>>> +++ b/arch/arm/boot/dts/Makefile
>>> @@ -679,6 +679,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
>>>         rk3288-popmetal.dtb \
>>>         rk3288-r89.dtb \
>>>         rk3288-rock2-square.dtb \
>>> +       rk3288-tinker.dtb \
>>>         rk3288-veyron-brain.dtb \
>>>         rk3288-veyron-jaq.dtb \
>>>         rk3288-veyron-jerry.dtb \
>>> diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
>>> new file mode 100644
>>> index 0000000..37cb431
>>> --- /dev/null
>>> +++ b/arch/arm/boot/dts/rk3288-tinker.dts
>>> @@ -0,0 +1,556 @@
>>> +/*
>>> + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
>>> + *
>>> + * This file is dual-licensed: you can use it either under the terms
>>> + * of the GPL or the X11 license, at your option. Note that this dual
>>> + * licensing only applies to this file, and not this project as a
>>> + * whole.
>>> + *
>>> + *  a) This file is free software; you can redistribute it and/or
>>> + *     modify it under the terms of the GNU General Public License as
>>> + *     published by the Free Software Foundation; either version 2 of the
>>> + *     License, or (at your option) any later version.
>>> + *
>>> + *     This file is distributed in the hope that it will be useful,
>>> + *     but WITHOUT ANY WARRANTY; without even the implied warranty of
>>> + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>>> + *     GNU General Public License for more details.
>>> + *
>>> + * Or, alternatively,
>>> + *
>>> + *  b) Permission is hereby granted, free of charge, to any person
>>> + *     obtaining a copy of this software and associated documentation
>>> + *     files (the "Software"), to deal in the Software without
>>> + *     restriction, including without limitation the rights to use,
>>> + *     copy, modify, merge, publish, distribute, sublicense, and/or
>>> + *     sell copies of the Software, and to permit persons to whom the
>>> + *     Software is furnished to do so, subject to the following
>>> + *     conditions:
>>> + *
>>> + *     The above copyright notice and this permission notice shall be
>>> + *     included in all copies or substantial portions of the Software.
>>> + *
>>> + *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>>> + *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
>>> + *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
>>> + *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
>>> + *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
>>> + *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
>>> + *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
>>> + *     OTHER DEALINGS IN THE SOFTWARE.
>>> + */
>>> +
>>> +/dts-v1/;
>>> +
>>> +#include "rk3288.dtsi"
>>> +
>>> +/ {
>>> +       model = "Rockchip RK3288 Tinker Board";
>>> +       compatible = "rockchip,rk3288-tinker", "rockchip,rk3288";
>>> +
>>> +       memory {
>>> +               reg = <0x0 0x80000000>;
>>> +               device_type = "memory";
>>> +       };
>>> +
>>> +       ext_gmac: external-gmac-clock {
>>> +               compatible = "fixed-clock";
>>> +               #clock-cells = <0>;
>>> +               clock-frequency = <125000000>;
>>> +               clock-output-names = "ext_gmac";
>>> +       };
>>> +
>>> +       gpio-keys {
>>> +               compatible = "gpio-keys";
>>> +               #address-cells = <1>;
>>> +               #size-cells = <0>;
>>> +               autorepeat;
>>> +
>>> +               pinctrl-names = "default";
>>> +               pinctrl-0 = <&pwrbtn>;
>>> +
>>> +               button@0 {
>>> +                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
>>> +                       linux,code = <116>;
>>> +                       label = "GPIO Key Power";
>>> +                       linux,input-type = <1>;
>>> +                       gpio-key,wakeup = <1>;
>>> +                       debounce-interval = <100>;
>>> +               };
>>> +       };
>>> +
>>> +       gpio-leds {
>>> +               compatible = "gpio-leds";
>>> +
>>> +               pwr-led {
>>> +                       gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
>>> +                       linux,default-trigger = "default-on";
>>> +               };
>>> +
>>> +               act-led {
>>> +                       gpios=<&gpio2 3 GPIO_ACTIVE_LOW>;
>>> +                       linux,default-trigger="mmc0";
>>> +               };
>>> +       };
>>> +
>>> +       sound {
>>> +               compatible = "simple-audio-card";
>>> +               simple-audio-card,format = "i2s";
>>> +               simple-audio-card,name = "rockchip,tinker-codec";
>>> +               simple-audio-card,mclk-fs = <512>;
>>> +               simple-audio-card,cpu {
>>> +                       sound-dai = <&i2s>;
>>> +               };
>>> +               simple-audio-card,codec {
>>> +                       sound-dai = <&hdmi>;
>>> +               };
>>> +       };
>>> +
>>> +       vcc_sys: vsys-regulator {
>>> +               compatible = "regulator-fixed";
>>> +               regulator-name = "vcc_sys";
>>> +               regulator-min-microvolt = <5000000>;
>>> +               regulator-max-microvolt = <5000000>;
>>> +               regulator-always-on;
>>> +               regulator-boot-on;
>>> +       };
>>> +
>>> +       /*
>>> +        * NOTE: vcc_sd isn't hooked up on v1.0 boards where power comes from
>>> +        * vcc_io directly.  Those boards won't be able to power cycle SD cards
>>> +        * but it shouldn't hurt to toggle this pin there anyway.
>>> +        */
>>> +       vcc_sd: sdmmc-regulator {
>>> +               compatible = "regulator-fixed";
>>> +               gpio = <&gpio7 11 GPIO_ACTIVE_LOW>;
>>> +               pinctrl-names = "default";
>>> +               pinctrl-0 = <&sdmmc_pwr>;
>>> +               regulator-name = "vcc_sd";
>>> +               regulator-min-microvolt = <3300000>;
>>> +               regulator-max-microvolt = <3300000>;
>>> +               startup-delay-us = <100000>;
>>> +               vin-supply = <&vcc_io>;
>>> +       };
>>> +};
>>> +
>>> +&cpu0 {
>>> +       cpu0-supply = <&vdd_cpu>;
>>> +};
>>> +
>>> +&gmac {
>>> +       phy-supply = <&vcc33_lan>;
>>> +       phy-mode = "rgmii";
>>> +       clock_in_out = "input";
>>> +       snps,reset-gpio = <&gpio4 7 0>;
>>> +       snps,reset-active-low;
>>> +       snps,reset-delays-us = <0 10000 1000000>;
>>> +       assigned-clocks = <&cru SCLK_MAC>;
>>> +       assigned-clock-parents = <&ext_gmac>;
>>> +       pinctrl-names = "default";
>>> +       pinctrl-0 = <&rgmii_pins>;
>>> +       tx_delay = <0x30>;
>>> +       rx_delay = <0x10>;
>>> +       status = "ok";
>>> +};
>>> +
>>> +&hdmi {
>>> +       #address-cells = <1>;
>>> +       #size-cells = <0>;
>>> +       #sound-dai-cells = <0>;
>>> +       ddc-i2c-bus = <&i2c5>;
>>> +       status = "okay";
>>> +       /* Don't use vopl for HDMI */
>>> +       ports {
>>> +               hdmi_in: port {
>>> +                       /delete-node/ endpoint@1;
>>> +               };
>>> +       };
>>> +};
>>> +
>>> +&i2c0 {
>>> +       status = "okay";
>>> +       clock-frequency = <400000>;
>>> +
>>> +       rk808: pmic@1b {
>>> +               compatible = "rockchip,rk808";
>>> +               reg = <0x1b>;
>>> +               interrupt-parent = <&gpio0>;
>>> +               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
>>> +               pinctrl-names = "default";
>>> +               pinctrl-0 = <&pmic_int &global_pwroff &dvs_1 &dvs_2>;
>>> +               dvs-gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>,
>>> +                               <&gpio0 12 GPIO_ACTIVE_HIGH>;
>>> +
>>> +               rockchip,system-power-controller;
>>> +               wakeup-source;
>>> +               #clock-cells = <1>;
>>> +               clock-output-names = "xin32k", "rk808-clkout2";
>>> +
>>> +               vcc1-supply = <&vcc_sys>;
>>> +               vcc2-supply = <&vcc_sys>;
>>> +               vcc3-supply = <&vcc_sys>;
>>> +               vcc4-supply = <&vcc_sys>;
>>> +               vcc6-supply = <&vcc_sys>;
>>> +               vcc7-supply = <&vcc_sys>;
>>> +               vcc8-supply = <&vcc_18>;
>>> +               vcc9-supply = <&vcc_io>;
>>> +               vcc10-supply = <&vcc_io>;
>>> +               vcc11-supply = <&vcc_sys>;
>>> +               vcc12-supply = <&vcc_io>;
>>> +               vddio-supply = <&vcc18_ldo1>;
>>> +
>>> +               regulators {
>>> +                       vdd_cpu: DCDC_REG1 {
>>> +                               regulator-always-on;
>>> +                               regulator-boot-on;
>>> +                               regulator-min-microvolt = <750000>;
>>> +                               regulator-max-microvolt = <1350000>;
>>> +                               regulator-name = "vdd_arm";
>>> +                               regulator-ramp-delay = <6000>;
>>> +                               regulator-state-mem {
>>> +                                       regulator-off-in-suspend;
>>> +                               };
>>> +                       };
>>> +
>>> +                       vdd_gpu: DCDC_REG2 {
>>> +                               regulator-always-on;
>>> +                               regulator-boot-on;
>>> +                               regulator-min-microvolt = <850000>;
>>> +                               regulator-max-microvolt = <1250000>;
>>> +                               regulator-name = "vdd_gpu";
>>> +                               regulator-ramp-delay = <6000>;
>>> +                               regulator-state-mem {
>>> +                                       regulator-on-in-suspend;
>>> +                                       regulator-suspend-microvolt = <1000000>;
>>> +                               };
>>> +                       };
>>> +
>>> +                       vcc_ddr: DCDC_REG3 {
>>> +                               regulator-always-on;
>>> +                               regulator-boot-on;
>>> +                               regulator-name = "vcc_ddr";
>>> +                               regulator-state-mem {
>>> +                                       regulator-on-in-suspend;
>>> +                               };
>>> +                       };
>>> +
>>> +                       vcc_io: DCDC_REG4 {
>>> +                               regulator-always-on;
>>> +                               regulator-boot-on;
>>> +                               regulator-min-microvolt = <3300000>;
>>> +                               regulator-max-microvolt = <3300000>;
>>> +                               regulator-name = "vcc_io";
>>> +                               regulator-state-mem {
>>> +                                       regulator-on-in-suspend;
>>> +                                       regulator-suspend-microvolt = <3300000>;
>>> +                               };
>>> +                       };
>>> +
>>> +                       vcc18_ldo1: LDO_REG1 {
>>> +                               regulator-always-on;
>>> +                               regulator-boot-on;
>>> +                               regulator-min-microvolt = <1800000>;
>>> +                               regulator-max-microvolt = <1800000>;
>>> +                               regulator-name = "vcc18_ldo1";
>>> +                               regulator-state-mem {
>>> +                                       regulator-on-in-suspend;
>>> +                                       regulator-suspend-microvolt = <1800000>;
>>> +                               };
>>> +                       };
>>> +
>>> +                       vcc33_mipi: LDO_REG2 {
>>> +                               regulator-always-on;
>>> +                               regulator-boot-on;
>>> +                               regulator-min-microvolt = <3300000>;
>>> +                               regulator-max-microvolt = <3300000>;
>>> +                               regulator-name = "vcc33_mipi";
>>> +                               regulator-state-mem {
>>> +                                       regulator-off-in-suspend;
>>> +                               };
>>> +                       };
>>> +
>>> +                       vdd_10: LDO_REG3 {
>>> +                               regulator-always-on;
>>> +                               regulator-boot-on;
>>> +                               regulator-min-microvolt = <1000000>;
>>> +                               regulator-max-microvolt = <1000000>;
>>> +                               regulator-name = "vdd_10";
>>> +                               regulator-state-mem {
>>> +                                       regulator-on-in-suspend;
>>> +                                       regulator-suspend-microvolt = <1000000>;
>>> +                               };
>>> +                       };
>>> +
>>> +                       vcc18_codec: LDO_REG4 {
>>> +                               regulator-always-on;
>>> +                               regulator-boot-on;
>>> +                               regulator-min-microvolt = <1800000>;
>>> +                               regulator-max-microvolt = <1800000>;
>>> +                               regulator-name = "vcc18_codec";
>>> +                               regulator-state-mem {
>>> +                                       regulator-on-in-suspend;
>>> +                                       regulator-suspend-microvolt = <1800000>;
>>> +                               };
>>> +                       };
>>> +
>>> +                       vccio_sd: LDO_REG5 {
>>> +                               regulator-always-on;
>>> +                               regulator-boot-on;
>>
>>
>>
>> are some other io banks or devices powered by
>> vccio_sd, so that you mark it as boot-on and always-on?
>
> This board do not have emmc, It use SD card to store firmware image.
> So have to always on.

mmc core will take over tis properly. I undertand that the SD card will
be always on but it shouldn't be the reason we need to it to be
always-on. And obvious we don't need it to be boot-on since again
mmc core will turn on it when starting to init SD card.

>>
>>
>>
>>> +                               regulator-min-microvolt = <1800000>;
>>> +                               regulator-max-microvolt = <3300000>;
>>> +                               regulator-name = "vccio_sd";
>>> +                               regulator-state-mem {
>>> +                                       regulator-on-in-suspend;
>>> +                                       regulator-suspend-microvolt = <3300000>;
>>> +                               };
>>> +                       };
>>> +
>>> +                       vdd10_lcd: LDO_REG6 {
>>> +                               regulator-always-on;
>>> +                               regulator-boot-on;
>>> +                               regulator-min-microvolt = <1000000>;
>>> +                               regulator-max-microvolt = <1000000>;
>>> +                               regulator-name = "vdd10_lcd";
>>> +                               regulator-state-mem {
>>> +                                       regulator-on-in-suspend;
>>> +                                       regulator-suspend-microvolt = <1000000>;
>>> +                               };
>>> +                       };
>>> +
>>> +                       vcc_18: LDO_REG7 {
>>> +                               regulator-always-on;
>>> +                               regulator-boot-on;
>>> +                               regulator-min-microvolt = <1800000>;
>>> +                               regulator-max-microvolt = <1800000>;
>>> +                               regulator-name = "vcc_18";
>>> +                               regulator-state-mem {
>>> +                                       regulator-on-in-suspend;
>>> +                                       regulator-suspend-microvolt = <1800000>;
>>> +                               };
>>> +                       };
>>> +
>>> +                       vcc18_lcd: LDO_REG8 {
>>> +                               regulator-always-on;
>>> +                               regulator-boot-on;
>>> +                               regulator-min-microvolt = <1800000>;
>>> +                               regulator-max-microvolt = <1800000>;
>>> +                               regulator-name = "vcc18_lcd";
>>> +                               regulator-state-mem {
>>> +                                       regulator-on-in-suspend;
>>> +                                       regulator-suspend-microvolt = <1800000>;
>>> +                               };
>>> +                       };
>>> +
>>> +                       vcc33_sd: SWITCH_REG1 {
>>> +                               regulator-always-on;
>>> +                               regulator-boot-on;
>>> +                               regulator-name = "vcc33_sd";
>>> +                               regulator-state-mem {
>>> +                                       regulator-on-in-suspend;
>>> +                               };
>>> +                       };
>>> +
>>> +                       vcc33_lan: SWITCH_REG2 {
>>> +                               regulator-always-on;
>>> +                               regulator-boot-on;
>>> +                               regulator-name = "vcc33_lan";
>>> +                               regulator-state-mem {
>>> +                                       regulator-on-in-suspend;
>>> +                               };
>>> +                       };
>>> +               };
>>> +       };
>>> +};
>>> +
>>> +&i2c2 {
>>> +       status = "okay";
>>> +};
>>> +
>>> +&i2c5 {
>>> +       status = "okay";
>>> +};
>>> +
>>> +&i2s {
>>> +       #sound-dai-cells = <0>;
>>> +       status = "okay";
>>> +};
>>> +
>>> +&io_domains {
>>> +       status = "okay";
>>> +
>>> +       sdcard-supply = <&vccio_sd>;
>>> +};
>>> +
>>> +&pinctrl {
>>> +       pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {
>>> +               drive-strength = <8>;
>>> +       };
>>> +
>>> +       pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {
>>> +               bias-pull-up;
>>> +               drive-strength = <8>;
>>> +       };
>>> +
>>> +       backlight {
>>> +               bl_en: bl-en {
>>> +                       rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>;
>>> +               };
>>> +       };
>>> +
>>> +       buttons {
>>> +               pwrbtn: pwrbtn {
>>> +                       rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
>>> +               };
>>> +       };
>>> +
>>> +       eth_phy {
>>> +               eth_phy_pwr: eth-phy-pwr {
>>> +                       rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_none>;
>>> +               };
>>> +       };
>>> +
>>> +       pmic {
>>> +               pmic_int: pmic-int {
>>> +                       rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO \
>>> +                                       &pcfg_pull_up>;
>>> +               };
>>> +
>>> +               dvs_1: dvs-1 {
>>> +                       rockchip,pins = <RK_GPIO0 11 RK_FUNC_GPIO \
>>> +                                       &pcfg_pull_down>;
>>> +               };
>>> +
>>> +               dvs_2: dvs-2 {
>>> +                       rockchip,pins = <RK_GPIO0 12 RK_FUNC_GPIO \
>>> +                                       &pcfg_pull_down>;
>>> +               };
>>> +       };
>>> +
>>> +       sdmmc {
>>> +               /*
>>> +                * Default drive strength isn't enough to achieve even
>>> +                * high-speed mode on EVB board so bump up to 8ma.
>>> +                */
>>> +               sdmmc_bus4: sdmmc-bus4 {
>>> +                       rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
>>> +                                       <6 17 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
>>> +                                       <6 18 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
>>> +                                       <6 19 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
>>> +               };
>>> +
>>> +               sdmmc_clk: sdmmc-clk {
>>> +                       rockchip,pins = <6 20 RK_FUNC_1 \
>>> +                                       &pcfg_pull_none_drv_8ma>;
>>> +               };
>>> +
>>> +               sdmmc_cmd: sdmmc-cmd {
>>> +                       rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
>>> +               };
>>> +
>>> +               sdmmc_pwr: sdmmc-pwr {
>>> +                       rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>;
>>> +               };
>>> +       };
>>> +
>>> +       usb {
>>> +               host_vbus_drv: host-vbus-drv {
>>> +                       rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;
>>> +               };
>>> +
>>> +               pwr_3g: pwr-3g {
>>> +                       rockchip,pins = <7 8 RK_FUNC_GPIO &pcfg_pull_none>;
>>> +               };
>>> +       };
>>> +};
>>> +
>>> +&pwm0 {
>>> +       status = "okay";
>>> +};
>>> +
>>> +&saradc {
>>> +       vref-supply = <&vcc18_ldo1>;
>>> +       status ="okay";
>>> +};
>>> +
>>> +&sdmmc {
>>> +       bus-width = <4>;
>>> +       cap-mmc-highspeed;
>>> +       cap-sd-highspeed;
>>> +       card-detect-delay = <200>;
>>> +       disable-wp;                     /* wp not hooked up */
>>> +       num-slots = <1>;
>>> +       pinctrl-names = "default";
>>> +       pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
>>> +       status = "okay";
>>> +       supports-sd;
>>
>>
>> This is not upstreamed property. We have no-sdio/no-emmc there to
>> skip the init sequence.
> OK, I will remove it next version
>>
>>
>>> +       vmmc-supply = <&vcc_sd>;
>>> +       vqmmc-supply = <&vccio_sd>;
>>> +};
>>> +
>>> +&tsadc {
>>> +       rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
>>> +       rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
>>> +       status = "okay";
>>> +};
>>> +
>>> +&uart0 {
>>> +       status = "okay";
>>> +};
>>> +
>>> +&uart1 {
>>> +       status = "okay";
>>> +};
>>> +
>>> +&uart2 {
>>> +       status = "okay";
>>> +};
>>> +
>>> +&uart3 {
>>> +       status = "okay";
>>> +};
>>> +
>>> +&uart4 {
>>> +       status = "okay";
>>> +};
>>> +
>>> +&usbphy {
>>> +       status = "okay";
>>> +};
>>> +
>>> +&usb_host0_ehci {
>>> +       no-relinquish-port;
>>> +       status = "okay";
>>> +};
>>> +
>>> +&usb_host1 {
>>> +       status = "okay";
>>> +};
>>> +
>>> +&usb_otg {
>>> +       status= "okay";
>>> +};
>>> +
>>> +&vopb {
>>> +       status = "okay";
>>> +};
>>> +
>>> +&vopb_mmu {
>>> +       status = "okay";
>>> +};
>>> +
>>> +&vopl {
>>> +       status = "okay";
>>> +       /* Don't use vopl for HDMI */
>>> +       vopl_out: port {
>>> +               /delete-node/ endpoint@0;
>>> +       };
>>> +};
>>> +
>>> +&vopl_mmu {
>>> +       status = "okay";
>>> +};
>>> +
>>> +&wdt {
>>> +       status = "okay";
>>> +};
>>> +
>>>
>>
>>
>> --
>> Best Regards
>> Shawn Lin
>>
>
>
>
Heiko Stübner Jan. 20, 2017, 8:12 a.m. UTC | #6
Hi Eddie,

Am Freitag, 20. Januar 2017, 15:10:47 CET schrieb Eddie Cai:
> 2017-01-19 17:58 GMT+08:00 Heiko Stuebner <heiko@sntech.de>:
> > Hi Eddie,
> > 
> > Am Donnerstag, 19. Januar 2017, 10:11:59 CET schrieb Eddie Cai:
> >> This patch add basic support for RK3288-Tinker board. We can boot in to
> >> rootfs with this patch.
> >> 
> >> Signed-off-by: Eddie Cai <eddie.cai@rock-chips.com>
> > 
> > looks good in general, just some small question down below.
> > 
> > [...]
> > 
> >> +     /*
> >> +      * NOTE: vcc_sd isn't hooked up on v1.0 boards where power comes
> >> from
> >> +      * vcc_io directly.  Those boards won't be able to power cycle SD
> >> cards +      * but it shouldn't hurt to toggle this pin there anyway.
> >> +      */
> > 
> > just to clarify, later board will have that pin connected, right?
> 
> Copy from rk3288-evb.dtsi. forgot to delete it. I will remove it in next
> version
> >> +     vcc_sd: sdmmc-regulator {
> >> +             compatible = "regulator-fixed";
> >> +             gpio = <&gpio7 11 GPIO_ACTIVE_LOW>;
> >> +             pinctrl-names = "default";
> >> +             pinctrl-0 = <&sdmmc_pwr>;
> >> +             regulator-name = "vcc_sd";
> >> +             regulator-min-microvolt = <3300000>;
> >> +             regulator-max-microvolt = <3300000>;
> >> +             startup-delay-us = <100000>;
> >> +             vin-supply = <&vcc_io>;
> >> +     };
> >> +};
> > 
> > [...]
> > 
> >> +&hdmi {
> >> +     #address-cells = <1>;
> >> +     #size-cells = <0>;
> >> +     #sound-dai-cells = <0>;
> >> +     ddc-i2c-bus = <&i2c5>;
> >> +     status = "okay";
> >> +     /* Don't use vopl for HDMI */
> >> +     ports {
> >> +             hdmi_in: port {
> >> +                     /delete-node/ endpoint@1;
> >> +             };
> > 
> > what is the reason for this? You enable both VOPs below and the linux
> > display subsystem should be able to select an appropriate VOP for output
> > just fine on its own. So there should be no reason for capping the hdmi's
> > connection to one of the vops.
> 
> The VOP big support 4k display. is designed for HDMI  4K display. VOP
> little is for other display(eDP, LVDS, Mipi etc)

The hdmi _can_ talk to both vops, which is why it has the connection to both. 
Resolution-limitations and selecting a matching vop should be handled in the 
drm driver I'd think - but you'll need to talk to Mark Yao or some else 
knowledgable in graphics.

The devicetree is about describing the _available_ hardware, not configuring 
how it is supposed to be used ;-) .


Heiko
Eddie Cai Jan. 20, 2017, 8:31 a.m. UTC | #7
2017-01-20 16:12 GMT+08:00 Heiko Stuebner <heiko@sntech.de>:
> Hi Eddie,
>
> Am Freitag, 20. Januar 2017, 15:10:47 CET schrieb Eddie Cai:
>> 2017-01-19 17:58 GMT+08:00 Heiko Stuebner <heiko@sntech.de>:
>> > Hi Eddie,
>> >
>> > Am Donnerstag, 19. Januar 2017, 10:11:59 CET schrieb Eddie Cai:
>> >> This patch add basic support for RK3288-Tinker board. We can boot in to
>> >> rootfs with this patch.
>> >>
>> >> Signed-off-by: Eddie Cai <eddie.cai@rock-chips.com>
>> >
>> > looks good in general, just some small question down below.
>> >
>> > [...]
>> >
>> >> +     /*
>> >> +      * NOTE: vcc_sd isn't hooked up on v1.0 boards where power comes
>> >> from
>> >> +      * vcc_io directly.  Those boards won't be able to power cycle SD
>> >> cards +      * but it shouldn't hurt to toggle this pin there anyway.
>> >> +      */
>> >
>> > just to clarify, later board will have that pin connected, right?
>>
>> Copy from rk3288-evb.dtsi. forgot to delete it. I will remove it in next
>> version
>> >> +     vcc_sd: sdmmc-regulator {
>> >> +             compatible = "regulator-fixed";
>> >> +             gpio = <&gpio7 11 GPIO_ACTIVE_LOW>;
>> >> +             pinctrl-names = "default";
>> >> +             pinctrl-0 = <&sdmmc_pwr>;
>> >> +             regulator-name = "vcc_sd";
>> >> +             regulator-min-microvolt = <3300000>;
>> >> +             regulator-max-microvolt = <3300000>;
>> >> +             startup-delay-us = <100000>;
>> >> +             vin-supply = <&vcc_io>;
>> >> +     };
>> >> +};
>> >
>> > [...]
>> >
>> >> +&hdmi {
>> >> +     #address-cells = <1>;
>> >> +     #size-cells = <0>;
>> >> +     #sound-dai-cells = <0>;
>> >> +     ddc-i2c-bus = <&i2c5>;
>> >> +     status = "okay";
>> >> +     /* Don't use vopl for HDMI */
>> >> +     ports {
>> >> +             hdmi_in: port {
>> >> +                     /delete-node/ endpoint@1;
>> >> +             };
>> >
>> > what is the reason for this? You enable both VOPs below and the linux
>> > display subsystem should be able to select an appropriate VOP for output
>> > just fine on its own. So there should be no reason for capping the hdmi's
>> > connection to one of the vops.
>>
>> The VOP big support 4k display. is designed for HDMI  4K display. VOP
>> little is for other display(eDP, LVDS, Mipi etc)
>
> The hdmi _can_ talk to both vops, which is why it has the connection to both.
> Resolution-limitations and selecting a matching vop should be handled in the
> drm driver I'd think - but you'll need to talk to Mark Yao or some else
> knowledgable in graphics.
>
> The devicetree is about describing the _available_ hardware, not configuring
> how it is supposed to be used ;-) .
OK, agree with you, i will remove it in next version.
>
>
> Heiko
diff mbox

Patch

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 7327250..4fc05b7 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -679,6 +679,7 @@  dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3288-popmetal.dtb \
 	rk3288-r89.dtb \
 	rk3288-rock2-square.dtb \
+	rk3288-tinker.dtb \
 	rk3288-veyron-brain.dtb \
 	rk3288-veyron-jaq.dtb \
 	rk3288-veyron-jerry.dtb \
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
new file mode 100644
index 0000000..37cb431
--- /dev/null
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
@@ -0,0 +1,556 @@ 
+/*
+ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+
+#include "rk3288.dtsi"
+
+/ {
+	model = "Rockchip RK3288 Tinker Board";
+	compatible = "rockchip,rk3288-tinker", "rockchip,rk3288";
+
+	memory {
+		reg = <0x0 0x80000000>;
+		device_type = "memory";
+	};
+
+	ext_gmac: external-gmac-clock {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <125000000>;
+		clock-output-names = "ext_gmac";
+	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		autorepeat;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&pwrbtn>;
+
+		button@0 {
+			gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+			linux,code = <116>;
+			label = "GPIO Key Power";
+			linux,input-type = <1>;
+			gpio-key,wakeup = <1>;
+			debounce-interval = <100>;
+		};
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		pwr-led {
+			gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "default-on";
+		};
+
+		act-led {
+			gpios=<&gpio2 3 GPIO_ACTIVE_LOW>;
+			linux,default-trigger="mmc0";
+		};
+	};
+
+	sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,name = "rockchip,tinker-codec";
+		simple-audio-card,mclk-fs = <512>;
+		simple-audio-card,cpu {
+			sound-dai = <&i2s>;
+		};
+		simple-audio-card,codec {
+			sound-dai = <&hdmi>;
+		};
+	};
+
+	vcc_sys: vsys-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_sys";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
+	/*
+	 * NOTE: vcc_sd isn't hooked up on v1.0 boards where power comes from
+	 * vcc_io directly.  Those boards won't be able to power cycle SD cards
+	 * but it shouldn't hurt to toggle this pin there anyway.
+	 */
+	vcc_sd: sdmmc-regulator {
+		compatible = "regulator-fixed";
+		gpio = <&gpio7 11 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&sdmmc_pwr>;
+		regulator-name = "vcc_sd";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		startup-delay-us = <100000>;
+		vin-supply = <&vcc_io>;
+	};
+};
+
+&cpu0 {
+	cpu0-supply = <&vdd_cpu>;
+};
+
+&gmac {
+	phy-supply = <&vcc33_lan>;
+	phy-mode = "rgmii";
+	clock_in_out = "input";
+	snps,reset-gpio = <&gpio4 7 0>;
+	snps,reset-active-low;
+	snps,reset-delays-us = <0 10000 1000000>;
+	assigned-clocks = <&cru SCLK_MAC>;
+	assigned-clock-parents = <&ext_gmac>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&rgmii_pins>;
+	tx_delay = <0x30>;
+	rx_delay = <0x10>;
+	status = "ok";
+};
+
+&hdmi {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	#sound-dai-cells = <0>;
+	ddc-i2c-bus = <&i2c5>;
+	status = "okay";
+	/* Don't use vopl for HDMI */
+	ports {
+		hdmi_in: port {
+			/delete-node/ endpoint@1;
+		};
+	};
+};
+
+&i2c0 {
+	status = "okay";
+	clock-frequency = <400000>;
+
+	rk808: pmic@1b {
+		compatible = "rockchip,rk808";
+		reg = <0x1b>;
+		interrupt-parent = <&gpio0>;
+		interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pmic_int &global_pwroff &dvs_1 &dvs_2>;
+		dvs-gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>,
+				<&gpio0 12 GPIO_ACTIVE_HIGH>;
+
+		rockchip,system-power-controller;
+		wakeup-source;
+		#clock-cells = <1>;
+		clock-output-names = "xin32k", "rk808-clkout2";
+
+		vcc1-supply = <&vcc_sys>;
+		vcc2-supply = <&vcc_sys>;
+		vcc3-supply = <&vcc_sys>;
+		vcc4-supply = <&vcc_sys>;
+		vcc6-supply = <&vcc_sys>;
+		vcc7-supply = <&vcc_sys>;
+		vcc8-supply = <&vcc_18>;
+		vcc9-supply = <&vcc_io>;
+		vcc10-supply = <&vcc_io>;
+		vcc11-supply = <&vcc_sys>;
+		vcc12-supply = <&vcc_io>;
+		vddio-supply = <&vcc18_ldo1>;
+
+		regulators {
+			vdd_cpu: DCDC_REG1 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <750000>;
+				regulator-max-microvolt = <1350000>;
+				regulator-name = "vdd_arm";
+				regulator-ramp-delay = <6000>;
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdd_gpu: DCDC_REG2 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <850000>;
+				regulator-max-microvolt = <1250000>;
+				regulator-name = "vdd_gpu";
+				regulator-ramp-delay = <6000>;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1000000>;
+				};
+			};
+
+			vcc_ddr: DCDC_REG3 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-name = "vcc_ddr";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+
+			vcc_io: DCDC_REG4 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc_io";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <3300000>;
+				};
+			};
+
+			vcc18_ldo1: LDO_REG1 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc18_ldo1";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vcc33_mipi: LDO_REG2 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc33_mipi";
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdd_10: LDO_REG3 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1000000>;
+				regulator-max-microvolt = <1000000>;
+				regulator-name = "vdd_10";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1000000>;
+				};
+			};
+
+			vcc18_codec: LDO_REG4 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc18_codec";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vccio_sd: LDO_REG5 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vccio_sd";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <3300000>;
+				};
+			};
+
+			vdd10_lcd: LDO_REG6 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1000000>;
+				regulator-max-microvolt = <1000000>;
+				regulator-name = "vdd10_lcd";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1000000>;
+				};
+			};
+
+			vcc_18: LDO_REG7 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc_18";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vcc18_lcd: LDO_REG8 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc18_lcd";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vcc33_sd: SWITCH_REG1 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-name = "vcc33_sd";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+
+			vcc33_lan: SWITCH_REG2 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-name = "vcc33_lan";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+		};
+	};
+};
+
+&i2c2 {
+	status = "okay";
+};
+
+&i2c5 {
+	status = "okay";
+};
+
+&i2s {
+	#sound-dai-cells = <0>;
+	status = "okay";
+};
+
+&io_domains {
+	status = "okay";
+
+	sdcard-supply = <&vccio_sd>;
+};
+
+&pinctrl {
+	pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {
+		drive-strength = <8>;
+	};
+
+	pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {
+		bias-pull-up;
+		drive-strength = <8>;
+	};
+
+	backlight {
+		bl_en: bl-en {
+			rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	buttons {
+		pwrbtn: pwrbtn {
+			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+	eth_phy {
+		eth_phy_pwr: eth-phy-pwr {
+			rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	pmic {
+		pmic_int: pmic-int {
+			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO \
+					&pcfg_pull_up>;
+		};
+
+		dvs_1: dvs-1 {
+			rockchip,pins = <RK_GPIO0 11 RK_FUNC_GPIO \
+					&pcfg_pull_down>;
+		};
+
+		dvs_2: dvs-2 {
+			rockchip,pins = <RK_GPIO0 12 RK_FUNC_GPIO \
+					&pcfg_pull_down>;
+		};
+	};
+
+	sdmmc {
+		/*
+		 * Default drive strength isn't enough to achieve even
+		 * high-speed mode on EVB board so bump up to 8ma.
+		 */
+		sdmmc_bus4: sdmmc-bus4 {
+			rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
+					<6 17 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
+					<6 18 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
+					<6 19 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
+		};
+
+		sdmmc_clk: sdmmc-clk {
+			rockchip,pins = <6 20 RK_FUNC_1 \
+					&pcfg_pull_none_drv_8ma>;
+		};
+
+		sdmmc_cmd: sdmmc-cmd {
+			rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
+		};
+
+		sdmmc_pwr: sdmmc-pwr {
+			rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	usb {
+		host_vbus_drv: host-vbus-drv {
+			rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		pwr_3g: pwr-3g {
+			rockchip,pins = <7 8 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+};
+
+&pwm0 {
+	status = "okay";
+};
+
+&saradc {
+	vref-supply = <&vcc18_ldo1>;
+	status ="okay";
+};
+
+&sdmmc {
+	bus-width = <4>;
+	cap-mmc-highspeed;
+	cap-sd-highspeed;
+	card-detect-delay = <200>;
+	disable-wp;			/* wp not hooked up */
+	num-slots = <1>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
+	status = "okay";
+	supports-sd;
+	vmmc-supply = <&vcc_sd>;
+	vqmmc-supply = <&vccio_sd>;
+};
+
+&tsadc {
+	rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
+	rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
+	status = "okay";
+};
+
+&uart0 {
+	status = "okay";
+};
+
+&uart1 {
+	status = "okay";
+};
+
+&uart2 {
+	status = "okay";
+};
+
+&uart3 {
+	status = "okay";
+};
+
+&uart4 {
+	status = "okay";
+};
+
+&usbphy {
+	status = "okay";
+};
+
+&usb_host0_ehci {
+	no-relinquish-port;
+	status = "okay";
+};
+
+&usb_host1 {
+	status = "okay";
+};
+
+&usb_otg {
+	status= "okay";
+};
+
+&vopb {
+	status = "okay";
+};
+
+&vopb_mmu {
+	status = "okay";
+};
+
+&vopl {
+	status = "okay";
+	/* Don't use vopl for HDMI */
+	vopl_out: port {
+		/delete-node/ endpoint@0;
+	};
+};
+
+&vopl_mmu {
+	status = "okay";
+};
+
+&wdt {
+	status = "okay";
+};
+