soc: loongson: Fix some issues about loongson2_pm

PATCH Applied Binbin Zhou 7 participants 13 messages Sep 2, 2023 – Sep 26, 2023

Subsystems (3)

Device tree bindings LoongArch Loongson-2 SoC series PM driver

lore

Share & tools

lore

Binbin Zhou

author

2023-09-02 08:47 UTC #0 lore raw

v3 cover soc: loongson: Fix some issues about loongson2_pm

Hi all:

Since commit 67694c076bd7 ("soc: loongson2_pm: add power management support"), the Loongson-2K PM driver was added, some issues have been found and this patchset is planned to fix these issues.

Specific:
Patch 1: Compilation error found by Randy;
Patch 2/3: Rewriting the ls2k-pmc compatible attribute with fallback compatible;
Patch 4/5: Add Loongson-2K SoC reboot/shutdown support as part of power management.

Thanks.

-----
V3:
- Changes "loongson_pm2" to "loongson2_pm" in all subject lines. Sorry, it was a clerical error.
patch 1:
- Add Fixes tag;
- Update commit message.
patch 2:
- Add Fixes and Acked-by tag.
patch 3:
- Add Fixes tag;
patch 4:
- Add Reviewed-by tag.

Link to V2:
https://lore.kernel.org/all/[email protected]/

V2:
patch 1:
- Change "depends on INPUT" to "depends on INPUT=y", because the compilation error still exists when "INPUT=m".
patch 2:
- Use ls2k0500 as the fallback compatible;
- Add ls2k2000 compatible.
patch 3:
- Drop ls2k1000 compatible, for ls2k0500 is used as the fallback compatible.
patch 4:
- Drop label;
- Drop regmap property in syscon-reboot, for it's deprecated;
- Add missing space.

Link to V1:
https://lore.kernel.org/all/[email protected]/

Binbin Zhou (5):
soc: loongson: loongson2_pm: Add dependency for INPUT
dt-bindings: soc: loongson,ls2k-pmc: Use fallbacks for ls2k-pmc
compatible
soc: loongson: loongson2_pm: Drop useless of_device_id compatible
dt-bindings: soc: loongson,ls2k-pmc: Allow
syscon-reboot/syscon-poweroff as child
soc: loongson: loongson2_pm: Populate children syscon nodes

 .../soc/loongson/loongson,ls2k-pmc.yaml       | 43 ++++++++++++++++---
 drivers/soc/loongson/Kconfig                  |  1 +
 drivers/soc/loongson/loongson2_pm.c           |  7 ++-
 3 files changed, 44 insertions(+), 7 deletions(-)

Signature · 1 line

2.39.3

Binbin Zhou

author

2023-09-02 08:47 UTC #1 lore raw

PATCH v3 1/5 soc: loongson: loongson2_pm: Add dependency for INPUT

Since commit 67694c076bd7 ("soc: loongson2_pm: add power management support"), the Loongson-2K PM driver was added, but it didn't update the Kconfig entry for the INPUT dependency, leading to build errors:

/opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
drivers/soc/loongson/loongson2_pm.o: in function `loongson2_power_button_init':
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:101:(.text+0x350): undefined reference to `input_allocate_device' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:109:(.text+0x3dc): undefined reference to `input_set_capability' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:111:(.text+0x3e4): undefined reference to `input_register_device' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:125:(.text+0x3fc): undefined reference to input_free_device' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld: drivers/soc/loongson/loongson2_pm.o: in function input_report_key':
/work/lnx/next/linux-next-20230825/LOONG64/../include/linux/input.h:425:(.text+0x58c): undefined reference to `input_event'

Also, since this driver can only be built-in, it fails to link when the INPUT is in a loadable module, so we should update the Kconfig entry to depend on INPUT=y.

Fixes 67694c076bd7 ("soc: loongson2_pm: add power management support")

Reported-by Randy Dunlap <[email protected]>

Signed-off-by Binbin Zhou <[email protected]>

---
 drivers/soc/loongson/Kconfig | 1 +
 1 file changed, 1 insertion(+)

drivers/soc/loongson/Kconfig +1 -0

index 314e13bb3e01..368344943a93 100644
@@ -20,6 +20,7 @@ config LOONGSON2_GUTS
 config LOONGSON2_PM
 	bool "Loongson-2 SoC Power Management Controller Driver"
 	depends on LOONGARCH && OF
