Unverified Commit e26f8413 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-drivers-6.3-2' of...

Merge tag 'samsung-drivers-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/drivers

Samsung SoC driver changes for v6.3

Deprecate syscon phandle to the PMU node in MIPI and DP video phy
drivers in favor of putting the device nodes directly under the PMU
nodes.  This better reflects device hierarchy and allows later to solve
dtc W=1 and dtbs_check warnings.

* tag 'samsung-drivers-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  phy: samsung,mipi-video-phy: deprecate syscon phandle
  phy: samsung,dp-video-phy: deprecate syscon phandle
  dt-bindings: phy: samsung,mipi-video-phy: deprecate syscon phandle
  dt-bindings: phy: samsung,dp-video-phy: deprecate syscon phandle
  MAINTAINERS: arm64: tesla: correct pattern for directory
  dt-bindings: soc: samsung: exynos-sysreg: correct indentation for deprecated
  dt-bindings: soc: samsung: exynos-sysreg: add dedicated SYSREG compatibles to Exynosautov9
  dt-bindings: soc: samsung: exynos-sysreg: add dedicated SYSREG compatibles to Exynos850
  dt-bindings: soc: samsung: exynos-sysreg: Add tesla FSD sysreg compatibles
  dt-bindings: soc: samsung: exynos-sysreg: add clocks for Exynos850
  dt-bindings: soc: samsung: exynos-sysreg: add dedicated SYSREG compatibles to Exynos5433
  dt-bindings: soc: samsung: exynos-sysreg: split from syscon

Link: https://lore.kernel.org/r/20230205144657.951749-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 426082a2 7ecd4e5f
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -64,12 +64,6 @@ properties:
              - rockchip,rk3568-qos
              - rockchip,rk3588-qos
              - rockchip,rv1126-qos
              - samsung,exynos3-sysreg
              - samsung,exynos4-sysreg
              - samsung,exynos5-sysreg
              - samsung,exynos5433-sysreg
              - samsung,exynos850-sysreg
              - samsung,exynosautov9-sysreg

          - const: syscon

+2 −3
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ properties:

  samsung,pmu-syscon:
    $ref: /schemas/types.yaml#/definitions/phandle
    deprecated: true
    description:
      Phandle to PMU system controller interface.
      Phandle to PMU system controller interface (if not a child of PMU).

required:
  - compatible
  - "#phy-cells"
  - samsung,pmu-syscon

additionalProperties: false

@@ -36,6 +36,5 @@ examples:
  - |
    phy {
        compatible = "samsung,exynos5420-dp-video-phy";
        samsung,pmu-syscon = <&pmu_system_controller>;
        #phy-cells = <0>;
    };
+5 −6
Original line number Diff line number Diff line
@@ -35,15 +35,18 @@ properties:

  syscon:
    $ref: /schemas/types.yaml#/definitions/phandle
    deprecated: true
    description:
      Phandle to PMU system controller interface, valid only for
      samsung,s5pv210-mipi-video-phy and samsung,exynos5420-mipi-video-phy.
      samsung,s5pv210-mipi-video-phy and samsung,exynos5420-mipi-video-phy (if
      not a child of PMU).

  samsung,pmu-syscon:
    $ref: /schemas/types.yaml#/definitions/phandle
    deprecated: true
    description:
      Phandle to PMU system controller interface, valid for
      samsung,exynos5433-mipi-video-phy.
      samsung,exynos5433-mipi-video-phy (if not a child of PMU).

  samsung,disp-sysreg:
    $ref: /schemas/types.yaml#/definitions/phandle
@@ -81,13 +84,10 @@ allOf:
        samsung,disp-sysreg: false
        samsung,cam0-sysreg: false
        samsung,cam1-sysreg: false
      required:
        - syscon
    else:
      properties:
        syscon: false
      required:
        - samsung,pmu-syscon
        - samsung,disp-sysreg
        - samsung,cam0-sysreg
        - samsung,cam1-sysreg
@@ -99,7 +99,6 @@ examples:
    phy {
        compatible = "samsung,exynos5433-mipi-video-phy";
        #phy-cells = <1>;
        samsung,pmu-syscon = <&pmu_system_controller>;
        samsung,cam0-sysreg = <&syscon_cam0>;
        samsung,cam1-sysreg = <&syscon_cam1>;
        samsung,disp-sysreg = <&syscon_disp>;
+87 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
%YAML 1.2
---
$id: http://devicetree.org/schemas/soc/samsung/samsung,exynos-sysreg.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Samsung Exynos SoC series System Registers (SYSREG)

maintainers:
  - Krzysztof Kozlowski <krzk@kernel.org>

properties:
  compatible:
    oneOf:
      - items:
          - enum:
              - samsung,exynos3-sysreg
              - samsung,exynos4-sysreg
              - samsung,exynos5-sysreg
              - tesla,fsd-cam-sysreg
              - tesla,fsd-fsys0-sysreg
              - tesla,fsd-fsys1-sysreg
              - tesla,fsd-peric-sysreg
          - const: syscon
      - items:
          - enum:
              - samsung,exynos5433-cam0-sysreg
              - samsung,exynos5433-cam1-sysreg
              - samsung,exynos5433-disp-sysreg
              - samsung,exynos5433-fsys-sysreg
          - const: samsung,exynos5433-sysreg
          - const: syscon
      - items:
          - enum:
              - samsung,exynos5433-sysreg
              - samsung,exynos850-sysreg
              - samsung,exynosautov9-sysreg
          - const: syscon
        deprecated: true
      - items:
          - enum:
              - samsung,exynos850-cmgp-sysreg
              - samsung,exynos850-peri-sysreg
          - const: samsung,exynos850-sysreg
          - const: syscon
      - items:
          - enum:
              - samsung,exynosautov9-fsys2-sysreg
              - samsung,exynosautov9-peric0-sysreg
              - samsung,exynosautov9-peric1-sysreg
          - const: samsung,exynosautov9-sysreg
          - const: syscon

  reg:
    maxItems: 1

  clocks:
    maxItems: 1

required:
  - compatible
  - reg

allOf:
  - if:
      properties:
        compatible:
          contains:
            enum:
              - samsung,exynos850-cmgp-sysreg
              - samsung,exynos850-peri-sysreg
              - samsung,exynos850-sysreg
    then:
      required:
        - clocks
    else:
      properties:
        clocks: false

additionalProperties: false

examples:
  - |
    system-controller@10010000 {
        compatible = "samsung,exynos4-sysreg", "syscon";
        reg = <0x10010000 0x400>;
    };
+1 −1
Original line number Diff line number Diff line
@@ -3010,7 +3010,7 @@ M: linux-fsd@tesla.com
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L:	linux-samsung-soc@vger.kernel.org
S:	Maintained
F:	arch/arm64/boot/dts/tesla*
F:	arch/arm64/boot/dts/tesla/
ARM/TETON BGA MACHINE SUPPORT
M:	"Mark F. Brown" <mark.brown314@gmail.com>
Loading