diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-06 10:35:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-06 10:35:18 -0500 |
| commit | bead4f2f2c85e1bf39d2c80ef733f1325eb336bb (patch) | |
| tree | ab462e322dffa41f8719a25eaa029b9900fe1e55 /arch/arm/dts/rk3308-roc-cc.dts | |
| parent | edbb8e09183e6c232b14ed1a087f93b7f0b560ac (diff) | |
| parent | b2e373d16b0345d3c3f4beefdf0889e83faf173d (diff) | |
Merge tag 'u-boot-rockchip-20191206' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- rockchip pwm driver update to support all the SoCs
- RK3308 GMAC and pinctrl support
- More UART interface support on PX30 and pmugrf reg fix
- Fixup on misc for eth_addr/serial#
- Other updates on variant SoCs
Diffstat (limited to 'arch/arm/dts/rk3308-roc-cc.dts')
| -rw-r--r-- | arch/arm/dts/rk3308-roc-cc.dts | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/dts/rk3308-roc-cc.dts b/arch/arm/dts/rk3308-roc-cc.dts index e10aa638a3..b4a54a852c 100644 --- a/arch/arm/dts/rk3308-roc-cc.dts +++ b/arch/arm/dts/rk3308-roc-cc.dts @@ -143,6 +143,15 @@ }; }; +&mac { + assigned-clocks = <&cru SCLK_MAC>; + assigned-clock-parents = <&mac_clkin>; + clock_in_out = "input"; + pinctrl-names = "default"; + pinctrl-0 = <&rmiim1_pins &macm1_refclk>; + status = "okay"; +}; + &pwm5 { status = "okay"; pinctrl-names = "active"; |