+	depends on INPUT=y
 	help
 	  The Loongson-2's power management controller was ACPI, supports ACPI
 	  S2Idle (Suspend To Idle), ACPI S3 (Suspend To RAM), ACPI S4 (Suspend To

Signature · 1 line

2.39.3

Randy Dunlap

Reviewed-by Tested-by on v3 1/5

2023-09-02 15:43 UTC #2 lore raw

Re: [PATCH v3 1/5] soc: loongson: loongson2_pm: Add dependency for INPUT

Quoted 16 lines · Binbin Zhou

Since commit 67694c076bd7 ("soc: loongson2_pm: add power management support"), the Loongson-2K PM driver was added, but it didn't update the Kconfig entry for the INPUT dependency, leading to build errors:
/opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
drivers/soc/loongson/loongson2_pm.o: in function `loongson2_power_button_init':
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:101:(.text+0x350): undefined reference to `input_allocate_device' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:109:(.text+0x3dc): undefined reference to `input_set_capability' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:111:(.text+0x3e4): undefined reference to `input_register_device' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:125:(.text+0x3fc): undefined reference to input_free_device' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld: drivers/soc/loongson/loongson2_pm.o: in function input_report_key':
/work/lnx/next/linux-next-20230825/LOONG64/../include/linux/input.h:425:(.text+0x58c): undefined reference to `input_event'

Quoted 7 lines

Also, since this driver can only be built-in, it fails to link when the INPUT is in a loadable module, so we should update the Kconfig entry to depend on INPUT=y.
Fixes 67694c076bd7 ("soc: loongson2_pm: add power management support")
Reported-by Randy Dunlap <[email protected]>
Signed-off-by Binbin Zhou <[email protected]>

Reviewed-by Randy Dunlap <[email protected]>

Tested-by Randy Dunlap <[email protected]>

Thanks.

Quoted 16 lines

---
 drivers/soc/loongson/Kconfig | 1 +
 1 file changed, 1 insertion(+)

drivers/soc/loongson/Kconfig +1 -0

index 314e13bb3e01..368344943a93 100644
@@ -20,6 +20,7 @@ config LOONGSON2_GUTS
 config LOONGSON2_PM
 	bool "Loongson-2 SoC Power Management Controller Driver"
 	depends on LOONGARCH && OF
+	depends on INPUT=y
 	help
 	  The Loongson-2's power management controller was ACPI, supports ACPI
 	  S2Idle (Suspend To Idle), ACPI S3 (Suspend To RAM), ACPI S4 (Suspend To

Signature · 1 line

~Randy

Randy Dunlap

2023-09-19 15:37 UTC #3 lore raw

Re: [PATCH v3 1/5] soc: loongson: loongson2_pm: Add dependency for INPUT

Hi--

Quoted 23 lines · Randy Dunlap

Quoted 20 lines · Binbin Zhou
Since commit 67694c076bd7 ("soc: loongson2_pm: add power management support"), the Loongson-2K PM driver was added, but it didn't update the Kconfig entry for the INPUT dependency, leading to build errors:
/opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
drivers/soc/loongson/loongson2_pm.o: in function `loongson2_power_button_init':
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:101:(.text+0x350): undefined reference to `input_allocate_device' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:109:(.text+0x3dc): undefined reference to `input_set_capability' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:111:(.text+0x3e4): undefined reference to `input_register_device' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:125:(.text+0x3fc): undefined reference to input_free_device' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld: drivers/soc/loongson/loongson2_pm.o: in function input_report_key':
/work/lnx/next/linux-next-20230825/LOONG64/../include/linux/input.h:425:(.text+0x58c): undefined reference to `input_event'
Also, since this driver can only be built-in, it fails to link when the INPUT is in a loadable module, so we should update the Kconfig entry to depend on INPUT=y.

Quoted 8 lines

Quoted 3 lines
Fixes 67694c076bd7 ("soc: loongson2_pm: add power management support")
Reported-by Randy Dunlap <[email protected]>
Signed-off-by Binbin Zhou <[email protected]>
Reviewed-by Randy Dunlap <[email protected]>
Tested-by Randy Dunlap <[email protected]>
Thanks.

What's the status of this patch?
linux-next builds are still failing without this patch.

Thanks.

Quoted 18 lines

Quoted 17 lines

---
 drivers/soc/loongson/Kconfig | 1 +
 1 file changed, 1 insertion(+)

drivers/soc/loongson/Kconfig +1 -0

index 314e13bb3e01..368344943a93 100644
@@ -20,6 +20,7 @@ config LOONGSON2_GUTS
 config LOONGSON2_PM
 	bool "Loongson-2 SoC Power Management Controller Driver"
 	depends on LOONGARCH && OF
+	depends on INPUT=y
 	help
 	  The Loongson-2's power management controller was ACPI, supports ACPI
 	  S2Idle (Suspend To Idle), ACPI S3 (Suspend To RAM), ACPI S4 (Suspend To

Signature · 1 line

~Randy

Conor Dooley

2023-09-19 15:48 UTC #4 lore raw

Re: [PATCH v3 1/5] soc: loongson: loongson2_pm: Add dependency for INPUT

Quoted 30 lines · Randy Dunlap

Hi--
Quoted 27 lines · Randy Dunlap
Quoted 23 lines · Binbin Zhou
Since commit 67694c076bd7 ("soc: loongson2_pm: add power management support"), the Loongson-2K PM driver was added, but it didn't update the Kconfig entry for the INPUT dependency, leading to build errors:
/opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
drivers/soc/loongson/loongson2_pm.o: in function `loongson2_power_button_init':
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:101:(.text+0x350): undefined reference to `input_allocate_device' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:109:(.text+0x3dc): undefined reference to `input_set_capability' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:111:(.text+0x3e4): undefined reference to `input_register_device' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:125:(.text+0x3fc): undefined reference to input_free_device' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld: drivers/soc/loongson/loongson2_pm.o: in function input_report_key':
/work/lnx/next/linux-next-20230825/LOONG64/../include/linux/input.h:425:(.text+0x58c): undefined reference to `input_event'
Also, since this driver can only be built-in, it fails to link when the INPUT is in a loadable module, so we should update the Kconfig entry to depend on INPUT=y.
Fixes 67694c076bd7 ("soc: loongson2_pm: add power management support")
Reported-by Randy Dunlap <[email protected]>
Signed-off-by Binbin Zhou <[email protected]>

Quoted 7 lines

Quoted 4 lines
Reviewed-by Randy Dunlap <[email protected]>
Tested-by Randy Dunlap <[email protected]>
Thanks.
What's the status of this patch?
linux-next builds are still failing without this patch.

Likely suffering (still) from:

https://lore.kernel.org/all/[email protected]/

Seemingly this was sent again in isolation 2 weeks ago, but neither the maintainer (Huacai) nor [email protected] were on cc:

https://lore.kernel.org/all/[email protected]/

/shrug
Conor.

Quoted 24 lines

Thanks.

Quoted 18 lines

Quoted 17 lines

---
 drivers/soc/loongson/Kconfig | 1 +
 1 file changed, 1 insertion(+)

drivers/soc/loongson/Kconfig +1 -0

index 314e13bb3e01..368344943a93 100644
@@ -20,6 +20,7 @@ config LOONGSON2_GUTS
 config LOONGSON2_PM
 	bool "Loongson-2 SoC Power Management Controller Driver"
 	depends on LOONGARCH && OF
+	depends on INPUT=y
 	help
 	  The Loongson-2's power management controller was ACPI, supports ACPI
 	  S2Idle (Suspend To Idle), ACPI S3 (Suspend To RAM), ACPI S4 (Suspend To

Signature · 1 line

~Randy

Huacai Chen

maintainer

2023-09-19 16:15 UTC #5 lore raw

Re: [PATCH v3 1/5] soc: loongson: loongson2_pm: Add dependency for INPUT

Hi, Conor,

Quoted 42 lines · Conor Dooley

Quoted 30 lines · Randy Dunlap
Hi--
Quoted 27 lines · Randy Dunlap
Quoted 23 lines · Binbin Zhou
Since commit 67694c076bd7 ("soc: loongson2_pm: add power management support"), the Loongson-2K PM driver was added, but it didn't update the Kconfig entry for the INPUT dependency, leading to build errors:
/opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
drivers/soc/loongson/loongson2_pm.o: in function `loongson2_power_button_init':
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:101:(.text+0x350): undefined reference to `input_allocate_device' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:109:(.text+0x3dc): undefined reference to `input_set_capability' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:111:(.text+0x3e4): undefined reference to `input_register_device' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld:
/work/lnx/next/linux-next-20230825/LOONG64/../drivers/soc/loongson/loongson2_pm.c:125:(.text+0x3fc): undefined reference to input_free_device' /opt/crosstool/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ld: drivers/soc/loongson/loongson2_pm.o: in function input_report_key':
/work/lnx/next/linux-next-20230825/LOONG64/../include/linux/input.h:425:(.text+0x58c): undefined reference to `input_event'
Also, since this driver can only be built-in, it fails to link when the INPUT is in a loadable module, so we should update the Kconfig entry to depend on INPUT=y.
Fixes 67694c076bd7 ("soc: loongson2_pm: add power management support")
Reported-by Randy Dunlap <[email protected]>
Signed-off-by Binbin Zhou <[email protected]>
Quoted 7 lines
Quoted 4 lines
Reviewed-by Randy Dunlap <[email protected]>
Tested-by Randy Dunlap <[email protected]>
Thanks.
What's the status of this patch?
linux-next builds are still failing without this patch.
Likely suffering (still) from:

Quoted 8 lines

https://lore.kernel.org/all/[email protected]/
:)
Seemingly this was sent again in isolation 2 weeks ago, but neither the maintainer (Huacai) nor [email protected] were on cc:
https://lore.kernel.org/all/[email protected]/

v3 indeed cc-ed [email protected]. :)

Arnd, could you please take this series to the soc tree? And also this series:
https://lore.kernel.org/loongarch/[email protected]/T/#t

Thanks,
Huacai

Quoted 28 lines

/shrug
Conor.

Quoted 24 lines

Thanks.

Quoted 5 lines

---
 drivers/soc/loongson/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Quoted 13 lines

drivers/soc/loongson/Kconfig config LOONGSON2_GUTS · line 26

Quoted 12 lines

drivers/soc/loongson/Kconfig +1 -0

index 314e13bb3e01..368344943a93 100644
@@ -20,6 +20,7 @@ config LOONGSON2_GUTS
 config LOONGSON2_PM
   bool "Loongson-2 SoC Power Management Controller Driver"
   depends on LOONGARCH && OF
+  depends on INPUT=y
   help
     The Loongson-2's power management controller was ACPI, supports ACPI
     S2Idle (Suspend To Idle), ACPI S3 (Suspend To RAM), ACPI S4 (Suspend To

--
~Randy

Arnd Bergmann

2023-09-22 14:43 UTC #6 lore raw

Re: [PATCH v3 1/5] soc: loongson: loongson2_pm: Add dependency for INPUT

Quoted 6 lines · Huacai Chen

Quoted 5 lines · Conor Dooley
On Tue, Sep 19, 2023 at 08:36:50AM -0700, Randy Dunlap wrote:
Seemingly this was sent again in isolation 2 weeks ago, but neither the maintainer (Huacai) nor [email protected] were on cc:

Quoted 6 lines

Quoted 1 line
https://lore.kernel.org/all/[email protected]/
v3 indeed cc-ed [email protected]. :)
Arnd, could you please take this series to the soc tree? And also this series:
https://lore.kernel.org/loongarch/[email protected]/T/#t

Sorry, I have been traveling and not pushed out the tree yet.

Can you confirm that the input dependency is required for 6.6 and the other series can wait until 6.7? When you send patches to [email protected], please always mention which tree you intend them for. I might disagree, but it's better than having to guess.

Arnd

Binbin Zhou

2023-09-24 12:21 UTC #7 lore raw

Re: [PATCH v3 1/5] soc: loongson: loongson2_pm: Add dependency for INPUT

Quoted 15 lines · Arnd Bergmann

Quoted 6 lines · Huacai Chen
Quoted 5 lines · Conor Dooley
On Tue, Sep 19, 2023 at 08:36:50AM -0700, Randy Dunlap wrote:
Seemingly this was sent again in isolation 2 weeks ago, but neither the maintainer (Huacai) nor [email protected] were on cc:
Quoted 6 lines
Quoted 1 line
https://lore.kernel.org/all/[email protected]/
v3 indeed cc-ed [email protected]. :)
Arnd, could you please take this series to the soc tree? And also this series:
https://lore.kernel.org/loongarch/[email protected]/T/#t

Quoted 7 lines

Sorry, I have been traveling and not pushed out the tree yet.
Can you confirm that the input dependency is required for 6.6 and the other series can wait until 6.7? When you send patches to [email protected], please always mention which tree you intend them for. I might disagree, but it's better than having to guess.

Hi Arnd:

Thanks for your reply.

As we know, this driver was just merged in during the v6.6 window, and no release will use it until now:

commit 67694c076bd7 soc: loongson2_pm: add power management support commit 6054a676e969 soc: dt-bindings: add loongson-2 pm

Now, since the Loongson-2K series SoCs are indifferent at the driver level, we used fallback compatible and added syscon-reboot/syscon-poweroff subnodes for power on/off functionality. These somewhat break the original devicetree rules.
So, I think these patches need to be merged in before the v6.6 release to avoid unnecessary compatibility issues.
Of course, I added the "Fixes:" tag in the corresponding patch.

Thanks.
Binbin

Quoted 1 line

Arnd

Binbin Zhou

author

2023-09-02 08:47 UTC #8 lore raw

PATCH v3 2/5 dt-bindings: soc: loongson,ls2k-pmc: Use fallbacks for ls2k-pmc compatible

In reply to Binbin Zhou

The Loongson-2K series chips (ls2k0500/ls2k1000/ls2k2000) share the same PM system controller, using ls2k0500 compatible as fallback for the others.

Fixes 6054a676e969 ("soc: dt-bindings: add loongson-2 pm")

Acked-by Conor Dooley <[email protected]>

Signed-off-by Binbin Zhou <[email protected]>

---
 .../soc/loongson/loongson,ls2k-pmc.yaml         | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

Documentation/devicetree/bindings/soc/loongson/loongson,ls2k-pmc.yaml +11 -6

index da2dcfeebf12..c45f5e7fc0e6 100644
@@ -11,11 +11,16 @@ maintainers:
 
 properties:
   compatible:
-    items:
-      - enum:
-          - loongson,ls2k0500-pmc
-          - loongson,ls2k1000-pmc
-      - const: syscon
+    oneOf:
+      - items:
+          - const: loongson,ls2k0500-pmc
+          - const: syscon
+      - items:
+          - enum:
+              - loongson,ls2k1000-pmc
+              - loongson,ls2k2000-pmc
+          - const: loongson,ls2k0500-pmc
+          - const: syscon
 
   reg:
     maxItems: 1

@@ -44,7 +49,7 @@ examples:
     #include <dt-bindings/interrupt-controller/irq.h>
 
     power-management@1fe27000 {
-        compatible = "loongson,ls2k1000-pmc", "syscon";
+        compatible = "loongson,ls2k1000-pmc", "loongson,ls2k0500-pmc", "syscon";
         reg = <0x1fe27000 0x58>;
         interrupt-parent = <&liointc1>;
         interrupts = <11 IRQ_TYPE_LEVEL_LOW>;

Signature · 1 line

2.39.3

Binbin Zhou

author

2023-09-02 08:47 UTC #9 lore raw

PATCH v3 3/5 soc: loongson: loongson2_pm: Drop useless of_device_id compatible

In reply to Binbin Zhou

Now, "loongson,ls2k0500-pmc" is used as fallback compatible, so the ls2k1000 compatible in the driver can be dropped directly.

Fixes 67694c076bd7 ("soc: loongson2_pm: add power management support")

Signed-off-by Binbin Zhou <[email protected]>

---
 drivers/soc/loongson/loongson2_pm.c | 1 -
 1 file changed, 1 deletion(-)

drivers/soc/loongson/loongson2_pm.c +0 -1

index 796add6e8b63..5ffb77afd9eb 100644
@@ -197,7 +197,6 @@ static int loongson2_pm_probe(struct platform_device *pdev)
 
 static const struct of_device_id loongson2_pm_match[] = {
 	{ .compatible = "loongson,ls2k0500-pmc", },
-	{ .compatible = "loongson,ls2k1000-pmc", },
 	{},
 };

Signature · 1 line

2.39.3

Binbin Zhou

author

2023-09-02 08:47 UTC #10 lore raw

PATCH v3 4/5 dt-bindings: soc: loongson,ls2k-pmc: Allow syscon-reboot/syscon-poweroff as child

In reply to Binbin Zhou

The reboot and poweroff features are actually part of the Power Management Unit system controller, thus allow them as its children, instead of specifying as separate device nodes with syscon phandle.

Without it, the reboot/poweroff feature becomes unavailable.

Reviewed-by Krzysztof Kozlowski <[email protected]>

Signed-off-by Binbin Zhou <[email protected]>

---
 .../soc/loongson/loongson,ls2k-pmc.yaml       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

Documentation/devicetree/bindings/soc/loongson/loongson,ls2k-pmc.yaml +26 -0

index c45f5e7fc0e6..510f6cb0f084 100644
@@ -37,6 +37,18 @@ properties:
       addition, the PM need according to it to indicate that current
       SoC whether support Suspend To RAM.
 
+  syscon-poweroff:
+    $ref: /schemas/power/reset/syscon-poweroff.yaml#
+    type: object
+    description:
+      Node for power off method
+
+  syscon-reboot:
+    $ref: /schemas/power/reset/syscon-reboot.yaml#
+    type: object
+    description:
+      Node for reboot method
+
 required:
   - compatible
   - reg

@@ -54,4 +66,18 @@ examples:
         interrupt-parent = <&liointc1>;
         interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
         loongson,suspend-address = <0x0 0x1c000500>;
+
+        syscon-reboot {
+            compatible = "syscon-reboot";
+            offset = <0x30>;
+            mask = <0x1>;
+        };
+
+        syscon-poweroff {
+            compatible = "syscon-poweroff";
+            regmap = <&pmc>;
+            offset = <0x14>;
+            mask = <0x3c00>;
+            value = <0x3c00>;
+        };
     };

Signature · 1 line

2.39.3

Binbin Zhou

author

2023-09-02 08:47 UTC #11 lore raw

PATCH v3 5/5 soc: loongson: loongson2_pm: Populate children syscon nodes

In reply to Binbin Zhou

The syscon poweroff and reboot nodes logically belong to the Power Management Unit so populate possible children.

Without it, the reboot/poweroff feature becomes unavailable.

Signed-off-by Binbin Zhou <[email protected]>

---
 drivers/soc/loongson/loongson2_pm.c | 6 ++++++
 1 file changed, 6 insertions(+)

drivers/soc/loongson/loongson2_pm.c +6 -0

index 5ffb77afd9eb..b8e5e1e3528a 100644
@@ -11,6 +11,7 @@
 #include <linux/input.h>
 #include <linux/suspend.h>
 #include <linux/interrupt.h>
+#include <linux/of_platform.h>
 #include <linux/pm_wakeirq.h>
 #include <linux/platform_device.h>
 #include <asm/bootinfo.h>

@@ -192,6 +193,11 @@ static int loongson2_pm_probe(struct platform_device *pdev)
 	if (loongson_sysconf.suspend_addr)
 		suspend_set_ops(&loongson2_suspend_ops);
 
+	/* Populate children */
+	retval = devm_of_platform_populate(dev);
+	if (retval)
+		dev_err(dev, "Error populating children, reboot and poweroff might not work properly\n");
+
 	return 0;
 }

