From c91d473eaded7b12830581fd269e1ce546f9175a Mon Sep 17 00:00:00 2001 From: Daniel DeGrasse Date: Thu, 21 Apr 2022 10:20:02 -0500 Subject: [PATCH] drivers: imx_usdhc: change DT_COMPAT string to imx-usdhc with the legacy USDHC driver fully removed from the tree, the nxp,imx-usdhc binding can now be used for the new SD host controller driver. Signed-off-by: Daniel DeGrasse --- drivers/sdhc/imx_usdhc.c | 4 ++-- dts/arm/nxp/nxp_rt.dtsi | 4 ++-- dts/arm/nxp/nxp_rt11xx.dtsi | 4 ++-- dts/arm/nxp/nxp_rt5xx_common.dtsi | 4 ++-- dts/arm/nxp/nxp_rt6xx_common.dtsi | 4 ++-- dts/bindings/sdhc/{nxp,imx-sdhc.yaml => nxp,imx-usdhc.yaml} | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) rename dts/bindings/sdhc/{nxp,imx-sdhc.yaml => nxp,imx-usdhc.yaml} (98%) diff --git a/drivers/sdhc/imx_usdhc.c b/drivers/sdhc/imx_usdhc.c index 434031d8a2c..88684e04d02 100644 --- a/drivers/sdhc/imx_usdhc.c +++ b/drivers/sdhc/imx_usdhc.c @@ -1,11 +1,11 @@ /* - * Copyright (c) 2022 NXP + * Copyright 2022 NXP * * SPDX-License-Identifier: Apache-2.0 */ -#define DT_DRV_COMPAT nxp_imx_sdhc +#define DT_DRV_COMPAT nxp_imx_usdhc #include #include diff --git a/dts/arm/nxp/nxp_rt.dtsi b/dts/arm/nxp/nxp_rt.dtsi index 5ec01b7b0be..a711827bd5f 100644 --- a/dts/arm/nxp/nxp_rt.dtsi +++ b/dts/arm/nxp/nxp_rt.dtsi @@ -680,7 +680,7 @@ }; usdhc1: usdhc@402c0000 { - compatible = "nxp,imx-sdhc"; + compatible = "nxp,imx-usdhc"; reg = <0x402c0000 0x4000>; status = "disabled"; interrupts = <110 0>; @@ -693,7 +693,7 @@ }; usdhc2: usdhc@402c4000 { - compatible = "nxp,imx-sdhc"; + compatible = "nxp,imx-usdhc"; reg = <0x402c4000 0x4000>; status = "disabled"; interrupts = <111 0>; diff --git a/dts/arm/nxp/nxp_rt11xx.dtsi b/dts/arm/nxp/nxp_rt11xx.dtsi index dc22e1b2a15..c145b7bd8ab 100644 --- a/dts/arm/nxp/nxp_rt11xx.dtsi +++ b/dts/arm/nxp/nxp_rt11xx.dtsi @@ -775,7 +775,7 @@ }; usdhc1: usdhc@40418000 { - compatible = "nxp,imx-sdhc"; + compatible = "nxp,imx-usdhc"; reg = <0x40418000 0x4000>; status = "disabled"; interrupts = <133 0>; @@ -788,7 +788,7 @@ }; usdhc2: usdhc@4041c000 { - compatible = "nxp,imx-sdhc"; + compatible = "nxp,imx-usdhc"; reg = <0x4041c000 0x4000>; status = "disabled"; interrupts = <134 0>; diff --git a/dts/arm/nxp/nxp_rt5xx_common.dtsi b/dts/arm/nxp/nxp_rt5xx_common.dtsi index 189656f48bb..f956feb688d 100644 --- a/dts/arm/nxp/nxp_rt5xx_common.dtsi +++ b/dts/arm/nxp/nxp_rt5xx_common.dtsi @@ -369,7 +369,7 @@ }; usdhc1: usdhc@136000 { - compatible = "nxp,imx-sdhc"; + compatible = "nxp,imx-usdhc"; reg = <0x136000 0x1000>; status = "disabled"; interrupts = <45 0>; @@ -382,7 +382,7 @@ }; usdhc2: usdhc@137000 { - compatible = "nxp,imx-sdhc"; + compatible = "nxp,imx-usdhc"; reg = <0x137000 0x1000>; status = "disabled"; interrupts = <46 0>; diff --git a/dts/arm/nxp/nxp_rt6xx_common.dtsi b/dts/arm/nxp/nxp_rt6xx_common.dtsi index 8af0f16a14a..efd3714b402 100644 --- a/dts/arm/nxp/nxp_rt6xx_common.dtsi +++ b/dts/arm/nxp/nxp_rt6xx_common.dtsi @@ -321,7 +321,7 @@ }; usdhc1: usdhc@136000 { - compatible = "nxp,imx-sdhc"; + compatible = "nxp,imx-usdhc"; reg = <0x136000 0x1000>; status = "disabled"; interrupts = <45 0>; @@ -334,7 +334,7 @@ }; usdhc2: usdhc@137000 { - compatible = "nxp,imx-sdhc"; + compatible = "nxp,imx-usdhc"; reg = <0x137000 0x1000>; status = "disabled"; interrupts = <46 0>; diff --git a/dts/bindings/sdhc/nxp,imx-sdhc.yaml b/dts/bindings/sdhc/nxp,imx-usdhc.yaml similarity index 98% rename from dts/bindings/sdhc/nxp,imx-sdhc.yaml rename to dts/bindings/sdhc/nxp,imx-usdhc.yaml index 3574934bf0f..2d6a48507b7 100644 --- a/dts/bindings/sdhc/nxp,imx-sdhc.yaml +++ b/dts/bindings/sdhc/nxp,imx-usdhc.yaml @@ -3,7 +3,7 @@ description: NXP imx USDHC controller -compatible: "nxp,imx-sdhc" +compatible: "nxp,imx-usdhc" include: [sdhc.yaml, pinctrl-device.yaml]