diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts index 1da13900fb6757..2da2d3e5e9889d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts @@ -126,6 +126,8 @@ pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_host_en>; regulator-name = "vcc5v0_host"; + regulator-always-on; + regulator-boot-on; }; vcc5v0_otg: vcc5v0-otg-regulator { @@ -135,6 +137,8 @@ pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_otg_en>; regulator-name = "vcc5v0_otg"; + regulator-always-on; + regulator-boot-on; }; vcc5v0_usbhub: vcc5v0-usbhub-regulator { @@ -680,6 +684,26 @@ status = "okay"; }; +&sfc { + status = "okay"; + max-freq = <50000000>; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&fspi_pins>; + + spi_flash: spi-flash@0 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "jedec,spi-nor"; + reg = <0x0>; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + status = "okay"; + }; +}; + &sfc { status = "okay"; }; @@ -918,6 +942,21 @@ &rockchip_suspend { status = "okay"; + rockchip,sleep-debug-en = <1>; + rockchip,sleep-mode-config = < + (0 + | RKPM_SLP_CENTER_OFF + | RKPM_SLP_HW_PLLS_OFF + | RKPM_SLP_PMUALIVE_32K + | RKPM_SLP_32K_PVTM + ) + >; + rockchip,wakeup-config = < + (0 + | RKPM_GPIO_WKUP_EN + | RKPM_USB_WKUP_EN + ) + >; }; &pinctrl { diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3b.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3b.dts index dab63c73a25289..5fe25ab920b8d7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3b.dts @@ -141,6 +141,7 @@ pinctrl-0 = <&vcc5v0_host_en>; regulator-name = "vcc5v0_host"; regulator-always-on; + regulator-boot-on; }; vcc5v0_otg: vcc5v0-otg-regulator { @@ -150,6 +151,8 @@ pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_otg_en>; regulator-name = "vcc5v0_otg"; + regulator-always-on; + regulator-boot-on; }; pcie30_avdd0v9: pcie30-avdd0v9 { @@ -211,15 +214,6 @@ status = "okay"; }; - bt_wake: bt-wake-gpio-regulator { - compatible = "regulator-fixed"; - regulator-name = "bt_wake"; - enable-active-high; - gpio = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; - regulator-boot-on; - regulator-always-on; - }; - gpio_leds: gpio-leds { compatible = "gpio-leds"; status = "okay"; @@ -794,6 +788,26 @@ status = "okay"; }; +&sfc { + status = "okay"; + max-freq = <50000000>; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&fspi_pins>; + + spi_flash: spi-flash@0 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "jedec,spi-nor"; + reg = <0x0>; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + status = "okay"; + }; +}; + &sfc { status = "okay"; }; @@ -1041,6 +1055,21 @@ &rockchip_suspend { status = "okay"; + rockchip,sleep-debug-en = <1>; + rockchip,sleep-mode-config = < + (0 + | RKPM_SLP_CENTER_OFF + | RKPM_SLP_HW_PLLS_OFF + | RKPM_SLP_PMUALIVE_32K + | RKPM_SLP_32K_PVTM + ) + >; + rockchip,wakeup-config = < + (0 + | RKPM_GPIO_WKUP_EN + | RKPM_USB_WKUP_EN + ) + >; }; &can1 {