Merge tag 'samsung-dt64-exynos-usi-5.17' into next/drivers

Samsung DTS ARM64 driver bindings for v5.17

Header with Samsung Exynos USI driver constants used by both DTS and
driver.

diff --git a/Documentation/devicetree/bindings/arm/samsung/pmu.yaml b/Documentation/devicetree/bindings/arm/samsung/pmu.yaml
index 17678d9..0bbd892 100644 (file)
--- a/Documentation/devicetree/bindings/arm/samsung/pmu.yaml
+++ b/Documentation/devicetree/bindings/arm/samsung/pmu.yaml
@@ -24,6 +24,7 @@ select:
           - samsung,exynos5420-pmu
           - samsung,exynos5433-pmu
           - samsung,exynos7-pmu
+          - samsung,exynos850-pmu
           - samsung-s5pv210-pmu
   required:
     - compatible
@@ -41,6 +42,7 @@ properties:
           - samsung,exynos5420-pmu
           - samsung,exynos5433-pmu
           - samsung,exynos7-pmu
+          - samsung,exynos850-pmu
           - samsung-s5pv210-pmu
       - const: syscon
 

diff --git a/drivers/soc/samsung/exynos-chipid.c b/drivers/soc/samsung/exynos-chipid.c
index a28053e..2746d05 100644 (file)
--- a/drivers/soc/samsung/exynos-chipid.c
+++ b/drivers/soc/samsung/exynos-chipid.c
@@ -42,6 +42,7 @@ static const struct exynos_soc_id {
        unsigned int id;
 } soc_ids[] = {
        /* List ordered by SoC name */
+       /* Compatible with: samsung,exynos4210-chipid */
        { "EXYNOS3250", 0xE3472000 },
        { "EXYNOS4210", 0x43200000 },   /* EVT0 revision */
        { "EXYNOS4210", 0x43210000 },
@@ -55,6 +56,8 @@ static const struct exynos_soc_id {
        { "EXYNOS5440", 0xE5440000 },
        { "EXYNOS5800", 0xE5422000 },
        { "EXYNOS7420", 0xE7420000 },
+       /* Compatible with: samsung,exynos850-chipid */
+       { "EXYNOS7885", 0xE7885000 },
        { "EXYNOS850", 0xE3830000 },
        { "EXYNOSAUTOV9", 0xAAA80000 },
 };

diff --git a/drivers/soc/samsung/exynos-pmu.c b/drivers/soc/samsung/exynos-pmu.c
index a18c93a..732c86c 100644 (file)
--- a/drivers/soc/samsung/exynos-pmu.c
+++ b/drivers/soc/samsung/exynos-pmu.c
@@ -94,6 +94,8 @@ static const struct of_device_id exynos_pmu_of_device_ids[] = {
                .compatible = "samsung,exynos5433-pmu",
        }, {
                .compatible = "samsung,exynos7-pmu",
+       }, {
+               .compatible = "samsung,exynos850-pmu",
        },
        { /*sentinel*/ },
 };