From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matwey V. Kornilov Date: Sun, 19 May 2019 15:11:27 +0300 Subject: [U-Boot] [PATCH 4/5] rockchip: dts: rk3328: add rk3328-rock64.dts In-Reply-To: References: <20190508063435.3796-1-matwey.kornilov@gmail.com> <20190508063435.3796-5-matwey.kornilov@gmail.com> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: u-boot@lists.denx.de Hi Kever, чт, 16 мая 2019 г. в 09:56, Kever Yang : > > Hi Matwey, > > > On 05/08/2019 02:34 PM, Matwey V. Kornilov wrote: > > rk3328-rock64.dts has been taken from Linux kernel with minor > > modifications. > > Could you detail about which commit of kernel do you take > this dts from? Sure. > > > > > Signed-off-by: Matwey V. Kornilov > > --- > > arch/arm/dts/Makefile | 1 + > > arch/arm/dts/rk3328-rock64-u-boot.dtsi | 30 ++++ > > arch/arm/dts/rk3328-rock64.dts | 294 +++++++++++++++++++++++++++++++++ > > 3 files changed, 325 insertions(+) > > create mode 100644 arch/arm/dts/rk3328-rock64-u-boot.dtsi > > create mode 100644 arch/arm/dts/rk3328-rock64.dts > > > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > > index 8e082f2840..cacc580502 100644 > > --- a/arch/arm/dts/Makefile > > +++ b/arch/arm/dts/Makefile > > @@ -85,6 +85,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ > > rk3288-veyron-speedy.dtb \ > > rk3288-vyasa.dtb \ > > rk3328-evb.dtb \ > > + rk3328-rock64.dtb \ > > rk3399-ficus.dtb \ > > rk3368-lion.dtb \ > > rk3368-sheep.dtb \ > > diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi > > new file mode 100644 > > index 0000000000..a0e04be758 > > --- /dev/null > > +++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi > > @@ -0,0 +1,30 @@ > > +/* > > + * (C) Copyright 2018 Rockchip Electronics Co., Ltd > > + * > > + * SPDX-License-Identifier: GPL-2.0+ > > + */ > > + > > +/ { > > + aliases { > > + mmc0 = &emmc; > > + mmc1 = &sdmmc; > > + }; > > Maybe you would need a spl-boot-order here to make sure SPL can find > u-boot from > both emmc and sdmmc. Done. Yet I don't have EMMC on my board to test. > > > +}; > > + > > +&cru { > > + u-boot,dm-pre-reloc; > > +}; > > + > > +&uart2 { > > + u-boot,dm-pre-reloc; > > +}; > > And maybe you need add 'clock-frequency=24000000' for uart2. uart2 node in rk3328.dtsi already has the clock-frequency. > > Thanks, > - Kever > > + > > +&emmc { > > + u-boot,dm-pre-reloc; > > + fifo-mode; > > +}; > > + > > +&sdmmc { > > + u-boot,dm-pre-reloc; > > + fifo-mode; > > +}; > > diff --git a/arch/arm/dts/rk3328-rock64.dts b/arch/arm/dts/rk3328-rock64.dts > > new file mode 100644 > > index 0000000000..7bcc53fcce > > --- /dev/null > > +++ b/arch/arm/dts/rk3328-rock64.dts > > @@ -0,0 +1,294 @@ > > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > +/* > > + * Copyright (c) 2017 PINE64 > > + */ > > + > > +/dts-v1/; > > +#include "rk3328.dtsi" > > + > > +/ { > > + model = "Pine64 Rock64"; > > + compatible = "pine64,rock64", "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>; > > + }; > > + > > + 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_host_5v: vcc-host-5v-regulator { > > + compatible = "regulator-fixed"; > > + enable-active-high; > > + gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; > > + pinctrl-names = "default"; > > + pinctrl-0 = <&usb30_host_drv>; > > + regulator-name = "vcc_host_5v"; > > + regulator-always-on; > > + regulator-boot-on; > > + vin-supply = <&vcc_sys>; > > + }; > > + > > + vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator { > > + compatible = "regulator-fixed"; > > + enable-active-high; > > + gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; > > + pinctrl-names = "default"; > > + pinctrl-0 = <&usb20_host_drv>; > > + regulator-name = "vcc_host1_5v"; > > + regulator-always-on; > > + regulator-boot-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>; > > + }; > > +}; > > + > > +&cpu0 { > > + cpu-supply = <&vdd_arm>; > > +}; > > + > > +&cpu1 { > > + cpu-supply = <&vdd_arm>; > > +}; > > + > > +&cpu2 { > > + cpu-supply = <&vdd_arm>; > > +}; > > + > > +&cpu3 { > > + cpu-supply = <&vdd_arm>; > > +}; > > + > > +&emmc { > > + bus-width = <8>; > > + cap-mmc-highspeed; > > + mmc-hs200-1_8v; > > + non-removable; > > + pinctrl-names = "default"; > > + pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>; > > + vmmc-supply = <&vcc_io>; > > + vqmmc-supply = <&vcc18_emmc>; > > + 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_io>; > > + phy-mode = "rgmii"; > > + pinctrl-names = "default"; > > + pinctrl-0 = <&rgmiim1_pins>; > > + snps,force_thresh_dma_mode; > > + snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; > > + snps,reset-active-low; > > + snps,reset-delays-us = <0 10000 50000>; > > + tx_delay = <0x24>; > > + rx_delay = <0x18>; > > + status = "okay"; > > +}; > > + > > +&i2c1 { > > + status = "okay"; > > + > > + rk805: rk805 at 18 { > > + compatible = "rockchip,rk805"; > > + reg = <0x18>; > > + interrupt-parent = <&gpio2>; > > + interrupts = <6 IRQ_TYPE_LEVEL_LOW>; > > + #clock-cells = <1>; > > + clock-output-names = "xin32k", "rk805-clkout2"; > > + 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_sys>; > > + > > + regulators { > > + vdd_logic: DCDC_REG1 { > > + regulator-name = "vdd_logic"; > > + regulator-min-microvolt = <712500>; > > + regulator-max-microvolt = <1450000>; > > + regulator-ramp-delay = <12500>; > > + 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-ramp-delay = <12500>; > > + 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 = "vdd_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 = "vcc_18emmc"; > > + 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>; > > + }; > > + }; > > + }; > > + }; > > +}; > > + > > +&io_domains { > > + status = "okay"; > > + > > + vccio1-supply = <&vcc_io>; > > + vccio2-supply = <&vcc18_emmc>; > > + vccio3-supply = <&vcc_io>; > > + vccio4-supply = <&vcc_18>; > > + vccio5-supply = <&vcc_io>; > > + vccio6-supply = <&vcc_io>; > > + pmuio-supply = <&vcc_io>; > > +}; > > + > > +&pinctrl { > > + pmic { > > + pmic_int_l: pmic-int-l { > > + rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; > > + }; > > + }; > > + > > + usb2 { > > + usb20_host_drv: usb20-host-drv { > > + rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; > > + }; > > + }; > > + > > + usb3 { > > + usb30_host_drv: usb30-host-drv { > > + rockchip,pins = <0 RK_PA0 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"; > > +}; > > + > > +&spi0 { > > + status = "okay"; > > + > > + spiflash at 0 { > > + compatible = "jedec,spi-nor"; > > + reg = <0>; > > + > > + /* maximum speed for Rockchip SPI */ > > + spi-max-frequency = <50000000>; > > + }; > > +}; > > + > > +&uart2 { > > + status = "okay"; > > +}; > > + > > +&usb20_otg { > > + dr_mode = "host"; > > + status = "okay"; > > +}; > > + > > +&usb_host0_ehci { > > + status = "okay"; > > +}; > > + > > +&usb_host0_ohci { > > + status = "okay"; > > +}; > > > -- With best regards, Matwey V. Kornilov