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

Merge tag 'samsung-drivers-6.1' of... 

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

Samsung SoC drivers changes for v6.1

1. Convert Samsung Exynos G-Scaler bindings to DT schema.
2. Maintainers update (drop Bartlomiej Zolnierkiewicz).

* tag 'samsung-drivers-6.1' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  MAINTAINERS: Drop Bartlomiej Zolnierkiewicz
  MAINTAINERS: pwm-fan: Drop Bartlomiej Zolnierkiewicz
  dt-bindings: media: samsung,exynos5250-gsc: convert to dtschema

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c3fe295c 6212d2d9

Documentation/devicetree/bindings/media/exynos5-gsc.txt

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
* Samsung Exynos5 G-Scaler device



G-Scaler is used for scaling and color space conversion on Exynos5 SoCs.



Required properties:

- compatible: should be one of

	      "samsung,exynos5250-gsc"

	      "samsung,exynos5420-gsc"

	      "samsung,exynos5433-gsc"

	      "samsung,exynos5-gsc" (deprecated)

- reg: should contain G-Scaler physical address location and length.

- interrupts: should contain G-Scaler interrupt number



Optional properties:

- samsung,sysreg: handle to syscon used to control the system registers to

  set writeback input and destination



Example:



gsc_0:  gsc@13e00000 {

	compatible = "samsung,exynos5250-gsc";

	reg = <0x13e00000 0x1000>;

	interrupts = <0 85 0>;

};



Aliases:

Each G-Scaler node should have a numbered alias in the aliases node,

in the form of gscN, N = 0...3. G-Scaler driver uses these aliases

to retrieve the device IDs using "of_alias_get_id()" call.



Example:



aliases {

	gsc0 =&gsc_0;

	gsc1 =&gsc_1;

	gsc2 =&gsc_2;

	gsc3 =&gsc_3;

};

Documentation/devicetree/bindings/media/samsung,exynos5250-gsc.yaml

0 → 100644
+109 −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/media/samsung,exynos5250-gsc.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Samsung Exynos SoC G-Scaler



maintainers:

  - Inki Dae <inki.dae@samsung.com>

  - Krzysztof Kozlowski <krzk@kernel.org>

  - Seung-Woo Kim <sw0312.kim@samsung.com



description:

  G-Scaler is used for scaling and color space conversion on Samsung Exynos

  SoCs.



  Each G-Scaler node should have a numbered alias in the aliases node, in the

  form of gscN, N = 0...3.



properties:

  compatible:

    oneOf:

      - items:

          - enum:

              - samsung,exynos5250-gsc

              - samsung,exynos5420-gsc

          - const: samsung,exynos5-gsc

      - enum:

          - samsung,exynos5433-gsc

      - const: samsung,exynos5-gsc

        deprecated: True



  clocks:

    minItems: 1

    maxItems: 5



  clock-names:

    minItems: 1

    maxItems: 5



  interrupts:

    maxItems: 1



  iommus:

    maxItems: 1



  power-domains:

    maxItems: 1



  reg:

    maxItems: 1



  samsung,sysreg:

    $ref: /schemas/types.yaml#/definitions/phandle

    description:

      Syscon used to control the system registers to set writeback input and destination.



required:

  - compatible

  - clocks

  - clock-names

  - interrupts

  - reg



allOf:

  - if:

      properties:

        compatible:

          contains:

            enum:

              - samsung,exynos5-gsc

              - samsung,exynos5250-gsc

              - samsung,exynos5420-gsc

    then:

      properties:

        clocks:

          maxItems: 1

        clock-names:

          items:

            - const: gscl

    else:

      properties:

        clocks:

          minItems: 5

        clock-names:

          items:

            - const: pclk

            - const: aclk

            - const: aclk_xiu

            - const: aclk_gsclbend

            - const: gsd



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/exynos5250.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>



    video-scaler@13e00000 {

        compatible = "samsung,exynos5250-gsc", "samsung,exynos5-gsc";

        reg = <0x13e00000 0x1000>;

        interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;

        power-domains = <&pd_gsc>;

        clocks = <&clock CLK_GSCL0>;

        clock-names = "gscl";

        iommus = <&sysmmu_gsc0>;

    };

MAINTAINERS

+1 −12
Original line number Diff line number Diff line
@@ -5373,8 +5373,8 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git 
F:	drivers/cpuidle/cpuidle-big_little.c









CPUIDLE DRIVER - ARM EXYNOS









M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>









M:	Daniel Lezcano <daniel.lezcano@linaro.org>









R:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Kukjin Kim <kgene@kernel.org>









L:	linux-pm@vger.kernel.org









L:	linux-samsung-soc@vger.kernel.org








@@ -12409,7 +12409,6 @@ F:	drivers/power/supply/max77976_charger.c















MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>









L:	linux-pm@vger.kernel.org









S:	Supported









B:	mailto:linux-samsung-soc@vger.kernel.org








@@ -12421,7 +12420,6 @@ F:	drivers/power/supply/max77693_charger.c







MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS









M:	Chanwoo Choi <cw00.choi@samsung.com>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>









L:	linux-kernel@vger.kernel.org









S:	Supported









B:	mailto:linux-samsung-soc@vger.kernel.org








@@ -16537,14 +16535,6 @@ T:	git git://linuxtv.org/media_tree.git







F:	drivers/media/usb/pwc/*









F:	include/trace/events/pwc.h

















PWM FAN DRIVER









M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>









L:	linux-hwmon@vger.kernel.org









S:	Supported









F:	Documentation/devicetree/bindings/hwmon/pwm-fan.txt









F:	Documentation/hwmon/pwm-fan.rst









F:	drivers/hwmon/pwm-fan.c

















PWM IR Transmitter









M:	Sean Young <sean@mess.org>









L:	linux-media@vger.kernel.org








@@ -17961,7 +17951,6 @@ F:	drivers/platform/x86/samsung-laptop.c















SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>









L:	linux-kernel@vger.kernel.org









L:	linux-samsung-soc@vger.kernel.org









S:	Supported