Signature · 1 line

2.39.3

[email protected]

CI Applied

2023-09-26 21:03 UTC #12 lore raw

In reply to Binbin Zhou

This series was applied to soc/soc.git (arm/fixes) by Arnd Bergmann <[email protected]>:

Hello:

This series was applied to soc/soc.git (arm/fixes) by Arnd Bergmann <[email protected]>:

Quoted 6 lines · On Sat, 2 Sep 2023 16:47:26 +0800 you wrote:

Hi all:
Since commit 67694c076bd7 ("soc: loongson2_pm: add power management support"), the Loongson-2K PM driver was added, some issues have been found and this patchset is planned to fix these issues.

Quoted 8 lines

Specific:
Patch 1: Compilation error found by Randy;
Patch 2/3: Rewriting the ls2k-pmc compatible attribute with fallback compatible;
Patch 4/5: Add Loongson-2K SoC reboot/shutdown support as part of power management.
[...]

Here is the summary with links:
- [v3,1/5] soc: loongson: loongson2_pm: Add dependency for INPUT

    https://git.kernel.org/soc/soc/c/9a7c9c7e34ac
  - [v3,2/5] dt-bindings: soc: loongson,ls2k-pmc: Use fallbacks for ls2k-pmc compatible
    https://git.kernel.org/soc/soc/c/8e5f17483ab4
  - [v3,3/5] soc: loongson: loongson2_pm: Drop useless of_device_id compatible
    https://git.kernel.org/soc/soc/c/59598d7ba6a8
  - [v3,4/5] dt-bindings: soc: loongson,ls2k-pmc: Allow syscon-reboot/syscon-poweroff as child
    https://git.kernel.org/soc/soc/c/019d79fe6c3d
  - [v3,5/5] soc: loongson: loongson2_pm: Populate children syscon nodes
    https://git.kernel.org/soc/soc/c/4e7b558e320a

You are awesome, thank you!

Signature · 2 lines

Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html