From 1cb2dceeb4e8ad1a69f5bc8b9d40148d92ec3066 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 10 Feb 2021 06:48:26 -0600 Subject: [PATCH] xtensa: intel_s1000: Rework device_get_binding for pinmux Switch to use DEVICE_DT_GET instead of device_get_binding for pinmux device. As part of this change drop the "label" property from the pinmux devicetree node and update the binding and dts files to reflect that. Signed-off-by: Kumar Gala --- boards/xtensa/intel_s1000_crb/pinmux.c | 4 +++- dts/bindings/pinctrl/intel,s1000-pinmux.yaml | 3 --- dts/xtensa/intel/intel_s1000.dtsi | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/boards/xtensa/intel_s1000_crb/pinmux.c b/boards/xtensa/intel_s1000_crb/pinmux.c index 5c407aafcca..83972c20d2d 100644 --- a/boards/xtensa/intel_s1000_crb/pinmux.c +++ b/boards/xtensa/intel_s1000_crb/pinmux.c @@ -25,7 +25,9 @@ static int intel_s1000_pinmux_init(const struct device *dev) { const struct device *pinmux; - pinmux = device_get_binding(DT_LABEL(DT_INST(0, intel_s1000_pinmux))); + pinmux = DEVICE_DT_GET(DT_INST(0, intel_s1000_pinmux)); + + __ASSERT_NO_MSG(device_is_ready(pinmux)); if (pinmux == NULL) { return -ENXIO; diff --git a/dts/bindings/pinctrl/intel,s1000-pinmux.yaml b/dts/bindings/pinctrl/intel,s1000-pinmux.yaml index b784caa5d75..e3fbdd7a459 100644 --- a/dts/bindings/pinctrl/intel,s1000-pinmux.yaml +++ b/dts/bindings/pinctrl/intel,s1000-pinmux.yaml @@ -9,9 +9,6 @@ properties: reg: required: true - label: - required: true - pinmux-cells: - pin - function diff --git a/dts/xtensa/intel/intel_s1000.dtsi b/dts/xtensa/intel/intel_s1000.dtsi index 24b35eb137d..c326183a57f 100644 --- a/dts/xtensa/intel/intel_s1000.dtsi +++ b/dts/xtensa/intel/intel_s1000.dtsi @@ -123,7 +123,6 @@ pinmux: pinmux@81c30 { compatible = "intel,s1000-pinmux"; reg = <0x00081c30 0xC>; - label = "PINMUX"; }; uart0: uart@80800 {