nfc: st-nci: set is_ese_present and is_uicc_present properly

When they're present, set is_ese_present and set is_uicc_present
to the value describe in their package description.

So far is_ese_present and is_uicc_present was set to true if their
property was present.

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c
index 6645972..a6a1977 100644 (file)
--- a/drivers/nfc/st-nci/i2c.c
+++ b/drivers/nfc/st-nci/i2c.c
@@ -214,6 +214,7 @@ static int st_nci_i2c_acpi_request_resources(struct i2c_client *client)
        const struct acpi_device_id *id;
        struct gpio_desc *gpiod_reset;
        struct device *dev;
+       u8 tmp;
 
        if (!client)
                return -EINVAL;
@@ -237,10 +238,18 @@ static int st_nci_i2c_acpi_request_resources(struct i2c_client *client)
 
        phy->irq_polarity = irq_get_trigger_type(client->irq);
 
-       phy->se_status.is_ese_present =
-                               device_property_present(dev, "ese-present");
-       phy->se_status.is_uicc_present =
-                               device_property_present(dev, "uicc-present");
+       phy->se_status.is_ese_present = false;
+       phy->se_status.is_uicc_present = false;
+
+       if (device_property_present(dev, "ese-present")) {
+               device_property_read_u8(dev, "ese-present", &tmp);
+               phy->se_status.is_ese_present = tmp;
+       }
+
+       if (device_property_present(dev, "uicc-present")) {
+               device_property_read_u8(dev, "uicc-present", &tmp);
+               phy->se_status.is_uicc_present = tmp;
+       }
 
        return 0;
 }

diff --git a/drivers/nfc/st-nci/spi.c b/drivers/nfc/st-nci/spi.c
index e015015..51a863f 100644 (file)
--- a/drivers/nfc/st-nci/spi.c
+++ b/drivers/nfc/st-nci/spi.c
@@ -229,6 +229,7 @@ static int st_nci_spi_acpi_request_resources(struct spi_device *spi_dev)
        const struct acpi_device_id *id;
        struct gpio_desc *gpiod_reset;
        struct device *dev;
+       u8 tmp;
 
        if (!spi_dev)
                return -EINVAL;
@@ -252,10 +253,18 @@ static int st_nci_spi_acpi_request_resources(struct spi_device *spi_dev)
 
        phy->irq_polarity = irq_get_trigger_type(spi_dev->irq);
 
-       phy->se_status.is_ese_present =
-                               device_property_present(dev, "ese-present");
-       phy->se_status.is_uicc_present =
-                               device_property_present(dev, "uicc-present");
+       phy->se_status.is_ese_present = false;
+       phy->se_status.is_uicc_present = false;
+
+       if (device_property_present(dev, "ese-present")) {
+               device_property_read_u8(dev, "ese-present", &tmp);
+               tmp = phy->se_status.is_ese_present;
+       }
+
+       if (device_property_present(dev, "uicc-present")) {
+               device_property_read_u8(dev, "uicc-present", &tmp);
+               tmp = phy->se_status.is_uicc_present;
+       }
 
        return 0;
 }