On Wed, Jun 08, 2022 at 10:17:47PM +0200, Michael Riesch wrote:
> The RK3568 EVB1 device tree in mainline Linux has matured since
> the initial RK3568 support entered barebox. Therefore, we can now
> switch to the mainline device tree.
>
> Signed-off-by: Michael Riesch <michael.riesch@xxxxxxxxxxxxxx>
> ---
> arch/arm/boards/rockchip-rk3568-evb/board.c | 5 +-
> arch/arm/dts/rk3568-evb1-v10.dts | 519 +-------------------
> 2 files changed, 5 insertions(+), 519 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/arch/arm/boards/rockchip-rk3568-evb/board.c b/arch/arm/boards/rockchip-rk3568-evb/board.c
> index 09385bea29..a466d385a2 100644
> --- a/arch/arm/boards/rockchip-rk3568-evb/board.c
> +++ b/arch/arm/boards/rockchip-rk3568-evb/board.c
> @@ -28,8 +28,9 @@ static int rk3568_evb_probe(struct device_d *dev)
> else
> of_device_enable_path("/chosen/environment-emmc");
>
> - rk3568_bbu_mmc_register("emmc", BBU_HANDLER_FLAG_DEFAULT, "/dev/emmc");
> - rk3568_bbu_mmc_register("sd", 0, "/dev/sd");
> + rk3568_bbu_mmc_register("sd", 0, "/dev/mmc0");
> + rk3568_bbu_mmc_register("emmc", BBU_HANDLER_FLAG_DEFAULT,
> + "/dev/mmc1");
>
> return 0;
> }
> diff --git a/arch/arm/dts/rk3568-evb1-v10.dts b/arch/arm/dts/rk3568-evb1-v10.dts
> index df5633978d..d2c1fc89a8 100644
> --- a/arch/arm/dts/rk3568-evb1-v10.dts
> +++ b/arch/arm/dts/rk3568-evb1-v10.dts
> @@ -5,22 +5,11 @@
> */
>
> /dts-v1/;
> -#include <dt-bindings/gpio/gpio.h>
> -#include <dt-bindings/pinctrl/rockchip.h>
> -#include "rk3568.dtsi"
>
> -/ {
> - model = "Rockchip RK3568 EVB1 DDR4 V10 Board";
> - compatible = "rockchip,rk3568-evb1-v10", "rockchip,rk3568";
> -
> - aliases {
> - emmc = &sdhci;
> - sd = &sdmmc0;
> - };
> +#include <arm64/rockchip/rk3568-evb1-v10.dts>
>
> +/ {
> chosen: chosen {
> - stdout-path = "serial2:1500000n8";
> -
> environment-sd {
> compatible = "barebox,environment";
> device-path = &environment_sd;
> @@ -38,437 +27,10 @@
> device_type = "memory";
> reg = <0x0 0x00a00000 0x0 0x7f600000>;
> };
> -
> - 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>;
> - };
> -
> - vcc3v3_sys: vcc3v3-sys {
> - compatible = "regulator-fixed";
> - regulator-name = "vcc3v3_sys";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <3300000>;
> - regulator-max-microvolt = <3300000>;
> - vin-supply = <&dc_12v>;
> - };
> -
> - vcc5v0_sys: vcc5v0-sys {
> - compatible = "regulator-fixed";
> - regulator-name = "vcc5v0_sys";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - vin-supply = <&dc_12v>;
> - };
> -
> - vcc3v3_lcd0_n: vcc3v3-lcd0-n {
> - compatible = "regulator-fixed";
> - regulator-name = "vcc3v3_lcd0_n";
> - regulator-boot-on;
> -
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vcc3v3_lcd1_n: vcc3v3-lcd1-n {
> - compatible = "regulator-fixed";
> - regulator-name = "vcc3v3_lcd1_n";
> - regulator-boot-on;
> -
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vcc5v0_otg: vcc5v0-otg-regulator {
> - compatible = "regulator-fixed";
> - enable-active-high;
> - gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&vcc5v0_otg_en>;
> - regulator-name = "vcc5v0_otg";
> - };
> -
> - vcc5v0_host: vcc5v0-host-regulator {
> - compatible = "regulator-fixed";
> - enable-active-high;
> - gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&vcc5v0_host_en>;
> - regulator-name = "vcc5v0_host";
> - regulator-always-on;
> - };
> -};
> -
> -&gmac0 {
> - phy-mode = "rgmii";
> - clock_in_out = "output";
> -
> - assigned-clocks = <&cru SCLK_GMAC0_RX_TX>, <&cru SCLK_GMAC0>;
> - assigned-clock-parents = <&cru SCLK_GMAC0_RGMII_SPEED>;
> - assigned-clock-rates = <0>, <125000000>;
> -
> - pinctrl-names = "default";
> - pinctrl-0 = <&gmac0_miim
> - &gmac0_tx_bus2
> - &gmac0_rx_bus2
> - &gmac0_rgmii_clk
> - &gmac0_rgmii_bus>;
> -
> - tx_delay = <0x3c>;
> - rx_delay = <0x2f>;
> -
> - phy-handle = <&rgmii_phy0>;
> - status = "okay";
> -};
> -
> -&gmac1 {
> - phy-mode = "rgmii";
> - clock_in_out = "output";
> -
> - assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1>;
> - assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>;
> - assigned-clock-rates = <0>, <125000000>;
> -
> - pinctrl-names = "default";
> - pinctrl-0 = <&gmac1m1_miim
> - &gmac1m1_tx_bus2
> - &gmac1m1_rx_bus2
> - &gmac1m1_rgmii_clk
> - &gmac1m1_rgmii_bus>;
> -
> - tx_delay = <0x4f>;
> - rx_delay = <0x26>;
> -
> - phy-handle = <&rgmii_phy1>;
> - status = "okay";
> -};
> -
> -&i2c0 {
> - status = "okay";
> -
> - rk809: pmic@20 {
> - compatible = "rockchip,rk809";
> - reg = <0x20>;
> - interrupt-parent = <&gpio0>;
> - interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
> -
> - pinctrl-names = "default", "pmic-sleep",
> - "pmic-power-off", "pmic-reset";
> - pinctrl-0 = <&pmic_int>;
> - pinctrl-1 = <&soc_slppin_slp>, <&rk817_slppin_slp>;
> - pinctrl-2 = <&soc_slppin_gpio>, <&rk817_slppin_pwrdn>;
> - pinctrl-3 = <&soc_slppin_gpio>, <&rk817_slppin_rst>;
> -
> - rockchip,system-power-controller;
> - wakeup-source;
> - #clock-cells = <1>;
> - clock-output-names = "rk808-clkout1", "rk808-clkout2";
> - //fb-inner-reg-idxs = <2>;
> - /* 1: rst regs (default in codes), 0: rst the pmic */
> - pmic-reset-func = <0>;
> -
> - vcc1-supply = <&vcc3v3_sys>;
> - vcc2-supply = <&vcc3v3_sys>;
> - vcc3-supply = <&vcc3v3_sys>;
> - vcc4-supply = <&vcc3v3_sys>;
> - vcc5-supply = <&vcc3v3_sys>;
> - vcc6-supply = <&vcc3v3_sys>;
> - vcc7-supply = <&vcc3v3_sys>;
> - vcc8-supply = <&vcc3v3_sys>;
> - vcc9-supply = <&vcc3v3_sys>;
> -
> - pwrkey {
> - status = "okay";
> - };
> -
> - pinctrl_rk8xx: pinctrl_rk8xx {
> - gpio-controller;
> - #gpio-cells = <2>;
> -
> - rk817_slppin_null: rk817_slppin_null {
> - pins = "gpio_slp";
> - function = "pin_fun0";
> - };
> -
> - rk817_slppin_slp: rk817_slppin_slp {
> - pins = "gpio_slp";
> - function = "pin_fun1";
> - };
> -
> - rk817_slppin_pwrdn: rk817_slppin_pwrdn {
> - pins = "gpio_slp";
> - function = "pin_fun2";
> - };
> -
> - rk817_slppin_rst: rk817_slppin_rst {
> - pins = "gpio_slp";
> - function = "pin_fun3";
> - };
> - };
> -
> - regulators {
> - vdd_logic: DCDC_REG1 {
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <500000>;
> - regulator-max-microvolt = <1350000>;
> - regulator-init-microvolt = <900000>;
> - regulator-ramp-delay = <6001>;
> - regulator-initial-mode = <0x2>;
> - regulator-name = "vdd_logic";
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vdd_gpu: DCDC_REG2 {
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <500000>;
> - regulator-max-microvolt = <1350000>;
> - regulator-init-microvolt = <900000>;
> - regulator-ramp-delay = <6001>;
> - regulator-initial-mode = <0x2>;
> - regulator-name = "vdd_gpu";
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vcc_ddr: DCDC_REG3 {
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-initial-mode = <0x2>;
> - regulator-name = "vcc_ddr";
> - regulator-state-mem {
> - regulator-on-in-suspend;
> - };
> - };
> -
> - vdd_npu: DCDC_REG4 {
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <500000>;
> - regulator-max-microvolt = <1350000>;
> - regulator-init-microvolt = <900000>;
> - regulator-ramp-delay = <6001>;
> - regulator-initial-mode = <0x2>;
> - regulator-name = "vdd_npu";
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vdda0v9_image: LDO_REG1 {
> - regulator-boot-on;
> - regulator-always-on;
> - regulator-min-microvolt = <900000>;
> - regulator-max-microvolt = <900000>;
> - regulator-name = "vdda0v9_image";
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vdda_0v9: LDO_REG2 {
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <900000>;
> - regulator-max-microvolt = <900000>;
> - regulator-name = "vdda_0v9";
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vdda0v9_pmu: LDO_REG3 {
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <900000>;
> - regulator-max-microvolt = <900000>;
> - regulator-name = "vdda0v9_pmu";
> - regulator-state-mem {
> - regulator-on-in-suspend;
> - regulator-suspend-microvolt = <900000>;
> - };
> - };
> -
> - vccio_acodec: LDO_REG4 {
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <3300000>;
> - regulator-max-microvolt = <3300000>;
> - regulator-name = "vccio_acodec";
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vccio_sd: LDO_REG5 {
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <3300000>;
> - regulator-name = "vccio_sd";
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vcc3v3_pmu: LDO_REG6 {
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <3300000>;
> - regulator-max-microvolt = <3300000>;
> - regulator-name = "vcc3v3_pmu";
> - regulator-state-mem {
> - regulator-on-in-suspend;
> - regulator-suspend-microvolt = <3300000>;
> - };
> - };
> -
> - vcca_1v8: LDO_REG7 {
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - regulator-name = "vcca_1v8";
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vcca1v8_pmu: LDO_REG8 {
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - regulator-name = "vcca1v8_pmu";
> - regulator-state-mem {
> - regulator-on-in-suspend;
> - regulator-suspend-microvolt = <1800000>;
> - };
> - };
> -
> - vcca1v8_image: LDO_REG9 {
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - regulator-name = "vcca1v8_image";
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vcc_1v8: DCDC_REG5 {
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - regulator-name = "vcc_1v8";
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vcc_3v3: SWITCH_REG1 {
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-name = "vcc_3v3";
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> -
> - vcc3v3_sd: SWITCH_REG2 {
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-name = "vcc3v3_sd";
> - regulator-state-mem {
> - regulator-off-in-suspend;
> - };
> - };
> - };
> - };
> -};
> -
> -&mdio0 {
> - rgmii_phy0: phy@0 {
> - compatible = "ethernet-phy-ieee802.3-c22";
> - reset-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
> - reset-assert-us = <20000>;
> - reset-deassert-us = <100000>;
> - reg = <0x0>;
> - };
> -};
> -
> -&mdio1 {
> - rgmii_phy1: phy@0 {
> - compatible = "ethernet-phy-ieee802.3-c22";
> - reset-gpios = <&gpio2 RK_PD1 GPIO_ACTIVE_LOW>;
> - reset-assert-us = <20000>;
> - reset-deassert-us = <100000>;
> - reg = <0x0>;
> - };
> -};
> -
> -&pinctrl {
> - pmic {
> - pmic_int: pmic_int {
> - rockchip,pins =
> - <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
> - };
> -
> - soc_slppin_gpio: soc_slppin_gpio {
> - rockchip,pins =
> - <0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low>;
> - };
> -
> - soc_slppin_slp: soc_slppin_slp {
> - rockchip,pins =
> - <0 RK_PA2 1 &pcfg_pull_none>;
> - };
> -
> - soc_slppin_rst: soc_slppin_rst {
> - rockchip,pins =
> - <0 RK_PA2 2 &pcfg_pull_none>;
> - };
> - };
> -
> - usb {
> - vcc5v0_host_en: vcc5v0-host-en {
> - rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> -
> - vcc5v0_otg_en: vcc5v0-otg-en {
> - rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> - };
> -};
> -
> -&saradc {
> - vref-supply = <&vcca_1v8>;
> - status = "okay";
> };
>
> &sdhci {
> - bus-width = <8>;
> - max-frequency = <200000000>;
> - non-removable;
> no-sd;
> - status = "okay";
> - pinctrl-names = "default";
> - pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
>
> partitions {
> compatible = "fixed-partitions";
> @@ -483,18 +45,6 @@
> };
>
> &sdmmc0 {
> - max-frequency = <150000000>;
> - bus-width = <4>;
> - cap-mmc-highspeed;
> - cap-sd-highspeed;
> - disable-wp;
> - sd-uhs-sdr104;
> - vmmc-supply = <&vcc3v3_sd>;
> - vqmmc-supply = <&vccio_sd>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>;
> - status = "okay";
> -
> partitions {
> compatible = "fixed-partitions";
> #address-cells = <2>;
> @@ -506,68 +56,3 @@
> };
> };
> };
> -
> -&uart2 {
> - status = "okay";
> -};
> -
> -&u2phy0_host {
> - phy-supply = <&vcc5v0_host>;
> - status = "okay";
> -};
> -
> -&u2phy0_otg {
> - vbus-supply = <&vcc5v0_otg>;
> - status = "okay";
> -};
> -
> -&u2phy1_host {
> - phy-supply = <&vcc5v0_host>;
> - status = "okay";
> -};
> -
> -&u2phy1_otg {
> - phy-supply = <&vcc5v0_host>;
> - status = "okay";
> -};
> -
> -&usb2phy0 {
> - status = "okay";
> -};
> -
> -&usb2phy1 {
> - status = "okay";
> -};
> -
> -&usb_host0_ehci {
> - status = "okay";
> -};
> -
> -&usb_host0_ohci {
> - status = "okay";
> -};
> -
> -&usb_host0_xhci {
> - extcon = <&usb2phy0>;
> - status = "okay";
> -};
> -
> -&usb_host1_ehci {
> - status = "okay";
> -};
> -
> -&usb_host1_ohci {
> - status = "okay";
> -};
> -
> -&usb_host1_xhci {
> - status = "okay";
> -};
> -
> -&combphy0_us {
> - status = "okay";
> -};
> -
> -&combphy1_usq {
> - status = "okay";
> -};
> --
> 2.30.2
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
