Unverified Commit 3f0f5d22 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-soc-6.3' of... 

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

Samsung mach/soc changes for v6.3

1. Correct s3c64xx_set_timer_source() prototype.
2. Re-work MIPI and DP phys as children of Exynos PMU system controller.
   This both better reflects actual device hierarchy and allows to
   remove later few warnings from dtc W=1 and dtbs_check.

* tag 'samsung-soc-6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  dt-bindings: soc: samsung: exynos-pmu: allow phys as child
  ARM: s3c: fix s3c64xx_set_timer_source prototype

Link: https://lore.kernel.org/r/20230129143944.5104-3-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 521d844d fe6a952b

Documentation/devicetree/bindings/soc/samsung/exynos-pmu.yaml

+57 −14
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ select: 


properties:

  compatible:

    items:

    oneOf:

      - items:

          - enum:

              - samsung,exynos3250-pmu

              - samsung,exynos4210-pmu
@@ -45,6 +46,13 @@ properties: 
              - samsung,exynos850-pmu

              - samsung-s5pv210-pmu

          - const: syscon

      - items:

          - enum:

              - samsung,exynos5250-pmu

              - samsung,exynos5420-pmu

              - samsung,exynos5433-pmu

          - const: simple-mfd

          - const: syscon



  reg:

    maxItems: 1
@@ -64,6 +72,10 @@ properties: 
    minItems: 1

    maxItems: 32



  dp-phy:

    $ref: /schemas/phy/samsung,dp-video-phy.yaml

    unevaluatedProperties: false



  interrupt-controller:

    description:

      Some PMUs are capable of behaving as an interrupt controller (mostly
@@ -74,6 +86,10 @@ properties: 
      Must be identical to the that of the parent interrupt controller.

    const: 3



  mipi-phy:

    $ref: /schemas/phy/samsung,mipi-video-phy.yaml

    unevaluatedProperties: false



  reboot-mode:

    $ref: /schemas/power/reset/syscon-reboot-mode.yaml

    type: object
@@ -117,6 +133,23 @@ allOf: 
        - clock-names

        - clocks



  - if:

      properties:

        compatible:

          contains:

            enum:

              - samsung,exynos5250-pmu

              - samsung,exynos5420-pmu

              - samsung,exynos5433-pmu

    then:

      properties:

        dp-phy: true

        mipi-phy: true

    else:

      properties:

        dp-phy: false

        mipi-phy: false



examples:

  - |

    #include <dt-bindings/clock/exynos5250.h>
@@ -130,4 +163,14 @@ examples: 
        #clock-cells = <1>;

        clock-names = "clkout16";

        clocks = <&clock CLK_FIN_PLL>;



        dp-phy {

            compatible = "samsung,exynos5250-dp-video-phy";

            #phy-cells = <0>;

        };



        mipi-phy {

            compatible = "samsung,s5pv210-mipi-video-phy";

            #phy-cells = <1>;

        };

    };

arch/arm/mach-s3c/s3c64xx.c

+2 −1
Original line number Diff line number Diff line
@@ -173,7 +173,8 @@ static struct samsung_pwm_variant s3c64xx_pwm_variant = { 
	.tclk_mask	= (1 << 7) | (1 << 6) | (1 << 5),

};



void __init s3c64xx_set_timer_source(unsigned int event, unsigned int source)

void __init s3c64xx_set_timer_source(enum s3c64xx_timer_mode event,

				     enum s3c64xx_timer_mode source)

{

	s3c64xx_pwm_variant.output_mask = BIT(SAMSUNG_PWM_NUM) - 1;

	s3c64xx_pwm_variant.output_mask &= ~(BIT(event) | BIT(source));