Amlogic Drivers updates for v5.18:

- Add support for Amlogic S4 in meson-secure-pwrc power domain driver
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmIlxcAACgkQd9zb2sjI
 SdG04Q/+OTU7F/FWaNzpdpFVnwlGbYA66TCH9TYV79m7L2j/FZ0D6rbZNhFtXW7J
 skclZS9Rkdllq90OpgkHgmPRNvygDw0m0OqOdjYhgCQbSn3f1lgXNYrxnFyVyoFT
 kXEDCw6lUFpJZ/wFlO01zSJRALgIJMLvWpkX/bsMs3n02hQOYkfdfNdRuVqOEx/e
 YblCM3RvfsII0etXh3pj/cAStdc5BcZ0pQStXqhRKQORtZ4zd1VIW7H3ouWdrQfi
 qIHZD85SlK9tPM9+PGgj0bfUXiiT5pBbr6kaVhseGJ5J58FdSvUkjfz+CffJRmgT
 2e61rVyMbaYKMy3NBG3/OSVFuFCv7w65/z0FXW9cGxdtOoxNm65RKzPff3rdA/rT
 XOPSbHBrVqF22kMjgh7aMUbce8ve0Cqf4r8QK8Opqghyq+b8ndMp/qwehI5NENf2
 xxvBPP6vEYgaIHgXKN+ZzKzLoYdaiEQFf3T4gSuIKnMqNfuUbbjBi2WUstJ4X2IC
 vtXLZ15XGvfe0oj+/EFwtqPEyHwpumCAYOlq+9iT34G5pllcAbnhNWMwlj4frBxG
 k8HBfyaJ9alIn6qe9qMAwjD4eBEgzuFgqJc5HDnb8YOcT4UmzxrzPVtdbXUHTgSX
 a2mj0ZMCDMXARKrGpmMpngdp9P6DmK4OHbWEGqo97APZCmExBg0=
 =I56h
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmInfxUACgkQmmx57+YA
 GNlE5g//W8rmP7MMQgJrSeoOaCHCcri2sByL5+lyz6E4PQx2paUfcgG0+hosW57g
 6BcmAo5YrlG/SQBkmXuHS4vvWzWlac4f4tDDldXmdQYOzywlqdUVsHy6KyJaj7r/
 cJGimvMzI7Lfhkub1zeSya3GGTtXGPx6Rj+JssSUSFW/yM7L0irp6K1iAEobHdNj
 5ljHdhZQ8GRfHasj5ToPoigBk4fQbAg0iOhYnA28CP2NMv1dEoGCSh1i0xQvtiP3
 3lGeL/6kHAg2j99lEkQqRaKD9kQHpiDxtMtzf1M8lmnOAMX5N6WlPffYCWA/J9tO
 C7E7Yo6cInos4USpjmhYFY+E6TTgaitVc4xU+wltpILidULaxLBRo4OcVtFdoOPn
 hnCZB65Q5DCqn2cuwkVZ5KPXC6yax9YfkiOH7BHBtAo+sKbtJyuaV0sH4ZPbrSmW
 NZafDpDsEhbO2vtsB9tki3eMeSu5/HAhJI/1aba+Lpdf9MvAOjelEH62N+mtwnWC
 EJMaYXWi4d8sNaEgJ2gj5H97/qzBMnG2COiL7KQuaYocGwJsRrkbXyoaBsnN58/K
 arhrzS7/4KPXtQ6UFx7i2Ri25vvoi9YkrjFz02ivl57zn8QFw5pc/ruKhJxfh24Y
 SsHbOs3gwWBhEPR6yLbeM/MU+kOwYzDu504gK9EQCWvcHGWMxJU=
 =zPvd
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-drivers-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/drivers

Amlogic Drivers updates for v5.18:
- Add support for Amlogic S4 in meson-secure-pwrc power domain driver

* tag 'amlogic-drivers-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  soc: s4: Add support for power domains controller
  dt-bindings: power: add Amlogic s4 power domains bindings

Link: https://lore.kernel.org/r/c7471989-d929-c744-c0c3-c8e86eaaa225@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml

@@ -12,13 +12,14 @@ maintainers:
   - Jianxin Pan <jianxin.pan@amlogic.com>
 
 description: |+
-  Secure Power Domains used in Meson A1/C1 SoCs, and should be the child node
+  Secure Power Domains used in Meson A1/C1/S4 SoCs, and should be the child node
   of secure-monitor.
 
 properties:
   compatible:
     enum:
       - amlogic,meson-a1-pwrc
+      - amlogic,meson-s4-pwrc
 
   "#power-domain-cells":
     const: 1

drivers/soc/amlogic/meson-secure-pwrc.c

@@ -11,6 +11,7 @@
 #include <linux/platform_device.h>
 #include <linux/pm_domain.h>
 #include <dt-bindings/power/meson-a1-power.h>
+#include <dt-bindings/power/meson-s4-power.h>
 #include <linux/arm-smccc.h>
 #include <linux/firmware/meson/meson_sm.h>
 #include <linux/module.h>
@@ -119,6 +120,18 @@ static struct meson_secure_pwrc_domain_desc a1_pwrc_domains[] = {
 	SEC_PD(RSA,	0),
 };
 
+static struct meson_secure_pwrc_domain_desc s4_pwrc_domains[] = {
+	SEC_PD(S4_DOS_HEVC,	0),
+	SEC_PD(S4_DOS_VDEC,	0),
+	SEC_PD(S4_VPU_HDMI,	0),
+	SEC_PD(S4_USB_COMB,	0),
+	SEC_PD(S4_GE2D,		0),
+	/* ETH is for ethernet online wakeup, and should be always on */
+	SEC_PD(S4_ETH,		GENPD_FLAG_ALWAYS_ON),
+	SEC_PD(S4_DEMOD,	0),
+	SEC_PD(S4_AUDIO,	0),
+};
+
 static int meson_secure_pwrc_probe(struct platform_device *pdev)
 {
 	int i;
@@ -187,11 +200,20 @@ static struct meson_secure_pwrc_domain_data meson_secure_a1_pwrc_data = {
 	.count = ARRAY_SIZE(a1_pwrc_domains),
 };
 
+static struct meson_secure_pwrc_domain_data meson_secure_s4_pwrc_data = {
+	.domains = s4_pwrc_domains,
+	.count = ARRAY_SIZE(s4_pwrc_domains),
+};
+
 static const struct of_device_id meson_secure_pwrc_match_table[] = {
 	{
 		.compatible = "amlogic,meson-a1-pwrc",
 		.data = &meson_secure_a1_pwrc_data,
 	},
+	{
+		.compatible = "amlogic,meson-s4-pwrc",
+		.data = &meson_secure_s4_pwrc_data,
+	},
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, meson_secure_pwrc_match_table);

include/dt-bindings/power/meson-s4-power.h

@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */
+/*
+ * Copyright (c) 2021 Amlogic, Inc.
+ * Author: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
+ */
+
+#ifndef _DT_BINDINGS_MESON_S4_POWER_H
+#define _DT_BINDINGS_MESON_S4_POWER_H
+
+#define PWRC_S4_DOS_HEVC_ID	0
+#define PWRC_S4_DOS_VDEC_ID	1
+#define PWRC_S4_VPU_HDMI_ID	2
+#define PWRC_S4_USB_COMB_ID	3
+#define PWRC_S4_GE2D_ID		4
+#define PWRC_S4_ETH_ID		5
+#define PWRC_S4_DEMOD_ID	6
+#define PWRC_S4_AUDIO_ID	7
+
+#endif