* [PATCH v3 0/9] rockchip: rk3328: sync dts and add ROC-RK3328-CC board
@ 2020-04-27 6:52 Chen-Yu Tsai
2020-04-27 6:52 ` [PATCH v3 1/9] rockchip: dts: rk3328-evb: Move vcc5v0-host-xhci-drv to -u-boot.dtsi Chen-Yu Tsai
` (9 more replies)
0 siblings, 10 replies; 20+ messages in thread
From: Chen-Yu Tsai @ 2020-04-27 6:52 UTC (permalink / raw)
To: u-boot
From: Chen-Yu Tsai <wens@csie.org>
Hi everyone,
This is v3 of my ROC-RK3328-CC series. Changes from v2 are mainly
fixing USB functionality on RK3328 in U-boot. This includes restoring
the U-Boot specific "hnp-srp-disable" property for dwc2, moving the
dwc2 device node after the ehci/ohci ones, and making vbus controllable
and tied only to the XHCI controller. Because of this, I dropped review
and tested tags from the DTS sync and new board patches.
Changes from v1 are mainly dropping the custom board target, and dealing
with the pinmuxing through proper use of DM regulators / GPIO / pinctrl
in SPL.
This series adds proper support for Firefly / Libre Computer ROC-RK3328-CC
single board computer.
The ROC-RK3328-CC from Firefly and Libre Computer Project is a credit
card size development board based on the Rockchip RK3328 SoC, with:
- 1/2/4 GB DDR4 DRAM
- eMMC connector for optional module
- micro SD card slot
- 1 x USB 3.0 host port
- 2 x USB 2.0 host port
- 1 x USB 2.0 OTG port
- HDMI video output
- TRRS connector with audio and composite video output
- gigabit Ethernet
- consumer IR receiver
- debug UART pins
Originally I started with Loic's patches, and syncing the device tree
files from Linux. That didn't get very far, with SPL failing to detect
the SD card. Examining the schematics and internal state of GRF and
GPIOs, I realized that the logic for the SD card power enable switch
is opposite that of what the SD card controller's SDMMC0_PWREN pin
would use. Instead, directly using the GPIO is required.
To deal with this, DM regulator and GPIO are enabled in SPL, and
various device nodes are marked with u-boot,dm-spl to have them work.
pinctrl properties are not stripped, so as to have the SDMMC0_PWREN
pin muxed over to GPIO.
Along the way, there are some clean-ups of existing dts files, moving
U-boot only features to -u-boot.dtsi files, and then a wholesale sync
from Linux. Only boards already existing in U-boot are synced. DT
binding header files are synced separately as there is already one
patch floating around. The DT sync also includes clean-up changes only
recently posted, and likely won't make it in for at least a few weeks.
Please have a look, and test if possible. I cc-ed a couple people that
showed interest in this board on mailing lists recently.
Regards
ChenYu
Chen-Yu Tsai (9):
rockchip: dts: rk3328-evb: Move vcc5v0-host-xhci-drv to -u-boot.dtsi
rockchip: dts: rk3328-evb: Move gmac2io related nodes to -u-boot.dtsi
rockchip: dts: rk3328: Move OTG node's hnp-srp-disable to
rk3328-u-boot.dtsi
dt-bindings: clock: rk3328: sync from upstream Linux kernel
dt-bindings: power: rk3328-power: sync from upstream Linux kernel
rockchip: rk3328: Disable generic PHY support
rockchip: dts: rk3328: Sync device tree files from Linux
rockchip: rk3328: Add support for ROC-RK3328-CC board
rockchip: dts: rock64: Fix XHCI usage
arch/arm/dts/Makefile | 1 +
arch/arm/dts/rk3328-evb-u-boot.dtsi | 39 +
arch/arm/dts/rk3328-evb.dts | 220 +--
arch/arm/dts/rk3328-roc-cc-u-boot.dtsi | 47 +
.../{rk3328-rock64.dts => rk3328-roc-cc.dts} | 135 +-
arch/arm/dts/rk3328-rock64-u-boot.dtsi | 11 +
arch/arm/dts/rk3328-rock64.dts | 132 +-
arch/arm/dts/rk3328-u-boot.dtsi | 4 +
arch/arm/dts/rk3328.dtsi | 1415 +++++++++++------
board/rockchip/evb_rk3328/MAINTAINERS | 7 +
configs/evb-rk3328_defconfig | 1 -
...3328_defconfig => roc-cc-rk3328_defconfig} | 19 +-
configs/rock64-rk3328_defconfig | 1 -
doc/README.rockchip | 4 +-
include/dt-bindings/clock/rk3328-cru.h | 212 +--
include/dt-bindings/power/rk3328-power.h | 19 +
16 files changed, 1514 insertions(+), 753 deletions(-)
create mode 100644 arch/arm/dts/rk3328-roc-cc-u-boot.dtsi
copy arch/arm/dts/{rk3328-rock64.dts => rk3328-roc-cc.dts} (68%)
copy configs/{rock64-rk3328_defconfig => roc-cc-rk3328_defconfig} (81%)
create mode 100644 include/dt-bindings/power/rk3328-power.h
--
2.26.0
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH v3 1/9] rockchip: dts: rk3328-evb: Move vcc5v0-host-xhci-drv to -u-boot.dtsi 2020-04-27 6:52 [PATCH v3 0/9] rockchip: rk3328: sync dts and add ROC-RK3328-CC board Chen-Yu Tsai @ 2020-04-27 6:52 ` Chen-Yu Tsai 2020-04-27 6:52 ` [PATCH v3 2/9] rockchip: dts: rk3328-evb: Move gmac2io related nodes " Chen-Yu Tsai ` (8 subsequent siblings) 9 siblings, 0 replies; 20+ messages in thread From: Chen-Yu Tsai @ 2020-04-27 6:52 UTC (permalink / raw) To: u-boot From: Chen-Yu Tsai <wens@csie.org> USB 3.0 is only supported in U-boot, not in the Linux kernel where the device tree files are ultimately synced from. While the xhci node was moved, the external vbus regulator was not. Move it as well. Fixes: 2e91e2025c1b ("rockchip: rk3328: migrate u-boot node to -u-boot.dtsi") Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Tested-by: Loic Devulder <ldevulder@suse.com> Tested-by: Peter Geis <pgwipeout@gmail.com> Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- Changes since v2: - none Changes since v1: - Added Kever's reviewed-by --- arch/arm/dts/rk3328-evb-u-boot.dtsi | 11 +++++++++++ arch/arm/dts/rk3328-evb.dts | 9 --------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi index 4a827063c555..5679897279aa 100644 --- a/arch/arm/dts/rk3328-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3328-evb-u-boot.dtsi @@ -6,6 +6,17 @@ #include "rk3328-u-boot.dtsi" #include "rk3328-sdram-ddr3-666.dtsi" +/{ + vcc5v0_host_xhci: vcc5v0-host-xhci-drv { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 0 GPIO_ACTIVE_HIGH>; + regulator-name = "vcc5v0_host_xhci"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; +}; + &usb_host0_xhci { vbus-supply = <&vcc5v0_host_xhci>; status = "okay"; diff --git a/arch/arm/dts/rk3328-evb.dts b/arch/arm/dts/rk3328-evb.dts index a2ee838fcd6b..e9bc849f8c23 100644 --- a/arch/arm/dts/rk3328-evb.dts +++ b/arch/arm/dts/rk3328-evb.dts @@ -38,15 +38,6 @@ regulator-max-microvolt = <5000000>; }; - vcc5v0_host_xhci: vcc5v0-host-xhci-drv { - compatible = "regulator-fixed"; - enable-active-high; - regulator-name = "vcc5v0_host_xhci"; - gpio = <&gpio0 0 GPIO_ACTIVE_HIGH>; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - }; - vcc_phy: vcc-phy-regulator { compatible = "regulator-fixed"; regulator-name = "vcc_phy"; -- 2.26.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v3 2/9] rockchip: dts: rk3328-evb: Move gmac2io related nodes to -u-boot.dtsi 2020-04-27 6:52 [PATCH v3 0/9] rockchip: rk3328: sync dts and add ROC-RK3328-CC board Chen-Yu Tsai 2020-04-27 6:52 ` [PATCH v3 1/9] rockchip: dts: rk3328-evb: Move vcc5v0-host-xhci-drv to -u-boot.dtsi Chen-Yu Tsai @ 2020-04-27 6:52 ` Chen-Yu Tsai 2020-04-27 6:52 ` [PATCH v3 3/9] rockchip: dts: rk3328: Move OTG node's hnp-srp-disable to rk3328-u-boot.dtsi Chen-Yu Tsai ` (7 subsequent siblings) 9 siblings, 0 replies; 20+ messages in thread From: Chen-Yu Tsai @ 2020-04-27 6:52 UTC (permalink / raw) To: u-boot From: Chen-Yu Tsai <wens@csie.org> The device tree file for rk3328-evb in the Linux kernel does not have gmac2io enabled. Instead, gmac2phy is enabled, but that is not supported in U-boot. Move the gmac2io related nodes to rk3328-evb-u-boot.dtsi to preserve the current functionality. When the device tree files are synced, gmac2phy should be marked as "broken" in -u-boot.dtsi files. Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Tested-by: Loic Devulder <ldevulder@suse.com> Tested-by: Peter Geis <pgwipeout@gmail.com> Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- Changes since v2: - none Changes since v1: - Added Kever's reviewed-by --- arch/arm/dts/rk3328-evb-u-boot.dtsi | 23 +++++++++++++++++++++++ arch/arm/dts/rk3328-evb.dts | 23 ----------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi index 5679897279aa..8ba53cf8f44b 100644 --- a/arch/arm/dts/rk3328-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3328-evb-u-boot.dtsi @@ -7,6 +7,13 @@ #include "rk3328-sdram-ddr3-666.dtsi" /{ + gmac_clkin: external-gmac-clock { + compatible = "fixed-clock"; + clock-frequency = <125000000>; + clock-output-names = "gmac_clkin"; + #clock-cells = <0>; + }; + vcc5v0_host_xhci: vcc5v0-host-xhci-drv { compatible = "regulator-fixed"; enable-active-high; @@ -17,6 +24,22 @@ }; }; +&gmac2io { + phy-supply = <&vcc_phy>; + phy-mode = "rgmii"; + clock_in_out = "input"; + snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; + snps,reset-active-low; + snps,reset-delays-us = <0 10000 50000>; + assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; + assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>; + pinctrl-names = "default"; + pinctrl-0 = <&rgmiim1_pins>; + tx_delay = <0x26>; + rx_delay = <0x11>; + status = "okay"; +}; + &usb_host0_xhci { vbus-supply = <&vcc5v0_host_xhci>; status = "okay"; diff --git a/arch/arm/dts/rk3328-evb.dts b/arch/arm/dts/rk3328-evb.dts index e9bc849f8c23..97bef37cf610 100644 --- a/arch/arm/dts/rk3328-evb.dts +++ b/arch/arm/dts/rk3328-evb.dts @@ -14,13 +14,6 @@ stdout-path = &uart2; }; - gmac_clkin: external-gmac-clock { - compatible = "fixed-clock"; - clock-frequency = <125000000>; - clock-output-names = "gmac_clkin"; - #clock-cells = <0>; - }; - vcc3v3_sdmmc: sdmmc-pwren { compatible = "regulator-fixed"; regulator-name = "vcc3v3"; @@ -78,22 +71,6 @@ status = "okay"; }; -&gmac2io { - phy-supply = <&vcc_phy>; - phy-mode = "rgmii"; - clock_in_out = "input"; - snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - snps,reset-delays-us = <0 10000 50000>; - assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; - assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>; - pinctrl-names = "default"; - pinctrl-0 = <&rgmiim1_pins>; - tx_delay = <0x26>; - rx_delay = <0x11>; - status = "okay"; -}; - &usb_host0_ehci { status = "okay"; }; -- 2.26.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v3 3/9] rockchip: dts: rk3328: Move OTG node's hnp-srp-disable to rk3328-u-boot.dtsi 2020-04-27 6:52 [PATCH v3 0/9] rockchip: rk3328: sync dts and add ROC-RK3328-CC board Chen-Yu Tsai 2020-04-27 6:52 ` [PATCH v3 1/9] rockchip: dts: rk3328-evb: Move vcc5v0-host-xhci-drv to -u-boot.dtsi Chen-Yu Tsai 2020-04-27 6:52 ` [PATCH v3 2/9] rockchip: dts: rk3328-evb: Move gmac2io related nodes " Chen-Yu Tsai @ 2020-04-27 6:52 ` Chen-Yu Tsai 2020-04-28 14:23 ` Kever Yang 2020-04-27 6:52 ` [PATCH v3 4/9] dt-bindings: clock: rk3328: sync from upstream Linux kernel Chen-Yu Tsai ` (6 subsequent siblings) 9 siblings, 1 reply; 20+ messages in thread From: Chen-Yu Tsai @ 2020-04-27 6:52 UTC (permalink / raw) To: u-boot From: Chen-Yu Tsai <wens@csie.org> The "hnp-srp-disable" property for dwc2 is specific to U-boot, not part of upstream Linux's device tree bindings. Move it to rk3328-u-boot.dtsi to avoid losing it when syncing device tree files. Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- Changes since v2: - New patch --- arch/arm/dts/rk3328-u-boot.dtsi | 4 ++++ arch/arm/dts/rk3328.dtsi | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi index 6d5b3ec06e07..c69e13e11efe 100644 --- a/arch/arm/dts/rk3328-u-boot.dtsi +++ b/arch/arm/dts/rk3328-u-boot.dtsi @@ -62,3 +62,7 @@ /* mmc to sram can't do dma, prevent aborts transfering TF-A parts */ u-boot,spl-fifo-mode; }; + +&usb20_otg { + hnp-srp-disable; +}; diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi index 060c84e6c0cf..57719b82d13e 100644 --- a/arch/arm/dts/rk3328.dtsi +++ b/arch/arm/dts/rk3328.dtsi @@ -483,7 +483,6 @@ "snps,dwc2"; reg = <0x0 0xff580000 0x0 0x40000>; interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; - hnp-srp-disable; dr_mode = "otg"; status = "disabled"; }; -- 2.26.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v3 3/9] rockchip: dts: rk3328: Move OTG node's hnp-srp-disable to rk3328-u-boot.dtsi 2020-04-27 6:52 ` [PATCH v3 3/9] rockchip: dts: rk3328: Move OTG node's hnp-srp-disable to rk3328-u-boot.dtsi Chen-Yu Tsai @ 2020-04-28 14:23 ` Kever Yang 0 siblings, 0 replies; 20+ messages in thread From: Kever Yang @ 2020-04-28 14:23 UTC (permalink / raw) To: u-boot On 2020/4/27 ??2:52, Chen-Yu Tsai wrote: > From: Chen-Yu Tsai <wens@csie.org> > > The "hnp-srp-disable" property for dwc2 is specific to U-boot, not part > of upstream Linux's device tree bindings. > > Move it to rk3328-u-boot.dtsi to avoid losing it when syncing device > tree files. > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > Changes since v2: > - New patch > --- > arch/arm/dts/rk3328-u-boot.dtsi | 4 ++++ > arch/arm/dts/rk3328.dtsi | 1 - > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi > index 6d5b3ec06e07..c69e13e11efe 100644 > --- a/arch/arm/dts/rk3328-u-boot.dtsi > +++ b/arch/arm/dts/rk3328-u-boot.dtsi > @@ -62,3 +62,7 @@ > /* mmc to sram can't do dma, prevent aborts transfering TF-A parts */ > u-boot,spl-fifo-mode; > }; > + > +&usb20_otg { > + hnp-srp-disable; > +}; > diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi > index 060c84e6c0cf..57719b82d13e 100644 > --- a/arch/arm/dts/rk3328.dtsi > +++ b/arch/arm/dts/rk3328.dtsi > @@ -483,7 +483,6 @@ > "snps,dwc2"; > reg = <0x0 0xff580000 0x0 0x40000>; > interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; > - hnp-srp-disable; > dr_mode = "otg"; > status = "disabled"; > }; ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v3 4/9] dt-bindings: clock: rk3328: sync from upstream Linux kernel 2020-04-27 6:52 [PATCH v3 0/9] rockchip: rk3328: sync dts and add ROC-RK3328-CC board Chen-Yu Tsai ` (2 preceding siblings ...) 2020-04-27 6:52 ` [PATCH v3 3/9] rockchip: dts: rk3328: Move OTG node's hnp-srp-disable to rk3328-u-boot.dtsi Chen-Yu Tsai @ 2020-04-27 6:52 ` Chen-Yu Tsai 2020-04-27 6:52 ` [PATCH v3 5/9] dt-bindings: power: rk3328-power: " Chen-Yu Tsai ` (5 subsequent siblings) 9 siblings, 0 replies; 20+ messages in thread From: Chen-Yu Tsai @ 2020-04-27 6:52 UTC (permalink / raw) To: u-boot From: Chen-Yu Tsai <wens@csie.org> This syncs the rk3328 clock header file from Linux kernel next-20200324, to support newer hardware blocks when syncing the device tree files. The last non-merge commit to touch it was 0dc14b013f79 ("clk: rockchip: add clock id for watchdog pclk on rk3328") Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Tested-by: Loic Devulder <ldevulder@suse.com> Tested-by: Peter Geis <pgwipeout@gmail.com> Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- Changes since v2: - none Changes since v1: - Added Kever's reviewed-by --- include/dt-bindings/clock/rk3328-cru.h | 212 ++++++++++++------------- 1 file changed, 106 insertions(+), 106 deletions(-) diff --git a/include/dt-bindings/clock/rk3328-cru.h b/include/dt-bindings/clock/rk3328-cru.h index cde61ed8830b..555b4ff660ae 100644 --- a/include/dt-bindings/clock/rk3328-cru.h +++ b/include/dt-bindings/clock/rk3328-cru.h @@ -1,6 +1,7 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * (C) Copyright 2016 Rockchip Electronics Co., Ltd + * Copyright (c) 2016 Rockchip Electronics Co. Ltd. + * Author: Elaine <zhangqing@rock-chips.com> */ #ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3328_H @@ -90,119 +91,118 @@ #define SCLK_MAC2IO_EXT 102 /* dclk gates */ -#define DCLK_LCDC 180 -#define DCLK_HDMIPHY 181 -#define HDMIPHY 182 -#define USB480M 183 -#define DCLK_LCDC_SRC 184 +#define DCLK_LCDC 120 +#define DCLK_HDMIPHY 121 +#define HDMIPHY 122 +#define USB480M 123 +#define DCLK_LCDC_SRC 124 /* aclk gates */ -#define ACLK_AXISRAM 190 -#define ACLK_VOP_PRE 191 -#define ACLK_USB3OTG 192 -#define ACLK_RGA_PRE 193 -#define ACLK_DMAC 194 -#define ACLK_GPU 195 -#define ACLK_BUS_PRE 196 -#define ACLK_PERI_PRE 197 -#define ACLK_RKVDEC_PRE 198 -#define ACLK_RKVDEC 199 -#define ACLK_RKVENC 200 -#define ACLK_VPU_PRE 201 -#define ACLK_VIO_PRE 202 -#define ACLK_VPU 203 -#define ACLK_VIO 204 -#define ACLK_VOP 205 -#define ACLK_GMAC 206 -#define ACLK_H265 207 -#define ACLK_H264 208 -#define ACLK_MAC2PHY 209 -#define ACLK_MAC2IO 210 -#define ACLK_DCF 211 -#define ACLK_TSP 212 -#define ACLK_PERI 213 -#define ACLK_RGA 214 -#define ACLK_IEP 215 -#define ACLK_CIF 216 -#define ACLK_HDCP 217 +#define ACLK_AXISRAM 130 +#define ACLK_VOP_PRE 131 +#define ACLK_USB3OTG 132 +#define ACLK_RGA_PRE 133 +#define ACLK_DMAC 134 +#define ACLK_GPU 135 +#define ACLK_BUS_PRE 136 +#define ACLK_PERI_PRE 137 +#define ACLK_RKVDEC_PRE 138 +#define ACLK_RKVDEC 139 +#define ACLK_RKVENC 140 +#define ACLK_VPU_PRE 141 +#define ACLK_VIO_PRE 142 +#define ACLK_VPU 143 +#define ACLK_VIO 144 +#define ACLK_VOP 145 +#define ACLK_GMAC 146 +#define ACLK_H265 147 +#define ACLK_H264 148 +#define ACLK_MAC2PHY 149 +#define ACLK_MAC2IO 150 +#define ACLK_DCF 151 +#define ACLK_TSP 152 +#define ACLK_PERI 153 +#define ACLK_RGA 154 +#define ACLK_IEP 155 +#define ACLK_CIF 156 +#define ACLK_HDCP 157 /* pclk gates */ -#define PCLK_GPIO0 300 -#define PCLK_GPIO1 301 -#define PCLK_GPIO2 302 -#define PCLK_GPIO3 303 -#define PCLK_GRF 304 -#define PCLK_I2C0 305 -#define PCLK_I2C1 306 -#define PCLK_I2C2 307 -#define PCLK_I2C3 308 -#define PCLK_SPI 309 -#define PCLK_UART0 310 -#define PCLK_UART1 311 -#define PCLK_UART2 312 -#define PCLK_TSADC 313 -#define PCLK_PWM 314 -#define PCLK_TIMER 315 -#define PCLK_BUS_PRE 316 -#define PCLK_PERI_PRE 317 -#define PCLK_HDMI_CTRL 318 -#define PCLK_HDMI_PHY 319 -#define PCLK_GMAC 320 -#define PCLK_H265 321 -#define PCLK_MAC2PHY 322 -#define PCLK_MAC2IO 323 -#define PCLK_USB3PHY_OTG 324 -#define PCLK_USB3PHY_PIPE 325 -#define PCLK_USB3_GRF 326 -#define PCLK_USB2_GRF 327 -#define PCLK_HDMIPHY 328 -#define PCLK_DDR 329 -#define PCLK_PERI 330 -#define PCLK_HDMI 331 -#define PCLK_HDCP 332 -#define PCLK_DCF 333 -#define PCLK_SARADC 334 +#define PCLK_GPIO0 200 +#define PCLK_GPIO1 201 +#define PCLK_GPIO2 202 +#define PCLK_GPIO3 203 +#define PCLK_GRF 204 +#define PCLK_I2C0 205 +#define PCLK_I2C1 206 +#define PCLK_I2C2 207 +#define PCLK_I2C3 208 +#define PCLK_SPI 209 +#define PCLK_UART0 210 +#define PCLK_UART1 211 +#define PCLK_UART2 212 +#define PCLK_TSADC 213 +#define PCLK_PWM 214 +#define PCLK_TIMER 215 +#define PCLK_BUS_PRE 216 +#define PCLK_PERI_PRE 217 +#define PCLK_HDMI_CTRL 218 +#define PCLK_HDMI_PHY 219 +#define PCLK_GMAC 220 +#define PCLK_H265 221 +#define PCLK_MAC2PHY 222 +#define PCLK_MAC2IO 223 +#define PCLK_USB3PHY_OTG 224 +#define PCLK_USB3PHY_PIPE 225 +#define PCLK_USB3_GRF 226 +#define PCLK_USB2_GRF 227 +#define PCLK_HDMIPHY 228 +#define PCLK_DDR 229 +#define PCLK_PERI 230 +#define PCLK_HDMI 231 +#define PCLK_HDCP 232 +#define PCLK_DCF 233 +#define PCLK_SARADC 234 +#define PCLK_ACODECPHY 235 +#define PCLK_WDT 236 /* hclk gates */ -#define HCLK_PERI 408 -#define HCLK_TSP 409 -#define HCLK_GMAC 410 -#define HCLK_I2S0_8CH 411 -#define HCLK_I2S1_8CH 413 -#define HCLK_I2S2_2CH 413 -#define HCLK_SPDIF_8CH 414 -#define HCLK_VOP 415 -#define HCLK_NANDC 416 -#define HCLK_SDMMC 417 -#define HCLK_SDIO 418 -#define HCLK_EMMC 419 -#define HCLK_SDMMC_EXT 420 -#define HCLK_RKVDEC_PRE 421 -#define HCLK_RKVDEC 422 -#define HCLK_RKVENC 423 -#define HCLK_VPU_PRE 424 -#define HCLK_VIO_PRE 425 -#define HCLK_VPU 426 -#define HCLK_VIO 427 -#define HCLK_BUS_PRE 428 -#define HCLK_PERI_PRE 429 -#define HCLK_H264 430 -#define HCLK_CIF 431 -#define HCLK_OTG_PMU 432 -#define HCLK_OTG 433 -#define HCLK_HOST0 434 -#define HCLK_HOST0_ARB 435 -#define HCLK_CRYPTO_MST 436 -#define HCLK_CRYPTO_SLV 437 -#define HCLK_PDM 438 -#define HCLK_IEP 439 -#define HCLK_RGA 440 -#define HCLK_HDCP 441 +#define HCLK_PERI 308 +#define HCLK_TSP 309 +#define HCLK_GMAC 310 +#define HCLK_I2S0_8CH 311 +#define HCLK_I2S1_8CH 312 +#define HCLK_I2S2_2CH 313 +#define HCLK_SPDIF_8CH 314 +#define HCLK_VOP 315 +#define HCLK_NANDC 316 +#define HCLK_SDMMC 317 +#define HCLK_SDIO 318 +#define HCLK_EMMC 319 +#define HCLK_SDMMC_EXT 320 +#define HCLK_RKVDEC_PRE 321 +#define HCLK_RKVDEC 322 +#define HCLK_RKVENC 323 +#define HCLK_VPU_PRE 324 +#define HCLK_VIO_PRE 325 +#define HCLK_VPU 326 +#define HCLK_BUS_PRE 328 +#define HCLK_PERI_PRE 329 +#define HCLK_H264 330 +#define HCLK_CIF 331 +#define HCLK_OTG_PMU 332 +#define HCLK_OTG 333 +#define HCLK_HOST0 334 +#define HCLK_HOST0_ARB 335 +#define HCLK_CRYPTO_MST 336 +#define HCLK_CRYPTO_SLV 337 +#define HCLK_PDM 338 +#define HCLK_IEP 339 +#define HCLK_RGA 340 +#define HCLK_HDCP 341 #define CLK_NR_CLKS (HCLK_HDCP + 1) -#define CLKGRF_NR_CLKS (SCLK_MAC2PHY + 1) - /* soft-reset indices */ #define SRST_CORE0_PO 0 #define SRST_CORE1_PO 1 -- 2.26.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v3 5/9] dt-bindings: power: rk3328-power: sync from upstream Linux kernel 2020-04-27 6:52 [PATCH v3 0/9] rockchip: rk3328: sync dts and add ROC-RK3328-CC board Chen-Yu Tsai ` (3 preceding siblings ...) 2020-04-27 6:52 ` [PATCH v3 4/9] dt-bindings: clock: rk3328: sync from upstream Linux kernel Chen-Yu Tsai @ 2020-04-27 6:52 ` Chen-Yu Tsai 2020-04-27 6:52 ` [PATCH v3 6/9] rockchip: rk3328: Disable generic PHY support Chen-Yu Tsai ` (4 subsequent siblings) 9 siblings, 0 replies; 20+ messages in thread From: Chen-Yu Tsai @ 2020-04-27 6:52 UTC (permalink / raw) To: u-boot From: Chen-Yu Tsai <wens@csie.org> This syncs the rk3328 power domain header file from Linux kernel next-20200324, to support newer hardware blocks when syncing the device tree files. The last non-merge commit to touch it was b24413180f56 ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license") Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Tested-by: Loic Devulder <ldevulder@suse.com> Tested-by: Peter Geis <pgwipeout@gmail.com> Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- Changes since v2: - none Changes since v1: - Added Kever's reviewed-by --- include/dt-bindings/power/rk3328-power.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 include/dt-bindings/power/rk3328-power.h diff --git a/include/dt-bindings/power/rk3328-power.h b/include/dt-bindings/power/rk3328-power.h new file mode 100644 index 000000000000..02e3d7fc1cce --- /dev/null +++ b/include/dt-bindings/power/rk3328-power.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __DT_BINDINGS_POWER_RK3328_POWER_H__ +#define __DT_BINDINGS_POWER_RK3328_POWER_H__ + +/** + * RK3328 idle id Summary. + */ +#define RK3328_PD_CORE 0 +#define RK3328_PD_GPU 1 +#define RK3328_PD_BUS 2 +#define RK3328_PD_MSCH 3 +#define RK3328_PD_PERI 4 +#define RK3328_PD_VIDEO 5 +#define RK3328_PD_HEVC 6 +#define RK3328_PD_SYS 7 +#define RK3328_PD_VPU 8 +#define RK3328_PD_VIO 9 + +#endif -- 2.26.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v3 6/9] rockchip: rk3328: Disable generic PHY support 2020-04-27 6:52 [PATCH v3 0/9] rockchip: rk3328: sync dts and add ROC-RK3328-CC board Chen-Yu Tsai ` (4 preceding siblings ...) 2020-04-27 6:52 ` [PATCH v3 5/9] dt-bindings: power: rk3328-power: " Chen-Yu Tsai @ 2020-04-27 6:52 ` Chen-Yu Tsai 2020-04-28 14:24 ` Kever Yang 2020-04-27 6:52 ` [PATCH v3 7/9] rockchip: dts: rk3328: Sync device tree files from Linux Chen-Yu Tsai ` (3 subsequent siblings) 9 siblings, 1 reply; 20+ messages in thread From: Chen-Yu Tsai @ 2020-04-27 6:52 UTC (permalink / raw) To: u-boot From: Chen-Yu Tsai <wens@csie.org> The USB PHYs on the RK3328 aren't supported, nor are any other generic PHYs. Because upstream Linux device trees already include the USB PHYs and references in the USB hosts, this would result in various calls to the generic PHY API to fail. Instead, just disable generic PHY support for now. Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- Changes since v2: - New patch --- configs/evb-rk3328_defconfig | 1 - configs/rock64-rk3328_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig index 5bbdc002148c..7667bb037b3d 100644 --- a/configs/evb-rk3328_defconfig +++ b/configs/evb-rk3328_defconfig @@ -61,7 +61,6 @@ CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y -CONFIG_PHY=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig index 826c7a691742..7d096d38c6d0 100644 --- a/configs/rock64-rk3328_defconfig +++ b/configs/rock64-rk3328_defconfig @@ -60,7 +60,6 @@ CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y -CONFIG_PHY=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y -- 2.26.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v3 6/9] rockchip: rk3328: Disable generic PHY support 2020-04-27 6:52 ` [PATCH v3 6/9] rockchip: rk3328: Disable generic PHY support Chen-Yu Tsai @ 2020-04-28 14:24 ` Kever Yang 0 siblings, 0 replies; 20+ messages in thread From: Kever Yang @ 2020-04-28 14:24 UTC (permalink / raw) To: u-boot On 2020/4/27 ??2:52, Chen-Yu Tsai wrote: > From: Chen-Yu Tsai <wens@csie.org> > > The USB PHYs on the RK3328 aren't supported, nor are any other generic > PHYs. Because upstream Linux device trees already include the USB PHYs > and references in the USB hosts, this would result in various calls > to the generic PHY API to fail. > > Instead, just disable generic PHY support for now. > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > Changes since v2: > - New patch > --- > configs/evb-rk3328_defconfig | 1 - > configs/rock64-rk3328_defconfig | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig > index 5bbdc002148c..7667bb037b3d 100644 > --- a/configs/evb-rk3328_defconfig > +++ b/configs/evb-rk3328_defconfig > @@ -61,7 +61,6 @@ CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_DM_ETH=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > -CONFIG_PHY=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > CONFIG_DM_PMIC=y > diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig > index 826c7a691742..7d096d38c6d0 100644 > --- a/configs/rock64-rk3328_defconfig > +++ b/configs/rock64-rk3328_defconfig > @@ -60,7 +60,6 @@ CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_DM_ETH=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > -CONFIG_PHY=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > CONFIG_DM_PMIC=y ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v3 7/9] rockchip: dts: rk3328: Sync device tree files from Linux 2020-04-27 6:52 [PATCH v3 0/9] rockchip: rk3328: sync dts and add ROC-RK3328-CC board Chen-Yu Tsai ` (5 preceding siblings ...) 2020-04-27 6:52 ` [PATCH v3 6/9] rockchip: rk3328: Disable generic PHY support Chen-Yu Tsai @ 2020-04-27 6:52 ` Chen-Yu Tsai 2020-05-11 18:59 ` Kurt Miller 2020-04-27 6:52 ` [PATCH v3 8/9] rockchip: rk3328: Add support for ROC-RK3328-CC board Chen-Yu Tsai ` (2 subsequent siblings) 9 siblings, 1 reply; 20+ messages in thread From: Chen-Yu Tsai @ 2020-04-27 6:52 UTC (permalink / raw) To: u-boot From: Chen-Yu Tsai <wens@csie.org> This syncs rk3328 device tree files from the Linux kernel next-20200324. The last commit to touch these files is: b2411befed60 ("arm64: dts: add bus to rockchip amba nodenames") Additional changes not yet in the Linux kernel include: arm64: dts: rockchip: rk3328: drop #address-cells, #size-cells from grf node arm64: dts: rockchip: rk3328: drop non-existent gmac2phy pinmux options arm64: dts: rockchip: rk3328: Replace RK805 PMIC node name with "pmic" Changes include: - conversion of raw pin numbers to macros - removal of deprecated RK_FUNC_* macros - update of device tree binding headers - new devices - device tree cleanups - gmac2phy disabled in -u-boot.dtsi as it is not supported in U-boot This includes a re-ordering of the USB device nodes compared to upstream Linux, moving the dwc2 OTG controller after the EHCI/OHCI nodes. This is currently required as otherwise the dwc2 controller would not be able to detect devices in some cases. This may be due to lack of USB PHY support in U-boot. Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- Changes since v2: - Dropped reviewed-by - Moved dwc2 OTG device node after EHCI/OHCI to make dwc2 work again Changes since v1: - Added Kever's reviewed-by --- arch/arm/dts/rk3328-evb-u-boot.dtsi | 5 + arch/arm/dts/rk3328-evb.dts | 196 ++-- arch/arm/dts/rk3328-rock64.dts | 132 ++- arch/arm/dts/rk3328.dtsi | 1414 +++++++++++++++++---------- 4 files changed, 1166 insertions(+), 581 deletions(-) diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi index 8ba53cf8f44b..4bfa0c2330ba 100644 --- a/arch/arm/dts/rk3328-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3328-evb-u-boot.dtsi @@ -40,6 +40,11 @@ status = "okay"; }; +&gmac2phy { + /* Integrated PHY unsupported by U-boot */ + status = "broken"; +}; + &usb_host0_xhci { vbus-supply = <&vcc5v0_host_xhci>; status = "okay"; diff --git a/arch/arm/dts/rk3328-evb.dts b/arch/arm/dts/rk3328-evb.dts index 97bef37cf610..6abc6f4a86cf 100644 --- a/arch/arm/dts/rk3328-evb.dts +++ b/arch/arm/dts/rk3328-evb.dts @@ -1,6 +1,6 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* - * (C) Copyright 2016 Rockchip Electronics Co., Ltd + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd */ /dts-v1/; @@ -11,24 +11,51 @@ compatible = "rockchip,rk3328-evb", "rockchip,rk3328"; chosen { - stdout-path = &uart2; + stdout-path = "serial2:1500000n8"; }; - vcc3v3_sdmmc: sdmmc-pwren { + dc_12v: dc-12v { compatible = "regulator-fixed"; - regulator-name = "vcc3v3"; - gpio = <&gpio0 30 GPIO_ACTIVE_LOW>; + regulator-name = "dc_12v"; regulator-always-on; regulator-boot-on; + regulator-min-microvolt = <12000000>; + regulator-max-microvolt = <12000000>; + }; + + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_enable_h>; + + /* + * On the module itself this is one of these (depending + * on the actual card populated): + * - SDIO_RESET_L_WL_REG_ON + * - PDN (power down when low) + */ + reset-gpios = <&gpio1 18 GPIO_ACTIVE_LOW>; + }; + + vcc_sd: sdmmc-regulator { + compatible = "regulator-fixed"; + gpio = <&gpio0 30 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>; }; - vcc5v0_otg: vcc5v0-otg-drv { + vcc_sys: vcc-sys { compatible = "regulator-fixed"; - enable-active-high; - regulator-name = "vcc5v0_otg"; - gpio = <&gpio0 27 GPIO_ACTIVE_HIGH>; + regulator-name = "vcc_sys"; + regulator-always-on; + regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; + vin-supply = <&dc_12v>; }; vcc_phy: vcc-phy-regulator { @@ -39,80 +66,60 @@ }; }; -&saradc { - status = "okay"; -}; - -&uart2 { - status = "okay"; -}; - -&sdmmc { - bus-width = <4>; - cap-mmc-highspeed; - cap-sd-highspeed; - card-detect-delay = <200>; - disable-wp; - num-slots = <1>; - pinctrl-names = "default"; - pinctrl-0 = <&sdmmc0_clk>, <&sdmmc0_cmd>, <&sdmmc0_dectn>, <&sdmmc0_bus4>; - status = "okay"; +&cpu0 { + cpu-supply = <&vdd_arm>; }; &emmc { bus-width = <8>; cap-mmc-highspeed; - supports-emmc; - disable-wp; non-removable; - num-slots = <1>; pinctrl-names = "default"; pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>; status = "okay"; }; -&usb_host0_ehci { - status = "okay"; -}; +&gmac2phy { + phy-supply = <&vcc_phy>; + clock_in_out = "output"; + assigned-clocks = <&cru SCLK_MAC2PHY_SRC>; + assigned-clock-rate = <50000000>; + assigned-clocks = <&cru SCLK_MAC2PHY>; + assigned-clock-parents = <&cru SCLK_MAC2PHY_SRC>; -&usb_host0_ohci { - status = "okay"; -}; - -&usb20_otg { - vbus-supply = <&vcc5v0_otg>; - status = "okay"; }; &i2c1 { - clock-frequency = <400000>; - i2c-scl-rising-time-ns = <168>; - i2c-scl-falling-time-ns = <4>; status = "okay"; rk805: pmic at 18 { compatible = "rockchip,rk805"; - status = "okay"; reg = <0x18>; interrupt-parent = <&gpio2>; interrupts = <6 IRQ_TYPE_LEVEL_LOW>; + #clock-cells = <1>; + clock-output-names = "xin32k", "rk805-clkout2"; + gpio-controller; + #gpio-cells = <2>; pinctrl-names = "default"; pinctrl-0 = <&pmic_int_l>; rockchip,system-power-controller; wakeup-source; - gpio-controller; - #gpio-cells = <2>; - #clock-cells = <1>; - clock-output-names = "xin32k", "rk805-clkout2"; + + vcc1-supply = <&vcc_sys>; + vcc2-supply = <&vcc_sys>; + vcc3-supply = <&vcc_sys>; + vcc4-supply = <&vcc_sys>; + vcc5-supply = <&vcc_io>; + vcc6-supply = <&vcc_io>; regulators { vdd_logic: DCDC_REG1 { regulator-name = "vdd_logic"; regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; - regulator-ramp-delay = <6001>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1000000>; @@ -123,19 +130,18 @@ regulator-name = "vdd_arm"; regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; - regulator-ramp-delay = <6001>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; - regulator-suspend-microvolt = <1000000>; + regulator-suspend-microvolt = <950000>; }; }; vcc_ddr: DCDC_REG3 { regulator-name = "vcc_ddr"; - regulator-boot-on; regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; }; @@ -145,32 +151,32 @@ regulator-name = "vcc_io"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <3300000>; }; }; - vdd_18: LDO_REG1 { - regulator-name = "vdd_18"; + vcc_18: LDO_REG1 { + regulator-name = "vcc_18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; }; }; - vcc_18emmc: LDO_REG2 { - regulator-name = "vcc_18emmc"; + vcc18_emmc: LDO_REG2 { + regulator-name = "vcc18_emmc"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; @@ -181,8 +187,8 @@ regulator-name = "vdd_10"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; - regulator-boot-on; regulator-always-on; + regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1000000>; @@ -195,9 +201,71 @@ &pinctrl { pmic { pmic_int_l: pmic-int-l { + rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + sdio-pwrseq { + wifi_enable_h: wifi-enable-h { rockchip,pins = - <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; /* gpio2_a6 */ + <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; }; }; }; +&sdio { + bus-width = <4>; + cap-sd-highspeed; + cap-sdio-irq; + keep-power-in-suspend; + max-frequency = <150000000>; + mmc-pwrseq = <&sdio_pwrseq>; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>; + status = "okay"; +}; + +&sdmmc { + bus-width = <4>; + cap-mmc-highspeed; + cap-sd-highspeed; + disable-wp; + max-frequency = <150000000>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>; + vmmc-supply = <&vcc_sd>; + status = "okay"; +}; + +&tsadc { + status = "okay"; +}; + +&uart2 { + status = "okay"; +}; + +&u2phy { + status = "okay"; +}; + +&u2phy_host { + status = "okay"; +}; + +&u2phy_otg { + status = "okay"; +}; + +&usb20_otg { + status = "okay"; +}; + +&usb_host0_ehci { + status = "okay"; +}; + +&usb_host0_ohci { + status = "okay"; +}; diff --git a/arch/arm/dts/rk3328-rock64.dts b/arch/arm/dts/rk3328-rock64.dts index a78eb4ac6fff..ebf3eb222e1f 100644 --- a/arch/arm/dts/rk3328-rock64.dts +++ b/arch/arm/dts/rk3328-rock64.dts @@ -43,6 +43,17 @@ vin-supply = <&vcc_sys>; }; + vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator { + compatible = "regulator-fixed"; + gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; + 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"; @@ -51,6 +62,56 @@ regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; }; + + ir-receiver { + compatible = "gpio-ir-receiver"; + gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>; + pinctrl-0 = <&ir_int>; + pinctrl-names = "default"; + }; + + leds { + compatible = "gpio-leds"; + + power { + gpios = <&rk805 1 GPIO_ACTIVE_LOW>; + linux,default-trigger = "mmc0"; + }; + + standby { + gpios = <&rk805 0 GPIO_ACTIVE_LOW>; + linux,default-trigger = "heartbeat"; + }; + }; + + sound { + compatible = "audio-graph-card"; + label = "rockchip,rk3328"; + dais = <&i2s1_p0 + &spdif_p0>; + }; + + spdif-dit { + compatible = "linux,spdif-dit"; + #sound-dai-cells = <0>; + + port { + dit_p0_0: endpoint { + remote-endpoint = <&spdif_p0_0>; + }; + }; + }; +}; + +&codec { + mute-gpios = <&grf_gpio 0 GPIO_ACTIVE_LOW>; + status = "okay"; + + port at 0 { + codec_p0_0: endpoint { + remote-endpoint = <&i2s1_p0_0>; + }; + }; }; &cpu0 { @@ -98,16 +159,26 @@ status = "okay"; }; +&hdmi { + status = "okay"; +}; + +&hdmiphy { + status = "okay"; +}; + &i2c1 { status = "okay"; - rk805: rk805 at 18 { + rk805: pmic 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"; + gpio-controller; + #gpio-cells = <2>; pinctrl-names = "default"; pinctrl-0 = <&pmic_int_l>; rockchip,system-power-controller; @@ -169,7 +240,7 @@ }; vcc_18: LDO_REG1 { - regulator-name = "vdd_18"; + regulator-name = "vcc_18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-always-on; @@ -181,7 +252,7 @@ }; vcc18_emmc: LDO_REG2 { - regulator-name = "vcc_18emmc"; + regulator-name = "vcc18_emmc"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-always-on; @@ -207,6 +278,18 @@ }; }; +&i2s1 { + status = "okay"; + + i2s1_p0: port { + i2s1_p0_0: endpoint { + dai-format = "i2s"; + mclk-fs = <256>; + remote-endpoint = <&codec_p0_0>; + }; + }; +}; + &io_domains { status = "okay"; @@ -220,6 +303,12 @@ }; &pinctrl { + ir { + ir_int: ir-int { + rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + pmic { pmic_int_l: pmic-int-l { rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; @@ -245,6 +334,17 @@ status = "okay"; }; +&spdif { + pinctrl-0 = <&spdifm0_tx>; + status = "okay"; + + spdif_p0: port { + spdif_p0_0: endpoint { + remote-endpoint = <&dit_p0_0>; + }; + }; +}; + &spi0 { status = "okay"; @@ -257,10 +357,28 @@ }; }; +&tsadc { + rockchip,hw-tshut-mode = <0>; + rockchip,hw-tshut-polarity = <0>; + status = "okay"; +}; + &uart2 { status = "okay"; }; +&u2phy { + status = "okay"; + + u2phy_host: host-port { + status = "okay"; + }; + + u2phy_otg: otg-port { + status = "okay"; + }; +}; + &usb20_otg { dr_mode = "host"; status = "okay"; @@ -273,3 +391,11 @@ &usb_host0_ohci { status = "okay"; }; + +&vop { + status = "okay"; +}; + +&vop_mmu { + status = "okay"; +}; diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi index 57719b82d13e..945387e579f0 100644 --- a/arch/arm/dts/rk3328.dtsi +++ b/arch/arm/dts/rk3328.dtsi @@ -1,6 +1,6 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* - * (C) Copyright 2016 Rockchip Electronics Co., Ltd + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd */ #include <dt-bindings/clock/rk3328-cru.h> @@ -8,6 +8,9 @@ #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/pinctrl/rockchip.h> +#include <dt-bindings/power/rk3328-power.h> +#include <dt-bindings/soc/rockchip,boot-mode.h> +#include <dt-bindings/thermal/thermal.h> / { compatible = "rockchip,rk3328"; @@ -24,9 +27,8 @@ i2c1 = &i2c1; i2c2 = &i2c2; i2c3 = &i2c3; - mmc0 = &emmc; - mmc1 = &sdmmc; - mmc2 = &sdmmc_ext; + ethernet0 = &gmac2io; + ethernet1 = &gmac2phy; }; cpus { @@ -35,29 +37,71 @@ cpu0: cpu at 0 { device_type = "cpu"; - compatible = "arm,cortex-a53", "arm,armv8"; + compatible = "arm,cortex-a53"; reg = <0x0 0x0>; + clocks = <&cru ARMCLK>; + #cooling-cells = <2>; + cpu-idle-states = <&CPU_SLEEP>; + dynamic-power-coefficient = <120>; enable-method = "psci"; -// clocks = <&cru ARMCLK>; + next-level-cache = <&l2>; operating-points-v2 = <&cpu0_opp_table>; }; + cpu1: cpu at 1 { device_type = "cpu"; - compatible = "arm,cortex-a53", "arm,armv8"; + compatible = "arm,cortex-a53"; reg = <0x0 0x1>; + clocks = <&cru ARMCLK>; + #cooling-cells = <2>; + cpu-idle-states = <&CPU_SLEEP>; + dynamic-power-coefficient = <120>; enable-method = "psci"; + next-level-cache = <&l2>; + operating-points-v2 = <&cpu0_opp_table>; }; + cpu2: cpu at 2 { device_type = "cpu"; - compatible = "arm,cortex-a53", "arm,armv8"; + compatible = "arm,cortex-a53"; reg = <0x0 0x2>; + clocks = <&cru ARMCLK>; + #cooling-cells = <2>; + cpu-idle-states = <&CPU_SLEEP>; + dynamic-power-coefficient = <120>; enable-method = "psci"; + next-level-cache = <&l2>; + operating-points-v2 = <&cpu0_opp_table>; }; + cpu3: cpu at 3 { device_type = "cpu"; - compatible = "arm,cortex-a53", "arm,armv8"; + compatible = "arm,cortex-a53"; reg = <0x0 0x3>; + clocks = <&cru ARMCLK>; + #cooling-cells = <2>; + cpu-idle-states = <&CPU_SLEEP>; + dynamic-power-coefficient = <120>; enable-method = "psci"; + next-level-cache = <&l2>; + operating-points-v2 = <&cpu0_opp_table>; + }; + + idle-states { + entry-method = "psci"; + + CPU_SLEEP: cpu-sleep { + compatible = "arm,idle-state"; + local-timer-stop; + arm,psci-suspend-param = <0x0010000>; + entry-latency-us = <120>; + exit-latency-us = <250>; + min-residency-us = <900>; + }; + }; + + l2: l2-cache0 { + compatible = "cache"; }; }; @@ -65,39 +109,72 @@ compatible = "operating-points-v2"; opp-shared; - opp at 408000000 { + opp-408000000 { opp-hz = /bits/ 64 <408000000>; opp-microvolt = <950000>; clock-latency-ns = <40000>; opp-suspend; }; - opp at 600000000 { + opp-600000000 { opp-hz = /bits/ 64 <600000000>; opp-microvolt = <950000>; clock-latency-ns = <40000>; }; - opp at 816000000 { + opp-816000000 { opp-hz = /bits/ 64 <816000000>; opp-microvolt = <1000000>; clock-latency-ns = <40000>; }; - opp at 1008000000 { + opp-1008000000 { opp-hz = /bits/ 64 <1008000000>; opp-microvolt = <1100000>; clock-latency-ns = <40000>; }; - opp at 1200000000 { + opp-1200000000 { opp-hz = /bits/ 64 <1200000000>; opp-microvolt = <1225000>; clock-latency-ns = <40000>; }; - opp at 1296000000 { + opp-1296000000 { opp-hz = /bits/ 64 <1296000000>; opp-microvolt = <1300000>; clock-latency-ns = <40000>; }; }; + amba: bus { + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + dmac: dmac at ff1f0000 { + compatible = "arm,pl330", "arm,primecell"; + reg = <0x0 0xff1f0000 0x0 0x4000>; + interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru ACLK_DMAC>; + clock-names = "apb_pclk"; + #dma-cells = <1>; + }; + }; + + analog_sound: analog-sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,name = "Analog"; + status = "disabled"; + + simple-audio-card,cpu { + sound-dai = <&i2s1>; + }; + + simple-audio-card,codec { + sound-dai = <&codec>; + }; + }; + arm-pmu { compatible = "arm,cortex-a53-pmu"; interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>, @@ -107,8 +184,29 @@ interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; }; + display_subsystem: display-subsystem { + compatible = "rockchip,display-subsystem"; + ports = <&vop_out>; + }; + + hdmi_sound: hdmi-sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,mclk-fs = <128>; + simple-audio-card,name = "HDMI"; + status = "disabled"; + + simple-audio-card,cpu { + sound-dai = <&i2s0>; + }; + + simple-audio-card,codec { + sound-dai = <&hdmi>; + }; + }; + psci { - compatible = "arm,psci-1.0"; + compatible = "arm,psci-1.0", "arm,psci-0.2"; method = "smc"; }; @@ -134,8 +232,8 @@ clocks = <&cru SCLK_I2S0>, <&cru HCLK_I2S0_8CH>; clock-names = "i2s_clk", "i2s_hclk"; dmas = <&dmac 11>, <&dmac 12>; - #dma-cells = <2>; dma-names = "tx", "rx"; + #sound-dai-cells = <0>; status = "disabled"; }; @@ -146,8 +244,8 @@ clocks = <&cru SCLK_I2S1>, <&cru HCLK_I2S1_8CH>; clock-names = "i2s_clk", "i2s_hclk"; dmas = <&dmac 14>, <&dmac 15>; - #dma-cells = <2>; dma-names = "tx", "rx"; + #sound-dai-cells = <0>; status = "disabled"; }; @@ -158,16 +256,8 @@ clocks = <&cru SCLK_I2S2>, <&cru HCLK_I2S2_2CH>; clock-names = "i2s_clk", "i2s_hclk"; dmas = <&dmac 0>, <&dmac 1>; - #dma-cells = <2>; dma-names = "tx", "rx"; - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&i2s2m0_mclk - &i2s2m0_sclk - &i2s2m0_lrcktx - &i2s2m0_lrckrx - &i2s2m0_sdo - &i2s2m0_sdi>; - pinctrl-1 = <&i2s2m0_sleep>; + #sound-dai-cells = <0>; status = "disabled"; }; @@ -178,10 +268,31 @@ clocks = <&cru SCLK_SPDIF>, <&cru HCLK_SPDIF_8CH>; clock-names = "mclk", "hclk"; dmas = <&dmac 10>; - #dma-cells = <1>; dma-names = "tx"; pinctrl-names = "default"; pinctrl-0 = <&spdifm2_tx>; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + pdm: pdm at ff040000 { + compatible = "rockchip,pdm"; + reg = <0x0 0xff040000 0x0 0x1000>; + clocks = <&cru SCLK_PDM>, <&cru HCLK_PDM>; + clock-names = "pdm_clk", "pdm_hclk"; + dmas = <&dmac 16>; + dma-names = "rx"; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pdmm0_clk + &pdmm0_sdi0 + &pdmm0_sdi1 + &pdmm0_sdi2 + &pdmm0_sdi3>; + pinctrl-1 = <&pdmm0_clk_sleep + &pdmm0_sdi0_sleep + &pdmm0_sdi1_sleep + &pdmm0_sdi2_sleep + &pdmm0_sdi3_sleep>; status = "disabled"; }; @@ -193,6 +304,39 @@ compatible = "rockchip,rk3328-io-voltage-domain"; status = "disabled"; }; + + grf_gpio: grf-gpio { + compatible = "rockchip,rk3328-grf-gpio"; + gpio-controller; + #gpio-cells = <2>; + }; + + power: power-controller { + compatible = "rockchip,rk3328-power-controller"; + #power-domain-cells = <1>; + #address-cells = <1>; + #size-cells = <0>; + + pd_hevc at RK3328_PD_HEVC { + reg = <RK3328_PD_HEVC>; + }; + pd_video at RK3328_PD_VIDEO { + reg = <RK3328_PD_VIDEO>; + }; + pd_vpu at RK3328_PD_VPU { + reg = <RK3328_PD_VPU>; + clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; + }; + }; + + reboot-mode { + compatible = "syscon-reboot-mode"; + offset = <0x5c8>; + mode-normal = <BOOT_NORMAL>; + mode-recovery = <BOOT_RECOVERY>; + mode-bootloader = <BOOT_FASTBOOT>; + mode-loader = <BOOT_BL_DOWNLOAD>; + }; }; uart0: serial at ff110000 { @@ -201,12 +345,12 @@ interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>; clock-names = "baudclk", "apb_pclk"; - reg-shift = <2>; - reg-io-width = <4>; dmas = <&dmac 2>, <&dmac 3>; - #dma-cells = <2>; + dma-names = "tx", "rx"; pinctrl-names = "default"; pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; + reg-io-width = <4>; + reg-shift = <2>; status = "disabled"; }; @@ -215,13 +359,13 @@ reg = <0x0 0xff120000 0x0 0x100>; interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>; - clock-names = "sclk_uart", "pclk_uart"; - reg-shift = <2>; - reg-io-width = <4>; + clock-names = "baudclk", "apb_pclk"; dmas = <&dmac 4>, <&dmac 5>; - #dma-cells = <2>; + dma-names = "tx", "rx"; pinctrl-names = "default"; pinctrl-0 = <&uart1_xfer &uart1_cts &uart1_rts>; + reg-io-width = <4>; + reg-shift = <2>; status = "disabled"; }; @@ -231,22 +375,17 @@ interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>; clock-names = "baudclk", "apb_pclk"; - reg-shift = <2>; - reg-io-width = <4>; dmas = <&dmac 6>, <&dmac 7>; - #dma-cells = <2>; + dma-names = "tx", "rx"; pinctrl-names = "default"; pinctrl-0 = <&uart2m1_xfer>; + reg-io-width = <4>; + reg-shift = <2>; status = "disabled"; }; - pmu: power-management at ff140000 { - compatible = "rockchip,rk3328-pmu", "syscon", "simple-mfd"; - reg = <0x0 0xff140000 0x0 0x1000>; - }; - i2c0: i2c at ff150000 { - compatible = "rockchip,rk3328-i2c"; + compatible = "rockchip,rk3328-i2c", "rockchip,rk3399-i2c"; reg = <0x0 0xff150000 0x0 0x1000>; interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; @@ -259,7 +398,7 @@ }; i2c1: i2c at ff160000 { - compatible = "rockchip,rk3328-i2c"; + compatible = "rockchip,rk3328-i2c", "rockchip,rk3399-i2c"; reg = <0x0 0xff160000 0x0 0x1000>; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; @@ -272,7 +411,7 @@ }; i2c2: i2c at ff170000 { - compatible = "rockchip,rk3328-i2c"; + compatible = "rockchip,rk3328-i2c", "rockchip,rk3399-i2c"; reg = <0x0 0xff170000 0x0 0x1000>; interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; @@ -285,7 +424,7 @@ }; i2c3: i2c at ff180000 { - compatible = "rockchip,rk3328-i2c"; + compatible = "rockchip,rk3328-i2c", "rockchip,rk3399-i2c"; reg = <0x0 0xff180000 0x0 0x1000>; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; @@ -306,7 +445,6 @@ clocks = <&cru SCLK_SPI>, <&cru PCLK_SPI>; clock-names = "spiclk", "apb_pclk"; dmas = <&dmac 8>, <&dmac 9>; - #dma-cells = <2>; dma-names = "tx", "rx"; pinctrl-names = "default"; pinctrl-0 = <&spi0m2_clk &spi0m2_tx &spi0m2_rx &spi0m2_cs0>; @@ -317,28 +455,141 @@ compatible = "snps,dw-wdt"; reg = <0x0 0xff1a0000 0x0 0x100>; interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru PCLK_WDT>; + }; + + pwm0: pwm at ff1b0000 { + compatible = "rockchip,rk3328-pwm"; + reg = <0x0 0xff1b0000 0x0 0x10>; + clocks = <&cru SCLK_PWM>, <&cru PCLK_PWM>; + clock-names = "pwm", "pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&pwm0_pin>; + #pwm-cells = <3>; status = "disabled"; }; - amba { - compatible = "simple-bus"; - #address-cells = <2>; - #size-cells = <2>; - ranges; + pwm1: pwm at ff1b0010 { + compatible = "rockchip,rk3328-pwm"; + reg = <0x0 0xff1b0010 0x0 0x10>; + clocks = <&cru SCLK_PWM>, <&cru PCLK_PWM>; + clock-names = "pwm", "pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&pwm1_pin>; + #pwm-cells = <3>; + status = "disabled"; + }; - dmac: dmac at ff1f0000 { - compatible = "arm,pl330", "arm,primecell"; - reg = <0x0 0xff1f0000 0x0 0x4000>; - interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&cru ACLK_DMAC>; - clock-names = "apb_pclk"; - #dma-cells = <1>; + pwm2: pwm at ff1b0020 { + compatible = "rockchip,rk3328-pwm"; + reg = <0x0 0xff1b0020 0x0 0x10>; + clocks = <&cru SCLK_PWM>, <&cru PCLK_PWM>; + clock-names = "pwm", "pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&pwm2_pin>; + #pwm-cells = <3>; + status = "disabled"; + }; + + pwm3: pwm at ff1b0030 { + compatible = "rockchip,rk3328-pwm"; + reg = <0x0 0xff1b0030 0x0 0x10>; + interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru SCLK_PWM>, <&cru PCLK_PWM>; + clock-names = "pwm", "pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&pwmir_pin>; + #pwm-cells = <3>; + status = "disabled"; + }; + + thermal-zones { + soc_thermal: soc-thermal { + polling-delay-passive = <20>; + polling-delay = <1000>; + sustainable-power = <1000>; + + thermal-sensors = <&tsadc 0>; + + trips { + threshold: trip-point0 { + temperature = <70000>; + hysteresis = <2000>; + type = "passive"; + }; + target: trip-point1 { + temperature = <85000>; + hysteresis = <2000>; + type = "passive"; + }; + soc_crit: soc-crit { + temperature = <95000>; + hysteresis = <2000>; + type = "critical"; + }; + }; + + cooling-maps { + map0 { + trip = <&target>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + contribution = <4096>; + }; + }; + }; + + }; + + tsadc: tsadc at ff250000 { + compatible = "rockchip,rk3328-tsadc"; + reg = <0x0 0xff250000 0x0 0x100>; + interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>; + assigned-clocks = <&cru SCLK_TSADC>; + assigned-clock-rates = <50000>; + clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>; + clock-names = "tsadc", "apb_pclk"; + pinctrl-names = "init", "default", "sleep"; + pinctrl-0 = <&otp_gpio>; + pinctrl-1 = <&otp_out>; + pinctrl-2 = <&otp_gpio>; + resets = <&cru SRST_TSADC>; + reset-names = "tsadc-apb"; + rockchip,grf = <&grf>; + rockchip,hw-tshut-temp = <100000>; + #thermal-sensor-cells = <1>; + status = "disabled"; + }; + + efuse: efuse at ff260000 { + compatible = "rockchip,rk3328-efuse"; + reg = <0x0 0xff260000 0x0 0x50>; + #address-cells = <1>; + #size-cells = <1>; + clocks = <&cru SCLK_EFUSE>; + clock-names = "pclk_efuse"; + rockchip,efuse-size = <0x20>; + + /* Data cells */ + efuse_id: id at 7 { + reg = <0x07 0x10>; + }; + cpu_leakage: cpu-leakage at 17 { + reg = <0x17 0x1>; + }; + logic_leakage: logic-leakage at 19 { + reg = <0x19 0x1>; + }; + efuse_cpu_version: cpu-version at 1a { + reg = <0x1a 0x1>; + bits = <3 3>; }; }; - saradc: saradc at ff280000 { - compatible = "rockchip,rk3328-saradc", "rockchip,saradc"; + saradc: adc at ff280000 { + compatible = "rockchip,rk3328-saradc", "rockchip,rk3399-saradc"; reg = <0x0 0xff280000 0x0 0x100>; interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>; #io-channel-cells = <1>; @@ -349,6 +600,169 @@ status = "disabled"; }; + gpu: gpu at ff300000 { + compatible = "rockchip,rk3328-mali", "arm,mali-450"; + reg = <0x0 0xff300000 0x0 0x40000>; + interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "gp", + "gpmmu", + "pp", + "pp0", + "ppmmu0", + "pp1", + "ppmmu1"; + clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>; + clock-names = "bus", "core"; + resets = <&cru SRST_GPU_A>; + }; + + h265e_mmu: iommu at ff330200 { + compatible = "rockchip,iommu"; + reg = <0x0 0xff330200 0 0x100>; + interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "h265e_mmu"; + clocks = <&cru ACLK_H265>, <&cru PCLK_H265>; + clock-names = "aclk", "iface"; + #iommu-cells = <0>; + status = "disabled"; + }; + + vepu_mmu: iommu at ff340800 { + compatible = "rockchip,iommu"; + reg = <0x0 0xff340800 0x0 0x40>; + interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "vepu_mmu"; + clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; + clock-names = "aclk", "iface"; + #iommu-cells = <0>; + status = "disabled"; + }; + + vpu: video-codec at ff350000 { + compatible = "rockchip,rk3328-vpu"; + reg = <0x0 0xff350000 0x0 0x800>; + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "vdpu"; + clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; + clock-names = "aclk", "hclk"; + iommus = <&vpu_mmu>; + power-domains = <&power RK3328_PD_VPU>; + }; + + vpu_mmu: iommu at ff350800 { + compatible = "rockchip,iommu"; + reg = <0x0 0xff350800 0x0 0x40>; + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "vpu_mmu"; + clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; + clock-names = "aclk", "iface"; + #iommu-cells = <0>; + power-domains = <&power RK3328_PD_VPU>; + }; + + rkvdec_mmu: iommu at ff360480 { + compatible = "rockchip,iommu"; + reg = <0x0 0xff360480 0x0 0x40>, <0x0 0xff3604c0 0x0 0x40>; + interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "rkvdec_mmu"; + clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>; + clock-names = "aclk", "iface"; + #iommu-cells = <0>; + status = "disabled"; + }; + + vop: vop at ff370000 { + compatible = "rockchip,rk3328-vop"; + reg = <0x0 0xff370000 0x0 0x3efc>; + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru ACLK_VOP>, <&cru DCLK_LCDC>, <&cru HCLK_VOP>; + clock-names = "aclk_vop", "dclk_vop", "hclk_vop"; + resets = <&cru SRST_VOP_A>, <&cru SRST_VOP_H>, <&cru SRST_VOP_D>; + reset-names = "axi", "ahb", "dclk"; + iommus = <&vop_mmu>; + status = "disabled"; + + vop_out: port { + #address-cells = <1>; + #size-cells = <0>; + + vop_out_hdmi: endpoint at 0 { + reg = <0>; + remote-endpoint = <&hdmi_in_vop>; + }; + }; + }; + + vop_mmu: iommu at ff373f00 { + compatible = "rockchip,iommu"; + reg = <0x0 0xff373f00 0x0 0x100>; + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "vop_mmu"; + clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>; + clock-names = "aclk", "iface"; + #iommu-cells = <0>; + status = "disabled"; + }; + + hdmi: hdmi at ff3c0000 { + compatible = "rockchip,rk3328-dw-hdmi"; + reg = <0x0 0xff3c0000 0x0 0x20000>; + reg-io-width = <4>; + interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru PCLK_HDMI>, + <&cru SCLK_HDMI_SFC>, + <&cru SCLK_RTC32K>; + clock-names = "iahb", + "isfr", + "cec"; + phys = <&hdmiphy>; + phy-names = "hdmi"; + pinctrl-names = "default"; + pinctrl-0 = <&hdmi_cec &hdmii2c_xfer &hdmi_hpd>; + rockchip,grf = <&grf>; + #sound-dai-cells = <0>; + status = "disabled"; + + ports { + hdmi_in: port { + hdmi_in_vop: endpoint { + remote-endpoint = <&vop_out_hdmi>; + }; + }; + }; + }; + + codec: codec at ff410000 { + compatible = "rockchip,rk3328-codec"; + reg = <0x0 0xff410000 0x0 0x1000>; + clocks = <&cru PCLK_ACODECPHY>, <&cru SCLK_I2S1>; + clock-names = "pclk", "mclk"; + rockchip,grf = <&grf>; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + hdmiphy: phy at ff430000 { + compatible = "rockchip,rk3328-hdmi-phy"; + reg = <0x0 0xff430000 0x0 0x10000>; + interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru PCLK_HDMIPHY>, <&xin24m>, <&cru DCLK_HDMIPHY>; + clock-names = "sysclk", "refoclk", "refpclk"; + clock-output-names = "hdmi_phy"; + #clock-cells = <0>; + nvmem-cells = <&efuse_cpu_version>; + nvmem-cell-names = "cpu-version"; + #phy-cells = <0>; + status = "disabled"; + }; + cru: clock-controller at ff440000 { compatible = "rockchip,rk3328-cru", "rockchip,cru", "syscon"; reg = <0x0 0xff440000 0x0 0x1000>; @@ -356,6 +770,12 @@ #clock-cells = <1>; #reset-cells = <1>; assigned-clocks = + /* + * CPLL should run at 1200, but that is to high for + * the initial dividers of most of its children. + * We need set cpll child clk div first, + * and then set the cpll frequency. + */ <&cru DCLK_LCDC>, <&cru SCLK_PDM>, <&cru SCLK_RTC32K>, <&cru SCLK_UART0>, <&cru SCLK_UART1>, <&cru SCLK_UART2>, @@ -371,15 +791,7 @@ <&cru ACLK_BUS_PRE>, <&cru HCLK_BUS_PRE>, <&cru PCLK_BUS_PRE>, <&cru ACLK_PERI_PRE>, <&cru HCLK_PERI>, <&cru PCLK_PERI>, - <&cru ACLK_VIO_PRE>, <&cru HCLK_VIO_PRE>, - <&cru ACLK_RGA_PRE>, <&cru SCLK_RGA>, - <&cru ACLK_VOP_PRE>, <&cru ACLK_RKVDEC_PRE>, - <&cru ACLK_RKVENC>, <&cru ACLK_VPU_PRE>, - <&cru SCLK_VDEC_CABAC>, <&cru SCLK_VDEC_CORE>, - <&cru SCLK_VENC_CORE>, <&cru SCLK_VENC_DSP>, - <&cru SCLK_EFUSE>, <&cru PCLK_DDR>, - <&cru ACLK_GMAC>, <&cru PCLK_GMAC>, - <&cru SCLK_RTC32K>, <&cru SCLK_USB3OTG_SUSPEND>; + <&cru SCLK_RTC32K>; assigned-clock-parents = <&cru HDMIPHY>, <&cru PLL_APLL>, <&cru PLL_GPLL>, <&xin24m>, @@ -400,55 +812,85 @@ <150000000>, <75000000>, <75000000>, <150000000>, <75000000>, <75000000>, - <300000000>, <100000000>, - <300000000>, <200000000>, - <400000000>, <500000000>, - <200000000>, <300000000>, - <300000000>, <250000000>, - <200000000>, <100000000>, - <24000000>, <100000000>, - <150000000>, <50000000>, - <32768>, <32768>; + <32768>; }; - sdmmc: rksdmmc at ff500000 { + usb2phy_grf: syscon at ff450000 { + compatible = "rockchip,rk3328-usb2phy-grf", "syscon", + "simple-mfd"; + reg = <0x0 0xff450000 0x0 0x10000>; + #address-cells = <1>; + #size-cells = <1>; + + u2phy: usb2-phy at 100 { + compatible = "rockchip,rk3328-usb2phy"; + reg = <0x100 0x10>; + clocks = <&xin24m>; + clock-names = "phyclk"; + clock-output-names = "usb480m_phy"; + #clock-cells = <0>; + assigned-clocks = <&cru USB480M>; + assigned-clock-parents = <&u2phy>; + status = "disabled"; + + u2phy_otg: otg-port { + #phy-cells = <0>; + interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "otg-bvalid", "otg-id", + "linestate"; + status = "disabled"; + }; + + u2phy_host: host-port { + #phy-cells = <0>; + interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "linestate"; + status = "disabled"; + }; + }; + }; + + sdmmc: mmc at ff500000 { compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc"; reg = <0x0 0xff500000 0x0 0x4000>; - max-frequency = <150000000>; - clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>; - clock-names = "biu", "ciu"; - fifo-depth = <0x100>; interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>, + <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>; + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; + fifo-depth = <0x100>; + max-frequency = <150000000>; status = "disabled"; }; - sdio: dwmmc at ff510000 { + sdio: mmc at ff510000 { compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc"; reg = <0x0 0xff510000 0x0 0x4000>; - max-frequency = <150000000>; + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>, <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>; - clock-names = "biu", "ciu", "ciu_drv", "ciu_sample"; + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; fifo-depth = <0x100>; - interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; + max-frequency = <150000000>; status = "disabled"; }; - emmc: rksdmmc at ff520000 { + emmc: mmc at ff520000 { compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc"; reg = <0x0 0xff520000 0x0 0x4000>; - max-frequency = <150000000>; - clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>; - clock-names = "biu", "ciu"; - fifo-depth = <0x100>; interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>, + <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>; + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; + fifo-depth = <0x100>; + max-frequency = <150000000>; status = "disabled"; }; gmac2io: ethernet at ff540000 { compatible = "rockchip,rk3328-gmac"; reg = <0x0 0xff540000 0x0 0x10000>; - rockchip,grf = <&grf>; interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "macirq"; clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_RX>, @@ -461,13 +903,56 @@ "pclk_mac"; resets = <&cru SRST_GMAC2IO_A>; reset-names = "stmmaceth"; + rockchip,grf = <&grf>; + snps,txpbl = <0x4>; status = "disabled"; }; + gmac2phy: ethernet at ff550000 { + compatible = "rockchip,rk3328-gmac"; + reg = <0x0 0xff550000 0x0 0x10000>; + rockchip,grf = <&grf>; + interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "macirq"; + clocks = <&cru SCLK_MAC2PHY_SRC>, <&cru SCLK_MAC2PHY_RXTX>, + <&cru SCLK_MAC2PHY_RXTX>, <&cru SCLK_MAC2PHY_REF>, + <&cru ACLK_MAC2PHY>, <&cru PCLK_MAC2PHY>, + <&cru SCLK_MAC2PHY_OUT>; + clock-names = "stmmaceth", "mac_clk_rx", + "mac_clk_tx", "clk_mac_ref", + "aclk_mac", "pclk_mac", + "clk_macphy"; + resets = <&cru SRST_GMAC2PHY_A>, <&cru SRST_MACPHY>; + reset-names = "stmmaceth", "mac-phy"; + phy-mode = "rmii"; + phy-handle = <&phy>; + snps,txpbl = <0x4>; + status = "disabled"; + + mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + + phy: phy at 0 { + compatible = "ethernet-phy-id1234.d400", "ethernet-phy-ieee802.3-c22"; + reg = <0>; + clocks = <&cru SCLK_MAC2PHY_OUT>; + resets = <&cru SRST_MACPHY>; + pinctrl-names = "default"; + pinctrl-0 = <&fephyled_rxm1 &fephyled_linkm1>; + phy-is-integrated; + }; + }; + }; + usb_host0_ehci: usb at ff5c0000 { compatible = "generic-ehci"; reg = <0x0 0xff5c0000 0x0 0x10000>; interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru HCLK_HOST0>, <&u2phy>; + phys = <&u2phy_host>; + phy-names = "usb"; status = "disabled"; }; @@ -475,30 +960,38 @@ compatible = "generic-ohci"; reg = <0x0 0xff5d0000 0x0 0x10000>; interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru HCLK_HOST0>, <&u2phy>; + phys = <&u2phy_host>; + phy-names = "usb"; status = "disabled"; }; + /* + * U-boot Specific Change + * + * The OTG controller must come after the USB host pair for it + * to work. This is likely due to lack of support for the USB + * PHYs. This must be manually changed after each device tree + * sync. There is no clean way to handle this in -u-boot.dtsi + * files. + */ usb20_otg: usb at ff580000 { compatible = "rockchip,rk3328-usb", "rockchip,rk3066-usb", "snps,dwc2"; reg = <0x0 0xff580000 0x0 0x40000>; interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru HCLK_OTG>; + clock-names = "otg"; dr_mode = "otg"; + g-np-tx-fifo-size = <16>; + g-rx-fifo-size = <280>; + g-tx-fifo-size = <256 128 128 64 32 16>; + phys = <&u2phy_otg>; + phy-names = "usb2-phy"; status = "disabled"; }; - sdmmc_ext: rksdmmc at ff5f0000 { - compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc"; - reg = <0x0 0xff5f0000 0x0 0x4000>; - max-frequency = <150000000>; - clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>; - clock-names = "biu", "ciu"; - fifo-depth = <0x100>; - interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; - status = "disabled"; - }; - - gic: interrupt-controller at ffb70000 { + gic: interrupt-controller at ff811000 { compatible = "arm,gic-400"; #interrupt-cells = <3>; #address-cells = <0>; @@ -646,654 +1139,576 @@ i2c0 { i2c0_xfer: i2c0-xfer { - rockchip,pins = - <2 24 RK_FUNC_1 &pcfg_pull_none>, - <2 25 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <2 RK_PD0 1 &pcfg_pull_none>, + <2 RK_PD1 1 &pcfg_pull_none>; }; }; i2c1 { i2c1_xfer: i2c1-xfer { - rockchip,pins = - <2 4 RK_FUNC_2 &pcfg_pull_none>, - <2 5 RK_FUNC_2 &pcfg_pull_none>; + rockchip,pins = <2 RK_PA4 2 &pcfg_pull_none>, + <2 RK_PA5 2 &pcfg_pull_none>; }; }; i2c2 { i2c2_xfer: i2c2-xfer { - rockchip,pins = - <2 13 RK_FUNC_1 &pcfg_pull_none>, - <2 14 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <2 RK_PB5 1 &pcfg_pull_none>, + <2 RK_PB6 1 &pcfg_pull_none>; }; }; i2c3 { i2c3_xfer: i2c3-xfer { - rockchip,pins = - <0 5 RK_FUNC_2 &pcfg_pull_none>, - <0 6 RK_FUNC_2 &pcfg_pull_none>; + rockchip,pins = <0 RK_PA5 2 &pcfg_pull_none>, + <0 RK_PA6 2 &pcfg_pull_none>; }; i2c3_gpio: i2c3-gpio { rockchip,pins = - <0 5 RK_FUNC_GPIO &pcfg_pull_none>, - <0 6 RK_FUNC_GPIO &pcfg_pull_none>; + <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>, + <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>; }; }; hdmi_i2c { hdmii2c_xfer: hdmii2c-xfer { + rockchip,pins = <0 RK_PA5 1 &pcfg_pull_none>, + <0 RK_PA6 1 &pcfg_pull_none>; + }; + }; + + pdm-0 { + pdmm0_clk: pdmm0-clk { + rockchip,pins = <2 RK_PC2 2 &pcfg_pull_none>; + }; + + pdmm0_fsync: pdmm0-fsync { + rockchip,pins = <2 RK_PC7 2 &pcfg_pull_none>; + }; + + pdmm0_sdi0: pdmm0-sdi0 { + rockchip,pins = <2 RK_PC3 2 &pcfg_pull_none>; + }; + + pdmm0_sdi1: pdmm0-sdi1 { + rockchip,pins = <2 RK_PC4 2 &pcfg_pull_none>; + }; + + pdmm0_sdi2: pdmm0-sdi2 { + rockchip,pins = <2 RK_PC5 2 &pcfg_pull_none>; + }; + + pdmm0_sdi3: pdmm0-sdi3 { + rockchip,pins = <2 RK_PC6 2 &pcfg_pull_none>; + }; + + pdmm0_clk_sleep: pdmm0-clk-sleep { + rockchip,pins = + <2 RK_PC2 RK_FUNC_GPIO &pcfg_input_high>; + }; + + pdmm0_sdi0_sleep: pdmm0-sdi0-sleep { + rockchip,pins = + <2 RK_PC3 RK_FUNC_GPIO &pcfg_input_high>; + }; + + pdmm0_sdi1_sleep: pdmm0-sdi1-sleep { + rockchip,pins = + <2 RK_PC4 RK_FUNC_GPIO &pcfg_input_high>; + }; + + pdmm0_sdi2_sleep: pdmm0-sdi2-sleep { + rockchip,pins = + <2 RK_PC5 RK_FUNC_GPIO &pcfg_input_high>; + }; + + pdmm0_sdi3_sleep: pdmm0-sdi3-sleep { + rockchip,pins = + <2 RK_PC6 RK_FUNC_GPIO &pcfg_input_high>; + }; + + pdmm0_fsync_sleep: pdmm0-fsync-sleep { rockchip,pins = - <0 5 RK_FUNC_1 &pcfg_pull_none>, - <0 6 RK_FUNC_1 &pcfg_pull_none>; + <2 RK_PC7 RK_FUNC_GPIO &pcfg_input_high>; + }; + }; + + tsadc { + otp_gpio: otp-gpio { + rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + otp_out: otp-out { + rockchip,pins = <2 RK_PB5 1 &pcfg_pull_none>; }; }; uart0 { uart0_xfer: uart0-xfer { - rockchip,pins = - <1 9 RK_FUNC_1 &pcfg_pull_up>, - <1 8 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <1 RK_PB1 1 &pcfg_pull_up>, + <1 RK_PB0 1 &pcfg_pull_none>; }; uart0_cts: uart0-cts { - rockchip,pins = - <1 11 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <1 RK_PB3 1 &pcfg_pull_none>; }; uart0_rts: uart0-rts { - rockchip,pins = - <1 10 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <1 RK_PB2 1 &pcfg_pull_none>; }; uart0_rts_gpio: uart0-rts-gpio { - rockchip,pins = - <1 10 RK_FUNC_GPIO &pcfg_pull_none>; + rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; }; }; uart1 { uart1_xfer: uart1-xfer { - rockchip,pins = - <3 4 RK_FUNC_4 &pcfg_pull_up>, - <3 6 RK_FUNC_4 &pcfg_pull_none>; + rockchip,pins = <3 RK_PA4 4 &pcfg_pull_up>, + <3 RK_PA6 4 &pcfg_pull_none>; }; uart1_cts: uart1-cts { - rockchip,pins = - <3 7 RK_FUNC_4 &pcfg_pull_none>; + rockchip,pins = <3 RK_PA7 4 &pcfg_pull_none>; }; uart1_rts: uart1-rts { - rockchip,pins = - <3 5 RK_FUNC_4 &pcfg_pull_none>; + rockchip,pins = <3 RK_PA5 4 &pcfg_pull_none>; }; uart1_rts_gpio: uart1-rts-gpio { - rockchip,pins = - <3 5 RK_FUNC_GPIO &pcfg_pull_none>; + rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; }; }; uart2-0 { uart2m0_xfer: uart2m0-xfer { - rockchip,pins = - <1 0 RK_FUNC_2 &pcfg_pull_up>, - <1 1 RK_FUNC_2 &pcfg_pull_none>; + rockchip,pins = <1 RK_PA0 2 &pcfg_pull_up>, + <1 RK_PA1 2 &pcfg_pull_none>; }; }; uart2-1 { uart2m1_xfer: uart2m1-xfer { - rockchip,pins = - <2 0 RK_FUNC_1 &pcfg_pull_up>, - <2 1 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <2 RK_PA0 1 &pcfg_pull_up>, + <2 RK_PA1 1 &pcfg_pull_none>; }; }; spi0-0 { spi0m0_clk: spi0m0-clk { - rockchip,pins = - <2 8 RK_FUNC_1 &pcfg_pull_up>; + rockchip,pins = <2 RK_PB0 1 &pcfg_pull_up>; }; spi0m0_cs0: spi0m0-cs0 { - rockchip,pins = - <2 11 RK_FUNC_1 &pcfg_pull_up>; + rockchip,pins = <2 RK_PB3 1 &pcfg_pull_up>; }; spi0m0_tx: spi0m0-tx { - rockchip,pins = - <2 9 RK_FUNC_1 &pcfg_pull_up>; + rockchip,pins = <2 RK_PB1 1 &pcfg_pull_up>; }; spi0m0_rx: spi0m0-rx { - rockchip,pins = - <2 10 RK_FUNC_1 &pcfg_pull_up>; + rockchip,pins = <2 RK_PB2 1 &pcfg_pull_up>; }; spi0m0_cs1: spi0m0-cs1 { - rockchip,pins = - <2 12 RK_FUNC_1 &pcfg_pull_up>; + rockchip,pins = <2 RK_PB4 1 &pcfg_pull_up>; }; }; spi0-1 { spi0m1_clk: spi0m1-clk { - rockchip,pins = - <3 23 RK_FUNC_2 &pcfg_pull_up>; + rockchip,pins = <3 RK_PC7 2 &pcfg_pull_up>; }; spi0m1_cs0: spi0m1-cs0 { - rockchip,pins = - <3 26 RK_FUNC_2 &pcfg_pull_up>; + rockchip,pins = <3 RK_PD2 2 &pcfg_pull_up>; }; spi0m1_tx: spi0m1-tx { - rockchip,pins = - <3 25 RK_FUNC_2 &pcfg_pull_up>; + rockchip,pins = <3 RK_PD1 2 &pcfg_pull_up>; }; spi0m1_rx: spi0m1-rx { - rockchip,pins = - <3 24 RK_FUNC_2 &pcfg_pull_up>; + rockchip,pins = <3 RK_PD0 2 &pcfg_pull_up>; }; spi0m1_cs1: spi0m1-cs1 { - rockchip,pins = - <3 27 RK_FUNC_2 &pcfg_pull_up>; + rockchip,pins = <3 RK_PD3 2 &pcfg_pull_up>; }; }; spi0-2 { spi0m2_clk: spi0m2-clk { - rockchip,pins = - <3 0 RK_FUNC_4 &pcfg_pull_up>; + rockchip,pins = <3 RK_PA0 4 &pcfg_pull_up>; }; spi0m2_cs0: spi0m2-cs0 { - rockchip,pins = - <3 8 RK_FUNC_3 &pcfg_pull_up>; + rockchip,pins = <3 RK_PB0 3 &pcfg_pull_up>; }; spi0m2_tx: spi0m2-tx { - rockchip,pins = - <3 1 RK_FUNC_4 &pcfg_pull_up>; + rockchip,pins = <3 RK_PA1 4 &pcfg_pull_up>; }; spi0m2_rx: spi0m2-rx { - rockchip,pins = - <3 2 RK_FUNC_4 &pcfg_pull_up>; + rockchip,pins = <3 RK_PA2 4 &pcfg_pull_up>; }; }; i2s1 { i2s1_mclk: i2s1-mclk { - rockchip,pins = - <2 15 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <2 RK_PB7 1 &pcfg_pull_none>; }; i2s1_sclk: i2s1-sclk { - rockchip,pins = - <2 18 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <2 RK_PC2 1 &pcfg_pull_none>; }; i2s1_lrckrx: i2s1-lrckrx { - rockchip,pins = - <2 16 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <2 RK_PC0 1 &pcfg_pull_none>; }; i2s1_lrcktx: i2s1-lrcktx { - rockchip,pins = - <2 17 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <2 RK_PC1 1 &pcfg_pull_none>; }; i2s1_sdi: i2s1-sdi { - rockchip,pins = - <2 19 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <2 RK_PC3 1 &pcfg_pull_none>; }; i2s1_sdo: i2s1-sdo { - rockchip,pins = - <2 23 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <2 RK_PC7 1 &pcfg_pull_none>; }; i2s1_sdio1: i2s1-sdio1 { - rockchip,pins = - <2 20 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <2 RK_PC4 1 &pcfg_pull_none>; }; i2s1_sdio2: i2s1-sdio2 { - rockchip,pins = - <2 21 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <2 RK_PC5 1 &pcfg_pull_none>; }; i2s1_sdio3: i2s1-sdio3 { - rockchip,pins = - <2 22 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <2 RK_PC6 1 &pcfg_pull_none>; }; i2s1_sleep: i2s1-sleep { rockchip,pins = - <2 15 RK_FUNC_GPIO &pcfg_input_high>, - <2 16 RK_FUNC_GPIO &pcfg_input_high>, - <2 17 RK_FUNC_GPIO &pcfg_input_high>, - <2 18 RK_FUNC_GPIO &pcfg_input_high>, - <2 19 RK_FUNC_GPIO &pcfg_input_high>, - <2 20 RK_FUNC_GPIO &pcfg_input_high>, - <2 21 RK_FUNC_GPIO &pcfg_input_high>, - <2 22 RK_FUNC_GPIO &pcfg_input_high>, - <2 23 RK_FUNC_GPIO &pcfg_input_high>; + <2 RK_PB7 RK_FUNC_GPIO &pcfg_input_high>, + <2 RK_PC0 RK_FUNC_GPIO &pcfg_input_high>, + <2 RK_PC1 RK_FUNC_GPIO &pcfg_input_high>, + <2 RK_PC2 RK_FUNC_GPIO &pcfg_input_high>, + <2 RK_PC3 RK_FUNC_GPIO &pcfg_input_high>, + <2 RK_PC4 RK_FUNC_GPIO &pcfg_input_high>, + <2 RK_PC5 RK_FUNC_GPIO &pcfg_input_high>, + <2 RK_PC6 RK_FUNC_GPIO &pcfg_input_high>, + <2 RK_PC7 RK_FUNC_GPIO &pcfg_input_high>; }; }; i2s2-0 { i2s2m0_mclk: i2s2m0-mclk { - rockchip,pins = - <1 21 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <1 RK_PC5 1 &pcfg_pull_none>; }; i2s2m0_sclk: i2s2m0-sclk { - rockchip,pins = - <1 22 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <1 RK_PC6 1 &pcfg_pull_none>; }; i2s2m0_lrckrx: i2s2m0-lrckrx { - rockchip,pins = - <1 26 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <1 RK_PD2 1 &pcfg_pull_none>; }; i2s2m0_lrcktx: i2s2m0-lrcktx { - rockchip,pins = - <1 23 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <1 RK_PC7 1 &pcfg_pull_none>; }; i2s2m0_sdi: i2s2m0-sdi { - rockchip,pins = - <1 24 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <1 RK_PD0 1 &pcfg_pull_none>; }; i2s2m0_sdo: i2s2m0-sdo { - rockchip,pins = - <1 25 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <1 RK_PD1 1 &pcfg_pull_none>; }; i2s2m0_sleep: i2s2m0-sleep { rockchip,pins = - <1 21 RK_FUNC_GPIO &pcfg_input_high>, - <1 22 RK_FUNC_GPIO &pcfg_input_high>, - <1 26 RK_FUNC_GPIO &pcfg_input_high>, - <1 23 RK_FUNC_GPIO &pcfg_input_high>, - <1 24 RK_FUNC_GPIO &pcfg_input_high>, - <1 25 RK_FUNC_GPIO &pcfg_input_high>; + <1 RK_PC5 RK_FUNC_GPIO &pcfg_input_high>, + <1 RK_PC6 RK_FUNC_GPIO &pcfg_input_high>, + <1 RK_PD2 RK_FUNC_GPIO &pcfg_input_high>, + <1 RK_PC7 RK_FUNC_GPIO &pcfg_input_high>, + <1 RK_PD0 RK_FUNC_GPIO &pcfg_input_high>, + <1 RK_PD1 RK_FUNC_GPIO &pcfg_input_high>; }; }; i2s2-1 { i2s2m1_mclk: i2s2m1-mclk { - rockchip,pins = - <1 21 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <1 RK_PC5 1 &pcfg_pull_none>; }; i2s2m1_sclk: i2s2m1-sclk { - rockchip,pins = - <3 0 RK_FUNC_6 &pcfg_pull_none>; + rockchip,pins = <3 RK_PA0 6 &pcfg_pull_none>; }; i2s2m1_lrckrx: i2sm1-lrckrx { - rockchip,pins = - <3 8 RK_FUNC_6 &pcfg_pull_none>; + rockchip,pins = <3 RK_PB0 6 &pcfg_pull_none>; }; i2s2m1_lrcktx: i2s2m1-lrcktx { - rockchip,pins = - <3 8 RK_FUNC_4 &pcfg_pull_none>; + rockchip,pins = <3 RK_PB0 4 &pcfg_pull_none>; }; i2s2m1_sdi: i2s2m1-sdi { - rockchip,pins = - <3 2 RK_FUNC_6 &pcfg_pull_none>; + rockchip,pins = <3 RK_PA2 6 &pcfg_pull_none>; }; i2s2m1_sdo: i2s2m1-sdo { - rockchip,pins = - <3 1 RK_FUNC_6 &pcfg_pull_none>; + rockchip,pins = <3 RK_PA1 6 &pcfg_pull_none>; }; i2s2m1_sleep: i2s2m1-sleep { rockchip,pins = - <1 21 RK_FUNC_GPIO &pcfg_input_high>, - <3 0 RK_FUNC_GPIO &pcfg_input_high>, - <3 8 RK_FUNC_GPIO &pcfg_input_high>, - <3 2 RK_FUNC_GPIO &pcfg_input_high>, - <3 1 RK_FUNC_GPIO &pcfg_input_high>; + <1 RK_PC5 RK_FUNC_GPIO &pcfg_input_high>, + <3 RK_PA0 RK_FUNC_GPIO &pcfg_input_high>, + <3 RK_PB0 RK_FUNC_GPIO &pcfg_input_high>, + <3 RK_PA2 RK_FUNC_GPIO &pcfg_input_high>, + <3 RK_PA1 RK_FUNC_GPIO &pcfg_input_high>; }; }; spdif-0 { spdifm0_tx: spdifm0-tx { - rockchip,pins = - <0 27 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <0 RK_PD3 1 &pcfg_pull_none>; }; }; spdif-1 { spdifm1_tx: spdifm1-tx { - rockchip,pins = - <2 17 RK_FUNC_2 &pcfg_pull_none>; + rockchip,pins = <2 RK_PC1 2 &pcfg_pull_none>; }; }; spdif-2 { spdifm2_tx: spdifm2-tx { - rockchip,pins = - <0 2 RK_FUNC_2 &pcfg_pull_none>; + rockchip,pins = <0 RK_PA2 2 &pcfg_pull_none>; }; }; sdmmc0-0 { sdmmc0m0_pwren: sdmmc0m0-pwren { - rockchip,pins = - <2 7 RK_FUNC_1 &pcfg_pull_up_4ma>; + rockchip,pins = <2 RK_PA7 1 &pcfg_pull_up_4ma>; }; sdmmc0m0_gpio: sdmmc0m0-gpio { - rockchip,pins = - <2 7 RK_FUNC_GPIO &pcfg_pull_up_4ma>; + rockchip,pins = <2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up_4ma>; }; }; sdmmc0-1 { sdmmc0m1_pwren: sdmmc0m1-pwren { - rockchip,pins = - <0 30 RK_FUNC_3 &pcfg_pull_up_4ma>; + rockchip,pins = <0 RK_PD6 3 &pcfg_pull_up_4ma>; }; sdmmc0m1_gpio: sdmmc0m1-gpio { - rockchip,pins = - <0 30 RK_FUNC_GPIO &pcfg_pull_up_4ma>; + rockchip,pins = <0 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up_4ma>; }; }; sdmmc0 { sdmmc0_clk: sdmmc0-clk { - rockchip,pins = - <1 6 RK_FUNC_1 &pcfg_pull_none_4ma>; + rockchip,pins = <1 RK_PA6 1 &pcfg_pull_none_8ma>; }; sdmmc0_cmd: sdmmc0-cmd { - rockchip,pins = - <1 4 RK_FUNC_1 &pcfg_pull_up_4ma>; + rockchip,pins = <1 RK_PA4 1 &pcfg_pull_up_8ma>; }; sdmmc0_dectn: sdmmc0-dectn { - rockchip,pins = - <1 5 RK_FUNC_1 &pcfg_pull_up_4ma>; + rockchip,pins = <1 RK_PA5 1 &pcfg_pull_up_4ma>; }; sdmmc0_wrprt: sdmmc0-wrprt { - rockchip,pins = - <1 7 RK_FUNC_1 &pcfg_pull_up_4ma>; + rockchip,pins = <1 RK_PA7 1 &pcfg_pull_up_4ma>; }; sdmmc0_bus1: sdmmc0-bus1 { - rockchip,pins = - <1 0 RK_FUNC_1 &pcfg_pull_up_4ma>; + rockchip,pins = <1 RK_PA0 1 &pcfg_pull_up_8ma>; }; sdmmc0_bus4: sdmmc0-bus4 { - rockchip,pins = - <1 0 RK_FUNC_1 &pcfg_pull_up_4ma>, - <1 1 RK_FUNC_1 &pcfg_pull_up_4ma>, - <1 2 RK_FUNC_1 &pcfg_pull_up_4ma>, - <1 3 RK_FUNC_1 &pcfg_pull_up_4ma>; + rockchip,pins = <1 RK_PA0 1 &pcfg_pull_up_8ma>, + <1 RK_PA1 1 &pcfg_pull_up_8ma>, + <1 RK_PA2 1 &pcfg_pull_up_8ma>, + <1 RK_PA3 1 &pcfg_pull_up_8ma>; }; sdmmc0_gpio: sdmmc0-gpio { rockchip,pins = - <1 6 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <1 4 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <1 5 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <1 7 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <1 3 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <1 2 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <1 1 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <1 0 RK_FUNC_GPIO &pcfg_pull_up_4ma>; + <1 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <1 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up_4ma>; }; }; sdmmc0ext { sdmmc0ext_clk: sdmmc0ext-clk { - rockchip,pins = - <3 2 RK_FUNC_3 &pcfg_pull_none_4ma>; + rockchip,pins = <3 RK_PA2 3 &pcfg_pull_none_4ma>; }; sdmmc0ext_cmd: sdmmc0ext-cmd { - rockchip,pins = - <3 0 RK_FUNC_3 &pcfg_pull_up_4ma>; + rockchip,pins = <3 RK_PA0 3 &pcfg_pull_up_4ma>; }; sdmmc0ext_wrprt: sdmmc0ext-wrprt { - rockchip,pins = - <3 3 RK_FUNC_3 &pcfg_pull_up_4ma>; + rockchip,pins = <3 RK_PA3 3 &pcfg_pull_up_4ma>; }; sdmmc0ext_dectn: sdmmc0ext-dectn { - rockchip,pins = - <3 1 RK_FUNC_3 &pcfg_pull_up_4ma>; + rockchip,pins = <3 RK_PA1 3 &pcfg_pull_up_4ma>; }; sdmmc0ext_bus1: sdmmc0ext-bus1 { - rockchip,pins = - <3 4 RK_FUNC_3 &pcfg_pull_up_4ma>; + rockchip,pins = <3 RK_PA4 3 &pcfg_pull_up_4ma>; }; sdmmc0ext_bus4: sdmmc0ext-bus4 { rockchip,pins = - <3 4 RK_FUNC_3 &pcfg_pull_up_4ma>, - <3 5 RK_FUNC_3 &pcfg_pull_up_4ma>, - <3 6 RK_FUNC_3 &pcfg_pull_up_4ma>, - <3 7 RK_FUNC_3 &pcfg_pull_up_4ma>; + <3 RK_PA4 3 &pcfg_pull_up_4ma>, + <3 RK_PA5 3 &pcfg_pull_up_4ma>, + <3 RK_PA6 3 &pcfg_pull_up_4ma>, + <3 RK_PA7 3 &pcfg_pull_up_4ma>; }; sdmmc0ext_gpio: sdmmc0ext-gpio { rockchip,pins = - <3 0 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <3 1 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <3 2 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <3 3 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <3 4 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <3 5 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <3 6 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <3 7 RK_FUNC_GPIO &pcfg_pull_up_4ma>; + <3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <3 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <3 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <3 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up_4ma>; }; }; sdmmc1 { sdmmc1_clk: sdmmc1-clk { - rockchip,pins = - <1 12 RK_FUNC_1 &pcfg_pull_none_8ma>; + rockchip,pins = <1 RK_PB4 1 &pcfg_pull_none_8ma>; }; sdmmc1_cmd: sdmmc1-cmd { - rockchip,pins = - <1 13 RK_FUNC_1 &pcfg_pull_up_8ma>; + rockchip,pins = <1 RK_PB5 1 &pcfg_pull_up_8ma>; }; sdmmc1_pwren: sdmmc1-pwren { - rockchip,pins = - <1 18 RK_FUNC_1 &pcfg_pull_up_8ma>; + rockchip,pins = <1 RK_PC2 1 &pcfg_pull_up_8ma>; }; sdmmc1_wrprt: sdmmc1-wrprt { - rockchip,pins = - <1 20 RK_FUNC_1 &pcfg_pull_up_8ma>; + rockchip,pins = <1 RK_PC4 1 &pcfg_pull_up_8ma>; }; sdmmc1_dectn: sdmmc1-dectn { - rockchip,pins = - <1 19 RK_FUNC_1 &pcfg_pull_up_8ma>; + rockchip,pins = <1 RK_PC3 1 &pcfg_pull_up_8ma>; }; sdmmc1_bus1: sdmmc1-bus1 { - rockchip,pins = - <1 14 RK_FUNC_1 &pcfg_pull_up_8ma>; + rockchip,pins = <1 RK_PB6 1 &pcfg_pull_up_8ma>; }; sdmmc1_bus4: sdmmc1-bus4 { - rockchip,pins = - <1 12 RK_FUNC_1 &pcfg_pull_up_8ma>, - <1 13 RK_FUNC_1 &pcfg_pull_up_8ma>, - <1 16 RK_FUNC_1 &pcfg_pull_up_8ma>, - <1 17 RK_FUNC_1 &pcfg_pull_up_8ma>; + rockchip,pins = <1 RK_PB6 1 &pcfg_pull_up_8ma>, + <1 RK_PB7 1 &pcfg_pull_up_8ma>, + <1 RK_PC0 1 &pcfg_pull_up_8ma>, + <1 RK_PC1 1 &pcfg_pull_up_8ma>; }; sdmmc1_gpio: sdmmc1-gpio { rockchip,pins = - <1 12 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <1 13 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <1 14 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <1 15 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <1 16 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <1 17 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <1 18 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <1 19 RK_FUNC_GPIO &pcfg_pull_up_4ma>, - <1 20 RK_FUNC_GPIO &pcfg_pull_up_4ma>; + <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <1 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <1 RK_PC0 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <1 RK_PC3 RK_FUNC_GPIO &pcfg_pull_up_4ma>, + <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_up_4ma>; }; }; emmc { emmc_clk: emmc-clk { - rockchip,pins = - <3 21 RK_FUNC_2 &pcfg_pull_none_12ma>; + rockchip,pins = <3 RK_PC5 2 &pcfg_pull_none_12ma>; }; emmc_cmd: emmc-cmd { - rockchip,pins = - <3 19 RK_FUNC_2 &pcfg_pull_up_12ma>; + rockchip,pins = <3 RK_PC3 2 &pcfg_pull_up_12ma>; }; emmc_pwren: emmc-pwren { - rockchip,pins = - <3 22 RK_FUNC_2 &pcfg_pull_none>; + rockchip,pins = <3 RK_PC6 2 &pcfg_pull_none>; }; emmc_rstnout: emmc-rstnout { - rockchip,pins = - <3 20 RK_FUNC_2 &pcfg_pull_none>; + rockchip,pins = <3 RK_PC4 2 &pcfg_pull_none>; }; emmc_bus1: emmc-bus1 { - rockchip,pins = - <0 7 RK_FUNC_2 &pcfg_pull_up_12ma>; + rockchip,pins = <0 RK_PA7 2 &pcfg_pull_up_12ma>; }; emmc_bus4: emmc-bus4 { rockchip,pins = - <0 7 RK_FUNC_2 &pcfg_pull_up_12ma>, - <2 28 RK_FUNC_2 &pcfg_pull_up_12ma>, - <2 29 RK_FUNC_2 &pcfg_pull_up_12ma>, - <2 30 RK_FUNC_2 &pcfg_pull_up_12ma>; + <0 RK_PA7 2 &pcfg_pull_up_12ma>, + <2 RK_PD4 2 &pcfg_pull_up_12ma>, + <2 RK_PD5 2 &pcfg_pull_up_12ma>, + <2 RK_PD6 2 &pcfg_pull_up_12ma>; }; emmc_bus8: emmc-bus8 { rockchip,pins = - <0 7 RK_FUNC_2 &pcfg_pull_up_12ma>, - <2 28 RK_FUNC_2 &pcfg_pull_up_12ma>, - <2 29 RK_FUNC_2 &pcfg_pull_up_12ma>, - <2 30 RK_FUNC_2 &pcfg_pull_up_12ma>, - <2 31 RK_FUNC_2 &pcfg_pull_up_12ma>, - <3 16 RK_FUNC_2 &pcfg_pull_up_12ma>, - <3 17 RK_FUNC_2 &pcfg_pull_up_12ma>, - <3 18 RK_FUNC_2 &pcfg_pull_up_12ma>; + <0 RK_PA7 2 &pcfg_pull_up_12ma>, + <2 RK_PD4 2 &pcfg_pull_up_12ma>, + <2 RK_PD5 2 &pcfg_pull_up_12ma>, + <2 RK_PD6 2 &pcfg_pull_up_12ma>, + <2 RK_PD7 2 &pcfg_pull_up_12ma>, + <3 RK_PC0 2 &pcfg_pull_up_12ma>, + <3 RK_PC1 2 &pcfg_pull_up_12ma>, + <3 RK_PC2 2 &pcfg_pull_up_12ma>; }; }; pwm0 { pwm0_pin: pwm0-pin { - rockchip,pins = - <2 4 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <2 RK_PA4 1 &pcfg_pull_none>; }; }; pwm1 { pwm1_pin: pwm1-pin { - rockchip,pins = - <2 5 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <2 RK_PA5 1 &pcfg_pull_none>; }; }; pwm2 { pwm2_pin: pwm2-pin { - rockchip,pins = - <2 6 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <2 RK_PA6 1 &pcfg_pull_none>; }; }; pwmir { pwmir_pin: pwmir-pin { - rockchip,pins = - <2 2 RK_FUNC_1 &pcfg_pull_none>; - }; - }; - - gmac-0 { - rgmiim0_pins: rgmiim0-pins { - rockchip,pins = - /* mac_txclk */ - <0 8 RK_FUNC_1 &pcfg_pull_none_12ma>, - /* mac_rxclk */ - <0 10 RK_FUNC_1 &pcfg_pull_none>, - /* mac_mdio */ - <0 11 RK_FUNC_1 &pcfg_pull_none>, - /* mac_txen */ - <0 12 RK_FUNC_1 &pcfg_pull_none_12ma>, - /* mac_clk */ - <0 24 RK_FUNC_1 &pcfg_pull_none>, - /* mac_rxdv */ - <0 25 RK_FUNC_1 &pcfg_pull_none>, - /* mac_mdc */ - <0 19 RK_FUNC_1 &pcfg_pull_none>, - /* mac_rxd1 */ - <0 14 RK_FUNC_1 &pcfg_pull_none>, - /* mac_rxd0 */ - <0 15 RK_FUNC_1 &pcfg_pull_none>, - /* mac_txd1 */ - <0 16 RK_FUNC_1 &pcfg_pull_none_12ma>, - /* mac_txd0 */ - <0 17 RK_FUNC_1 &pcfg_pull_none_12ma>, - /* mac_rxd3 */ - <0 20 RK_FUNC_1 &pcfg_pull_none>, - /* mac_rxd2 */ - <0 21 RK_FUNC_1 &pcfg_pull_none>, - /* mac_txd3 */ - <0 23 RK_FUNC_1 &pcfg_pull_none_12ma>, - /* mac_txd2 */ - <0 22 RK_FUNC_1 &pcfg_pull_none_12ma>; - }; - - rmiim0_pins: rmiim0-pins { - rockchip,pins = - /* mac_mdio */ - <0 11 RK_FUNC_1 &pcfg_pull_none>, - /* mac_txen */ - <0 12 RK_FUNC_1 &pcfg_pull_none_12ma>, - /* mac_clk */ - <0 24 RK_FUNC_1 &pcfg_pull_none>, - /* mac_rxer */ - <0 13 RK_FUNC_1 &pcfg_pull_none>, - /* mac_rxdv */ - <0 25 RK_FUNC_1 &pcfg_pull_none>, - /* mac_mdc */ - <0 19 RK_FUNC_1 &pcfg_pull_none>, - /* mac_rxd1 */ - <0 14 RK_FUNC_1 &pcfg_pull_none>, - /* mac_rxd0 */ - <0 15 RK_FUNC_1 &pcfg_pull_none>, - /* mac_txd1 */ - <0 16 RK_FUNC_1 &pcfg_pull_none_12ma>, - /* mac_txd0 */ - <0 17 RK_FUNC_1 &pcfg_pull_none_12ma>; + rockchip,pins = <2 RK_PA2 1 &pcfg_pull_none>; }; }; @@ -1301,157 +1716,128 @@ rgmiim1_pins: rgmiim1-pins { rockchip,pins = /* mac_txclk */ - <1 12 RK_FUNC_2 &pcfg_pull_none_12ma>, + <1 RK_PB4 2 &pcfg_pull_none_8ma>, /* mac_rxclk */ - <1 13 RK_FUNC_2 &pcfg_pull_none_2ma>, + <1 RK_PB5 2 &pcfg_pull_none_4ma>, /* mac_mdio */ - <1 19 RK_FUNC_2 &pcfg_pull_none_2ma>, + <1 RK_PC3 2 &pcfg_pull_none_4ma>, /* mac_txen */ - <1 25 RK_FUNC_2 &pcfg_pull_none_12ma>, + <1 RK_PD1 2 &pcfg_pull_none_8ma>, /* mac_clk */ - <1 21 RK_FUNC_2 &pcfg_pull_none_2ma>, + <1 RK_PC5 2 &pcfg_pull_none_4ma>, /* mac_rxdv */ - <1 22 RK_FUNC_2 &pcfg_pull_none_2ma>, + <1 RK_PC6 2 &pcfg_pull_none_4ma>, /* mac_mdc */ - <1 23 RK_FUNC_2 &pcfg_pull_none_2ma>, + <1 RK_PC7 2 &pcfg_pull_none_4ma>, /* mac_rxd1 */ - <1 10 RK_FUNC_2 &pcfg_pull_none_2ma>, + <1 RK_PB2 2 &pcfg_pull_none_4ma>, /* mac_rxd0 */ - <1 11 RK_FUNC_2 &pcfg_pull_none_2ma>, + <1 RK_PB3 2 &pcfg_pull_none_4ma>, /* mac_txd1 */ - <1 8 RK_FUNC_2 &pcfg_pull_none_12ma>, + <1 RK_PB0 2 &pcfg_pull_none_8ma>, /* mac_txd0 */ - <1 9 RK_FUNC_2 &pcfg_pull_none_12ma>, + <1 RK_PB1 2 &pcfg_pull_none_8ma>, /* mac_rxd3 */ - <1 14 RK_FUNC_2 &pcfg_pull_none_2ma>, + <1 RK_PB6 2 &pcfg_pull_none_4ma>, /* mac_rxd2 */ - <1 15 RK_FUNC_2 &pcfg_pull_none_2ma>, + <1 RK_PB7 2 &pcfg_pull_none_4ma>, /* mac_txd3 */ - <1 16 RK_FUNC_2 &pcfg_pull_none_12ma>, + <1 RK_PC0 2 &pcfg_pull_none_8ma>, /* mac_txd2 */ - <1 17 RK_FUNC_2 &pcfg_pull_none_12ma>, + <1 RK_PC1 2 &pcfg_pull_none_8ma>, /* mac_txclk */ - <0 8 RK_FUNC_1 &pcfg_pull_none>, + <0 RK_PB0 1 &pcfg_pull_none_8ma>, /* mac_txen */ - <0 12 RK_FUNC_1 &pcfg_pull_none>, + <0 RK_PB4 1 &pcfg_pull_none_8ma>, /* mac_clk */ - <0 24 RK_FUNC_1 &pcfg_pull_none>, + <0 RK_PD0 1 &pcfg_pull_none_4ma>, /* mac_txd1 */ - <0 16 RK_FUNC_1 &pcfg_pull_none>, + <0 RK_PC0 1 &pcfg_pull_none_8ma>, /* mac_txd0 */ - <0 17 RK_FUNC_1 &pcfg_pull_none>, + <0 RK_PC1 1 &pcfg_pull_none_8ma>, /* mac_txd3 */ - <0 23 RK_FUNC_1 &pcfg_pull_none>, + <0 RK_PC7 1 &pcfg_pull_none_8ma>, /* mac_txd2 */ - <0 22 RK_FUNC_1 &pcfg_pull_none>; + <0 RK_PC6 1 &pcfg_pull_none_8ma>; }; rmiim1_pins: rmiim1-pins { rockchip,pins = /* mac_mdio */ - <1 19 RK_FUNC_2 &pcfg_pull_none_2ma>, + <1 RK_PC3 2 &pcfg_pull_none_2ma>, /* mac_txen */ - <1 25 RK_FUNC_2 &pcfg_pull_none_12ma>, + <1 RK_PD1 2 &pcfg_pull_none_12ma>, /* mac_clk */ - <1 21 RK_FUNC_2 &pcfg_pull_none_2ma>, + <1 RK_PC5 2 &pcfg_pull_none_2ma>, /* mac_rxer */ - <1 24 RK_FUNC_2 &pcfg_pull_none_2ma>, + <1 RK_PD0 2 &pcfg_pull_none_2ma>, /* mac_rxdv */ - <1 22 RK_FUNC_2 &pcfg_pull_none_2ma>, + <1 RK_PC6 2 &pcfg_pull_none_2ma>, /* mac_mdc */ - <1 23 RK_FUNC_2 &pcfg_pull_none_2ma>, + <1 RK_PC7 2 &pcfg_pull_none_2ma>, /* mac_rxd1 */ - <1 10 RK_FUNC_2 &pcfg_pull_none_2ma>, + <1 RK_PB2 2 &pcfg_pull_none_2ma>, /* mac_rxd0 */ - <1 11 RK_FUNC_2 &pcfg_pull_none_2ma>, + <1 RK_PB3 2 &pcfg_pull_none_2ma>, /* mac_txd1 */ - <1 8 RK_FUNC_2 &pcfg_pull_none_12ma>, + <1 RK_PB0 2 &pcfg_pull_none_12ma>, /* mac_txd0 */ - <1 9 RK_FUNC_2 &pcfg_pull_none_12ma>, + <1 RK_PB1 2 &pcfg_pull_none_12ma>, /* mac_mdio */ - <0 11 RK_FUNC_1 &pcfg_pull_none>, + <0 RK_PB3 1 &pcfg_pull_none>, /* mac_txen */ - <0 12 RK_FUNC_1 &pcfg_pull_none>, + <0 RK_PB4 1 &pcfg_pull_none>, /* mac_clk */ - <0 24 RK_FUNC_1 &pcfg_pull_none>, + <0 RK_PD0 1 &pcfg_pull_none>, /* mac_mdc */ - <0 19 RK_FUNC_1 &pcfg_pull_none>, + <0 RK_PC3 1 &pcfg_pull_none>, /* mac_txd1 */ - <0 16 RK_FUNC_1 &pcfg_pull_none>, + <0 RK_PC0 1 &pcfg_pull_none>, /* mac_txd0 */ - <0 17 RK_FUNC_1 &pcfg_pull_none>; + <0 RK_PC1 1 &pcfg_pull_none>; }; }; gmac2phy { - fephyled_speed100: fephyled-speed100 { - rockchip,pins = - <0 31 RK_FUNC_1 &pcfg_pull_none>; - }; - fephyled_speed10: fephyled-speed10 { - rockchip,pins = - <0 30 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <0 RK_PD6 1 &pcfg_pull_none>; }; fephyled_duplex: fephyled-duplex { - rockchip,pins = - <0 30 RK_FUNC_2 &pcfg_pull_none>; - }; - - fephyled_rxm0: fephyled-rxm0 { - rockchip,pins = - <0 29 RK_FUNC_1 &pcfg_pull_none>; - }; - - fephyled_txm0: fephyled-txm0 { - rockchip,pins = - <0 29 RK_FUNC_2 &pcfg_pull_none>; - }; - - fephyled_linkm0: fephyled-linkm0 { - rockchip,pins = - <0 28 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <0 RK_PD6 2 &pcfg_pull_none>; }; fephyled_rxm1: fephyled-rxm1 { - rockchip,pins = - <2 25 RK_FUNC_2 &pcfg_pull_none>; + rockchip,pins = <2 RK_PD1 2 &pcfg_pull_none>; }; fephyled_txm1: fephyled-txm1 { - rockchip,pins = - <2 25 RK_FUNC_3 &pcfg_pull_none>; + rockchip,pins = <2 RK_PD1 3 &pcfg_pull_none>; }; fephyled_linkm1: fephyled-linkm1 { - rockchip,pins = - <2 24 RK_FUNC_2 &pcfg_pull_none>; + rockchip,pins = <2 RK_PD0 2 &pcfg_pull_none>; }; }; tsadc_pin { tsadc_int: tsadc-int { - rockchip,pins = - <2 13 RK_FUNC_2 &pcfg_pull_none>; + rockchip,pins = <2 RK_PB5 2 &pcfg_pull_none>; }; tsadc_gpio: tsadc-gpio { - rockchip,pins = - <2 13 RK_FUNC_GPIO &pcfg_pull_none>; + rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; }; }; hdmi_pin { hdmi_cec: hdmi-cec { - rockchip,pins = - <0 3 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <0 RK_PA3 1 &pcfg_pull_none>; }; hdmi_hpd: hdmi-hpd { - rockchip,pins = - <0 4 RK_FUNC_1 &pcfg_pull_down>; + rockchip,pins = <0 RK_PA4 1 &pcfg_pull_down>; }; }; @@ -1459,29 +1845,29 @@ dvp_d2d9_m0:dvp-d2d9-m0 { rockchip,pins = /* cif_d0 */ - <3 4 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PA4 2 &pcfg_pull_none>, /* cif_d1 */ - <3 5 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PA5 2 &pcfg_pull_none>, /* cif_d2 */ - <3 6 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PA6 2 &pcfg_pull_none>, /* cif_d3 */ - <3 7 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PA7 2 &pcfg_pull_none>, /* cif_d4 */ - <3 8 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PB0 2 &pcfg_pull_none>, /* cif_d5m0 */ - <3 9 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PB1 2 &pcfg_pull_none>, /* cif_d6m0 */ - <3 10 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PB2 2 &pcfg_pull_none>, /* cif_d7m0 */ - <3 11 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PB3 2 &pcfg_pull_none>, /* cif_href */ - <3 1 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PA1 2 &pcfg_pull_none>, /* cif_vsync */ - <3 0 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PA0 2 &pcfg_pull_none>, /* cif_clkoutm0 */ - <3 3 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PA3 2 &pcfg_pull_none>, /* cif_clkin */ - <3 2 RK_FUNC_2 &pcfg_pull_none>; + <3 RK_PA2 2 &pcfg_pull_none>; }; }; @@ -1489,29 +1875,29 @@ dvp_d2d9_m1:dvp-d2d9-m1 { rockchip,pins = /* cif_d0 */ - <3 4 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PA4 2 &pcfg_pull_none>, /* cif_d1 */ - <3 5 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PA5 2 &pcfg_pull_none>, /* cif_d2 */ - <3 6 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PA6 2 &pcfg_pull_none>, /* cif_d3 */ - <3 7 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PA7 2 &pcfg_pull_none>, /* cif_d4 */ - <3 8 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PB0 2 &pcfg_pull_none>, /* cif_d5m1 */ - <2 16 RK_FUNC_4 &pcfg_pull_none>, + <2 RK_PC0 4 &pcfg_pull_none>, /* cif_d6m1 */ - <2 17 RK_FUNC_4 &pcfg_pull_none>, + <2 RK_PC1 4 &pcfg_pull_none>, /* cif_d7m1 */ - <2 18 RK_FUNC_4 &pcfg_pull_none>, + <2 RK_PC2 4 &pcfg_pull_none>, /* cif_href */ - <3 1 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PA1 2 &pcfg_pull_none>, /* cif_vsync */ - <3 0 RK_FUNC_2 &pcfg_pull_none>, + <3 RK_PA0 2 &pcfg_pull_none>, /* cif_clkoutm1 */ - <2 15 RK_FUNC_4 &pcfg_pull_none>, + <2 RK_PB7 4 &pcfg_pull_none>, /* cif_clkin */ - <3 2 RK_FUNC_2 &pcfg_pull_none>; + <3 RK_PA2 2 &pcfg_pull_none>; }; }; }; -- 2.26.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v3 7/9] rockchip: dts: rk3328: Sync device tree files from Linux 2020-04-27 6:52 ` [PATCH v3 7/9] rockchip: dts: rk3328: Sync device tree files from Linux Chen-Yu Tsai @ 2020-05-11 18:59 ` Kurt Miller 2020-05-14 4:10 ` Chen-Yu Tsai 0 siblings, 1 reply; 20+ messages in thread From: Kurt Miller @ 2020-05-11 18:59 UTC (permalink / raw) To: u-boot On Mon, 2020-04-27 at 14:52 +0800, Chen-Yu Tsai wrote: > From: Chen-Yu Tsai <wens@csie.org> > > This syncs rk3328 device tree files from the Linux kernel next-20200324. > The last commit to touch these files is: > > ????b2411befed60 ("arm64: dts: add bus to rockchip amba nodenames") > > Additional changes not yet in the Linux kernel include: > > ????arm64: dts: rockchip: rk3328: drop #address-cells, #size-cells from grf node > ????arm64: dts: rockchip: rk3328: drop non-existent gmac2phy pinmux options > ????arm64: dts: rockchip: rk3328: Replace RK805 PMIC node name with "pmic" > > Changes include: > > ? - conversion of raw pin numbers to macros > ? - removal of deprecated RK_FUNC_* macros > ? - update of device tree binding headers > ? - new devices > ? - device tree cleanups > ? - gmac2phy disabled in -u-boot.dtsi as it is not supported in U-boot > > This includes a re-ordering of the USB device nodes compared to upstream > Linux, moving the dwc2 OTG controller after the EHCI/OHCI nodes. This is > currently required as otherwise the dwc2 controller would not be able to > detect devices in some cases. This may be due to lack of USB PHY support > in U-boot. Hi Chen-Yu, Thank you for syncing rk3328 device tree files. On the rock64 with v2020.04 one USB 2.0 port was working (the lower one). Building? master now with this merged, no USB ports are working. No power appears to be enabled on them and USB devices are not recognized. Do you have any suggestions for me to try to get them enabled again? Thanks, -Kurt > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > --- > Changes since v2: > ? - Dropped reviewed-by > ? - Moved dwc2 OTG device node after EHCI/OHCI to make dwc2 work again > Changes since v1: > ? - Added Kever's reviewed-by > --- > ?arch/arm/dts/rk3328-evb-u-boot.dtsi |????5 + > ?arch/arm/dts/rk3328-evb.dts?????????|??196 ++-- > ?arch/arm/dts/rk3328-rock64.dts??????|??132 ++- > ?arch/arm/dts/rk3328.dtsi????????????| 1414 +++++++++++++++++---------- > ?4 files changed, 1166 insertions(+), 581 deletions(-) > > diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi > index 8ba53cf8f44b..4bfa0c2330ba 100644 > --- a/arch/arm/dts/rk3328-evb-u-boot.dtsi > +++ b/arch/arm/dts/rk3328-evb-u-boot.dtsi > @@ -40,6 +40,11 @@ > ? status = "okay"; > ?}; > ? > +&gmac2phy { > + /* Integrated PHY unsupported by U-boot */ > + status = "broken"; > +}; > + > ?&usb_host0_xhci { > ? vbus-supply = <&vcc5v0_host_xhci>; > ? status = "okay"; > diff --git a/arch/arm/dts/rk3328-evb.dts b/arch/arm/dts/rk3328-evb.dts > index 97bef37cf610..6abc6f4a86cf 100644 > --- a/arch/arm/dts/rk3328-evb.dts > +++ b/arch/arm/dts/rk3328-evb.dts > @@ -1,6 +1,6 @@ > -// SPDX-License-Identifier: GPL-2.0+ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > ?/* > - * (C) Copyright 2016 Rockchip Electronics Co., Ltd > + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd > ? */ > ? > ?/dts-v1/; > @@ -11,24 +11,51 @@ > ? compatible = "rockchip,rk3328-evb", "rockchip,rk3328"; > ? > ? chosen { > - stdout-path = &uart2; > + stdout-path = "serial2:1500000n8"; > ? }; > ? > - vcc3v3_sdmmc: sdmmc-pwren { > + dc_12v: dc-12v { > ? compatible = "regulator-fixed"; > - regulator-name = "vcc3v3"; > - gpio = <&gpio0 30 GPIO_ACTIVE_LOW>; > + regulator-name = "dc_12v"; > ? regulator-always-on; > ? regulator-boot-on; > + regulator-min-microvolt = <12000000>; > + regulator-max-microvolt = <12000000>; > + }; > + > + sdio_pwrseq: sdio-pwrseq { > + compatible = "mmc-pwrseq-simple"; > + pinctrl-names = "default"; > + pinctrl-0 = <&wifi_enable_h>; > + > + /* > + ?* On the module itself this is one of these (depending > + ?* on the actual card populated): > + ?* - SDIO_RESET_L_WL_REG_ON > + ?* - PDN (power down when low) > + ?*/ > + reset-gpios = <&gpio1 18 GPIO_ACTIVE_LOW>; > + }; > + > + vcc_sd: sdmmc-regulator { > + compatible = "regulator-fixed"; > + gpio = <&gpio0 30 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>; > ? }; > ? > - vcc5v0_otg: vcc5v0-otg-drv { > + vcc_sys: vcc-sys { > ? compatible = "regulator-fixed"; > - enable-active-high; > - regulator-name = "vcc5v0_otg"; > - gpio = <&gpio0 27 GPIO_ACTIVE_HIGH>; > + regulator-name = "vcc_sys"; > + regulator-always-on; > + regulator-boot-on; > ? regulator-min-microvolt = <5000000>; > ? regulator-max-microvolt = <5000000>; > + vin-supply = <&dc_12v>; > ? }; > ? > ? vcc_phy: vcc-phy-regulator { > @@ -39,80 +66,60 @@ > ? }; > ?}; > ? > -&saradc { > - status = "okay"; > -}; > - > -&uart2 { > - status = "okay"; > -}; > - > -&sdmmc { > - bus-width = <4>; > - cap-mmc-highspeed; > - cap-sd-highspeed; > - card-detect-delay = <200>; > - disable-wp; > - num-slots = <1>; > - pinctrl-names = "default"; > - pinctrl-0 = <&sdmmc0_clk>, <&sdmmc0_cmd>, <&sdmmc0_dectn>, <&sdmmc0_bus4>; > - status = "okay"; > +&cpu0 { > + cpu-supply = <&vdd_arm>; > ?}; > ? > ?&emmc { > ? bus-width = <8>; > ? cap-mmc-highspeed; > - supports-emmc; > - disable-wp; > ? non-removable; > - num-slots = <1>; > ? pinctrl-names = "default"; > ? pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>; > ? status = "okay"; > ?}; > ? > -&usb_host0_ehci { > - status = "okay"; > -}; > +&gmac2phy { > + phy-supply = <&vcc_phy>; > + clock_in_out = "output"; > + assigned-clocks = <&cru SCLK_MAC2PHY_SRC>; > + assigned-clock-rate = <50000000>; > + assigned-clocks = <&cru SCLK_MAC2PHY>; > + assigned-clock-parents = <&cru SCLK_MAC2PHY_SRC>; > ? > -&usb_host0_ohci { > - status = "okay"; > -}; > - > -&usb20_otg { > - vbus-supply = <&vcc5v0_otg>; > - status = "okay"; > ?}; > ? > ?&i2c1 { > - clock-frequency = <400000>; > - i2c-scl-rising-time-ns = <168>; > - i2c-scl-falling-time-ns = <4>; > ? status = "okay"; > ? > ? rk805: pmic at 18 { > ? compatible = "rockchip,rk805"; > - status = "okay"; > ? reg = <0x18>; > ? interrupt-parent = <&gpio2>; > ? interrupts = <6 IRQ_TYPE_LEVEL_LOW>; > + #clock-cells = <1>; > + clock-output-names = "xin32k", "rk805-clkout2"; > + gpio-controller; > + #gpio-cells = <2>; > ? pinctrl-names = "default"; > ? pinctrl-0 = <&pmic_int_l>; > ? rockchip,system-power-controller; > ? wakeup-source; > - gpio-controller; > - #gpio-cells = <2>; > - #clock-cells = <1>; > - clock-output-names = "xin32k", "rk805-clkout2"; > + > + vcc1-supply = <&vcc_sys>; > + vcc2-supply = <&vcc_sys>; > + vcc3-supply = <&vcc_sys>; > + vcc4-supply = <&vcc_sys>; > + vcc5-supply = <&vcc_io>; > + vcc6-supply = <&vcc_io>; > ? > ? regulators { > ? vdd_logic: DCDC_REG1 { > ? regulator-name = "vdd_logic"; > ? regulator-min-microvolt = <712500>; > ? regulator-max-microvolt = <1450000>; > - regulator-ramp-delay = <6001>; > - regulator-boot-on; > ? regulator-always-on; > + regulator-boot-on; > ? regulator-state-mem { > ? regulator-on-in-suspend; > ? regulator-suspend-microvolt = <1000000>; > @@ -123,19 +130,18 @@ > ? regulator-name = "vdd_arm"; > ? regulator-min-microvolt = <712500>; > ? regulator-max-microvolt = <1450000>; > - regulator-ramp-delay = <6001>; > - regulator-boot-on; > ? regulator-always-on; > + regulator-boot-on; > ? regulator-state-mem { > ? regulator-on-in-suspend; > - regulator-suspend-microvolt = <1000000>; > + regulator-suspend-microvolt = <950000>; > ? }; > ? }; > ? > ? vcc_ddr: DCDC_REG3 { > ? regulator-name = "vcc_ddr"; > - regulator-boot-on; > ? regulator-always-on; > + regulator-boot-on; > ? regulator-state-mem { > ? regulator-on-in-suspend; > ? }; > @@ -145,32 +151,32 @@ > ? regulator-name = "vcc_io"; > ? regulator-min-microvolt = <3300000>; > ? regulator-max-microvolt = <3300000>; > - regulator-boot-on; > ? regulator-always-on; > + regulator-boot-on; > ? regulator-state-mem { > ? regulator-on-in-suspend; > ? regulator-suspend-microvolt = <3300000>; > ? }; > ? }; > ? > - vdd_18: LDO_REG1 { > - regulator-name = "vdd_18"; > + vcc_18: LDO_REG1 { > + regulator-name = "vcc_18"; > ? regulator-min-microvolt = <1800000>; > ? regulator-max-microvolt = <1800000>; > - regulator-boot-on; > ? regulator-always-on; > + regulator-boot-on; > ? regulator-state-mem { > ? regulator-on-in-suspend; > ? regulator-suspend-microvolt = <1800000>; > ? }; > ? }; > ? > - vcc_18emmc: LDO_REG2 { > - regulator-name = "vcc_18emmc"; > + vcc18_emmc: LDO_REG2 { > + regulator-name = "vcc18_emmc"; > ? regulator-min-microvolt = <1800000>; > ? regulator-max-microvolt = <1800000>; > - regulator-boot-on; > ? regulator-always-on; > + regulator-boot-on; > ? regulator-state-mem { > ? regulator-on-in-suspend; > ? regulator-suspend-microvolt = <1800000>; > @@ -181,8 +187,8 @@ > ? regulator-name = "vdd_10"; > ? regulator-min-microvolt = <1000000>; > ? regulator-max-microvolt = <1000000>; > - regulator-boot-on; > ? regulator-always-on; > + regulator-boot-on; > ? regulator-state-mem { > ? regulator-on-in-suspend; > ? regulator-suspend-microvolt = <1000000>; > @@ -195,9 +201,71 @@ > ?&pinctrl { > ? pmic { > ? pmic_int_l: pmic-int-l { > + rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; > + }; > + }; > + > + sdio-pwrseq { > + wifi_enable_h: wifi-enable-h { > ? rockchip,pins = > - <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; /* gpio2_a6 */ > + <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; > ? }; > ? }; > ?}; > ? > +&sdio { > + bus-width = <4>; > + cap-sd-highspeed; > + cap-sdio-irq; > + keep-power-in-suspend; > + max-frequency = <150000000>; > + mmc-pwrseq = <&sdio_pwrseq>; > + non-removable; > + pinctrl-names = "default"; > + pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>; > + status = "okay"; > +}; > + > +&sdmmc { > + bus-width = <4>; > + cap-mmc-highspeed; > + cap-sd-highspeed; > + disable-wp; > + max-frequency = <150000000>; > + pinctrl-names = "default"; > + pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>; > + vmmc-supply = <&vcc_sd>; > + status = "okay"; > +}; > + > +&tsadc { > + status = "okay"; > +}; > + > +&uart2 { > + status = "okay"; > +}; > + > +&u2phy { > + status = "okay"; > +}; > + > +&u2phy_host { > + status = "okay"; > +}; > + > +&u2phy_otg { > + status = "okay"; > +}; > + > +&usb20_otg { > + status = "okay"; > +}; > + > +&usb_host0_ehci { > + status = "okay"; > +}; > + > +&usb_host0_ohci { > + status = "okay"; > +}; > diff --git a/arch/arm/dts/rk3328-rock64.dts b/arch/arm/dts/rk3328-rock64.dts > index a78eb4ac6fff..ebf3eb222e1f 100644 > --- a/arch/arm/dts/rk3328-rock64.dts > +++ b/arch/arm/dts/rk3328-rock64.dts > @@ -43,6 +43,17 @@ > ? vin-supply = <&vcc_sys>; > ? }; > ? > + vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator { > + compatible = "regulator-fixed"; > + gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; > + 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"; > @@ -51,6 +62,56 @@ > ? regulator-min-microvolt = <5000000>; > ? regulator-max-microvolt = <5000000>; > ? }; > + > + ir-receiver { > + compatible = "gpio-ir-receiver"; > + gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>; > + pinctrl-0 = <&ir_int>; > + pinctrl-names = "default"; > + }; > + > + leds { > + compatible = "gpio-leds"; > + > + power { > + gpios = <&rk805 1 GPIO_ACTIVE_LOW>; > + linux,default-trigger = "mmc0"; > + }; > + > + standby { > + gpios = <&rk805 0 GPIO_ACTIVE_LOW>; > + linux,default-trigger = "heartbeat"; > + }; > + }; > + > + sound { > + compatible = "audio-graph-card"; > + label = "rockchip,rk3328"; > + dais = <&i2s1_p0 > + &spdif_p0>; > + }; > + > + spdif-dit { > + compatible = "linux,spdif-dit"; > + #sound-dai-cells = <0>; > + > + port { > + dit_p0_0: endpoint { > + remote-endpoint = <&spdif_p0_0>; > + }; > + }; > + }; > +}; > + > +&codec { > + mute-gpios = <&grf_gpio 0 GPIO_ACTIVE_LOW>; > + status = "okay"; > + > + port at 0 { > + codec_p0_0: endpoint { > + remote-endpoint = <&i2s1_p0_0>; > + }; > + }; > ?}; > ? > ?&cpu0 { > @@ -98,16 +159,26 @@ > ? status = "okay"; > ?}; > ? > +&hdmi { > + status = "okay"; > +}; > + > +&hdmiphy { > + status = "okay"; > +}; > + > ?&i2c1 { > ? status = "okay"; > ? > - rk805: rk805 at 18 { > + rk805: pmic 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"; > + gpio-controller; > + #gpio-cells = <2>; > ? pinctrl-names = "default"; > ? pinctrl-0 = <&pmic_int_l>; > ? rockchip,system-power-controller; > @@ -169,7 +240,7 @@ > ? }; > ? > ? vcc_18: LDO_REG1 { > - regulator-name = "vdd_18"; > + regulator-name = "vcc_18"; > ? regulator-min-microvolt = <1800000>; > ? regulator-max-microvolt = <1800000>; > ? regulator-always-on; > @@ -181,7 +252,7 @@ > ? }; > ? > ? vcc18_emmc: LDO_REG2 { > - regulator-name = "vcc_18emmc"; > + regulator-name = "vcc18_emmc"; > ? regulator-min-microvolt = <1800000>; > ? regulator-max-microvolt = <1800000>; > ? regulator-always-on; > @@ -207,6 +278,18 @@ > ? }; > ?}; > ? > +&i2s1 { > + status = "okay"; > + > + i2s1_p0: port { > + i2s1_p0_0: endpoint { > + dai-format = "i2s"; > + mclk-fs = <256>; > + remote-endpoint = <&codec_p0_0>; > + }; > + }; > +}; > + > ?&io_domains { > ? status = "okay"; > ? > @@ -220,6 +303,12 @@ > ?}; > ? > ?&pinctrl { > + ir { > + ir_int: ir-int { > + rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + }; > + > ? pmic { > ? pmic_int_l: pmic-int-l { > ? rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; > @@ -245,6 +334,17 @@ > ? status = "okay"; > ?}; > ? > +&spdif { > + pinctrl-0 = <&spdifm0_tx>; > + status = "okay"; > + > + spdif_p0: port { > + spdif_p0_0: endpoint { > + remote-endpoint = <&dit_p0_0>; > + }; > + }; > +}; > + > ?&spi0 { > ? status = "okay"; > ? > @@ -257,10 +357,28 @@ > ? }; > ?}; > ? > +&tsadc { > + rockchip,hw-tshut-mode = <0>; > + rockchip,hw-tshut-polarity = <0>; > + status = "okay"; > +}; > + > ?&uart2 { > ? status = "okay"; > ?}; > ? > +&u2phy { > + status = "okay"; > + > + u2phy_host: host-port { > + status = "okay"; > + }; > + > + u2phy_otg: otg-port { > + status = "okay"; > + }; > +}; > + > ?&usb20_otg { > ? dr_mode = "host"; > ? status = "okay"; > @@ -273,3 +391,11 @@ > ?&usb_host0_ohci { > ? status = "okay"; > ?}; > + > +&vop { > + status = "okay"; > +}; > + > +&vop_mmu { > + status = "okay"; > +}; > diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi > index 57719b82d13e..945387e579f0 100644 > --- a/arch/arm/dts/rk3328.dtsi > +++ b/arch/arm/dts/rk3328.dtsi > @@ -1,6 +1,6 @@ > -// SPDX-License-Identifier: GPL-2.0+ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > ?/* > - * (C) Copyright 2016 Rockchip Electronics Co., Ltd > + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd > ? */ > ? > ?#include <dt-bindings/clock/rk3328-cru.h> > @@ -8,6 +8,9 @@ > ?#include <dt-bindings/interrupt-controller/arm-gic.h> > ?#include <dt-bindings/interrupt-controller/irq.h> > ?#include <dt-bindings/pinctrl/rockchip.h> > +#include <dt-bindings/power/rk3328-power.h> > +#include <dt-bindings/soc/rockchip,boot-mode.h> > +#include <dt-bindings/thermal/thermal.h> > ? > ?/ { > ? compatible = "rockchip,rk3328"; > @@ -24,9 +27,8 @@ > ? i2c1 = &i2c1; > ? i2c2 = &i2c2; > ? i2c3 = &i2c3; > - mmc0 = &emmc; > - mmc1 = &sdmmc; > - mmc2 = &sdmmc_ext; > + ethernet0 = &gmac2io; > + ethernet1 = &gmac2phy; > ? }; > ? > ? cpus { > @@ -35,29 +37,71 @@ > ? > ? cpu0: cpu at 0 { > ? device_type = "cpu"; > - compatible = "arm,cortex-a53", "arm,armv8"; > + compatible = "arm,cortex-a53"; > ? reg = <0x0 0x0>; > + clocks = <&cru ARMCLK>; > + #cooling-cells = <2>; > + cpu-idle-states = <&CPU_SLEEP>; > + dynamic-power-coefficient = <120>; > ? enable-method = "psci"; > -// clocks = <&cru ARMCLK>; > + next-level-cache = <&l2>; > ? operating-points-v2 = <&cpu0_opp_table>; > ? }; > + > ? cpu1: cpu at 1 { > ? device_type = "cpu"; > - compatible = "arm,cortex-a53", "arm,armv8"; > + compatible = "arm,cortex-a53"; > ? reg = <0x0 0x1>; > + clocks = <&cru ARMCLK>; > + #cooling-cells = <2>; > + cpu-idle-states = <&CPU_SLEEP>; > + dynamic-power-coefficient = <120>; > ? enable-method = "psci"; > + next-level-cache = <&l2>; > + operating-points-v2 = <&cpu0_opp_table>; > ? }; > + > ? cpu2: cpu at 2 { > ? device_type = "cpu"; > - compatible = "arm,cortex-a53", "arm,armv8"; > + compatible = "arm,cortex-a53"; > ? reg = <0x0 0x2>; > + clocks = <&cru ARMCLK>; > + #cooling-cells = <2>; > + cpu-idle-states = <&CPU_SLEEP>; > + dynamic-power-coefficient = <120>; > ? enable-method = "psci"; > + next-level-cache = <&l2>; > + operating-points-v2 = <&cpu0_opp_table>; > ? }; > + > ? cpu3: cpu at 3 { > ? device_type = "cpu"; > - compatible = "arm,cortex-a53", "arm,armv8"; > + compatible = "arm,cortex-a53"; > ? reg = <0x0 0x3>; > + clocks = <&cru ARMCLK>; > + #cooling-cells = <2>; > + cpu-idle-states = <&CPU_SLEEP>; > + dynamic-power-coefficient = <120>; > ? enable-method = "psci"; > + next-level-cache = <&l2>; > + operating-points-v2 = <&cpu0_opp_table>; > + }; > + > + idle-states { > + entry-method = "psci"; > + > + CPU_SLEEP: cpu-sleep { > + compatible = "arm,idle-state"; > + local-timer-stop; > + arm,psci-suspend-param = <0x0010000>; > + entry-latency-us = <120>; > + exit-latency-us = <250>; > + min-residency-us = <900>; > + }; > + }; > + > + l2: l2-cache0 { > + compatible = "cache"; > ? }; > ? }; > ? > @@ -65,39 +109,72 @@ > ? compatible = "operating-points-v2"; > ? opp-shared; > ? > - opp at 408000000 { > + opp-408000000 { > ? opp-hz = /bits/ 64 <408000000>; > ? opp-microvolt = <950000>; > ? clock-latency-ns = <40000>; > ? opp-suspend; > ? }; > - opp at 600000000 { > + opp-600000000 { > ? opp-hz = /bits/ 64 <600000000>; > ? opp-microvolt = <950000>; > ? clock-latency-ns = <40000>; > ? }; > - opp at 816000000 { > + opp-816000000 { > ? opp-hz = /bits/ 64 <816000000>; > ? opp-microvolt = <1000000>; > ? clock-latency-ns = <40000>; > ? }; > - opp at 1008000000 { > + opp-1008000000 { > ? opp-hz = /bits/ 64 <1008000000>; > ? opp-microvolt = <1100000>; > ? clock-latency-ns = <40000>; > ? }; > - opp at 1200000000 { > + opp-1200000000 { > ? opp-hz = /bits/ 64 <1200000000>; > ? opp-microvolt = <1225000>; > ? clock-latency-ns = <40000>; > ? }; > - opp at 1296000000 { > + opp-1296000000 { > ? opp-hz = /bits/ 64 <1296000000>; > ? opp-microvolt = <1300000>; > ? clock-latency-ns = <40000>; > ? }; > ? }; > ? > + amba: bus { > + compatible = "simple-bus"; > + #address-cells = <2>; > + #size-cells = <2>; > + ranges; > + > + dmac: dmac at ff1f0000 { > + compatible = "arm,pl330", "arm,primecell"; > + reg = <0x0 0xff1f0000 0x0 0x4000>; > + interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>, > + ?????<GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&cru ACLK_DMAC>; > + clock-names = "apb_pclk"; > + #dma-cells = <1>; > + }; > + }; > + > + analog_sound: analog-sound { > + compatible = "simple-audio-card"; > + simple-audio-card,format = "i2s"; > + simple-audio-card,mclk-fs = <256>; > + simple-audio-card,name = "Analog"; > + status = "disabled"; > + > + simple-audio-card,cpu { > + sound-dai = <&i2s1>; > + }; > + > + simple-audio-card,codec { > + sound-dai = <&codec>; > + }; > + }; > + > ? arm-pmu { > ? compatible = "arm,cortex-a53-pmu"; > ? interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>, > @@ -107,8 +184,29 @@ > ? interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; > ? }; > ? > + display_subsystem: display-subsystem { > + compatible = "rockchip,display-subsystem"; > + ports = <&vop_out>; > + }; > + > + hdmi_sound: hdmi-sound { > + compatible = "simple-audio-card"; > + simple-audio-card,format = "i2s"; > + simple-audio-card,mclk-fs = <128>; > + simple-audio-card,name = "HDMI"; > + status = "disabled"; > + > + simple-audio-card,cpu { > + sound-dai = <&i2s0>; > + }; > + > + simple-audio-card,codec { > + sound-dai = <&hdmi>; > + }; > + }; > + > ? psci { > - compatible = "arm,psci-1.0"; > + compatible = "arm,psci-1.0", "arm,psci-0.2"; > ? method = "smc"; > ? }; > ? > @@ -134,8 +232,8 @@ > ? clocks = <&cru SCLK_I2S0>, <&cru HCLK_I2S0_8CH>; > ? clock-names = "i2s_clk", "i2s_hclk"; > ? dmas = <&dmac 11>, <&dmac 12>; > - #dma-cells = <2>; > ? dma-names = "tx", "rx"; > + #sound-dai-cells = <0>; > ? status = "disabled"; > ? }; > ? > @@ -146,8 +244,8 @@ > ? clocks = <&cru SCLK_I2S1>, <&cru HCLK_I2S1_8CH>; > ? clock-names = "i2s_clk", "i2s_hclk"; > ? dmas = <&dmac 14>, <&dmac 15>; > - #dma-cells = <2>; > ? dma-names = "tx", "rx"; > + #sound-dai-cells = <0>; > ? status = "disabled"; > ? }; > ? > @@ -158,16 +256,8 @@ > ? clocks = <&cru SCLK_I2S2>, <&cru HCLK_I2S2_2CH>; > ? clock-names = "i2s_clk", "i2s_hclk"; > ? dmas = <&dmac 0>, <&dmac 1>; > - #dma-cells = <2>; > ? dma-names = "tx", "rx"; > - pinctrl-names = "default", "sleep"; > - pinctrl-0 = <&i2s2m0_mclk > - ?????&i2s2m0_sclk > - ?????&i2s2m0_lrcktx > - ?????&i2s2m0_lrckrx > - ?????&i2s2m0_sdo > - ?????&i2s2m0_sdi>; > - pinctrl-1 = <&i2s2m0_sleep>; > + #sound-dai-cells = <0>; > ? status = "disabled"; > ? }; > ? > @@ -178,10 +268,31 @@ > ? clocks = <&cru SCLK_SPDIF>, <&cru HCLK_SPDIF_8CH>; > ? clock-names = "mclk", "hclk"; > ? dmas = <&dmac 10>; > - #dma-cells = <1>; > ? dma-names = "tx"; > ? pinctrl-names = "default"; > ? pinctrl-0 = <&spdifm2_tx>; > + #sound-dai-cells = <0>; > + status = "disabled"; > + }; > + > + pdm: pdm at ff040000 { > + compatible = "rockchip,pdm"; > + reg = <0x0 0xff040000 0x0 0x1000>; > + clocks = <&cru SCLK_PDM>, <&cru HCLK_PDM>; > + clock-names = "pdm_clk", "pdm_hclk"; > + dmas = <&dmac 16>; > + dma-names = "rx"; > + pinctrl-names = "default", "sleep"; > + pinctrl-0 = <&pdmm0_clk > + ?????&pdmm0_sdi0 > + ?????&pdmm0_sdi1 > + ?????&pdmm0_sdi2 > + ?????&pdmm0_sdi3>; > + pinctrl-1 = <&pdmm0_clk_sleep > + ?????&pdmm0_sdi0_sleep > + ?????&pdmm0_sdi1_sleep > + ?????&pdmm0_sdi2_sleep > + ?????&pdmm0_sdi3_sleep>; > ? status = "disabled"; > ? }; > ? > @@ -193,6 +304,39 @@ > ? compatible = "rockchip,rk3328-io-voltage-domain"; > ? status = "disabled"; > ? }; > + > + grf_gpio: grf-gpio { > + compatible = "rockchip,rk3328-grf-gpio"; > + gpio-controller; > + #gpio-cells = <2>; > + }; > + > + power: power-controller { > + compatible = "rockchip,rk3328-power-controller"; > + #power-domain-cells = <1>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + pd_hevc at RK3328_PD_HEVC { > + reg = <RK3328_PD_HEVC>; > + }; > + pd_video at RK3328_PD_VIDEO { > + reg = <RK3328_PD_VIDEO>; > + }; > + pd_vpu at RK3328_PD_VPU { > + reg = <RK3328_PD_VPU>; > + clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; > + }; > + }; > + > + reboot-mode { > + compatible = "syscon-reboot-mode"; > + offset = <0x5c8>; > + mode-normal = <BOOT_NORMAL>; > + mode-recovery = <BOOT_RECOVERY>; > + mode-bootloader = <BOOT_FASTBOOT>; > + mode-loader = <BOOT_BL_DOWNLOAD>; > + }; > ? }; > ? > ? uart0: serial at ff110000 { > @@ -201,12 +345,12 @@ > ? interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>; > ? clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>; > ? clock-names = "baudclk", "apb_pclk"; > - reg-shift = <2>; > - reg-io-width = <4>; > ? dmas = <&dmac 2>, <&dmac 3>; > - #dma-cells = <2>; > + dma-names = "tx", "rx"; > ? pinctrl-names = "default"; > ? pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; > + reg-io-width = <4>; > + reg-shift = <2>; > ? status = "disabled"; > ? }; > ? > @@ -215,13 +359,13 @@ > ? reg = <0x0 0xff120000 0x0 0x100>; > ? interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>; > ? clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>; > - clock-names = "sclk_uart", "pclk_uart"; > - reg-shift = <2>; > - reg-io-width = <4>; > + clock-names = "baudclk", "apb_pclk"; > ? dmas = <&dmac 4>, <&dmac 5>; > - #dma-cells = <2>; > + dma-names = "tx", "rx"; > ? pinctrl-names = "default"; > ? pinctrl-0 = <&uart1_xfer &uart1_cts &uart1_rts>; > + reg-io-width = <4>; > + reg-shift = <2>; > ? status = "disabled"; > ? }; > ? > @@ -231,22 +375,17 @@ > ? interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>; > ? clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>; > ? clock-names = "baudclk", "apb_pclk"; > - reg-shift = <2>; > - reg-io-width = <4>; > ? dmas = <&dmac 6>, <&dmac 7>; > - #dma-cells = <2>; > + dma-names = "tx", "rx"; > ? pinctrl-names = "default"; > ? pinctrl-0 = <&uart2m1_xfer>; > + reg-io-width = <4>; > + reg-shift = <2>; > ? status = "disabled"; > ? }; > ? > - pmu: power-management at ff140000 { > - compatible = "rockchip,rk3328-pmu", "syscon", "simple-mfd"; > - reg = <0x0 0xff140000 0x0 0x1000>; > - }; > - > ? i2c0: i2c at ff150000 { > - compatible = "rockchip,rk3328-i2c"; > + compatible = "rockchip,rk3328-i2c", "rockchip,rk3399-i2c"; > ? reg = <0x0 0xff150000 0x0 0x1000>; > ? interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; > ? #address-cells = <1>; > @@ -259,7 +398,7 @@ > ? }; > ? > ? i2c1: i2c at ff160000 { > - compatible = "rockchip,rk3328-i2c"; > + compatible = "rockchip,rk3328-i2c", "rockchip,rk3399-i2c"; > ? reg = <0x0 0xff160000 0x0 0x1000>; > ? interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; > ? #address-cells = <1>; > @@ -272,7 +411,7 @@ > ? }; > ? > ? i2c2: i2c at ff170000 { > - compatible = "rockchip,rk3328-i2c"; > + compatible = "rockchip,rk3328-i2c", "rockchip,rk3399-i2c"; > ? reg = <0x0 0xff170000 0x0 0x1000>; > ? interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; > ? #address-cells = <1>; > @@ -285,7 +424,7 @@ > ? }; > ? > ? i2c3: i2c at ff180000 { > - compatible = "rockchip,rk3328-i2c"; > + compatible = "rockchip,rk3328-i2c", "rockchip,rk3399-i2c"; > ? reg = <0x0 0xff180000 0x0 0x1000>; > ? interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; > ? #address-cells = <1>; > @@ -306,7 +445,6 @@ > ? clocks = <&cru SCLK_SPI>, <&cru PCLK_SPI>; > ? clock-names = "spiclk", "apb_pclk"; > ? dmas = <&dmac 8>, <&dmac 9>; > - #dma-cells = <2>; > ? dma-names = "tx", "rx"; > ? pinctrl-names = "default"; > ? pinctrl-0 = <&spi0m2_clk &spi0m2_tx &spi0m2_rx &spi0m2_cs0>; > @@ -317,28 +455,141 @@ > ? compatible = "snps,dw-wdt"; > ? reg = <0x0 0xff1a0000 0x0 0x100>; > ? interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&cru PCLK_WDT>; > + }; > + > + pwm0: pwm at ff1b0000 { > + compatible = "rockchip,rk3328-pwm"; > + reg = <0x0 0xff1b0000 0x0 0x10>; > + clocks = <&cru SCLK_PWM>, <&cru PCLK_PWM>; > + clock-names = "pwm", "pclk"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pwm0_pin>; > + #pwm-cells = <3>; > ? status = "disabled"; > ? }; > ? > - amba { > - compatible = "simple-bus"; > - #address-cells = <2>; > - #size-cells = <2>; > - ranges; > + pwm1: pwm at ff1b0010 { > + compatible = "rockchip,rk3328-pwm"; > + reg = <0x0 0xff1b0010 0x0 0x10>; > + clocks = <&cru SCLK_PWM>, <&cru PCLK_PWM>; > + clock-names = "pwm", "pclk"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pwm1_pin>; > + #pwm-cells = <3>; > + status = "disabled"; > + }; > ? > - dmac: dmac at ff1f0000 { > - compatible = "arm,pl330", "arm,primecell"; > - reg = <0x0 0xff1f0000 0x0 0x4000>; > - interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>, > - ?????<GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>; > - clocks = <&cru ACLK_DMAC>; > - clock-names = "apb_pclk"; > - #dma-cells = <1>; > + pwm2: pwm at ff1b0020 { > + compatible = "rockchip,rk3328-pwm"; > + reg = <0x0 0xff1b0020 0x0 0x10>; > + clocks = <&cru SCLK_PWM>, <&cru PCLK_PWM>; > + clock-names = "pwm", "pclk"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pwm2_pin>; > + #pwm-cells = <3>; > + status = "disabled"; > + }; > + > + pwm3: pwm at ff1b0030 { > + compatible = "rockchip,rk3328-pwm"; > + reg = <0x0 0xff1b0030 0x0 0x10>; > + interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&cru SCLK_PWM>, <&cru PCLK_PWM>; > + clock-names = "pwm", "pclk"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pwmir_pin>; > + #pwm-cells = <3>; > + status = "disabled"; > + }; > + > + thermal-zones { > + soc_thermal: soc-thermal { > + polling-delay-passive = <20>; > + polling-delay = <1000>; > + sustainable-power = <1000>; > + > + thermal-sensors = <&tsadc 0>; > + > + trips { > + threshold: trip-point0 { > + temperature = <70000>; > + hysteresis = <2000>; > + type = "passive"; > + }; > + target: trip-point1 { > + temperature = <85000>; > + hysteresis = <2000>; > + type = "passive"; > + }; > + soc_crit: soc-crit { > + temperature = <95000>; > + hysteresis = <2000>; > + type = "critical"; > + }; > + }; > + > + cooling-maps { > + map0 { > + trip = <&target>; > + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > + ?<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > + ?<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > + ?<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; > + contribution = <4096>; > + }; > + }; > + }; > + > + }; > + > + tsadc: tsadc at ff250000 { > + compatible = "rockchip,rk3328-tsadc"; > + reg = <0x0 0xff250000 0x0 0x100>; > + interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>; > + assigned-clocks = <&cru SCLK_TSADC>; > + assigned-clock-rates = <50000>; > + clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>; > + clock-names = "tsadc", "apb_pclk"; > + pinctrl-names = "init", "default", "sleep"; > + pinctrl-0 = <&otp_gpio>; > + pinctrl-1 = <&otp_out>; > + pinctrl-2 = <&otp_gpio>; > + resets = <&cru SRST_TSADC>; > + reset-names = "tsadc-apb"; > + rockchip,grf = <&grf>; > + rockchip,hw-tshut-temp = <100000>; > + #thermal-sensor-cells = <1>; > + status = "disabled"; > + }; > + > + efuse: efuse at ff260000 { > + compatible = "rockchip,rk3328-efuse"; > + reg = <0x0 0xff260000 0x0 0x50>; > + #address-cells = <1>; > + #size-cells = <1>; > + clocks = <&cru SCLK_EFUSE>; > + clock-names = "pclk_efuse"; > + rockchip,efuse-size = <0x20>; > + > + /* Data cells */ > + efuse_id: id at 7 { > + reg = <0x07 0x10>; > + }; > + cpu_leakage: cpu-leakage at 17 { > + reg = <0x17 0x1>; > + }; > + logic_leakage: logic-leakage at 19 { > + reg = <0x19 0x1>; > + }; > + efuse_cpu_version: cpu-version at 1a { > + reg = <0x1a 0x1>; > + bits = <3 3>; > ? }; > ? }; > ? > - saradc: saradc at ff280000 { > - compatible = "rockchip,rk3328-saradc", "rockchip,saradc"; > + saradc: adc at ff280000 { > + compatible = "rockchip,rk3328-saradc", "rockchip,rk3399-saradc"; > ? reg = <0x0 0xff280000 0x0 0x100>; > ? interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>; > ? #io-channel-cells = <1>; > @@ -349,6 +600,169 @@ > ? status = "disabled"; > ? }; > ? > + gpu: gpu at ff300000 { > + compatible = "rockchip,rk3328-mali", "arm,mali-450"; > + reg = <0x0 0xff300000 0x0 0x40000>; > + interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>, > + ?????<GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>, > + ?????<GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>, > + ?????<GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>, > + ?????<GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>, > + ?????<GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>, > + ?????<GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "gp", > + ??"gpmmu", > + ??"pp", > + ??"pp0", > + ??"ppmmu0", > + ??"pp1", > + ??"ppmmu1"; > + clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>; > + clock-names = "bus", "core"; > + resets = <&cru SRST_GPU_A>; > + }; > + > + h265e_mmu: iommu at ff330200 { > + compatible = "rockchip,iommu"; > + reg = <0x0 0xff330200 0 0x100>; > + interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "h265e_mmu"; > + clocks = <&cru ACLK_H265>, <&cru PCLK_H265>; > + clock-names = "aclk", "iface"; > + #iommu-cells = <0>; > + status = "disabled"; > + }; > + > + vepu_mmu: iommu at ff340800 { > + compatible = "rockchip,iommu"; > + reg = <0x0 0xff340800 0x0 0x40>; > + interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "vepu_mmu"; > + clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; > + clock-names = "aclk", "iface"; > + #iommu-cells = <0>; > + status = "disabled"; > + }; > + > + vpu: video-codec at ff350000 { > + compatible = "rockchip,rk3328-vpu"; > + reg = <0x0 0xff350000 0x0 0x800>; > + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "vdpu"; > + clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; > + clock-names = "aclk", "hclk"; > + iommus = <&vpu_mmu>; > + power-domains = <&power RK3328_PD_VPU>; > + }; > + > + vpu_mmu: iommu at ff350800 { > + compatible = "rockchip,iommu"; > + reg = <0x0 0xff350800 0x0 0x40>; > + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "vpu_mmu"; > + clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; > + clock-names = "aclk", "iface"; > + #iommu-cells = <0>; > + power-domains = <&power RK3328_PD_VPU>; > + }; > + > + rkvdec_mmu: iommu at ff360480 { > + compatible = "rockchip,iommu"; > + reg = <0x0 0xff360480 0x0 0x40>, <0x0 0xff3604c0 0x0 0x40>; > + interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "rkvdec_mmu"; > + clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>; > + clock-names = "aclk", "iface"; > + #iommu-cells = <0>; > + status = "disabled"; > + }; > + > + vop: vop at ff370000 { > + compatible = "rockchip,rk3328-vop"; > + reg = <0x0 0xff370000 0x0 0x3efc>; > + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&cru ACLK_VOP>, <&cru DCLK_LCDC>, <&cru HCLK_VOP>; > + clock-names = "aclk_vop", "dclk_vop", "hclk_vop"; > + resets = <&cru SRST_VOP_A>, <&cru SRST_VOP_H>, <&cru SRST_VOP_D>; > + reset-names = "axi", "ahb", "dclk"; > + iommus = <&vop_mmu>; > + status = "disabled"; > + > + vop_out: port { > + #address-cells = <1>; > + #size-cells = <0>; > + > + vop_out_hdmi: endpoint at 0 { > + reg = <0>; > + remote-endpoint = <&hdmi_in_vop>; > + }; > + }; > + }; > + > + vop_mmu: iommu at ff373f00 { > + compatible = "rockchip,iommu"; > + reg = <0x0 0xff373f00 0x0 0x100>; > + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "vop_mmu"; > + clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>; > + clock-names = "aclk", "iface"; > + #iommu-cells = <0>; > + status = "disabled"; > + }; > + > + hdmi: hdmi at ff3c0000 { > + compatible = "rockchip,rk3328-dw-hdmi"; > + reg = <0x0 0xff3c0000 0x0 0x20000>; > + reg-io-width = <4>; > + interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>, > + ?????<GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&cru PCLK_HDMI>, > + ?<&cru SCLK_HDMI_SFC>, > + ?<&cru SCLK_RTC32K>; > + clock-names = "iahb", > + ??????"isfr", > + ??????"cec"; > + phys = <&hdmiphy>; > + phy-names = "hdmi"; > + pinctrl-names = "default"; > + pinctrl-0 = <&hdmi_cec &hdmii2c_xfer &hdmi_hpd>; > + rockchip,grf = <&grf>; > + #sound-dai-cells = <0>; > + status = "disabled"; > + > + ports { > + hdmi_in: port { > + hdmi_in_vop: endpoint { > + remote-endpoint = <&vop_out_hdmi>; > + }; > + }; > + }; > + }; > + > + codec: codec at ff410000 { > + compatible = "rockchip,rk3328-codec"; > + reg = <0x0 0xff410000 0x0 0x1000>; > + clocks = <&cru PCLK_ACODECPHY>, <&cru SCLK_I2S1>; > + clock-names = "pclk", "mclk"; > + rockchip,grf = <&grf>; > + #sound-dai-cells = <0>; > + status = "disabled"; > + }; > + > + hdmiphy: phy at ff430000 { > + compatible = "rockchip,rk3328-hdmi-phy"; > + reg = <0x0 0xff430000 0x0 0x10000>; > + interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&cru PCLK_HDMIPHY>, <&xin24m>, <&cru DCLK_HDMIPHY>; > + clock-names = "sysclk", "refoclk", "refpclk"; > + clock-output-names = "hdmi_phy"; > + #clock-cells = <0>; > + nvmem-cells = <&efuse_cpu_version>; > + nvmem-cell-names = "cpu-version"; > + #phy-cells = <0>; > + status = "disabled"; > + }; > + > ? cru: clock-controller at ff440000 { > ? compatible = "rockchip,rk3328-cru", "rockchip,cru", "syscon"; > ? reg = <0x0 0xff440000 0x0 0x1000>; > @@ -356,6 +770,12 @@ > ? #clock-cells = <1>; > ? #reset-cells = <1>; > ? assigned-clocks = > + /* > + ?* CPLL should run at 1200, but that is to high for > + ?* the initial dividers of most of its children. > + ?* We need set cpll child clk div first, > + ?* and then set the cpll frequency. > + ?*/ > ? <&cru DCLK_LCDC>, <&cru SCLK_PDM>, > ? <&cru SCLK_RTC32K>, <&cru SCLK_UART0>, > ? <&cru SCLK_UART1>, <&cru SCLK_UART2>, > @@ -371,15 +791,7 @@ > ? <&cru ACLK_BUS_PRE>, <&cru HCLK_BUS_PRE>, > ? <&cru PCLK_BUS_PRE>, <&cru ACLK_PERI_PRE>, > ? <&cru HCLK_PERI>, <&cru PCLK_PERI>, > - <&cru ACLK_VIO_PRE>, <&cru HCLK_VIO_PRE>, > - <&cru ACLK_RGA_PRE>, <&cru SCLK_RGA>, > - <&cru ACLK_VOP_PRE>, <&cru ACLK_RKVDEC_PRE>, > - <&cru ACLK_RKVENC>, <&cru ACLK_VPU_PRE>, > - <&cru SCLK_VDEC_CABAC>, <&cru SCLK_VDEC_CORE>, > - <&cru SCLK_VENC_CORE>, <&cru SCLK_VENC_DSP>, > - <&cru SCLK_EFUSE>, <&cru PCLK_DDR>, > - <&cru ACLK_GMAC>, <&cru PCLK_GMAC>, > - <&cru SCLK_RTC32K>, <&cru SCLK_USB3OTG_SUSPEND>; > + <&cru SCLK_RTC32K>; > ? assigned-clock-parents = > ? <&cru HDMIPHY>, <&cru PLL_APLL>, > ? <&cru PLL_GPLL>, <&xin24m>, > @@ -400,55 +812,85 @@ > ? <150000000>, <75000000>, > ? <75000000>, <150000000>, > ? <75000000>, <75000000>, > - <300000000>, <100000000>, > - <300000000>, <200000000>, > - <400000000>, <500000000>, > - <200000000>, <300000000>, > - <300000000>, <250000000>, > - <200000000>, <100000000>, > - <24000000>, <100000000>, > - <150000000>, <50000000>, > - <32768>, <32768>; > + <32768>; > ? }; > ? > - sdmmc: rksdmmc at ff500000 { > + usb2phy_grf: syscon at ff450000 { > + compatible = "rockchip,rk3328-usb2phy-grf", "syscon", > + ?????"simple-mfd"; > + reg = <0x0 0xff450000 0x0 0x10000>; > + #address-cells = <1>; > + #size-cells = <1>; > + > + u2phy: usb2-phy at 100 { > + compatible = "rockchip,rk3328-usb2phy"; > + reg = <0x100 0x10>; > + clocks = <&xin24m>; > + clock-names = "phyclk"; > + clock-output-names = "usb480m_phy"; > + #clock-cells = <0>; > + assigned-clocks = <&cru USB480M>; > + assigned-clock-parents = <&u2phy>; > + status = "disabled"; > + > + u2phy_otg: otg-port { > + #phy-cells = <0>; > + interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>, > + ?????<GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>, > + ?????<GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "otg-bvalid", "otg-id", > + ??"linestate"; > + status = "disabled"; > + }; > + > + u2phy_host: host-port { > + #phy-cells = <0>; > + interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "linestate"; > + status = "disabled"; > + }; > + }; > + }; > + > + sdmmc: mmc at ff500000 { > ? compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc"; > ? reg = <0x0 0xff500000 0x0 0x4000>; > - max-frequency = <150000000>; > - clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>; > - clock-names = "biu", "ciu"; > - fifo-depth = <0x100>; > ? interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>, > + ?<&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>; > + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; > + fifo-depth = <0x100>; > + max-frequency = <150000000>; > ? status = "disabled"; > ? }; > ? > - sdio: dwmmc at ff510000 { > + sdio: mmc at ff510000 { > ? compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc"; > ? reg = <0x0 0xff510000 0x0 0x4000>; > - max-frequency = <150000000>; > + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; > ? clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>, > ? ?<&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>; > - clock-names = "biu", "ciu", "ciu_drv", "ciu_sample"; > + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; > ? fifo-depth = <0x100>; > - interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; > + max-frequency = <150000000>; > ? status = "disabled"; > ? }; > ? > - emmc: rksdmmc at ff520000 { > + emmc: mmc at ff520000 { > ? compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc"; > ? reg = <0x0 0xff520000 0x0 0x4000>; > - max-frequency = <150000000>; > - clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>; > - clock-names = "biu", "ciu"; > - fifo-depth = <0x100>; > ? interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>, > + ?<&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>; > + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; > + fifo-depth = <0x100>; > + max-frequency = <150000000>; > ? status = "disabled"; > ? }; > ? > ? gmac2io: ethernet at ff540000 { > ? compatible = "rockchip,rk3328-gmac"; > ? reg = <0x0 0xff540000 0x0 0x10000>; > - rockchip,grf = <&grf>; > ? interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; > ? interrupt-names = "macirq"; > ? clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_RX>, > @@ -461,13 +903,56 @@ > ? ??????"pclk_mac"; > ? resets = <&cru SRST_GMAC2IO_A>; > ? reset-names = "stmmaceth"; > + rockchip,grf = <&grf>; > + snps,txpbl = <0x4>; > ? status = "disabled"; > ? }; > ? > + gmac2phy: ethernet at ff550000 { > + compatible = "rockchip,rk3328-gmac"; > + reg = <0x0 0xff550000 0x0 0x10000>; > + rockchip,grf = <&grf>; > + interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "macirq"; > + clocks = <&cru SCLK_MAC2PHY_SRC>, <&cru SCLK_MAC2PHY_RXTX>, > + ?<&cru SCLK_MAC2PHY_RXTX>, <&cru SCLK_MAC2PHY_REF>, > + ?<&cru ACLK_MAC2PHY>, <&cru PCLK_MAC2PHY>, > + ?<&cru SCLK_MAC2PHY_OUT>; > + clock-names = "stmmaceth", "mac_clk_rx", > + ??????"mac_clk_tx", "clk_mac_ref", > + ??????"aclk_mac", "pclk_mac", > + ??????"clk_macphy"; > + resets = <&cru SRST_GMAC2PHY_A>, <&cru SRST_MACPHY>; > + reset-names = "stmmaceth", "mac-phy"; > + phy-mode = "rmii"; > + phy-handle = <&phy>; > + snps,txpbl = <0x4>; > + status = "disabled"; > + > + mdio { > + compatible = "snps,dwmac-mdio"; > + #address-cells = <1>; > + #size-cells = <0>; > + > + phy: phy at 0 { > + compatible = "ethernet-phy-id1234.d400", "ethernet-phy-ieee802.3-c22"; > + reg = <0>; > + clocks = <&cru SCLK_MAC2PHY_OUT>; > + resets = <&cru SRST_MACPHY>; > + pinctrl-names = "default"; > + pinctrl-0 = <&fephyled_rxm1 &fephyled_linkm1>; > + phy-is-integrated; > + }; > + }; > + }; > + > ? usb_host0_ehci: usb at ff5c0000 { > ? compatible = "generic-ehci"; > ? reg = <0x0 0xff5c0000 0x0 0x10000>; > ? interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&cru HCLK_HOST0>, <&u2phy>; > + phys = <&u2phy_host>; > + phy-names = "usb"; > ? status = "disabled"; > ? }; > ? > @@ -475,30 +960,38 @@ > ? compatible = "generic-ohci"; > ? reg = <0x0 0xff5d0000 0x0 0x10000>; > ? interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&cru HCLK_HOST0>, <&u2phy>; > + phys = <&u2phy_host>; > + phy-names = "usb"; > ? status = "disabled"; > ? }; > ? > + /* > + ?* U-boot Specific Change > + ?* > + ?* The OTG controller must come after the USB host pair for it > + ?* to work. This is likely due to lack of support for the USB > + ?* PHYs. This must be manually changed after each device tree > + ?* sync. There is no clean way to handle this in -u-boot.dtsi > + ?* files. > + ?*/ > ? usb20_otg: usb at ff580000 { > ? compatible = "rockchip,rk3328-usb", "rockchip,rk3066-usb", > ? ?????"snps,dwc2"; > ? reg = <0x0 0xff580000 0x0 0x40000>; > ? interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&cru HCLK_OTG>; > + clock-names = "otg"; > ? dr_mode = "otg"; > + g-np-tx-fifo-size = <16>; > + g-rx-fifo-size = <280>; > + g-tx-fifo-size = <256 128 128 64 32 16>; > + phys = <&u2phy_otg>; > + phy-names = "usb2-phy"; > ? status = "disabled"; > ? }; > ? > - sdmmc_ext: rksdmmc at ff5f0000 { > - compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc"; > - reg = <0x0 0xff5f0000 0x0 0x4000>; > - max-frequency = <150000000>; > - clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>; > - clock-names = "biu", "ciu"; > - fifo-depth = <0x100>; > - interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; > - status = "disabled"; > - }; > - > - gic: interrupt-controller at ffb70000 { > + gic: interrupt-controller at ff811000 { > ? compatible = "arm,gic-400"; > ? #interrupt-cells = <3>; > ? #address-cells = <0>; > @@ -646,654 +1139,576 @@ > ? > ? i2c0 { > ? i2c0_xfer: i2c0-xfer { > - rockchip,pins = > - <2 24 RK_FUNC_1 &pcfg_pull_none>, > - <2 25 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PD0 1 &pcfg_pull_none>, > + <2 RK_PD1 1 &pcfg_pull_none>; > ? }; > ? }; > ? > ? i2c1 { > ? i2c1_xfer: i2c1-xfer { > - rockchip,pins = > - <2 4 RK_FUNC_2 &pcfg_pull_none>, > - <2 5 RK_FUNC_2 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PA4 2 &pcfg_pull_none>, > + <2 RK_PA5 2 &pcfg_pull_none>; > ? }; > ? }; > ? > ? i2c2 { > ? i2c2_xfer: i2c2-xfer { > - rockchip,pins = > - <2 13 RK_FUNC_1 &pcfg_pull_none>, > - <2 14 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PB5 1 &pcfg_pull_none>, > + <2 RK_PB6 1 &pcfg_pull_none>; > ? }; > ? }; > ? > ? i2c3 { > ? i2c3_xfer: i2c3-xfer { > - rockchip,pins = > - <0 5 RK_FUNC_2 &pcfg_pull_none>, > - <0 6 RK_FUNC_2 &pcfg_pull_none>; > + rockchip,pins = <0 RK_PA5 2 &pcfg_pull_none>, > + <0 RK_PA6 2 &pcfg_pull_none>; > ? }; > ? i2c3_gpio: i2c3-gpio { > ? rockchip,pins = > - <0 5 RK_FUNC_GPIO &pcfg_pull_none>, > - <0 6 RK_FUNC_GPIO &pcfg_pull_none>; > + <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>, > + <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>; > ? }; > ? }; > ? > ? hdmi_i2c { > ? hdmii2c_xfer: hdmii2c-xfer { > + rockchip,pins = <0 RK_PA5 1 &pcfg_pull_none>, > + <0 RK_PA6 1 &pcfg_pull_none>; > + }; > + }; > + > + pdm-0 { > + pdmm0_clk: pdmm0-clk { > + rockchip,pins = <2 RK_PC2 2 &pcfg_pull_none>; > + }; > + > + pdmm0_fsync: pdmm0-fsync { > + rockchip,pins = <2 RK_PC7 2 &pcfg_pull_none>; > + }; > + > + pdmm0_sdi0: pdmm0-sdi0 { > + rockchip,pins = <2 RK_PC3 2 &pcfg_pull_none>; > + }; > + > + pdmm0_sdi1: pdmm0-sdi1 { > + rockchip,pins = <2 RK_PC4 2 &pcfg_pull_none>; > + }; > + > + pdmm0_sdi2: pdmm0-sdi2 { > + rockchip,pins = <2 RK_PC5 2 &pcfg_pull_none>; > + }; > + > + pdmm0_sdi3: pdmm0-sdi3 { > + rockchip,pins = <2 RK_PC6 2 &pcfg_pull_none>; > + }; > + > + pdmm0_clk_sleep: pdmm0-clk-sleep { > + rockchip,pins = > + <2 RK_PC2 RK_FUNC_GPIO &pcfg_input_high>; > + }; > + > + pdmm0_sdi0_sleep: pdmm0-sdi0-sleep { > + rockchip,pins = > + <2 RK_PC3 RK_FUNC_GPIO &pcfg_input_high>; > + }; > + > + pdmm0_sdi1_sleep: pdmm0-sdi1-sleep { > + rockchip,pins = > + <2 RK_PC4 RK_FUNC_GPIO &pcfg_input_high>; > + }; > + > + pdmm0_sdi2_sleep: pdmm0-sdi2-sleep { > + rockchip,pins = > + <2 RK_PC5 RK_FUNC_GPIO &pcfg_input_high>; > + }; > + > + pdmm0_sdi3_sleep: pdmm0-sdi3-sleep { > + rockchip,pins = > + <2 RK_PC6 RK_FUNC_GPIO &pcfg_input_high>; > + }; > + > + pdmm0_fsync_sleep: pdmm0-fsync-sleep { > ? rockchip,pins = > - <0 5 RK_FUNC_1 &pcfg_pull_none>, > - <0 6 RK_FUNC_1 &pcfg_pull_none>; > + <2 RK_PC7 RK_FUNC_GPIO &pcfg_input_high>; > + }; > + }; > + > + tsadc { > + otp_gpio: otp-gpio { > + rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + > + otp_out: otp-out { > + rockchip,pins = <2 RK_PB5 1 &pcfg_pull_none>; > ? }; > ? }; > ? > ? uart0 { > ? uart0_xfer: uart0-xfer { > - rockchip,pins = > - <1 9 RK_FUNC_1 &pcfg_pull_up>, > - <1 8 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <1 RK_PB1 1 &pcfg_pull_up>, > + <1 RK_PB0 1 &pcfg_pull_none>; > ? }; > ? > ? uart0_cts: uart0-cts { > - rockchip,pins = > - <1 11 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <1 RK_PB3 1 &pcfg_pull_none>; > ? }; > ? > ? uart0_rts: uart0-rts { > - rockchip,pins = > - <1 10 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <1 RK_PB2 1 &pcfg_pull_none>; > ? }; > ? > ? uart0_rts_gpio: uart0-rts-gpio { > - rockchip,pins = > - <1 10 RK_FUNC_GPIO &pcfg_pull_none>; > + rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; > ? }; > ? }; > ? > ? uart1 { > ? uart1_xfer: uart1-xfer { > - rockchip,pins = > - <3 4 RK_FUNC_4 &pcfg_pull_up>, > - <3 6 RK_FUNC_4 &pcfg_pull_none>; > + rockchip,pins = <3 RK_PA4 4 &pcfg_pull_up>, > + <3 RK_PA6 4 &pcfg_pull_none>; > ? }; > ? > ? uart1_cts: uart1-cts { > - rockchip,pins = > - <3 7 RK_FUNC_4 &pcfg_pull_none>; > + rockchip,pins = <3 RK_PA7 4 &pcfg_pull_none>; > ? }; > ? > ? uart1_rts: uart1-rts { > - rockchip,pins = > - <3 5 RK_FUNC_4 &pcfg_pull_none>; > + rockchip,pins = <3 RK_PA5 4 &pcfg_pull_none>; > ? }; > ? > ? uart1_rts_gpio: uart1-rts-gpio { > - rockchip,pins = > - <3 5 RK_FUNC_GPIO &pcfg_pull_none>; > + rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; > ? }; > ? }; > ? > ? uart2-0 { > ? uart2m0_xfer: uart2m0-xfer { > - rockchip,pins = > - <1 0 RK_FUNC_2 &pcfg_pull_up>, > - <1 1 RK_FUNC_2 &pcfg_pull_none>; > + rockchip,pins = <1 RK_PA0 2 &pcfg_pull_up>, > + <1 RK_PA1 2 &pcfg_pull_none>; > ? }; > ? }; > ? > ? uart2-1 { > ? uart2m1_xfer: uart2m1-xfer { > - rockchip,pins = > - <2 0 RK_FUNC_1 &pcfg_pull_up>, > - <2 1 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PA0 1 &pcfg_pull_up>, > + <2 RK_PA1 1 &pcfg_pull_none>; > ? }; > ? }; > ? > ? spi0-0 { > ? spi0m0_clk: spi0m0-clk { > - rockchip,pins = > - <2 8 RK_FUNC_1 &pcfg_pull_up>; > + rockchip,pins = <2 RK_PB0 1 &pcfg_pull_up>; > ? }; > ? > ? spi0m0_cs0: spi0m0-cs0 { > - rockchip,pins = > - <2 11 RK_FUNC_1 &pcfg_pull_up>; > + rockchip,pins = <2 RK_PB3 1 &pcfg_pull_up>; > ? }; > ? > ? spi0m0_tx: spi0m0-tx { > - rockchip,pins = > - <2 9 RK_FUNC_1 &pcfg_pull_up>; > + rockchip,pins = <2 RK_PB1 1 &pcfg_pull_up>; > ? }; > ? > ? spi0m0_rx: spi0m0-rx { > - rockchip,pins = > - <2 10 RK_FUNC_1 &pcfg_pull_up>; > + rockchip,pins = <2 RK_PB2 1 &pcfg_pull_up>; > ? }; > ? > ? spi0m0_cs1: spi0m0-cs1 { > - rockchip,pins = > - <2 12 RK_FUNC_1 &pcfg_pull_up>; > + rockchip,pins = <2 RK_PB4 1 &pcfg_pull_up>; > ? }; > ? }; > ? > ? spi0-1 { > ? spi0m1_clk: spi0m1-clk { > - rockchip,pins = > - <3 23 RK_FUNC_2 &pcfg_pull_up>; > + rockchip,pins = <3 RK_PC7 2 &pcfg_pull_up>; > ? }; > ? > ? spi0m1_cs0: spi0m1-cs0 { > - rockchip,pins = > - <3 26 RK_FUNC_2 &pcfg_pull_up>; > + rockchip,pins = <3 RK_PD2 2 &pcfg_pull_up>; > ? }; > ? > ? spi0m1_tx: spi0m1-tx { > - rockchip,pins = > - <3 25 RK_FUNC_2 &pcfg_pull_up>; > + rockchip,pins = <3 RK_PD1 2 &pcfg_pull_up>; > ? }; > ? > ? spi0m1_rx: spi0m1-rx { > - rockchip,pins = > - <3 24 RK_FUNC_2 &pcfg_pull_up>; > + rockchip,pins = <3 RK_PD0 2 &pcfg_pull_up>; > ? }; > ? > ? spi0m1_cs1: spi0m1-cs1 { > - rockchip,pins = > - <3 27 RK_FUNC_2 &pcfg_pull_up>; > + rockchip,pins = <3 RK_PD3 2 &pcfg_pull_up>; > ? }; > ? }; > ? > ? spi0-2 { > ? spi0m2_clk: spi0m2-clk { > - rockchip,pins = > - <3 0 RK_FUNC_4 &pcfg_pull_up>; > + rockchip,pins = <3 RK_PA0 4 &pcfg_pull_up>; > ? }; > ? > ? spi0m2_cs0: spi0m2-cs0 { > - rockchip,pins = > - <3 8 RK_FUNC_3 &pcfg_pull_up>; > + rockchip,pins = <3 RK_PB0 3 &pcfg_pull_up>; > ? }; > ? > ? spi0m2_tx: spi0m2-tx { > - rockchip,pins = > - <3 1 RK_FUNC_4 &pcfg_pull_up>; > + rockchip,pins = <3 RK_PA1 4 &pcfg_pull_up>; > ? }; > ? > ? spi0m2_rx: spi0m2-rx { > - rockchip,pins = > - <3 2 RK_FUNC_4 &pcfg_pull_up>; > + rockchip,pins = <3 RK_PA2 4 &pcfg_pull_up>; > ? }; > ? }; > ? > ? i2s1 { > ? i2s1_mclk: i2s1-mclk { > - rockchip,pins = > - <2 15 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PB7 1 &pcfg_pull_none>; > ? }; > ? > ? i2s1_sclk: i2s1-sclk { > - rockchip,pins = > - <2 18 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PC2 1 &pcfg_pull_none>; > ? }; > ? > ? i2s1_lrckrx: i2s1-lrckrx { > - rockchip,pins = > - <2 16 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PC0 1 &pcfg_pull_none>; > ? }; > ? > ? i2s1_lrcktx: i2s1-lrcktx { > - rockchip,pins = > - <2 17 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PC1 1 &pcfg_pull_none>; > ? }; > ? > ? i2s1_sdi: i2s1-sdi { > - rockchip,pins = > - <2 19 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PC3 1 &pcfg_pull_none>; > ? }; > ? > ? i2s1_sdo: i2s1-sdo { > - rockchip,pins = > - <2 23 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PC7 1 &pcfg_pull_none>; > ? }; > ? > ? i2s1_sdio1: i2s1-sdio1 { > - rockchip,pins = > - <2 20 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PC4 1 &pcfg_pull_none>; > ? }; > ? > ? i2s1_sdio2: i2s1-sdio2 { > - rockchip,pins = > - <2 21 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PC5 1 &pcfg_pull_none>; > ? }; > ? > ? i2s1_sdio3: i2s1-sdio3 { > - rockchip,pins = > - <2 22 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PC6 1 &pcfg_pull_none>; > ? }; > ? > ? i2s1_sleep: i2s1-sleep { > ? rockchip,pins = > - <2 15 RK_FUNC_GPIO &pcfg_input_high>, > - <2 16 RK_FUNC_GPIO &pcfg_input_high>, > - <2 17 RK_FUNC_GPIO &pcfg_input_high>, > - <2 18 RK_FUNC_GPIO &pcfg_input_high>, > - <2 19 RK_FUNC_GPIO &pcfg_input_high>, > - <2 20 RK_FUNC_GPIO &pcfg_input_high>, > - <2 21 RK_FUNC_GPIO &pcfg_input_high>, > - <2 22 RK_FUNC_GPIO &pcfg_input_high>, > - <2 23 RK_FUNC_GPIO &pcfg_input_high>; > + <2 RK_PB7 RK_FUNC_GPIO &pcfg_input_high>, > + <2 RK_PC0 RK_FUNC_GPIO &pcfg_input_high>, > + <2 RK_PC1 RK_FUNC_GPIO &pcfg_input_high>, > + <2 RK_PC2 RK_FUNC_GPIO &pcfg_input_high>, > + <2 RK_PC3 RK_FUNC_GPIO &pcfg_input_high>, > + <2 RK_PC4 RK_FUNC_GPIO &pcfg_input_high>, > + <2 RK_PC5 RK_FUNC_GPIO &pcfg_input_high>, > + <2 RK_PC6 RK_FUNC_GPIO &pcfg_input_high>, > + <2 RK_PC7 RK_FUNC_GPIO &pcfg_input_high>; > ? }; > ? }; > ? > ? i2s2-0 { > ? i2s2m0_mclk: i2s2m0-mclk { > - rockchip,pins = > - <1 21 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <1 RK_PC5 1 &pcfg_pull_none>; > ? }; > ? > ? i2s2m0_sclk: i2s2m0-sclk { > - rockchip,pins = > - <1 22 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <1 RK_PC6 1 &pcfg_pull_none>; > ? }; > ? > ? i2s2m0_lrckrx: i2s2m0-lrckrx { > - rockchip,pins = > - <1 26 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <1 RK_PD2 1 &pcfg_pull_none>; > ? }; > ? > ? i2s2m0_lrcktx: i2s2m0-lrcktx { > - rockchip,pins = > - <1 23 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <1 RK_PC7 1 &pcfg_pull_none>; > ? }; > ? > ? i2s2m0_sdi: i2s2m0-sdi { > - rockchip,pins = > - <1 24 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <1 RK_PD0 1 &pcfg_pull_none>; > ? }; > ? > ? i2s2m0_sdo: i2s2m0-sdo { > - rockchip,pins = > - <1 25 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <1 RK_PD1 1 &pcfg_pull_none>; > ? }; > ? > ? i2s2m0_sleep: i2s2m0-sleep { > ? rockchip,pins = > - <1 21 RK_FUNC_GPIO &pcfg_input_high>, > - <1 22 RK_FUNC_GPIO &pcfg_input_high>, > - <1 26 RK_FUNC_GPIO &pcfg_input_high>, > - <1 23 RK_FUNC_GPIO &pcfg_input_high>, > - <1 24 RK_FUNC_GPIO &pcfg_input_high>, > - <1 25 RK_FUNC_GPIO &pcfg_input_high>; > + <1 RK_PC5 RK_FUNC_GPIO &pcfg_input_high>, > + <1 RK_PC6 RK_FUNC_GPIO &pcfg_input_high>, > + <1 RK_PD2 RK_FUNC_GPIO &pcfg_input_high>, > + <1 RK_PC7 RK_FUNC_GPIO &pcfg_input_high>, > + <1 RK_PD0 RK_FUNC_GPIO &pcfg_input_high>, > + <1 RK_PD1 RK_FUNC_GPIO &pcfg_input_high>; > ? }; > ? }; > ? > ? i2s2-1 { > ? i2s2m1_mclk: i2s2m1-mclk { > - rockchip,pins = > - <1 21 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <1 RK_PC5 1 &pcfg_pull_none>; > ? }; > ? > ? i2s2m1_sclk: i2s2m1-sclk { > - rockchip,pins = > - <3 0 RK_FUNC_6 &pcfg_pull_none>; > + rockchip,pins = <3 RK_PA0 6 &pcfg_pull_none>; > ? }; > ? > ? i2s2m1_lrckrx: i2sm1-lrckrx { > - rockchip,pins = > - <3 8 RK_FUNC_6 &pcfg_pull_none>; > + rockchip,pins = <3 RK_PB0 6 &pcfg_pull_none>; > ? }; > ? > ? i2s2m1_lrcktx: i2s2m1-lrcktx { > - rockchip,pins = > - <3 8 RK_FUNC_4 &pcfg_pull_none>; > + rockchip,pins = <3 RK_PB0 4 &pcfg_pull_none>; > ? }; > ? > ? i2s2m1_sdi: i2s2m1-sdi { > - rockchip,pins = > - <3 2 RK_FUNC_6 &pcfg_pull_none>; > + rockchip,pins = <3 RK_PA2 6 &pcfg_pull_none>; > ? }; > ? > ? i2s2m1_sdo: i2s2m1-sdo { > - rockchip,pins = > - <3 1 RK_FUNC_6 &pcfg_pull_none>; > + rockchip,pins = <3 RK_PA1 6 &pcfg_pull_none>; > ? }; > ? > ? i2s2m1_sleep: i2s2m1-sleep { > ? rockchip,pins = > - <1 21 RK_FUNC_GPIO &pcfg_input_high>, > - <3 0 RK_FUNC_GPIO &pcfg_input_high>, > - <3 8 RK_FUNC_GPIO &pcfg_input_high>, > - <3 2 RK_FUNC_GPIO &pcfg_input_high>, > - <3 1 RK_FUNC_GPIO &pcfg_input_high>; > + <1 RK_PC5 RK_FUNC_GPIO &pcfg_input_high>, > + <3 RK_PA0 RK_FUNC_GPIO &pcfg_input_high>, > + <3 RK_PB0 RK_FUNC_GPIO &pcfg_input_high>, > + <3 RK_PA2 RK_FUNC_GPIO &pcfg_input_high>, > + <3 RK_PA1 RK_FUNC_GPIO &pcfg_input_high>; > ? }; > ? }; > ? > ? spdif-0 { > ? spdifm0_tx: spdifm0-tx { > - rockchip,pins = > - <0 27 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <0 RK_PD3 1 &pcfg_pull_none>; > ? }; > ? }; > ? > ? spdif-1 { > ? spdifm1_tx: spdifm1-tx { > - rockchip,pins = > - <2 17 RK_FUNC_2 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PC1 2 &pcfg_pull_none>; > ? }; > ? }; > ? > ? spdif-2 { > ? spdifm2_tx: spdifm2-tx { > - rockchip,pins = > - <0 2 RK_FUNC_2 &pcfg_pull_none>; > + rockchip,pins = <0 RK_PA2 2 &pcfg_pull_none>; > ? }; > ? }; > ? > ? sdmmc0-0 { > ? sdmmc0m0_pwren: sdmmc0m0-pwren { > - rockchip,pins = > - <2 7 RK_FUNC_1 &pcfg_pull_up_4ma>; > + rockchip,pins = <2 RK_PA7 1 &pcfg_pull_up_4ma>; > ? }; > ? > ? sdmmc0m0_gpio: sdmmc0m0-gpio { > - rockchip,pins = > - <2 7 RK_FUNC_GPIO &pcfg_pull_up_4ma>; > + rockchip,pins = <2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up_4ma>; > ? }; > ? }; > ? > ? sdmmc0-1 { > ? sdmmc0m1_pwren: sdmmc0m1-pwren { > - rockchip,pins = > - <0 30 RK_FUNC_3 &pcfg_pull_up_4ma>; > + rockchip,pins = <0 RK_PD6 3 &pcfg_pull_up_4ma>; > ? }; > ? > ? sdmmc0m1_gpio: sdmmc0m1-gpio { > - rockchip,pins = > - <0 30 RK_FUNC_GPIO &pcfg_pull_up_4ma>; > + rockchip,pins = <0 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up_4ma>; > ? }; > ? }; > ? > ? sdmmc0 { > ? sdmmc0_clk: sdmmc0-clk { > - rockchip,pins = > - <1 6 RK_FUNC_1 &pcfg_pull_none_4ma>; > + rockchip,pins = <1 RK_PA6 1 &pcfg_pull_none_8ma>; > ? }; > ? > ? sdmmc0_cmd: sdmmc0-cmd { > - rockchip,pins = > - <1 4 RK_FUNC_1 &pcfg_pull_up_4ma>; > + rockchip,pins = <1 RK_PA4 1 &pcfg_pull_up_8ma>; > ? }; > ? > ? sdmmc0_dectn: sdmmc0-dectn { > - rockchip,pins = > - <1 5 RK_FUNC_1 &pcfg_pull_up_4ma>; > + rockchip,pins = <1 RK_PA5 1 &pcfg_pull_up_4ma>; > ? }; > ? > ? sdmmc0_wrprt: sdmmc0-wrprt { > - rockchip,pins = > - <1 7 RK_FUNC_1 &pcfg_pull_up_4ma>; > + rockchip,pins = <1 RK_PA7 1 &pcfg_pull_up_4ma>; > ? }; > ? > ? sdmmc0_bus1: sdmmc0-bus1 { > - rockchip,pins = > - <1 0 RK_FUNC_1 &pcfg_pull_up_4ma>; > + rockchip,pins = <1 RK_PA0 1 &pcfg_pull_up_8ma>; > ? }; > ? > ? sdmmc0_bus4: sdmmc0-bus4 { > - rockchip,pins = > - <1 0 RK_FUNC_1 &pcfg_pull_up_4ma>, > - <1 1 RK_FUNC_1 &pcfg_pull_up_4ma>, > - <1 2 RK_FUNC_1 &pcfg_pull_up_4ma>, > - <1 3 RK_FUNC_1 &pcfg_pull_up_4ma>; > + rockchip,pins = <1 RK_PA0 1 &pcfg_pull_up_8ma>, > + <1 RK_PA1 1 &pcfg_pull_up_8ma>, > + <1 RK_PA2 1 &pcfg_pull_up_8ma>, > + <1 RK_PA3 1 &pcfg_pull_up_8ma>; > ? }; > ? > ? sdmmc0_gpio: sdmmc0-gpio { > ? rockchip,pins = > - <1 6 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <1 4 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <1 5 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <1 7 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <1 3 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <1 2 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <1 1 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <1 0 RK_FUNC_GPIO &pcfg_pull_up_4ma>; > + <1 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <1 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up_4ma>; > ? }; > ? }; > ? > ? sdmmc0ext { > ? sdmmc0ext_clk: sdmmc0ext-clk { > - rockchip,pins = > - <3 2 RK_FUNC_3 &pcfg_pull_none_4ma>; > + rockchip,pins = <3 RK_PA2 3 &pcfg_pull_none_4ma>; > ? }; > ? > ? sdmmc0ext_cmd: sdmmc0ext-cmd { > - rockchip,pins = > - <3 0 RK_FUNC_3 &pcfg_pull_up_4ma>; > + rockchip,pins = <3 RK_PA0 3 &pcfg_pull_up_4ma>; > ? }; > ? > ? sdmmc0ext_wrprt: sdmmc0ext-wrprt { > - rockchip,pins = > - <3 3 RK_FUNC_3 &pcfg_pull_up_4ma>; > + rockchip,pins = <3 RK_PA3 3 &pcfg_pull_up_4ma>; > ? }; > ? > ? sdmmc0ext_dectn: sdmmc0ext-dectn { > - rockchip,pins = > - <3 1 RK_FUNC_3 &pcfg_pull_up_4ma>; > + rockchip,pins = <3 RK_PA1 3 &pcfg_pull_up_4ma>; > ? }; > ? > ? sdmmc0ext_bus1: sdmmc0ext-bus1 { > - rockchip,pins = > - <3 4 RK_FUNC_3 &pcfg_pull_up_4ma>; > + rockchip,pins = <3 RK_PA4 3 &pcfg_pull_up_4ma>; > ? }; > ? > ? sdmmc0ext_bus4: sdmmc0ext-bus4 { > ? rockchip,pins = > - <3 4 RK_FUNC_3 &pcfg_pull_up_4ma>, > - <3 5 RK_FUNC_3 &pcfg_pull_up_4ma>, > - <3 6 RK_FUNC_3 &pcfg_pull_up_4ma>, > - <3 7 RK_FUNC_3 &pcfg_pull_up_4ma>; > + <3 RK_PA4 3 &pcfg_pull_up_4ma>, > + <3 RK_PA5 3 &pcfg_pull_up_4ma>, > + <3 RK_PA6 3 &pcfg_pull_up_4ma>, > + <3 RK_PA7 3 &pcfg_pull_up_4ma>; > ? }; > ? > ? sdmmc0ext_gpio: sdmmc0ext-gpio { > ? rockchip,pins = > - <3 0 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <3 1 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <3 2 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <3 3 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <3 4 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <3 5 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <3 6 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <3 7 RK_FUNC_GPIO &pcfg_pull_up_4ma>; > + <3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <3 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <3 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <3 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up_4ma>; > ? }; > ? }; > ? > ? sdmmc1 { > ? sdmmc1_clk: sdmmc1-clk { > - rockchip,pins = > - <1 12 RK_FUNC_1 &pcfg_pull_none_8ma>; > + rockchip,pins = <1 RK_PB4 1 &pcfg_pull_none_8ma>; > ? }; > ? > ? sdmmc1_cmd: sdmmc1-cmd { > - rockchip,pins = > - <1 13 RK_FUNC_1 &pcfg_pull_up_8ma>; > + rockchip,pins = <1 RK_PB5 1 &pcfg_pull_up_8ma>; > ? }; > ? > ? sdmmc1_pwren: sdmmc1-pwren { > - rockchip,pins = > - <1 18 RK_FUNC_1 &pcfg_pull_up_8ma>; > + rockchip,pins = <1 RK_PC2 1 &pcfg_pull_up_8ma>; > ? }; > ? > ? sdmmc1_wrprt: sdmmc1-wrprt { > - rockchip,pins = > - <1 20 RK_FUNC_1 &pcfg_pull_up_8ma>; > + rockchip,pins = <1 RK_PC4 1 &pcfg_pull_up_8ma>; > ? }; > ? > ? sdmmc1_dectn: sdmmc1-dectn { > - rockchip,pins = > - <1 19 RK_FUNC_1 &pcfg_pull_up_8ma>; > + rockchip,pins = <1 RK_PC3 1 &pcfg_pull_up_8ma>; > ? }; > ? > ? sdmmc1_bus1: sdmmc1-bus1 { > - rockchip,pins = > - <1 14 RK_FUNC_1 &pcfg_pull_up_8ma>; > + rockchip,pins = <1 RK_PB6 1 &pcfg_pull_up_8ma>; > ? }; > ? > ? sdmmc1_bus4: sdmmc1-bus4 { > - rockchip,pins = > - <1 12 RK_FUNC_1 &pcfg_pull_up_8ma>, > - <1 13 RK_FUNC_1 &pcfg_pull_up_8ma>, > - <1 16 RK_FUNC_1 &pcfg_pull_up_8ma>, > - <1 17 RK_FUNC_1 &pcfg_pull_up_8ma>; > + rockchip,pins = <1 RK_PB6 1 &pcfg_pull_up_8ma>, > + <1 RK_PB7 1 &pcfg_pull_up_8ma>, > + <1 RK_PC0 1 &pcfg_pull_up_8ma>, > + <1 RK_PC1 1 &pcfg_pull_up_8ma>; > ? }; > ? > ? sdmmc1_gpio: sdmmc1-gpio { > ? rockchip,pins = > - <1 12 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <1 13 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <1 14 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <1 15 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <1 16 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <1 17 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <1 18 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <1 19 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > - <1 20 RK_FUNC_GPIO &pcfg_pull_up_4ma>; > + <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <1 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <1 RK_PC0 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <1 RK_PC3 RK_FUNC_GPIO &pcfg_pull_up_4ma>, > + <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_up_4ma>; > ? }; > ? }; > ? > ? emmc { > ? emmc_clk: emmc-clk { > - rockchip,pins = > - <3 21 RK_FUNC_2 &pcfg_pull_none_12ma>; > + rockchip,pins = <3 RK_PC5 2 &pcfg_pull_none_12ma>; > ? }; > ? > ? emmc_cmd: emmc-cmd { > - rockchip,pins = > - <3 19 RK_FUNC_2 &pcfg_pull_up_12ma>; > + rockchip,pins = <3 RK_PC3 2 &pcfg_pull_up_12ma>; > ? }; > ? > ? emmc_pwren: emmc-pwren { > - rockchip,pins = > - <3 22 RK_FUNC_2 &pcfg_pull_none>; > + rockchip,pins = <3 RK_PC6 2 &pcfg_pull_none>; > ? }; > ? > ? emmc_rstnout: emmc-rstnout { > - rockchip,pins = > - <3 20 RK_FUNC_2 &pcfg_pull_none>; > + rockchip,pins = <3 RK_PC4 2 &pcfg_pull_none>; > ? }; > ? > ? emmc_bus1: emmc-bus1 { > - rockchip,pins = > - <0 7 RK_FUNC_2 &pcfg_pull_up_12ma>; > + rockchip,pins = <0 RK_PA7 2 &pcfg_pull_up_12ma>; > ? }; > ? > ? emmc_bus4: emmc-bus4 { > ? rockchip,pins = > - <0 7 RK_FUNC_2 &pcfg_pull_up_12ma>, > - <2 28 RK_FUNC_2 &pcfg_pull_up_12ma>, > - <2 29 RK_FUNC_2 &pcfg_pull_up_12ma>, > - <2 30 RK_FUNC_2 &pcfg_pull_up_12ma>; > + <0 RK_PA7 2 &pcfg_pull_up_12ma>, > + <2 RK_PD4 2 &pcfg_pull_up_12ma>, > + <2 RK_PD5 2 &pcfg_pull_up_12ma>, > + <2 RK_PD6 2 &pcfg_pull_up_12ma>; > ? }; > ? > ? emmc_bus8: emmc-bus8 { > ? rockchip,pins = > - <0 7 RK_FUNC_2 &pcfg_pull_up_12ma>, > - <2 28 RK_FUNC_2 &pcfg_pull_up_12ma>, > - <2 29 RK_FUNC_2 &pcfg_pull_up_12ma>, > - <2 30 RK_FUNC_2 &pcfg_pull_up_12ma>, > - <2 31 RK_FUNC_2 &pcfg_pull_up_12ma>, > - <3 16 RK_FUNC_2 &pcfg_pull_up_12ma>, > - <3 17 RK_FUNC_2 &pcfg_pull_up_12ma>, > - <3 18 RK_FUNC_2 &pcfg_pull_up_12ma>; > + <0 RK_PA7 2 &pcfg_pull_up_12ma>, > + <2 RK_PD4 2 &pcfg_pull_up_12ma>, > + <2 RK_PD5 2 &pcfg_pull_up_12ma>, > + <2 RK_PD6 2 &pcfg_pull_up_12ma>, > + <2 RK_PD7 2 &pcfg_pull_up_12ma>, > + <3 RK_PC0 2 &pcfg_pull_up_12ma>, > + <3 RK_PC1 2 &pcfg_pull_up_12ma>, > + <3 RK_PC2 2 &pcfg_pull_up_12ma>; > ? }; > ? }; > ? > ? pwm0 { > ? pwm0_pin: pwm0-pin { > - rockchip,pins = > - <2 4 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PA4 1 &pcfg_pull_none>; > ? }; > ? }; > ? > ? pwm1 { > ? pwm1_pin: pwm1-pin { > - rockchip,pins = > - <2 5 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PA5 1 &pcfg_pull_none>; > ? }; > ? }; > ? > ? pwm2 { > ? pwm2_pin: pwm2-pin { > - rockchip,pins = > - <2 6 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PA6 1 &pcfg_pull_none>; > ? }; > ? }; > ? > ? pwmir { > ? pwmir_pin: pwmir-pin { > - rockchip,pins = > - <2 2 RK_FUNC_1 &pcfg_pull_none>; > - }; > - }; > - > - gmac-0 { > - rgmiim0_pins: rgmiim0-pins { > - rockchip,pins = > - /* mac_txclk */ > - <0 8 RK_FUNC_1 &pcfg_pull_none_12ma>, > - /* mac_rxclk */ > - <0 10 RK_FUNC_1 &pcfg_pull_none>, > - /* mac_mdio */ > - <0 11 RK_FUNC_1 &pcfg_pull_none>, > - /* mac_txen */ > - <0 12 RK_FUNC_1 &pcfg_pull_none_12ma>, > - /* mac_clk */ > - <0 24 RK_FUNC_1 &pcfg_pull_none>, > - /* mac_rxdv */ > - <0 25 RK_FUNC_1 &pcfg_pull_none>, > - /* mac_mdc */ > - <0 19 RK_FUNC_1 &pcfg_pull_none>, > - /* mac_rxd1 */ > - <0 14 RK_FUNC_1 &pcfg_pull_none>, > - /* mac_rxd0 */ > - <0 15 RK_FUNC_1 &pcfg_pull_none>, > - /* mac_txd1 */ > - <0 16 RK_FUNC_1 &pcfg_pull_none_12ma>, > - /* mac_txd0 */ > - <0 17 RK_FUNC_1 &pcfg_pull_none_12ma>, > - /* mac_rxd3 */ > - <0 20 RK_FUNC_1 &pcfg_pull_none>, > - /* mac_rxd2 */ > - <0 21 RK_FUNC_1 &pcfg_pull_none>, > - /* mac_txd3 */ > - <0 23 RK_FUNC_1 &pcfg_pull_none_12ma>, > - /* mac_txd2 */ > - <0 22 RK_FUNC_1 &pcfg_pull_none_12ma>; > - }; > - > - rmiim0_pins: rmiim0-pins { > - rockchip,pins = > - /* mac_mdio */ > - <0 11 RK_FUNC_1 &pcfg_pull_none>, > - /* mac_txen */ > - <0 12 RK_FUNC_1 &pcfg_pull_none_12ma>, > - /* mac_clk */ > - <0 24 RK_FUNC_1 &pcfg_pull_none>, > - /* mac_rxer */ > - <0 13 RK_FUNC_1 &pcfg_pull_none>, > - /* mac_rxdv */ > - <0 25 RK_FUNC_1 &pcfg_pull_none>, > - /* mac_mdc */ > - <0 19 RK_FUNC_1 &pcfg_pull_none>, > - /* mac_rxd1 */ > - <0 14 RK_FUNC_1 &pcfg_pull_none>, > - /* mac_rxd0 */ > - <0 15 RK_FUNC_1 &pcfg_pull_none>, > - /* mac_txd1 */ > - <0 16 RK_FUNC_1 &pcfg_pull_none_12ma>, > - /* mac_txd0 */ > - <0 17 RK_FUNC_1 &pcfg_pull_none_12ma>; > + rockchip,pins = <2 RK_PA2 1 &pcfg_pull_none>; > ? }; > ? }; > ? > @@ -1301,157 +1716,128 @@ > ? rgmiim1_pins: rgmiim1-pins { > ? rockchip,pins = > ? /* mac_txclk */ > - <1 12 RK_FUNC_2 &pcfg_pull_none_12ma>, > + <1 RK_PB4 2 &pcfg_pull_none_8ma>, > ? /* mac_rxclk */ > - <1 13 RK_FUNC_2 &pcfg_pull_none_2ma>, > + <1 RK_PB5 2 &pcfg_pull_none_4ma>, > ? /* mac_mdio */ > - <1 19 RK_FUNC_2 &pcfg_pull_none_2ma>, > + <1 RK_PC3 2 &pcfg_pull_none_4ma>, > ? /* mac_txen */ > - <1 25 RK_FUNC_2 &pcfg_pull_none_12ma>, > + <1 RK_PD1 2 &pcfg_pull_none_8ma>, > ? /* mac_clk */ > - <1 21 RK_FUNC_2 &pcfg_pull_none_2ma>, > + <1 RK_PC5 2 &pcfg_pull_none_4ma>, > ? /* mac_rxdv */ > - <1 22 RK_FUNC_2 &pcfg_pull_none_2ma>, > + <1 RK_PC6 2 &pcfg_pull_none_4ma>, > ? /* mac_mdc */ > - <1 23 RK_FUNC_2 &pcfg_pull_none_2ma>, > + <1 RK_PC7 2 &pcfg_pull_none_4ma>, > ? /* mac_rxd1 */ > - <1 10 RK_FUNC_2 &pcfg_pull_none_2ma>, > + <1 RK_PB2 2 &pcfg_pull_none_4ma>, > ? /* mac_rxd0 */ > - <1 11 RK_FUNC_2 &pcfg_pull_none_2ma>, > + <1 RK_PB3 2 &pcfg_pull_none_4ma>, > ? /* mac_txd1 */ > - <1 8 RK_FUNC_2 &pcfg_pull_none_12ma>, > + <1 RK_PB0 2 &pcfg_pull_none_8ma>, > ? /* mac_txd0 */ > - <1 9 RK_FUNC_2 &pcfg_pull_none_12ma>, > + <1 RK_PB1 2 &pcfg_pull_none_8ma>, > ? /* mac_rxd3 */ > - <1 14 RK_FUNC_2 &pcfg_pull_none_2ma>, > + <1 RK_PB6 2 &pcfg_pull_none_4ma>, > ? /* mac_rxd2 */ > - <1 15 RK_FUNC_2 &pcfg_pull_none_2ma>, > + <1 RK_PB7 2 &pcfg_pull_none_4ma>, > ? /* mac_txd3 */ > - <1 16 RK_FUNC_2 &pcfg_pull_none_12ma>, > + <1 RK_PC0 2 &pcfg_pull_none_8ma>, > ? /* mac_txd2 */ > - <1 17 RK_FUNC_2 &pcfg_pull_none_12ma>, > + <1 RK_PC1 2 &pcfg_pull_none_8ma>, > ? > ? /* mac_txclk */ > - <0 8 RK_FUNC_1 &pcfg_pull_none>, > + <0 RK_PB0 1 &pcfg_pull_none_8ma>, > ? /* mac_txen */ > - <0 12 RK_FUNC_1 &pcfg_pull_none>, > + <0 RK_PB4 1 &pcfg_pull_none_8ma>, > ? /* mac_clk */ > - <0 24 RK_FUNC_1 &pcfg_pull_none>, > + <0 RK_PD0 1 &pcfg_pull_none_4ma>, > ? /* mac_txd1 */ > - <0 16 RK_FUNC_1 &pcfg_pull_none>, > + <0 RK_PC0 1 &pcfg_pull_none_8ma>, > ? /* mac_txd0 */ > - <0 17 RK_FUNC_1 &pcfg_pull_none>, > + <0 RK_PC1 1 &pcfg_pull_none_8ma>, > ? /* mac_txd3 */ > - <0 23 RK_FUNC_1 &pcfg_pull_none>, > + <0 RK_PC7 1 &pcfg_pull_none_8ma>, > ? /* mac_txd2 */ > - <0 22 RK_FUNC_1 &pcfg_pull_none>; > + <0 RK_PC6 1 &pcfg_pull_none_8ma>; > ? }; > ? > ? rmiim1_pins: rmiim1-pins { > ? rockchip,pins = > ? /* mac_mdio */ > - <1 19 RK_FUNC_2 &pcfg_pull_none_2ma>, > + <1 RK_PC3 2 &pcfg_pull_none_2ma>, > ? /* mac_txen */ > - <1 25 RK_FUNC_2 &pcfg_pull_none_12ma>, > + <1 RK_PD1 2 &pcfg_pull_none_12ma>, > ? /* mac_clk */ > - <1 21 RK_FUNC_2 &pcfg_pull_none_2ma>, > + <1 RK_PC5 2 &pcfg_pull_none_2ma>, > ? /* mac_rxer */ > - <1 24 RK_FUNC_2 &pcfg_pull_none_2ma>, > + <1 RK_PD0 2 &pcfg_pull_none_2ma>, > ? /* mac_rxdv */ > - <1 22 RK_FUNC_2 &pcfg_pull_none_2ma>, > + <1 RK_PC6 2 &pcfg_pull_none_2ma>, > ? /* mac_mdc */ > - <1 23 RK_FUNC_2 &pcfg_pull_none_2ma>, > + <1 RK_PC7 2 &pcfg_pull_none_2ma>, > ? /* mac_rxd1 */ > - <1 10 RK_FUNC_2 &pcfg_pull_none_2ma>, > + <1 RK_PB2 2 &pcfg_pull_none_2ma>, > ? /* mac_rxd0 */ > - <1 11 RK_FUNC_2 &pcfg_pull_none_2ma>, > + <1 RK_PB3 2 &pcfg_pull_none_2ma>, > ? /* mac_txd1 */ > - <1 8 RK_FUNC_2 &pcfg_pull_none_12ma>, > + <1 RK_PB0 2 &pcfg_pull_none_12ma>, > ? /* mac_txd0 */ > - <1 9 RK_FUNC_2 &pcfg_pull_none_12ma>, > + <1 RK_PB1 2 &pcfg_pull_none_12ma>, > ? > ? /* mac_mdio */ > - <0 11 RK_FUNC_1 &pcfg_pull_none>, > + <0 RK_PB3 1 &pcfg_pull_none>, > ? /* mac_txen */ > - <0 12 RK_FUNC_1 &pcfg_pull_none>, > + <0 RK_PB4 1 &pcfg_pull_none>, > ? /* mac_clk */ > - <0 24 RK_FUNC_1 &pcfg_pull_none>, > + <0 RK_PD0 1 &pcfg_pull_none>, > ? /* mac_mdc */ > - <0 19 RK_FUNC_1 &pcfg_pull_none>, > + <0 RK_PC3 1 &pcfg_pull_none>, > ? /* mac_txd1 */ > - <0 16 RK_FUNC_1 &pcfg_pull_none>, > + <0 RK_PC0 1 &pcfg_pull_none>, > ? /* mac_txd0 */ > - <0 17 RK_FUNC_1 &pcfg_pull_none>; > + <0 RK_PC1 1 &pcfg_pull_none>; > ? }; > ? }; > ? > ? gmac2phy { > - fephyled_speed100: fephyled-speed100 { > - rockchip,pins = > - <0 31 RK_FUNC_1 &pcfg_pull_none>; > - }; > - > ? fephyled_speed10: fephyled-speed10 { > - rockchip,pins = > - <0 30 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <0 RK_PD6 1 &pcfg_pull_none>; > ? }; > ? > ? fephyled_duplex: fephyled-duplex { > - rockchip,pins = > - <0 30 RK_FUNC_2 &pcfg_pull_none>; > - }; > - > - fephyled_rxm0: fephyled-rxm0 { > - rockchip,pins = > - <0 29 RK_FUNC_1 &pcfg_pull_none>; > - }; > - > - fephyled_txm0: fephyled-txm0 { > - rockchip,pins = > - <0 29 RK_FUNC_2 &pcfg_pull_none>; > - }; > - > - fephyled_linkm0: fephyled-linkm0 { > - rockchip,pins = > - <0 28 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <0 RK_PD6 2 &pcfg_pull_none>; > ? }; > ? > ? fephyled_rxm1: fephyled-rxm1 { > - rockchip,pins = > - <2 25 RK_FUNC_2 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PD1 2 &pcfg_pull_none>; > ? }; > ? > ? fephyled_txm1: fephyled-txm1 { > - rockchip,pins = > - <2 25 RK_FUNC_3 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PD1 3 &pcfg_pull_none>; > ? }; > ? > ? fephyled_linkm1: fephyled-linkm1 { > - rockchip,pins = > - <2 24 RK_FUNC_2 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PD0 2 &pcfg_pull_none>; > ? }; > ? }; > ? > ? tsadc_pin { > ? tsadc_int: tsadc-int { > - rockchip,pins = > - <2 13 RK_FUNC_2 &pcfg_pull_none>; > + rockchip,pins = <2 RK_PB5 2 &pcfg_pull_none>; > ? }; > ? tsadc_gpio: tsadc-gpio { > - rockchip,pins = > - <2 13 RK_FUNC_GPIO &pcfg_pull_none>; > + rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; > ? }; > ? }; > ? > ? hdmi_pin { > ? hdmi_cec: hdmi-cec { > - rockchip,pins = > - <0 3 RK_FUNC_1 &pcfg_pull_none>; > + rockchip,pins = <0 RK_PA3 1 &pcfg_pull_none>; > ? }; > ? > ? hdmi_hpd: hdmi-hpd { > - rockchip,pins = > - <0 4 RK_FUNC_1 &pcfg_pull_down>; > + rockchip,pins = <0 RK_PA4 1 &pcfg_pull_down>; > ? }; > ? }; > ? > @@ -1459,29 +1845,29 @@ > ? dvp_d2d9_m0:dvp-d2d9-m0 { > ? rockchip,pins = > ? /* cif_d0 */ > - <3 4 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PA4 2 &pcfg_pull_none>, > ? /* cif_d1 */ > - <3 5 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PA5 2 &pcfg_pull_none>, > ? /* cif_d2 */ > - <3 6 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PA6 2 &pcfg_pull_none>, > ? /* cif_d3 */ > - <3 7 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PA7 2 &pcfg_pull_none>, > ? /* cif_d4 */ > - <3 8 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PB0 2 &pcfg_pull_none>, > ? /* cif_d5m0 */ > - <3 9 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PB1 2 &pcfg_pull_none>, > ? /* cif_d6m0 */ > - <3 10 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PB2 2 &pcfg_pull_none>, > ? /* cif_d7m0 */ > - <3 11 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PB3 2 &pcfg_pull_none>, > ? /* cif_href */ > - <3 1 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PA1 2 &pcfg_pull_none>, > ? /* cif_vsync */ > - <3 0 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PA0 2 &pcfg_pull_none>, > ? /* cif_clkoutm0 */ > - <3 3 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PA3 2 &pcfg_pull_none>, > ? /* cif_clkin */ > - <3 2 RK_FUNC_2 &pcfg_pull_none>; > + <3 RK_PA2 2 &pcfg_pull_none>; > ? }; > ? }; > ? > @@ -1489,29 +1875,29 @@ > ? dvp_d2d9_m1:dvp-d2d9-m1 { > ? rockchip,pins = > ? /* cif_d0 */ > - <3 4 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PA4 2 &pcfg_pull_none>, > ? /* cif_d1 */ > - <3 5 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PA5 2 &pcfg_pull_none>, > ? /* cif_d2 */ > - <3 6 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PA6 2 &pcfg_pull_none>, > ? /* cif_d3 */ > - <3 7 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PA7 2 &pcfg_pull_none>, > ? /* cif_d4 */ > - <3 8 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PB0 2 &pcfg_pull_none>, > ? /* cif_d5m1 */ > - <2 16 RK_FUNC_4 &pcfg_pull_none>, > + <2 RK_PC0 4 &pcfg_pull_none>, > ? /* cif_d6m1 */ > - <2 17 RK_FUNC_4 &pcfg_pull_none>, > + <2 RK_PC1 4 &pcfg_pull_none>, > ? /* cif_d7m1 */ > - <2 18 RK_FUNC_4 &pcfg_pull_none>, > + <2 RK_PC2 4 &pcfg_pull_none>, > ? /* cif_href */ > - <3 1 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PA1 2 &pcfg_pull_none>, > ? /* cif_vsync */ > - <3 0 RK_FUNC_2 &pcfg_pull_none>, > + <3 RK_PA0 2 &pcfg_pull_none>, > ? /* cif_clkoutm1 */ > - <2 15 RK_FUNC_4 &pcfg_pull_none>, > + <2 RK_PB7 4 &pcfg_pull_none>, > ? /* cif_clkin */ > - <3 2 RK_FUNC_2 &pcfg_pull_none>; > + <3 RK_PA2 2 &pcfg_pull_none>; > ? }; > ? }; > ? }; ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v3 7/9] rockchip: dts: rk3328: Sync device tree files from Linux 2020-05-11 18:59 ` Kurt Miller @ 2020-05-14 4:10 ` Chen-Yu Tsai 2020-05-14 17:02 ` Kurt Miller 0 siblings, 1 reply; 20+ messages in thread From: Chen-Yu Tsai @ 2020-05-14 4:10 UTC (permalink / raw) To: u-boot Hi Kurt On Tue, May 12, 2020 at 3:00 AM Kurt Miller <kurt@intricatesoftware.com> wrote: > > On Mon, 2020-04-27 at 14:52 +0800, Chen-Yu Tsai wrote: > > From: Chen-Yu Tsai <wens@csie.org> > > > > This syncs rk3328 device tree files from the Linux kernel next-20200324. > > The last commit to touch these files is: > > > > b2411befed60 ("arm64: dts: add bus to rockchip amba nodenames") > > > > Additional changes not yet in the Linux kernel include: > > > > arm64: dts: rockchip: rk3328: drop #address-cells, #size-cells from grf node > > arm64: dts: rockchip: rk3328: drop non-existent gmac2phy pinmux options > > arm64: dts: rockchip: rk3328: Replace RK805 PMIC node name with "pmic" > > > > Changes include: > > > > - conversion of raw pin numbers to macros > > - removal of deprecated RK_FUNC_* macros > > - update of device tree binding headers > > - new devices > > - device tree cleanups > > - gmac2phy disabled in -u-boot.dtsi as it is not supported in U-boot > > > > This includes a re-ordering of the USB device nodes compared to upstream > > Linux, moving the dwc2 OTG controller after the EHCI/OHCI nodes. This is > > currently required as otherwise the dwc2 controller would not be able to > > detect devices in some cases. This may be due to lack of USB PHY support > > in U-boot. > > Hi Chen-Yu, > > Thank you for syncing rk3328 device tree files. On the rock64 with > v2020.04 one USB 2.0 port was working (the lower one). Building > master now with this merged, no USB ports are working. No power > appears to be enabled on them and USB devices are not recognized. When I was working on v3, it was based on d202f67db077 Merge branch '2020-04-25-master-imports' And it was definitely working. My Rock64 is back in its case, so I tested again with the ROC-RK3328-CC just now. All three USB ports work properly, on both the old tree and current master. Are you using the defconfig, or have you deviated from it? XHCI must be enabled, as VBUS is tied to it (to get everything to work). ChenYu > Do you have any suggestions for me to try to get them enabled again? > > Thanks, > -Kurt ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v3 7/9] rockchip: dts: rk3328: Sync device tree files from Linux 2020-05-14 4:10 ` Chen-Yu Tsai @ 2020-05-14 17:02 ` Kurt Miller 0 siblings, 0 replies; 20+ messages in thread From: Kurt Miller @ 2020-05-14 17:02 UTC (permalink / raw) To: u-boot On Thu, 2020-05-14 at 12:10 +0800, Chen-Yu Tsai wrote: > Hi Kurt > > On Tue, May 12, 2020 at 3:00 AM Kurt Miller <kurt@intricatesoftware.com> wrote: > > > > > > On Mon, 2020-04-27 at 14:52 +0800, Chen-Yu Tsai wrote: > > > > > > From: Chen-Yu Tsai <wens@csie.org> > > > > > > This syncs rk3328 device tree files from the Linux kernel next-20200324. > > > The last commit to touch these files is: > > > > > > ????b2411befed60 ("arm64: dts: add bus to rockchip amba nodenames") > > > > > > Additional changes not yet in the Linux kernel include: > > > > > > ????arm64: dts: rockchip: rk3328: drop #address-cells, #size-cells from grf node > > > ????arm64: dts: rockchip: rk3328: drop non-existent gmac2phy pinmux options > > > ????arm64: dts: rockchip: rk3328: Replace RK805 PMIC node name with "pmic" > > > > > > Changes include: > > > > > > ? - conversion of raw pin numbers to macros > > > ? - removal of deprecated RK_FUNC_* macros > > > ? - update of device tree binding headers > > > ? - new devices > > > ? - device tree cleanups > > > ? - gmac2phy disabled in -u-boot.dtsi as it is not supported in U-boot > > > > > > This includes a re-ordering of the USB device nodes compared to upstream > > > Linux, moving the dwc2 OTG controller after the EHCI/OHCI nodes. This is > > > currently required as otherwise the dwc2 controller would not be able to > > > detect devices in some cases. This may be due to lack of USB PHY support > > > in U-boot. > > Hi Chen-Yu, > > > > Thank you for syncing rk3328 device tree files. On the rock64 with > > v2020.04 one USB 2.0 port was working (the lower one). Building > > master now with this merged, no USB ports are working. No power > > appears to be enabled on them and USB devices are not recognized. > When I was working on v3, it was based on > > ????d202f67db077 Merge branch '2020-04-25-master-imports' > > And it was definitely working. My Rock64 is back in its case, so I tested > again with the ROC-RK3328-CC just now. All three USB ports work properly, > on both the old tree and current master. > > Are you using the defconfig, or have you deviated from it? XHCI must be > enabled, as VBUS is tied to it (to get everything to work). > Hi Chen-Yu, Thank you for your reply. I've tested with and without the SPL gen3 changes I posted yesterday on gen2 and gen3 boards. In all cases there's no power to all three usb ports. The only other change I have in defconfig is? adjusting the baud rate. Mark Kettenis suggested I revert Patch 9/9 from this series and with that reverted the one USB 2.0 port works again. Mark has a better understanding of the issues and perhaps can comment further - cc'ed. Regards, -Kurt ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v3 8/9] rockchip: rk3328: Add support for ROC-RK3328-CC board 2020-04-27 6:52 [PATCH v3 0/9] rockchip: rk3328: sync dts and add ROC-RK3328-CC board Chen-Yu Tsai ` (6 preceding siblings ...) 2020-04-27 6:52 ` [PATCH v3 7/9] rockchip: dts: rk3328: Sync device tree files from Linux Chen-Yu Tsai @ 2020-04-27 6:52 ` Chen-Yu Tsai 2020-04-28 14:25 ` Kever Yang 2020-04-30 9:08 ` Kever Yang 2020-04-27 6:52 ` [PATCH v3 9/9] rockchip: dts: rock64: Fix XHCI usage Chen-Yu Tsai 2020-04-30 9:04 ` [PATCH v3 0/9] rockchip: rk3328: sync dts and add ROC-RK3328-CC board Kever Yang 9 siblings, 2 replies; 20+ messages in thread From: Chen-Yu Tsai @ 2020-04-27 6:52 UTC (permalink / raw) To: u-boot From: Chen-Yu Tsai <wens@csie.org> The ROC-RK3328-CC from Firefly and Libre Computer Project is a credit card size development board based on the Rockchip RK3328 SoC, with: - 1/2/4 GB DDR4 DRAM - eMMC connector for optional module - micro SD card slot - 1 x USB 3.0 host port - 2 x USB 2.0 host port - 1 x USB 2.0 OTG port - HDMI video output - TRRS connector with audio and composite video output - gigabit Ethernet - consumer IR receiver - debug UART pins The ROC-RK3328-CC has the enable pin of the SD card power switch tied to GPIO_0_D6. This pin also has the function SDMMC0_PWREN, which is muxed by default. SDMMC0_PWREN is an active high signal controlled by the MMC controller, however the switch enable is active low, and pulled low (enabled) by default to make things work on boot. As such, we need to mux away from SDMMC0_PWREN and use GPIO to enable power to the card. The default GPIO state for the pin is pull-down and input, which doesn't require extra configuration when paired with the external pull-down and active low switch. Deal with this by enabling regulator support in SPL, and setting "u-boot,dm-spl" for the regulator and other device nodes needed for muxing the pin. The device tree file is synced from the Linux kernel next-20200324. Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- Changes since v2: - Remove regulator-always-on from VBUS regulator - Disable CONFIG_PHY Changes since v1: - Drop custom target; use pinctrl and regulators in SPL --- arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3328-roc-cc-u-boot.dtsi | 47 ++++ arch/arm/dts/rk3328-roc-cc.dts | 354 +++++++++++++++++++++++++ board/rockchip/evb_rk3328/MAINTAINERS | 7 + configs/roc-cc-rk3328_defconfig | 102 +++++++ doc/README.rockchip | 4 +- 6 files changed, 514 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/rk3328-roc-cc-u-boot.dtsi create mode 100644 arch/arm/dts/rk3328-roc-cc.dts create mode 100644 configs/roc-cc-rk3328_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index af7d804b6669..a683525e7c6a 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -106,6 +106,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \ dtb-$(CONFIG_ROCKCHIP_RK3328) += \ rk3328-evb.dtb \ + rk3328-roc-cc.dtb \ rk3328-rock64.dtb dtb-$(CONFIG_ROCKCHIP_RK3368) += \ diff --git a/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi b/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi new file mode 100644 index 000000000000..e929d86e306a --- /dev/null +++ b/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi @@ -0,0 +1,47 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd + */ + +#include "rk3328-u-boot.dtsi" +#include "rk3328-sdram-ddr4-666.dtsi" +/ { + chosen { + u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc; + }; +}; + +&gpio0 { + u-boot,dm-spl; +}; + +&pinctrl { + u-boot,dm-spl; +}; + +&sdmmc0m1_gpio { + u-boot,dm-spl; +}; + +&pcfg_pull_up_4ma { + u-boot,dm-spl; +}; + +&usb_host0_xhci { + vbus-supply = <&vcc_host1_5v>; + status = "okay"; +}; + +/* + * This makes XHCI responsible for toggling VBUS. This is needed to work + * around an issue where either XHCI only works with USB 2.0 or OTG doesn't + * work, depending on how VBUS is configured. Having USB 3.0 seems better. + */ +&vcc_host1_5v { + /delete-property/ regulator-always-on; +}; + +/* Need this and all the pinctrl/gpio stuff above to set pinmux */ +&vcc_sd { + u-boot,dm-spl; +}; diff --git a/arch/arm/dts/rk3328-roc-cc.dts b/arch/arm/dts/rk3328-roc-cc.dts new file mode 100644 index 000000000000..8d553c92182a --- /dev/null +++ b/arch/arm/dts/rk3328-roc-cc.dts @@ -0,0 +1,354 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd + */ + +/dts-v1/; +#include "rk3328.dtsi" + +/ { + model = "Firefly roc-rk3328-cc"; + compatible = "firefly,roc-rk3328-cc", "rockchip,rk3328"; + + chosen { + stdout-path = "serial2:1500000n8"; + }; + + gmac_clkin: external-gmac-clock { + compatible = "fixed-clock"; + clock-frequency = <125000000>; + clock-output-names = "gmac_clkin"; + #clock-cells = <0>; + }; + + dc_12v: dc-12v { + compatible = "regulator-fixed"; + regulator-name = "dc_12v"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <12000000>; + regulator-max-microvolt = <12000000>; + }; + + vcc_sd: sdmmc-regulator { + compatible = "regulator-fixed"; + gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc0m1_gpio>; + regulator-boot-on; + regulator-name = "vcc_sd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc_io>; + }; + + vcc_sdio: sdmmcio-regulator { + compatible = "regulator-gpio"; + gpios = <&grf_gpio 0 GPIO_ACTIVE_HIGH>; + states = <1800000 0x1 + 3300000 0x0>; + regulator-name = "vcc_sdio"; + regulator-type = "voltage"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + vin-supply = <&vcc_sys>; + }; + + vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usb20_host_drv>; + regulator-name = "vcc_host1_5v"; + regulator-always-on; + vin-supply = <&vcc_sys>; + }; + + vcc_sys: vcc-sys { + compatible = "regulator-fixed"; + regulator-name = "vcc_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&dc_12v>; + }; + + vcc_phy: vcc-phy-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc_phy"; + regulator-always-on; + regulator-boot-on; + }; + + leds { + compatible = "gpio-leds"; + + power { + label = "firefly:blue:power"; + linux,default-trigger = "heartbeat"; + gpios = <&rk805 1 GPIO_ACTIVE_LOW>; + default-state = "on"; + mode = <0x23>; + }; + + user { + label = "firefly:yellow:user"; + linux,default-trigger = "mmc1"; + gpios = <&rk805 0 GPIO_ACTIVE_LOW>; + default-state = "off"; + mode = <0x05>; + }; + }; +}; + +&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; + max-frequency = <150000000>; + mmc-ddr-1_8v; + 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_phy>; + phy-mode = "rgmii"; + pinctrl-names = "default"; + pinctrl-0 = <&rgmiim1_pins>; + snps,aal; + snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; + snps,reset-active-low; + snps,reset-delays-us = <0 10000 50000>; + snps,rxpbl = <0x4>; + snps,txpbl = <0x4>; + tx_delay = <0x24>; + rx_delay = <0x18>; + status = "okay"; +}; + +&hdmi { + status = "okay"; +}; + +&hdmiphy { + status = "okay"; +}; + +&i2c1 { + status = "okay"; + + rk805: pmic at 18 { + compatible = "rockchip,rk805"; + reg = <0x18>; + interrupt-parent = <&gpio1>; + interrupts = <24 IRQ_TYPE_LEVEL_LOW>; + #clock-cells = <1>; + clock-output-names = "xin32k", "rk805-clkout2"; + gpio-controller; + #gpio-cells = <2>; + pinctrl-names = "default"; + pinctrl-0 = <&pmic_int_l>; + rockchip,system-power-controller; + wakeup-source; + + vcc1-supply = <&vcc_sys>; + vcc2-supply = <&vcc_sys>; + vcc3-supply = <&vcc_sys>; + vcc4-supply = <&vcc_sys>; + vcc5-supply = <&vcc_io>; + vcc6-supply = <&vcc_io>; + + regulators { + vdd_logic: DCDC_REG1 { + regulator-name = "vdd_logic"; + regulator-min-microvolt = <712500>; + regulator-max-microvolt = <1450000>; + regulator-always-on; + regulator-boot-on; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1000000>; + }; + }; + + vdd_arm: DCDC_REG2 { + regulator-name = "vdd_arm"; + regulator-min-microvolt = <712500>; + regulator-max-microvolt = <1450000>; + regulator-always-on; + regulator-boot-on; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <950000>; + }; + }; + + vcc_ddr: DCDC_REG3 { + regulator-name = "vcc_ddr"; + regulator-always-on; + regulator-boot-on; + regulator-state-mem { + regulator-on-in-suspend; + }; + }; + + vcc_io: DCDC_REG4 { + regulator-name = "vcc_io"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + regulator-boot-on; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <3300000>; + }; + }; + + vcc_18: LDO_REG1 { + regulator-name = "vcc_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + regulator-boot-on; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; + }; + }; + + vcc18_emmc: LDO_REG2 { + regulator-name = "vcc18_emmc"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + regulator-boot-on; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; + }; + }; + + vdd_10: LDO_REG3 { + regulator-name = "vdd_10"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-always-on; + regulator-boot-on; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1000000>; + }; + }; + }; + }; +}; + +&io_domains { + status = "okay"; + + vccio1-supply = <&vcc_io>; + vccio2-supply = <&vcc18_emmc>; + vccio3-supply = <&vcc_sdio>; + 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 = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + usb2 { + usb20_host_drv: usb20-host-drv { + rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + +&sdmmc { + bus-width = <4>; + cap-mmc-highspeed; + cap-sd-highspeed; + disable-wp; + max-frequency = <150000000>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr50; + sd-uhs-sdr104; + vmmc-supply = <&vcc_sd>; + vqmmc-supply = <&vcc_sdio>; + status = "okay"; +}; + +&tsadc { + status = "okay"; +}; + +&u2phy { + status = "okay"; +}; + +&u2phy_host { + status = "okay"; +}; + +&u2phy_otg { + status = "okay"; +}; + +&uart2 { + status = "okay"; +}; + +&usb20_otg { + status = "okay"; +}; + +&usb_host0_ehci { + status = "okay"; +}; + +&usb_host0_ohci { + status = "okay"; +}; + +&vop { + status = "okay"; +}; + +&vop_mmu { + status = "okay"; +}; diff --git a/board/rockchip/evb_rk3328/MAINTAINERS b/board/rockchip/evb_rk3328/MAINTAINERS index c661d2e06ae3..c6c22a373df5 100644 --- a/board/rockchip/evb_rk3328/MAINTAINERS +++ b/board/rockchip/evb_rk3328/MAINTAINERS @@ -5,6 +5,13 @@ F: board/rockchip/evb_rk3328 F: include/configs/evb_rk3328.h F: configs/evb-rk3328_defconfig +ROC-RK3328-CC +M: Loic Devulder <ldevulder@suse.com> +M: Chen-Yu Tsai <wens@csie.org> +S: Maintained +F: configs/roc-rk3328-cc_defconfig +F: arch/arm/dts/rk3328-roc-cc-u-boot.dtsi + ROCK64-RK3328 M: Matwey V. Kornilov <matwey.kornilov@gmail.com> S: Maintained diff --git a/configs/roc-cc-rk3328_defconfig b/configs/roc-cc-rk3328_defconfig new file mode 100644 index 000000000000..933a1c6967d4 --- /dev/null +++ b/configs/roc-cc-rk3328_defconfig @@ -0,0 +1,102 @@ +CONFIG_ARM=y +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_SPL_GPIO_SUPPORT=y +CONFIG_ENV_OFFSET=0x3F8000 +CONFIG_ROCKCHIP_RK3328=y +CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y +CONFIG_TPL_LIBCOMMON_SUPPORT=y +CONFIG_TPL_LIBGENERIC_SUPPORT=y +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_STACK_R_ADDR=0x600000 +CONFIG_NR_DRAM_BANKS=1 +CONFIG_DEBUG_UART_BASE=0xFF130000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_SMBIOS_PRODUCT_NAME="roc-rk3328-cc" +CONFIG_DEBUG_UART=y +CONFIG_TPL_SYS_MALLOC_F_LEN=0x800 +# CONFIG_ANDROID_BOOT_IMAGE is not set +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-roc-cc.dtb" +CONFIG_MISC_INIT_R=y +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +CONFIG_TPL_SYS_MALLOC_SIMPLE=y +CONFIG_SPL_STACK_R=y +CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y +CONFIG_SPL_ATF=y +CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_TIME=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_TPL_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="rk3328-roc-cc" +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_TPL_OF_PLATDATA=y +CONFIG_ENV_IS_IN_MMC=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_TPL_DM=y +CONFIG_REGMAP=y +CONFIG_SPL_REGMAP=y +CONFIG_TPL_REGMAP=y +CONFIG_SYSCON=y +CONFIG_SPL_SYSCON=y +CONFIG_TPL_SYSCON=y +CONFIG_CLK=y +CONFIG_SPL_CLK=y +CONFIG_FASTBOOT_BUF_ADDR=0x800800 +CONFIG_FASTBOOT_CMD_OEM_FORMAT=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_SF_DEFAULT_SPEED=20000000 +CONFIG_PHY_REALTEK=y +CONFIG_DM_ETH=y +CONFIG_PHY_GIGE=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_GMAC_ROCKCHIP=y +CONFIG_PINCTRL=y +CONFIG_SPL_PINCTRL=y +CONFIG_DM_PMIC=y +CONFIG_PMIC_RK8XX=y +CONFIG_SPL_DM_REGULATOR=y +CONFIG_REGULATOR_PWM=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_SPL_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_REGULATOR_RK8XX=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_RAM=y +CONFIG_SPL_RAM=y +CONFIG_TPL_RAM=y +CONFIG_DM_RESET=y +CONFIG_BAUDRATE=1500000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_SYSRESET=y +# CONFIG_TPL_SYSRESET is not set +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_GENERIC=y +CONFIG_USB_DWC2=y +CONFIG_USB_DWC3=y +# CONFIG_USB_DWC3_GADGET is not set +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_SPL_TINY_MEMSET=y +CONFIG_TPL_TINY_MEMSET=y +CONFIG_ERRNO_STR=y +CONFIG_SMBIOS_MANUFACTURER="firefly" diff --git a/doc/README.rockchip b/doc/README.rockchip index 9b699b9ae5d3..70c8798ed2d0 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -52,10 +52,12 @@ Two RK3308 boards are supported: - EVB RK3308 - use evb-rk3308 configuration - ROC-CC-RK3308 - use roc-cc-rk3308 configuration -Two RK3328 board are supported: +Three RK3328 boards are supported: - EVB RK3328 - use evb-rk3328_defconfig - Pine64 Rock64 board - use rock64-rk3328_defconfig + - Firefly / Libre Computer Project ROC-RK3328-CC board - + use roc-cc-rk3328_defconfig Size RK3399 boards are supported (aarch64): -- 2.26.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v3 8/9] rockchip: rk3328: Add support for ROC-RK3328-CC board 2020-04-27 6:52 ` [PATCH v3 8/9] rockchip: rk3328: Add support for ROC-RK3328-CC board Chen-Yu Tsai @ 2020-04-28 14:25 ` Kever Yang 2020-04-30 9:08 ` Kever Yang 1 sibling, 0 replies; 20+ messages in thread From: Kever Yang @ 2020-04-28 14:25 UTC (permalink / raw) To: u-boot On 2020/4/27 ??2:52, Chen-Yu Tsai wrote: > From: Chen-Yu Tsai <wens@csie.org> > > The ROC-RK3328-CC from Firefly and Libre Computer Project is a credit > card size development board based on the Rockchip RK3328 SoC, with: > > - 1/2/4 GB DDR4 DRAM > - eMMC connector for optional module > - micro SD card slot > - 1 x USB 3.0 host port > - 2 x USB 2.0 host port > - 1 x USB 2.0 OTG port > - HDMI video output > - TRRS connector with audio and composite video output > - gigabit Ethernet > - consumer IR receiver > - debug UART pins > > The ROC-RK3328-CC has the enable pin of the SD card power switch tied > to GPIO_0_D6. This pin also has the function SDMMC0_PWREN, which is > muxed by default. SDMMC0_PWREN is an active high signal controlled by > the MMC controller, however the switch enable is active low, and > pulled low (enabled) by default to make things work on boot. > > As such, we need to mux away from SDMMC0_PWREN and use GPIO to enable > power to the card. The default GPIO state for the pin is pull-down and > input, which doesn't require extra configuration when paired with the > external pull-down and active low switch. > > Deal with this by enabling regulator support in SPL, and setting > "u-boot,dm-spl" for the regulator and other device nodes needed for > muxing the pin. > > The device tree file is synced from the Linux kernel next-20200324. > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > Changes since v2: > - Remove regulator-always-on from VBUS regulator > - Disable CONFIG_PHY > Changes since v1: > - Drop custom target; use pinctrl and regulators in SPL > --- > arch/arm/dts/Makefile | 1 + > arch/arm/dts/rk3328-roc-cc-u-boot.dtsi | 47 ++++ > arch/arm/dts/rk3328-roc-cc.dts | 354 +++++++++++++++++++++++++ > board/rockchip/evb_rk3328/MAINTAINERS | 7 + > configs/roc-cc-rk3328_defconfig | 102 +++++++ > doc/README.rockchip | 4 +- > 6 files changed, 514 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/dts/rk3328-roc-cc-u-boot.dtsi > create mode 100644 arch/arm/dts/rk3328-roc-cc.dts > create mode 100644 configs/roc-cc-rk3328_defconfig > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index af7d804b6669..a683525e7c6a 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -106,6 +106,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \ > > dtb-$(CONFIG_ROCKCHIP_RK3328) += \ > rk3328-evb.dtb \ > + rk3328-roc-cc.dtb \ > rk3328-rock64.dtb > > dtb-$(CONFIG_ROCKCHIP_RK3368) += \ > diff --git a/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi b/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi > new file mode 100644 > index 000000000000..e929d86e306a > --- /dev/null > +++ b/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi > @@ -0,0 +1,47 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd > + */ > + > +#include "rk3328-u-boot.dtsi" > +#include "rk3328-sdram-ddr4-666.dtsi" > +/ { > + chosen { > + u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc; > + }; > +}; > + > +&gpio0 { > + u-boot,dm-spl; > +}; > + > +&pinctrl { > + u-boot,dm-spl; > +}; > + > +&sdmmc0m1_gpio { > + u-boot,dm-spl; > +}; > + > +&pcfg_pull_up_4ma { > + u-boot,dm-spl; > +}; > + > +&usb_host0_xhci { > + vbus-supply = <&vcc_host1_5v>; > + status = "okay"; > +}; > + > +/* > + * This makes XHCI responsible for toggling VBUS. This is needed to work > + * around an issue where either XHCI only works with USB 2.0 or OTG doesn't > + * work, depending on how VBUS is configured. Having USB 3.0 seems better. > + */ > +&vcc_host1_5v { > + /delete-property/ regulator-always-on; > +}; > + > +/* Need this and all the pinctrl/gpio stuff above to set pinmux */ > +&vcc_sd { > + u-boot,dm-spl; > +}; > diff --git a/arch/arm/dts/rk3328-roc-cc.dts b/arch/arm/dts/rk3328-roc-cc.dts > new file mode 100644 > index 000000000000..8d553c92182a > --- /dev/null > +++ b/arch/arm/dts/rk3328-roc-cc.dts > @@ -0,0 +1,354 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd > + */ > + > +/dts-v1/; > +#include "rk3328.dtsi" > + > +/ { > + model = "Firefly roc-rk3328-cc"; > + compatible = "firefly,roc-rk3328-cc", "rockchip,rk3328"; > + > + chosen { > + stdout-path = "serial2:1500000n8"; > + }; > + > + gmac_clkin: external-gmac-clock { > + compatible = "fixed-clock"; > + clock-frequency = <125000000>; > + clock-output-names = "gmac_clkin"; > + #clock-cells = <0>; > + }; > + > + dc_12v: dc-12v { > + compatible = "regulator-fixed"; > + regulator-name = "dc_12v"; > + regulator-always-on; > + regulator-boot-on; > + regulator-min-microvolt = <12000000>; > + regulator-max-microvolt = <12000000>; > + }; > + > + vcc_sd: sdmmc-regulator { > + compatible = "regulator-fixed"; > + gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>; > + pinctrl-names = "default"; > + pinctrl-0 = <&sdmmc0m1_gpio>; > + regulator-boot-on; > + regulator-name = "vcc_sd"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + vin-supply = <&vcc_io>; > + }; > + > + vcc_sdio: sdmmcio-regulator { > + compatible = "regulator-gpio"; > + gpios = <&grf_gpio 0 GPIO_ACTIVE_HIGH>; > + states = <1800000 0x1 > + 3300000 0x0>; > + regulator-name = "vcc_sdio"; > + regulator-type = "voltage"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + vin-supply = <&vcc_sys>; > + }; > + > + vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator { > + compatible = "regulator-fixed"; > + enable-active-high; > + gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; > + pinctrl-names = "default"; > + pinctrl-0 = <&usb20_host_drv>; > + regulator-name = "vcc_host1_5v"; > + regulator-always-on; > + vin-supply = <&vcc_sys>; > + }; > + > + vcc_sys: vcc-sys { > + compatible = "regulator-fixed"; > + regulator-name = "vcc_sys"; > + regulator-always-on; > + regulator-boot-on; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + vin-supply = <&dc_12v>; > + }; > + > + vcc_phy: vcc-phy-regulator { > + compatible = "regulator-fixed"; > + regulator-name = "vcc_phy"; > + regulator-always-on; > + regulator-boot-on; > + }; > + > + leds { > + compatible = "gpio-leds"; > + > + power { > + label = "firefly:blue:power"; > + linux,default-trigger = "heartbeat"; > + gpios = <&rk805 1 GPIO_ACTIVE_LOW>; > + default-state = "on"; > + mode = <0x23>; > + }; > + > + user { > + label = "firefly:yellow:user"; > + linux,default-trigger = "mmc1"; > + gpios = <&rk805 0 GPIO_ACTIVE_LOW>; > + default-state = "off"; > + mode = <0x05>; > + }; > + }; > +}; > + > +&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; > + max-frequency = <150000000>; > + mmc-ddr-1_8v; > + 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_phy>; > + phy-mode = "rgmii"; > + pinctrl-names = "default"; > + pinctrl-0 = <&rgmiim1_pins>; > + snps,aal; > + snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; > + snps,reset-active-low; > + snps,reset-delays-us = <0 10000 50000>; > + snps,rxpbl = <0x4>; > + snps,txpbl = <0x4>; > + tx_delay = <0x24>; > + rx_delay = <0x18>; > + status = "okay"; > +}; > + > +&hdmi { > + status = "okay"; > +}; > + > +&hdmiphy { > + status = "okay"; > +}; > + > +&i2c1 { > + status = "okay"; > + > + rk805: pmic at 18 { > + compatible = "rockchip,rk805"; > + reg = <0x18>; > + interrupt-parent = <&gpio1>; > + interrupts = <24 IRQ_TYPE_LEVEL_LOW>; > + #clock-cells = <1>; > + clock-output-names = "xin32k", "rk805-clkout2"; > + gpio-controller; > + #gpio-cells = <2>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pmic_int_l>; > + rockchip,system-power-controller; > + wakeup-source; > + > + vcc1-supply = <&vcc_sys>; > + vcc2-supply = <&vcc_sys>; > + vcc3-supply = <&vcc_sys>; > + vcc4-supply = <&vcc_sys>; > + vcc5-supply = <&vcc_io>; > + vcc6-supply = <&vcc_io>; > + > + regulators { > + vdd_logic: DCDC_REG1 { > + regulator-name = "vdd_logic"; > + regulator-min-microvolt = <712500>; > + regulator-max-microvolt = <1450000>; > + regulator-always-on; > + regulator-boot-on; > + regulator-state-mem { > + regulator-on-in-suspend; > + regulator-suspend-microvolt = <1000000>; > + }; > + }; > + > + vdd_arm: DCDC_REG2 { > + regulator-name = "vdd_arm"; > + regulator-min-microvolt = <712500>; > + regulator-max-microvolt = <1450000>; > + regulator-always-on; > + regulator-boot-on; > + regulator-state-mem { > + regulator-on-in-suspend; > + regulator-suspend-microvolt = <950000>; > + }; > + }; > + > + vcc_ddr: DCDC_REG3 { > + regulator-name = "vcc_ddr"; > + regulator-always-on; > + regulator-boot-on; > + regulator-state-mem { > + regulator-on-in-suspend; > + }; > + }; > + > + vcc_io: DCDC_REG4 { > + regulator-name = "vcc_io"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + regulator-boot-on; > + regulator-state-mem { > + regulator-on-in-suspend; > + regulator-suspend-microvolt = <3300000>; > + }; > + }; > + > + vcc_18: LDO_REG1 { > + regulator-name = "vcc_18"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-always-on; > + regulator-boot-on; > + regulator-state-mem { > + regulator-on-in-suspend; > + regulator-suspend-microvolt = <1800000>; > + }; > + }; > + > + vcc18_emmc: LDO_REG2 { > + regulator-name = "vcc18_emmc"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-always-on; > + regulator-boot-on; > + regulator-state-mem { > + regulator-on-in-suspend; > + regulator-suspend-microvolt = <1800000>; > + }; > + }; > + > + vdd_10: LDO_REG3 { > + regulator-name = "vdd_10"; > + regulator-min-microvolt = <1000000>; > + regulator-max-microvolt = <1000000>; > + regulator-always-on; > + regulator-boot-on; > + regulator-state-mem { > + regulator-on-in-suspend; > + regulator-suspend-microvolt = <1000000>; > + }; > + }; > + }; > + }; > +}; > + > +&io_domains { > + status = "okay"; > + > + vccio1-supply = <&vcc_io>; > + vccio2-supply = <&vcc18_emmc>; > + vccio3-supply = <&vcc_sdio>; > + 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 = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>; > + }; > + }; > + > + usb2 { > + usb20_host_drv: usb20-host-drv { > + rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + }; > +}; > + > +&sdmmc { > + bus-width = <4>; > + cap-mmc-highspeed; > + cap-sd-highspeed; > + disable-wp; > + max-frequency = <150000000>; > + pinctrl-names = "default"; > + pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>; > + sd-uhs-sdr12; > + sd-uhs-sdr25; > + sd-uhs-sdr50; > + sd-uhs-sdr104; > + vmmc-supply = <&vcc_sd>; > + vqmmc-supply = <&vcc_sdio>; > + status = "okay"; > +}; > + > +&tsadc { > + status = "okay"; > +}; > + > +&u2phy { > + status = "okay"; > +}; > + > +&u2phy_host { > + status = "okay"; > +}; > + > +&u2phy_otg { > + status = "okay"; > +}; > + > +&uart2 { > + status = "okay"; > +}; > + > +&usb20_otg { > + status = "okay"; > +}; > + > +&usb_host0_ehci { > + status = "okay"; > +}; > + > +&usb_host0_ohci { > + status = "okay"; > +}; > + > +&vop { > + status = "okay"; > +}; > + > +&vop_mmu { > + status = "okay"; > +}; > diff --git a/board/rockchip/evb_rk3328/MAINTAINERS b/board/rockchip/evb_rk3328/MAINTAINERS > index c661d2e06ae3..c6c22a373df5 100644 > --- a/board/rockchip/evb_rk3328/MAINTAINERS > +++ b/board/rockchip/evb_rk3328/MAINTAINERS > @@ -5,6 +5,13 @@ F: board/rockchip/evb_rk3328 > F: include/configs/evb_rk3328.h > F: configs/evb-rk3328_defconfig > > +ROC-RK3328-CC > +M: Loic Devulder <ldevulder@suse.com> > +M: Chen-Yu Tsai <wens@csie.org> > +S: Maintained > +F: configs/roc-rk3328-cc_defconfig > +F: arch/arm/dts/rk3328-roc-cc-u-boot.dtsi > + > ROCK64-RK3328 > M: Matwey V. Kornilov <matwey.kornilov@gmail.com> > S: Maintained > diff --git a/configs/roc-cc-rk3328_defconfig b/configs/roc-cc-rk3328_defconfig > new file mode 100644 > index 000000000000..933a1c6967d4 > --- /dev/null > +++ b/configs/roc-cc-rk3328_defconfig > @@ -0,0 +1,102 @@ > +CONFIG_ARM=y > +CONFIG_ARCH_ROCKCHIP=y > +CONFIG_SYS_TEXT_BASE=0x00200000 > +CONFIG_SPL_GPIO_SUPPORT=y > +CONFIG_ENV_OFFSET=0x3F8000 > +CONFIG_ROCKCHIP_RK3328=y > +CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y > +CONFIG_TPL_LIBCOMMON_SUPPORT=y > +CONFIG_TPL_LIBGENERIC_SUPPORT=y > +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y > +CONFIG_SPL_STACK_R_ADDR=0x600000 > +CONFIG_NR_DRAM_BANKS=1 > +CONFIG_DEBUG_UART_BASE=0xFF130000 > +CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_SMBIOS_PRODUCT_NAME="roc-rk3328-cc" > +CONFIG_DEBUG_UART=y > +CONFIG_TPL_SYS_MALLOC_F_LEN=0x800 > +# CONFIG_ANDROID_BOOT_IMAGE is not set > +CONFIG_FIT=y > +CONFIG_FIT_VERBOSE=y > +CONFIG_SPL_LOAD_FIT=y > +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-roc-cc.dtb" > +CONFIG_MISC_INIT_R=y > +# CONFIG_DISPLAY_CPUINFO is not set > +CONFIG_DISPLAY_BOARDINFO_LATE=y > +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > +CONFIG_TPL_SYS_MALLOC_SIMPLE=y > +CONFIG_SPL_STACK_R=y > +CONFIG_SPL_I2C_SUPPORT=y > +CONFIG_SPL_POWER_SUPPORT=y > +CONFIG_SPL_ATF=y > +CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y > +CONFIG_CMD_BOOTZ=y > +CONFIG_CMD_GPT=y > +CONFIG_CMD_MMC=y > +CONFIG_CMD_USB=y > +# CONFIG_CMD_SETEXPR is not set > +CONFIG_CMD_TIME=y > +CONFIG_SPL_OF_CONTROL=y > +CONFIG_TPL_OF_CONTROL=y > +CONFIG_DEFAULT_DEVICE_TREE="rk3328-roc-cc" > +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > +CONFIG_TPL_OF_PLATDATA=y > +CONFIG_ENV_IS_IN_MMC=y > +CONFIG_SYS_RELOC_GD_ENV_ADDR=y > +CONFIG_NET_RANDOM_ETHADDR=y > +CONFIG_TPL_DM=y > +CONFIG_REGMAP=y > +CONFIG_SPL_REGMAP=y > +CONFIG_TPL_REGMAP=y > +CONFIG_SYSCON=y > +CONFIG_SPL_SYSCON=y > +CONFIG_TPL_SYSCON=y > +CONFIG_CLK=y > +CONFIG_SPL_CLK=y > +CONFIG_FASTBOOT_BUF_ADDR=0x800800 > +CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > +CONFIG_ROCKCHIP_GPIO=y > +CONFIG_SYS_I2C_ROCKCHIP=y > +CONFIG_MMC_DW=y > +CONFIG_MMC_DW_ROCKCHIP=y > +CONFIG_SF_DEFAULT_SPEED=20000000 > +CONFIG_PHY_REALTEK=y > +CONFIG_DM_ETH=y > +CONFIG_PHY_GIGE=y > +CONFIG_ETH_DESIGNWARE=y > +CONFIG_GMAC_ROCKCHIP=y > +CONFIG_PINCTRL=y > +CONFIG_SPL_PINCTRL=y > +CONFIG_DM_PMIC=y > +CONFIG_PMIC_RK8XX=y > +CONFIG_SPL_DM_REGULATOR=y > +CONFIG_REGULATOR_PWM=y > +CONFIG_DM_REGULATOR_FIXED=y > +CONFIG_SPL_DM_REGULATOR_FIXED=y > +CONFIG_DM_REGULATOR_GPIO=y > +CONFIG_REGULATOR_RK8XX=y > +CONFIG_PWM_ROCKCHIP=y > +CONFIG_RAM=y > +CONFIG_SPL_RAM=y > +CONFIG_TPL_RAM=y > +CONFIG_DM_RESET=y > +CONFIG_BAUDRATE=1500000 > +CONFIG_DEBUG_UART_SHIFT=2 > +CONFIG_SYSRESET=y > +# CONFIG_TPL_SYSRESET is not set > +CONFIG_USB=y > +CONFIG_USB_XHCI_HCD=y > +CONFIG_USB_XHCI_DWC3=y > +CONFIG_USB_EHCI_HCD=y > +CONFIG_USB_EHCI_GENERIC=y > +CONFIG_USB_OHCI_HCD=y > +CONFIG_USB_OHCI_GENERIC=y > +CONFIG_USB_DWC2=y > +CONFIG_USB_DWC3=y > +# CONFIG_USB_DWC3_GADGET is not set > +CONFIG_USB_GADGET=y > +CONFIG_USB_GADGET_DWC2_OTG=y > +CONFIG_SPL_TINY_MEMSET=y > +CONFIG_TPL_TINY_MEMSET=y > +CONFIG_ERRNO_STR=y > +CONFIG_SMBIOS_MANUFACTURER="firefly" > diff --git a/doc/README.rockchip b/doc/README.rockchip > index 9b699b9ae5d3..70c8798ed2d0 100644 > --- a/doc/README.rockchip > +++ b/doc/README.rockchip > @@ -52,10 +52,12 @@ Two RK3308 boards are supported: > - EVB RK3308 - use evb-rk3308 configuration > - ROC-CC-RK3308 - use roc-cc-rk3308 configuration > > -Two RK3328 board are supported: > +Three RK3328 boards are supported: > > - EVB RK3328 - use evb-rk3328_defconfig > - Pine64 Rock64 board - use rock64-rk3328_defconfig > + - Firefly / Libre Computer Project ROC-RK3328-CC board - > + use roc-cc-rk3328_defconfig > > Size RK3399 boards are supported (aarch64): > ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v3 8/9] rockchip: rk3328: Add support for ROC-RK3328-CC board 2020-04-27 6:52 ` [PATCH v3 8/9] rockchip: rk3328: Add support for ROC-RK3328-CC board Chen-Yu Tsai 2020-04-28 14:25 ` Kever Yang @ 2020-04-30 9:08 ` Kever Yang 2020-04-30 9:16 ` Chen-Yu Tsai 1 sibling, 1 reply; 20+ messages in thread From: Kever Yang @ 2020-04-30 9:08 UTC (permalink / raw) To: u-boot On 2020/4/27 ??2:52, Chen-Yu Tsai wrote: > --- a/board/rockchip/evb_rk3328/MAINTAINERS > +++ b/board/rockchip/evb_rk3328/MAINTAINERS > @@ -5,6 +5,13 @@ F: board/rockchip/evb_rk3328 > F: include/configs/evb_rk3328.h > F: configs/evb-rk3328_defconfig > > +ROC-RK3328-CC > +M: Loic Devulder<ldevulder@suse.com> > +M: Chen-Yu Tsai<wens@csie.org> > +S: Maintained > +F: configs/roc-rk3328-cc_defconfig This need to be roc-cc-rk3328_defconfig, or else there will be warning: WARNING: no status info for 'roc-cc-rk3328' WARNING: no maintainers for 'roc-cc-rk3328' I will update it before merge. Thanks, - Kever > +F: arch/arm/dts/rk3328-roc-cc-u-boot.dtsi > + ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v3 8/9] rockchip: rk3328: Add support for ROC-RK3328-CC board 2020-04-30 9:08 ` Kever Yang @ 2020-04-30 9:16 ` Chen-Yu Tsai 0 siblings, 0 replies; 20+ messages in thread From: Chen-Yu Tsai @ 2020-04-30 9:16 UTC (permalink / raw) To: u-boot On Thu, Apr 30, 2020 at 5:08 PM Kever Yang <kever.yang@rock-chips.com> wrote: > > > On 2020/4/27 ??2:52, Chen-Yu Tsai wrote: > > --- a/board/rockchip/evb_rk3328/MAINTAINERS > > +++ b/board/rockchip/evb_rk3328/MAINTAINERS > > @@ -5,6 +5,13 @@ F: board/rockchip/evb_rk3328 > > F: include/configs/evb_rk3328.h > > F: configs/evb-rk3328_defconfig > > > > +ROC-RK3328-CC > > +M: Loic Devulder<ldevulder@suse.com> > > +M: Chen-Yu Tsai<wens@csie.org> > > +S: Maintained > > +F: configs/roc-rk3328-cc_defconfig > > This need to be roc-cc-rk3328_defconfig, or else there will be warning: > > WARNING: no status info for 'roc-cc-rk3328' > WARNING: no maintainers for 'roc-cc-rk3328' > > I will update it before merge. Sorry about that, and thanks for fixing it up. ChenYu > Thanks, > > - Kever > > > +F: arch/arm/dts/rk3328-roc-cc-u-boot.dtsi > > + > > ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v3 9/9] rockchip: dts: rock64: Fix XHCI usage 2020-04-27 6:52 [PATCH v3 0/9] rockchip: rk3328: sync dts and add ROC-RK3328-CC board Chen-Yu Tsai ` (7 preceding siblings ...) 2020-04-27 6:52 ` [PATCH v3 8/9] rockchip: rk3328: Add support for ROC-RK3328-CC board Chen-Yu Tsai @ 2020-04-27 6:52 ` Chen-Yu Tsai 2020-04-28 14:26 ` Kever Yang 2020-04-30 9:04 ` [PATCH v3 0/9] rockchip: rk3328: sync dts and add ROC-RK3328-CC board Kever Yang 9 siblings, 1 reply; 20+ messages in thread From: Chen-Yu Tsai @ 2020-04-27 6:52 UTC (permalink / raw) To: u-boot From: Chen-Yu Tsai <wens@csie.org> If the VBUS regulator is always-on, XHCI will fail to detect USB 3.0 devices; USB 2.0 devices will work however. Make the VBUS regulator controllable and tie it to only the XHCI. This makes all three USB ports usable. Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- Changes since v2: - new patch --- arch/arm/dts/rk3328-rock64-u-boot.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi index e5946d2d2dc7..8318bf4e6030 100644 --- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi +++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi @@ -12,5 +12,16 @@ }; &usb_host0_xhci { + vbus-supply = <&vcc_host_5v>; status = "okay"; }; + +/* + * This makes XHCI responsible for toggling VBUS. This is needed to work + * around an issue where either XHCI only works with USB 2.0 or OTG doesn't + * work, depending on how VBUS is configured. Having USB 3.0 seems better. + */ +&vcc_host_5v { + /delete-property/ regulator-always-on; + /delete-property/ regulator-boot-on; +}; -- 2.26.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v3 9/9] rockchip: dts: rock64: Fix XHCI usage 2020-04-27 6:52 ` [PATCH v3 9/9] rockchip: dts: rock64: Fix XHCI usage Chen-Yu Tsai @ 2020-04-28 14:26 ` Kever Yang 0 siblings, 0 replies; 20+ messages in thread From: Kever Yang @ 2020-04-28 14:26 UTC (permalink / raw) To: u-boot On 2020/4/27 ??2:52, Chen-Yu Tsai wrote: > From: Chen-Yu Tsai <wens@csie.org> > > If the VBUS regulator is always-on, XHCI will fail to detect USB 3.0 > devices; USB 2.0 devices will work however. > > Make the VBUS regulator controllable and tie it to only the XHCI. This > makes all three USB ports usable. > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > Changes since v2: > - new patch > --- > arch/arm/dts/rk3328-rock64-u-boot.dtsi | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi > index e5946d2d2dc7..8318bf4e6030 100644 > --- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi > +++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi > @@ -12,5 +12,16 @@ > }; > > &usb_host0_xhci { > + vbus-supply = <&vcc_host_5v>; > status = "okay"; > }; > + > +/* > + * This makes XHCI responsible for toggling VBUS. This is needed to work > + * around an issue where either XHCI only works with USB 2.0 or OTG doesn't > + * work, depending on how VBUS is configured. Having USB 3.0 seems better. > + */ > +&vcc_host_5v { > + /delete-property/ regulator-always-on; > + /delete-property/ regulator-boot-on; > +}; ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v3 0/9] rockchip: rk3328: sync dts and add ROC-RK3328-CC board 2020-04-27 6:52 [PATCH v3 0/9] rockchip: rk3328: sync dts and add ROC-RK3328-CC board Chen-Yu Tsai ` (8 preceding siblings ...) 2020-04-27 6:52 ` [PATCH v3 9/9] rockchip: dts: rock64: Fix XHCI usage Chen-Yu Tsai @ 2020-04-30 9:04 ` Kever Yang 9 siblings, 0 replies; 20+ messages in thread From: Kever Yang @ 2020-04-30 9:04 UTC (permalink / raw) To: u-boot On 2020/4/27 ??2:52, Chen-Yu Tsai wrote: > From: Chen-Yu Tsai <wens@csie.org> > > Hi everyone, > > This is v3 of my ROC-RK3328-CC series. Changes from v2 are mainly > fixing USB functionality on RK3328 in U-boot. This includes restoring > the U-Boot specific "hnp-srp-disable" property for dwc2, moving the > dwc2 device node after the ehci/ohci ones, and making vbus controllable > and tied only to the XHCI controller. Because of this, I dropped review > and tested tags from the DTS sync and new board patches. > > Changes from v1 are mainly dropping the custom board target, and dealing > with the pinmuxing through proper use of DM regulators / GPIO / pinctrl > in SPL. > > This series adds proper support for Firefly / Libre Computer ROC-RK3328-CC > single board computer. > > The ROC-RK3328-CC from Firefly and Libre Computer Project is a credit > card size development board based on the Rockchip RK3328 SoC, with: > > - 1/2/4 GB DDR4 DRAM > - eMMC connector for optional module > - micro SD card slot > - 1 x USB 3.0 host port > - 2 x USB 2.0 host port > - 1 x USB 2.0 OTG port > - HDMI video output > - TRRS connector with audio and composite video output > - gigabit Ethernet > - consumer IR receiver > - debug UART pins > > Originally I started with Loic's patches, and syncing the device tree > files from Linux. That didn't get very far, with SPL failing to detect > the SD card. Examining the schematics and internal state of GRF and > GPIOs, I realized that the logic for the SD card power enable switch > is opposite that of what the SD card controller's SDMMC0_PWREN pin > would use. Instead, directly using the GPIO is required. > > To deal with this, DM regulator and GPIO are enabled in SPL, and > various device nodes are marked with u-boot,dm-spl to have them work. > pinctrl properties are not stripped, so as to have the SDMMC0_PWREN > pin muxed over to GPIO. > > Along the way, there are some clean-ups of existing dts files, moving > U-boot only features to -u-boot.dtsi files, and then a wholesale sync > from Linux. Only boards already existing in U-boot are synced. DT > binding header files are synced separately as there is already one > patch floating around. The DT sync also includes clean-up changes only > recently posted, and likely won't make it in for at least a few weeks. > > Please have a look, and test if possible. I cc-ed a couple people that > showed interest in this board on mailing lists recently. > > Regards > ChenYu > > > Chen-Yu Tsai (9): > rockchip: dts: rk3328-evb: Move vcc5v0-host-xhci-drv to -u-boot.dtsi > rockchip: dts: rk3328-evb: Move gmac2io related nodes to -u-boot.dtsi > rockchip: dts: rk3328: Move OTG node's hnp-srp-disable to > rk3328-u-boot.dtsi > dt-bindings: clock: rk3328: sync from upstream Linux kernel > dt-bindings: power: rk3328-power: sync from upstream Linux kernel > rockchip: rk3328: Disable generic PHY support > rockchip: dts: rk3328: Sync device tree files from Linux > rockchip: rk3328: Add support for ROC-RK3328-CC board > rockchip: dts: rock64: Fix XHCI usage > > arch/arm/dts/Makefile | 1 + > arch/arm/dts/rk3328-evb-u-boot.dtsi | 39 + > arch/arm/dts/rk3328-evb.dts | 220 +-- > arch/arm/dts/rk3328-roc-cc-u-boot.dtsi | 47 + > .../{rk3328-rock64.dts => rk3328-roc-cc.dts} | 135 +- > arch/arm/dts/rk3328-rock64-u-boot.dtsi | 11 + > arch/arm/dts/rk3328-rock64.dts | 132 +- > arch/arm/dts/rk3328-u-boot.dtsi | 4 + > arch/arm/dts/rk3328.dtsi | 1415 +++++++++++------ > board/rockchip/evb_rk3328/MAINTAINERS | 7 + > configs/evb-rk3328_defconfig | 1 - > ...3328_defconfig => roc-cc-rk3328_defconfig} | 19 +- > configs/rock64-rk3328_defconfig | 1 - > doc/README.rockchip | 4 +- > include/dt-bindings/clock/rk3328-cru.h | 212 +-- > include/dt-bindings/power/rk3328-power.h | 19 + > 16 files changed, 1514 insertions(+), 753 deletions(-) > create mode 100644 arch/arm/dts/rk3328-roc-cc-u-boot.dtsi > copy arch/arm/dts/{rk3328-rock64.dts => rk3328-roc-cc.dts} (68%) > copy configs/{rock64-rk3328_defconfig => roc-cc-rk3328_defconfig} (81%) > create mode 100644 include/dt-bindings/power/rk3328-power.h > Applied to u-boot-rockchip/master, Thanks, - Kever ^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2020-05-14 17:02 UTC | newest] Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-04-27 6:52 [PATCH v3 0/9] rockchip: rk3328: sync dts and add ROC-RK3328-CC board Chen-Yu Tsai 2020-04-27 6:52 ` [PATCH v3 1/9] rockchip: dts: rk3328-evb: Move vcc5v0-host-xhci-drv to -u-boot.dtsi Chen-Yu Tsai 2020-04-27 6:52 ` [PATCH v3 2/9] rockchip: dts: rk3328-evb: Move gmac2io related nodes " Chen-Yu Tsai 2020-04-27 6:52 ` [PATCH v3 3/9] rockchip: dts: rk3328: Move OTG node's hnp-srp-disable to rk3328-u-boot.dtsi Chen-Yu Tsai 2020-04-28 14:23 ` Kever Yang 2020-04-27 6:52 ` [PATCH v3 4/9] dt-bindings: clock: rk3328: sync from upstream Linux kernel Chen-Yu Tsai 2020-04-27 6:52 ` [PATCH v3 5/9] dt-bindings: power: rk3328-power: " Chen-Yu Tsai 2020-04-27 6:52 ` [PATCH v3 6/9] rockchip: rk3328: Disable generic PHY support Chen-Yu Tsai 2020-04-28 14:24 ` Kever Yang 2020-04-27 6:52 ` [PATCH v3 7/9] rockchip: dts: rk3328: Sync device tree files from Linux Chen-Yu Tsai 2020-05-11 18:59 ` Kurt Miller 2020-05-14 4:10 ` Chen-Yu Tsai 2020-05-14 17:02 ` Kurt Miller 2020-04-27 6:52 ` [PATCH v3 8/9] rockchip: rk3328: Add support for ROC-RK3328-CC board Chen-Yu Tsai 2020-04-28 14:25 ` Kever Yang 2020-04-30 9:08 ` Kever Yang 2020-04-30 9:16 ` Chen-Yu Tsai 2020-04-27 6:52 ` [PATCH v3 9/9] rockchip: dts: rock64: Fix XHCI usage Chen-Yu Tsai 2020-04-28 14:26 ` Kever Yang 2020-04-30 9:04 ` [PATCH v3 0/9] rockchip: rk3328: sync dts and add ROC-RK3328-CC board Kever Yang
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.