nfc: s3fwrn5: Few cleanups
Subsystems (6)
Krzysztof Kozlowski
maintainerv3 cover nfc: s3fwrn5: Few cleanups
Hi,
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.
Best regards,
Krzysztof
Krzysztof Kozlowski (8):
dt-bindings: net: nfc: s3fwrn5: Convert to dtschema
dt-bindings: net: nfc: s3fwrn5: Remove wrong vendor prefix from GPIOs
nfc: s3fwrn5: Remove wrong vendor prefix from GPIOs
nfc: s3fwrn5: Remove unneeded 'ret' variable
nfc: s3fwrn5: Add missing CRYPTO_HASH dependency
nfc: s3fwrn5: Constify s3fwrn5_fw_info when not modified
MAINTAINERS: Add Krzysztof Kozlowski to Samsung S3FWRN5 and remove
Robert
arm64: dts: exynos: Use newer S3FWRN5 GPIO properties in Exynos5433
TM2
CREDITS | 4 + .../devicetree/bindings/net/nfc/s3fwrn5.txt | 25 ------- .../bindings/net/nfc/samsung,s3fwrn5.yaml | 73 +++++++++++++++++++ MAINTAINERS | 5 +- .../dts/exynos/exynos5433-tm2-common.dtsi | 4 +- drivers/nfc/s3fwrn5/Kconfig | 1 + drivers/nfc/s3fwrn5/firmware.c | 4 +- drivers/nfc/s3fwrn5/firmware.h | 2 +- drivers/nfc/s3fwrn5/i2c.c | 24 +++--- 9 files changed, 101 insertions(+), 41 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt create mode 100644 Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
Signature · 1 line
2.17.1
Krzysztof Kozlowski
maintainerPATCH v3 1/8 dt-bindings: net: nfc: s3fwrn5: Convert to dtschema
Convert the Samsung S3FWRN5 NCI NFC controller bindings to dtschema. This is conversion only so it includes properties with invalid prefixes (s3fwrn5,en-gpios) which should be addressed later.
--- .../devicetree/bindings/net/nfc/s3fwrn5.txt | 25 -------- .../bindings/net/nfc/samsung,s3fwrn5.yaml | 61 +++++++++++++++++++ MAINTAINERS | 1 + 3 files changed, 62 insertions(+), 25 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt create mode 100644 Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt deleted +0 -25
@@ -1,25 +0,0 @@ -* 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 new file +61 -0
61 lines not on this page · raw message
MAINTAINERS +1 -0
@@ -15273,6 +15273,7 @@ M: Robert Baldyga <[email protected]> M: Krzysztof Opasiak <[email protected]> L: [email protected] (moderated for non-subscribers) S: Supported +F: Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml F: drivers/nfc/s3fwrn5 SAMSUNG S5C73M3 CAMERA DRIVER
Signature · 1 line
2.17.1
Krzysztof Kozlowski
maintainerPATCH v3 2/8 dt-bindings: net: nfc: s3fwrn5: Remove wrong vendor prefix from GPIOs
In reply to Krzysztof KozlowskiThe device tree property prefix describes the vendor, which in case of S3FWRN5 chip is Samsung. Therefore the "s3fwrn5" prefix for "en-gpios" and "fw-gpios" is not correct and should be deprecated. Introduce properly named properties for these GPIOs and rename the fw-gpios" to "wake-gpios" to better describe its purpose.
--- .../bindings/net/nfc/samsung,s3fwrn5.yaml | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml +18 -6
@@ -14,30 +14,42 @@ 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: - Output GPIO pin used for enabling/disabling the chip + Use en-gpios s3fwrn5,fw-gpios: maxItems: 1 + deprecated: true description: - Output GPIO pin used to enter firmware mode and sleep/wakeup control + Use wake-gpios additionalProperties: false required: - compatible + - en-gpios - interrupts - reg - - s3fwrn5,en-gpios - - s3fwrn5,fw-gpios + - wake-gpios examples: - |
@@ -55,7 +67,7 @@ examples: 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>; }; };
Signature · 1 line
2.17.1
Krzysztof Kozlowski
maintainerPATCH v3 3/8 nfc: s3fwrn5: Remove wrong vendor prefix from GPIOs
In reply to Krzysztof KozlowskiThe device tree property prefix describes the vendor, which in case of S3FWRN5 chip is Samsung. Therefore the "s3fwrn5" prefix for "en-gpios" and "fw-gpios" is not correct and should be deprecated. Introduce properly named properties for these GPIOs but still support deprecated ones.
--- drivers/nfc/s3fwrn5/i2c.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/nfc/s3fwrn5/i2c.c +14 -6
@@ -200,13 +200,21 @@ static int s3fwrn5_i2c_parse_dt(struct i2c_client *client)if (!np)return -ENODEV ; - phy->gpio_en =of_get_named_gpio (np,"s3fwrn5,en-gpios" ,0 ); -if (!gpio_is_valid (phy->gpio_en)) -return -ENODEV ; + phy->gpio_en =of_get_named_gpio (np,"en-gpios" ,0 ); +if (!gpio_is_valid (phy->gpio_en)) { +/* Support also deprecated property */ + phy->gpio_en =of_get_named_gpio (np,"s3fwrn5,en-gpios" ,0 ); +if (!gpio_is_valid (phy->gpio_en)) +return -ENODEV ; + } - phy->gpio_fw_wake =of_get_named_gpio (np,"s3fwrn5,fw-gpios" ,0 ); -if (!gpio_is_valid (phy->gpio_fw_wake)) -return -ENODEV ; + phy->gpio_fw_wake =of_get_named_gpio (np,"wake-gpios" ,0 ); +if (!gpio_is_valid (phy->gpio_fw_wake)) { +/* Support also deprecated property */ + phy->gpio_fw_wake =of_get_named_gpio (np,"s3fwrn5,fw-gpios" ,0 ); +if (!gpio_is_valid (phy->gpio_fw_wake)) +return -ENODEV ; + }return 0 ; }
Signature · 1 line
2.17.1
Krzysztof Kozlowski
maintainerPATCH v3 4/8 nfc: s3fwrn5: Remove unneeded 'ret' variable
In reply to Krzysztof KozlowskiThe local variable 'ret' can be removed:
drivers/nfc/s3fwrn5/i2c.c:167:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
--- drivers/nfc/s3fwrn5/i2c.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/nfc/s3fwrn5/i2c.c +1 -3
@@ -164,7 +164,6 @@ static int s3fwrn5_i2c_read(struct s3fwrn5_i2c_phy *phy)static irqreturn_t s3fwrn5_i2c_irq_thread_fn (int irq,void *phy_id) {struct s3fwrn5_i2c_phy *phy = phy_id; -int ret =0 ;if (!phy || !phy->ndev) {WARN_ON_ONCE (1 );
@@ -179,10 +178,9 @@ static irqreturn_t s3fwrn5_i2c_irq_thread_fn(int irq, void *phy_id)switch (phy->mode) {case S3FWRN5_MODE_NCI :case S3FWRN5_MODE_FW : - ret =s3fwrn5_i2c_read (phy); +s3fwrn5_i2c_read (phy);break ;case S3FWRN5_MODE_COLD : - ret = -EREMOTEIO ;break ; }
Signature · 1 line
2.17.1
Krzysztof Kozlowski
maintainerPATCH v3 5/8 nfc: s3fwrn5: Add missing CRYPTO_HASH dependency
In reply to Krzysztof KozlowskiThe driver uses crypto hash functions so it needs to select CRYPTO_HASH. This fixes build errors:
arc-linux-ld: drivers/nfc/s3fwrn5/firmware.o: in function `s3fwrn5_fw_download':
firmware.c:(.text+0x152): undefined reference to `crypto_alloc_shash'
--- drivers/nfc/s3fwrn5/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/nfc/s3fwrn5/Kconfig +1 -0
@@ -2,6 +2,7 @@ config NFC_S3FWRN5 tristate select CRYPTO + select CRYPTO_HASH help Core driver for Samsung S3FWRN5 NFC chip. Contains core utilities of chip. It's intended to be used by PHYs to avoid duplicating lots
Signature · 1 line
2.17.1
Krzysztof Kozlowski
maintainerPATCH v3 6/8 nfc: s3fwrn5: Constify s3fwrn5_fw_info when not modified
In reply to Krzysztof KozlowskiTwo functions accept pointer to struct s3fwrn5_fw_info but do not modify the contents. Make them const so the code is a little bit safer.
--- drivers/nfc/s3fwrn5/firmware.c | 4 ++-- drivers/nfc/s3fwrn5/firmware.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/nfc/s3fwrn5/firmware.c +2 -2
@@ -348,7 +348,7 @@ static int s3fwrn5_fw_get_base_addr( }static inline bool -s3fwrn5_fw_is_custom (struct s3fwrn5_fw_cmd_get_bootinfo_rsp *bootinfo) +s3fwrn5_fw_is_custom (const struct s3fwrn5_fw_cmd_get_bootinfo_rsp *bootinfo) {return !!bootinfo->hw_version[2 ]; }
@@ -399,7 +399,7 @@ int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info)return ret; } -bool s3fwrn5_fw_check_version (struct s3fwrn5_fw_info *fw_info,u32 version) +bool s3fwrn5_fw_check_version (const struct s3fwrn5_fw_info *fw_info,u32 version) {struct s3fwrn5_fw_version *new = (void *) &fw_info->fw.version;struct s3fwrn5_fw_version *old = (void *) &version;
drivers/nfc/s3fwrn5/firmware.h +1 -1
@@ -91,7 +91,7 @@ struct s3fwrn5_fw_info {void s3fwrn5_fw_init (struct s3fwrn5_fw_info *fw_info,const char *fw_name);int s3fwrn5_fw_setup (struct s3fwrn5_fw_info *fw_info); -bool s3fwrn5_fw_check_version (struct s3fwrn5_fw_info *fw_info,u32 version); +bool s3fwrn5_fw_check_version (const struct s3fwrn5_fw_info *fw_info,u32 version);int s3fwrn5_fw_download (struct s3fwrn5_fw_info *fw_info);void s3fwrn5_fw_cleanup (struct s3fwrn5_fw_info *fw_info);
Signature · 1 line
2.17.1
Krzysztof Kozlowski
maintainerPATCH v3 7/8 MAINTAINERS: Add Krzysztof Kozlowski to Samsung S3FWRN5 and remove Robert
In reply to Krzysztof KozlowskiRobert Bałdyga's email does not work (bounces) since 2016 so remove it. Additionally there are no review/ack/tested tags from Krzysztof Opasiak so it looks like the driver is not supported.
As a maintainer of Samsung ARM/ARM64 SoC, I can take care about this driver and provide some review. However clearly driver is not in supported mode as I do not work in Samsung anymore.
--- CREDITS | 4 ++++ MAINTAINERS | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)
CREDITS +4 -0
@@ -191,6 +191,10 @@ N: Krishna Balasubramanian E: [email protected] D: Wrote SYS V IPC (part of standard kernel since 0.99.10) +B: Robert Baldyga +E: [email protected] +D: Samsung S3FWRN5 NCI NFC Controller + N: Chris Ball E: [email protected] D: Former maintainer of the MMC/SD/SDIO subsystem.
MAINTAINERS +2 -2
@@ -15269,10 +15269,10 @@ F: drivers/media/platform/s3c-camif/ F: include/media/drv-intf/s3c_camif.h SAMSUNG S3FWRN5 NFC DRIVER -M: Robert Baldyga <[email protected]> +M: Krzysztof Kozlowski <[email protected]> M: Krzysztof Opasiak <[email protected]> L: [email protected] (moderated for non-subscribers) -S: Supported +S: Maintained F: Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml F: drivers/nfc/s3fwrn5
Signature · 1 line
2.17.1
Krzysztof Kozlowski
maintainerPATCH v3 8/8 arm64: dts: exynos: Use newer S3FWRN5 GPIO properties in Exynos5433 TM2
In reply to Krzysztof KozlowskiSince "s3fwrn5" is not a valid vendor prefix, use new GPIO properties instead of the deprecated.
--- arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +2 -2
@@ -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>; }; };
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Krzysztof Kozlowski <[email protected]>
Date: Thu, 10 Sep 2020 18:12:11 +0200
Quoted 9 lines
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.
Seires applied to net-next, thanks.
Krzysztof Kozlowski
maintainerQuoted 8 lines · David Miller
From: Krzysztof Kozlowski <[email protected]>
Date: Thu, 10 Sep 2020 18:12:11 +0200Quoted 4 lines
Changes since v2:
1. Fix dtschema ID after rename (patch 1/8).
2. Apply patch 9/9 (defconfig change).
Quoted 7 lines
Quoted 5 lines
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.Seires applied to net-next, thanks.
Thanks. The DTS should go separate - via samsung-soc/arm-soc tree. However if it is too late, then no problem.
Best regards,
Krzysztof