diff options
author | Andrew McRae <amcrae@google.com> | 2022-01-27 10:30:19 +1100 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2022-01-27 21:35:52 +0000 |
commit | f8af09f1abb8460ff8af7ac00f4720c8065801ca (patch) | |
tree | a985ce330a639ba8c858e1ee6a0a1a8e7b5a0834 | |
parent | 01ac7141ac80489909c75c85995fce4805b61dd2 (diff) | |
download | chrome-ec-f8af09f1abb8460ff8af7ac00f4720c8065801ca.tar.gz |
pcf85063: Move int-gpio to int-pin
Change naming so GPIO is not required.
BUG=b:216402316
TEST=zmake configure -b herobrine_npcx9
BRANCH=none
Signed-off-by: Andrew McRae <amcrae@google.com>
Change-Id: Ifc8d961dee6b24f3cc77d16149a981759d0dc4ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3418797
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
-rw-r--r-- | zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c | 17 | ||||
-rw-r--r-- | zephyr/dts/bindings/cros_rtc/nxp,rtc-pcf85063a.yaml | 4 | ||||
-rw-r--r-- | zephyr/projects/herobrine/i2c.dts | 2 |
3 files changed, 11 insertions, 12 deletions
diff --git a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c b/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c index 94632947c6..3b213e21c8 100644 --- a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c +++ b/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c @@ -417,7 +417,7 @@ static int nxp_rtc_pcf85063a_init(const struct device *dev) } #define PCF85063A_INT_GPIOS \ - DT_PHANDLE_BY_IDX(DT_NODELABEL(pcf85063a), int_gpios, 0) + DT_PHANDLE(DT_NODELABEL(pcf85063a), int_pin) /* * dt_flags is a uint8_t type. However, for platform/ec @@ -426,20 +426,19 @@ static int nxp_rtc_pcf85063a_init(const struct device *dev) * Cast back to a gpio_dt_flags to compile, discarding the bits * that are not supported by the Zephyr GPIO API. */ -#define CROS_EC_GPIO_DT_SPEC_GET_BY_IDX(node_id, prop, idx) \ - { \ - .port = \ - DEVICE_DT_GET(DT_GPIO_CTLR_BY_IDX(node_id, prop, idx)), \ - .pin = DT_GPIO_PIN_BY_IDX(node_id, prop, idx), \ - .dt_flags = \ - (gpio_dt_flags_t)DT_GPIO_FLAGS_BY_IDX(node_id, prop, idx), \ +#define CROS_EC_GPIO_DT_SPEC_GET(node_id, prop) \ + { \ + .port = DEVICE_DT_GET(DT_GPIO_CTLR(node_id, prop)), \ + .pin = DT_GPIO_PIN(node_id, prop), \ + .dt_flags = \ + (gpio_dt_flags_t)DT_GPIO_FLAGS(node_id, prop), \ } static const struct nxp_rtc_pcf85063a_config nxp_rtc_pcf85063a_cfg_0 = { .bus = DEVICE_DT_GET(DT_INST_BUS(0)), .i2c_addr_flags = DT_INST_REG_ADDR(0), .gpio_alert = - CROS_EC_GPIO_DT_SPEC_GET_BY_IDX(PCF85063A_INT_GPIOS, gpios, 0) + CROS_EC_GPIO_DT_SPEC_GET(PCF85063A_INT_GPIOS, gpios) }; static struct nxp_rtc_pcf85063a_data nxp_rtc_pcf85063a_data_0; diff --git a/zephyr/dts/bindings/cros_rtc/nxp,rtc-pcf85063a.yaml b/zephyr/dts/bindings/cros_rtc/nxp,rtc-pcf85063a.yaml index 7717649ede..8b881d2f2c 100644 --- a/zephyr/dts/bindings/cros_rtc/nxp,rtc-pcf85063a.yaml +++ b/zephyr/dts/bindings/cros_rtc/nxp,rtc-pcf85063a.yaml @@ -11,7 +11,7 @@ properties: label: required: true - int-gpios: - type: phandle-array + int-pin: + type: phandle required: true description: Interrupt from RTC diff --git a/zephyr/projects/herobrine/i2c.dts b/zephyr/projects/herobrine/i2c.dts index d8cb226710..040abb55ef 100644 --- a/zephyr/projects/herobrine/i2c.dts +++ b/zephyr/projects/herobrine/i2c.dts @@ -123,7 +123,7 @@ compatible = "nxp,rtc-pcf85063a"; reg = <0x51>; label = "RTC_PCF85063A"; - int-gpios = <&gpio_rtc_ec_wake_odl>; + int-pin = <&gpio_rtc_ec_wake_odl>; }; }; |