Hi Sascha,
Very nice, thanks for the patches.
On 10/1/24 12:47, Sascha Hauer wrote:
> rk3568-wolfvision-pf5-io-expander-upstream.dtso has been merged in the
> upstream dts files, so switch to using the upstream version.
>
> Signed-off-by: Sascha Hauer <s.ha...@pengutronix.de>
Reviewed-by: Michael Riesch <michael.rie...@wolfvision.net>
Regards, Michael
> ---
> ...8-wolfvision-pf5-io-expander-upstream.dtso | 137 ------------------
> .../rk3568-wolfvision-pf5-io-expander.dtso | 2 +-
> 2 files changed, 1 insertion(+), 138 deletions(-)
> delete mode 100644
> arch/arm/dts/rk3568-wolfvision-pf5-io-expander-upstream.dtso
>
> diff --git a/arch/arm/dts/rk3568-wolfvision-pf5-io-expander-upstream.dtso
> b/arch/arm/dts/rk3568-wolfvision-pf5-io-expander-upstream.dtso
> deleted file mode 100644
> index ebcaeafc38..0000000000
> --- a/arch/arm/dts/rk3568-wolfvision-pf5-io-expander-upstream.dtso
> +++ /dev/null
> @@ -1,137 +0,0 @@
> -// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
> -/*
> - * Device tree overlay for the WolfVision PF5 IO Expander board.
> - *
> - * Copyright (C) 2024 WolfVision GmbH.
> - */
> -
> -/dts-v1/;
> -/plugin/;
> -
> -#include <dt-bindings/clock/rk3568-cru.h>
> -#include <dt-bindings/gpio/gpio.h>
> -#include <dt-bindings/interrupt-controller/irq.h>
> -#include <dt-bindings/pinctrl/rockchip.h>
> -
> -&{/} {
> - gmac0_clkin: external-gmac0-clock {
> - compatible = "fixed-clock";
> - clock-frequency = <50000000>;
> - clock-output-names = "gmac0_clkin";
> - #clock-cells = <0>;
> - };
> -
> - usb_host_vbus: usb-host-vbus-regulator {
> - compatible = "regulator-fixed";
> - enable-active-high;
> - gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&usb_host_vbus_en>;
> - regulator-name = "usb_host_vbus";
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - vin-supply = <&vcc5v_in>;
> - };
> -
> - vcc1v8_eth: vcc1v8-eth-regulator {
> - compatible = "regulator-fixed";
> - enable-active-high;
> - gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&vcc1v8_eth_en>;
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-name = "1v8_eth";
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - vin-supply = <&vcc3v3_sys>;
> - };
> -
> - vcc3v3_eth: vcc3v3-eth-regulator {
> - compatible = "regulator-fixed";
> - enable-active-low;
> - gpio = <&gpio0 RK_PC0 GPIO_ACTIVE_LOW>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&vcc3v3_eth_enn>;
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-name = "3v3_eth";
> - regulator-min-microvolt = <3300000>;
> - regulator-max-microvolt = <3300000>;
> - vin-supply = <&vcc3v3_sys>;
> - };
> -};
> -
> -&gmac0 {
> - assigned-clocks = <&cru SCLK_GMAC0_RX_TX>,
> - <&cru SCLK_GMAC0>;
> - assigned-clock-parents = <&cru SCLK_GMAC0_RMII_SPEED>,
> - <&gmac0_clkin>;
> - clock_in_out = "input";
> - phy-handle = <&dp83826>;
> - phy-mode = "rmii";
> - phy-supply = <&vcc3v3_eth>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&gmac0_miim
> - &gmac0_clkinout
> - &gmac0_rx_er
> - &gmac0_rx_bus2
> - &gmac0_tx_bus2>;
> - status = "okay";
> -};
> -
> -&mdio0 {
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - dp83826: ethernet-phy@0 {
> - compatible = "ethernet-phy-ieee802.3-c22";
> - reg = <0x0>;
> - interrupt-parent = <&gpio0>;
> - interrupts = <RK_PD3 IRQ_TYPE_EDGE_FALLING>;
> - pinctrl-names = "default";
> - pinctrl-0 = <ð_wake_intn ð_phy_rstn>;
> - reset-assert-us = <1000>;
> - reset-deassert-us = <2000>;
> - reset-gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_LOW>;
> - wakeup-source;
> - };
> -};
> -
> -&pinctrl {
> - ethernet {
> - eth_wake_intn: eth-wake-intn-pinctrl {
> - rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> -
> - eth_phy_rstn: eth-phy-rstn-pinctrl {
> - rockchip,pins = <0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> -
> - vcc1v8_eth_en: vcc1v8-eth-en-pinctrl {
> - rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> -
> - vcc3v3_eth_enn: vcc3v3-eth-enn-pinctrl {
> - rockchip,pins = <0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> - };
> -
> - usb {
> - usb_host_vbus_en: usb-host-vbus-en-pinctrl {
> - rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> - };
> -};
> -
> -&usb_host1_xhci {
> - maximum-speed = "high-speed";
> - phys = <&usb2phy0_host>;
> - phy-names = "usb2-phy";
> - status = "okay";
> -};
> -
> -&usb2phy0_host {
> - phy-supply = <&usb_host_vbus>;
> - status = "okay";
> -};
> diff --git a/arch/arm/dts/rk3568-wolfvision-pf5-io-expander.dtso
> b/arch/arm/dts/rk3568-wolfvision-pf5-io-expander.dtso
> index 37b48afd2d..5160a7ec1a 100644
> --- a/arch/arm/dts/rk3568-wolfvision-pf5-io-expander.dtso
> +++ b/arch/arm/dts/rk3568-wolfvision-pf5-io-expander.dtso
> @@ -8,4 +8,4 @@
> /dts-v1/;
> /plugin/;
>
> -#include "rk3568-wolfvision-pf5-io-expander-upstream.dtso"
> +#include <arm64/rockchip/rk3568-wolfvision-pf5-io-expander.dtso>
