diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi index 49a468a5fe53..e964dd4a0f89 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi @@ -304,14 +304,16 @@ rockchip_suspend: rockchip-suspend { compatible = "rockchip,pm-rk3568"; status = "disabled"; - rockchip,sleep-debug-en = <0>; + rockchip,sleep-debug-en = <1>; rockchip,sleep-mode-config = < (0 - | RKPM_SLP_ARMOFF - | RKPM_SLP_PMU_PMUALIVE_32K - | RKPM_SLP_PMU_DIS_OSC + | RKPM_SLP_ARMOFF_LOGOFF + | RKPM_SLP_CENTER_OFF + | RKPM_SLP_HW_PLLS_OFF + | RKPM_SLP_PMUALIVE_32K + | RKPM_SLP_OSC_DIS | RKPM_SLP_PMIC_LP - | RKPM_SLP_32K_EXT + | RKPM_SLP_32K_PVTM ) >; rockchip,wakeup-config = < diff --git a/include/dt-bindings/suspend/rockchip-rk3568.h b/include/dt-bindings/suspend/rockchip-rk3568.h index 242d32dc30b5..91e89f64a067 100644 --- a/include/dt-bindings/suspend/rockchip-rk3568.h +++ b/include/dt-bindings/suspend/rockchip-rk3568.h @@ -14,36 +14,35 @@ #define BIT(nr) (1 << (nr)) #endif -#define RKPM_SLP_ARMPD BIT(0) +#define RKPM_SLP_WFI BIT(0) #define RKPM_SLP_ARMOFF BIT(1) -#define RKPM_SLP_ARMOFF_DDRPD BIT(2) +#define RKPM_SLP_CENTER_OFF BIT(2) #define RKPM_SLP_ARMOFF_LOGOFF BIT(3) #define RKPM_SLP_FROM_UBOOT BIT(4) -#define RKPM_SLP_ULTRA BIT(5) -#define RKPM_SLP_PIN_REVERSE BIT(6) - -/* all plls except ddr's pll */ -#define RKPM_SLP_PMU_HW_PLLS_PD BIT(8) -#define RKPM_SLP_PMU_PMUALIVE_32K BIT(9) -#define RKPM_SLP_PMU_DIS_OSC BIT(10) - -#define RKPM_SLP_CLK_GT BIT(16) -#define RKPM_SLP_PMIC_LP BIT(17) - -#define RKPM_SLP_32K_EXT BIT(24) -#define RKPM_SLP_TIME_OUT_WKUP BIT(25) -#define RKPM_SLP_PMU_DBG BIT(26) - +#define RKPM_SLP_PMIC_LP BIT(5) +#define RKPM_SLP_HW_PLLS_OFF BIT(6) +#define RKPM_SLP_PMUALIVE_32K BIT(7) +#define RKPM_SLP_OSC_DIS BIT(8) +#define RKPM_SLP_32K_EXT BIT(9) +#define RKPM_SLP_32K_PVTM BIT(10) /* the wake up source */ -#define RKPM_CLUSTER_WKUP_EN BIT(0) -#define RKPM_GPIO_WKUP_EN BIT(2) -#define RKPM_SDIO_WKUP_EN BIT(3) -#define RKPM_SDMMC_WKUP_EN BIT(4) +#define RKPM_CPU0_WKUP_EN BIT(0) +#define RKPM_CPU1_WKUP_EN BIT(1) +#define RKPM_CPU2_WKUP_EN BIT(2) +#define RKPM_CPU3_WKUP_EN BIT(3) +#define RKPM_GPIO_WKUP_EN BIT(4) #define RKPM_UART0_WKUP_EN BIT(5) -#define RKPM_TIMER_WKUP_EN BIT(6) -#define RKPM_USB_WKUP_EN BIT(7) -#define RKPM_SFT_WKUP_EN BIT(8) -#define RKPM_TIME_OUT_WKUP_EN BIT(10) +#define RKPM_SDMMC0_WKUP_EN BIT(6) +#define RKPM_SDMMC1_WKUP_EN BIT(7) +#define RKPM_SDMMC2_WKUP_EN BIT(8) +#define RKPM_USB_WKUP_EN BIT(9) +#define RKPM_PCIE_WKUP_EN BIT(10) +#define RKPM_VAD_WKUP_EN BIT(11) +#define RKPM_TIMER_WKUP_EN BIT(12) +#define RKPM_PWM0_WKUP_EN BIT(13) +#define RKPM_TIMEOUT_WKUP_EN BIT(14) +#define RKPM_SFT_WKUP_EN BIT(15) +#define RKPM_USB_LINESTATE_WKUP_EN BIT(16) #define RKPM_SLP_LDO1_ON BIT(0) #define RKPM_SLP_LDO2_ON BIT(1)