Commit b55353e2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'nfc-s3fwrn5-Few-cleanups' 



Krzysztof Kozlowski says:

====================
nfc: s3fwrn5: Few cleanups

Changes since v2:
1. Fix dtschema ID after rename (patch 1/8).
2. Apply patch 9/9 (defconfig change).

Changes since v1:
1. Rename dtschema file and add additionalProperties:false, as Rob
   suggested,
2. Add Marek's tested-by,
3. New patches: #4, #5, #6, #7 and #9.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3fe6ab12 0760aad0

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -191,6 +191,10 @@ N: Krishna Balasubramanian 
E: balasub@cis.ohio-state.edu

D: Wrote SYS V IPC (part of standard kernel since 0.99.10)



B: Robert Baldyga

E: r.baldyga@hackerion.com

D: Samsung S3FWRN5 NCI NFC Controller



N: Chris Ball

E: chris@printf.net

D: Former maintainer of the MMC/SD/SDIO subsystem.

Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
* Samsung S3FWRN5 NCI NFC Controller



Required properties:

- compatible: Should be "samsung,s3fwrn5-i2c".

- reg: address on the bus

- interrupts: GPIO interrupt to which the chip is connected

- s3fwrn5,en-gpios: Output GPIO pin used for enabling/disabling the chip

- s3fwrn5,fw-gpios: Output GPIO pin used to enter firmware mode and

  sleep/wakeup control



Example:



&hsi2c_4 {

	s3fwrn5@27 {

		compatible = "samsung,s3fwrn5-i2c";



		reg = <0x27>;



		interrupt-parent = <&gpa1>;

		interrupts = <3 0 0>;



		s3fwrn5,en-gpios = <&gpf1 4 0>;

		s3fwrn5,fw-gpios = <&gpj0 2 0>;

	};

};

Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml

0 → 100644
+73 −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/net/nfc/samsung,s3fwrn5.yaml#

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



title: Samsung S3FWRN5 NCI NFC Controller



maintainers:

  - Krzysztof Kozlowski <krzk@kernel.org>

  - Krzysztof Opasiak <k.opasiak@samsung.com>



properties:

  compatible:

    const: samsung,s3fwrn5-i2c



  en-gpios:

    maxItems: 1

    description:

      Output GPIO pin used for enabling/disabling the chip



  interrupts:

    maxItems: 1



  reg:

    maxItems: 1



  wake-gpios:

    maxItems: 1

    description:

      Output GPIO pin used to enter firmware mode and sleep/wakeup control



  s3fwrn5,en-gpios:

    maxItems: 1

    deprecated: true

    description:

      Use en-gpios



  s3fwrn5,fw-gpios:

    maxItems: 1

    deprecated: true

    description:

      Use wake-gpios



additionalProperties: false



required:

  - compatible

  - en-gpios

  - interrupts

  - reg

  - wake-gpios



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>

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



    i2c4 {

        #address-cells = <1>;

        #size-cells = <0>;



        s3fwrn5@27 {

            compatible = "samsung,s3fwrn5-i2c";

            reg = <0x27>;



            interrupt-parent = <&gpa1>;

            interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;



            en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>;

            wake-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>;

        };

    };

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -15292,10 +15292,11 @@ F: drivers/media/platform/s3c-camif/ 
F:	include/media/drv-intf/s3c_camif.h















SAMSUNG S3FWRN5 NFC DRIVER













M:	Robert Baldyga <r.baldyga@samsung.com>













M:	Krzysztof Kozlowski <krzk@kernel.org>















M:	Krzysztof Opasiak <k.opasiak@samsung.com>















L:	linux-nfc@lists.01.org (moderated for non-subscribers)













S:	Supported













S:	Maintained













F:	Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml















F:	drivers/nfc/s3fwrn5





























SAMSUNG S5C73M3 CAMERA DRIVER

































arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi



+2
−2






























Original line number
Diff line number
Diff line








@@ -795,8 +795,8 @@













		reg = <0x27>;















		interrupt-parent = <&gpa1>;















		interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;













		s3fwrn5,en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>;













		s3fwrn5,fw-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>;













		en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>;













		wake-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>;















	};















};

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE