pá 24. 7. 2020 v 9:01 odesílatel Michal Simek <michal.si...@xilinx.com> napsal:
>
> s/xlnx,mio_bank/xlnx,mio-bank/g
>
> DT binding is describing mio-bank not mio_bank that's why fix all DTSes and
> also driver itself.
>
> Signed-off-by: Michal Simek <michal.si...@xilinx.com>
> ---
>
> arch/arm/dts/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dts | 2 +-
> arch/arm/dts/avnet-ultrazedev-som-v1.0.dtsi | 2 +-
> arch/arm/dts/versal-mini-emmc0.dts | 2 +-
> arch/arm/dts/versal-mini-emmc1.dts | 2 +-
> arch/arm/dts/zynqmp-e-a2197-00-revA.dts | 2 +-
> arch/arm/dts/zynqmp-g-a2197-00-revA.dts | 2 +-
> arch/arm/dts/zynqmp-m-a2197-01-revA.dts | 4 ++--
> arch/arm/dts/zynqmp-m-a2197-02-revA.dts | 4 ++--
> arch/arm/dts/zynqmp-m-a2197-03-revA.dts | 4 ++--
> arch/arm/dts/zynqmp-p-a2197-00-revA.dts | 4 ++--
> arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts | 4 ++--
> arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 4 ++--
> arch/arm/dts/zynqmp-zcu100-revC.dts | 4 ++--
> arch/arm/dts/zynqmp-zcu102-revA.dts | 2 +-
> arch/arm/dts/zynqmp-zcu104-revA.dts | 2 +-
> arch/arm/dts/zynqmp-zcu104-revC.dts | 2 +-
> arch/arm/dts/zynqmp-zcu106-revA.dts | 2 +-
> arch/arm/dts/zynqmp-zcu111-revA.dts | 2 +-
> arch/arm/dts/zynqmp-zcu1275-revB.dts | 2 +-
> arch/arm/dts/zynqmp-zcu1285-revA.dts | 2 +-
> arch/arm/dts/zynqmp-zcu208-revA.dts | 2 +-
> arch/arm/dts/zynqmp-zcu216-revA.dts | 2 +-
> drivers/mmc/zynq_sdhci.c | 2 +-
> 23 files changed, 30 insertions(+), 30 deletions(-)
>
> diff --git a/arch/arm/dts/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dts
> b/arch/arm/dts/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dts
> index ac641ff1a582..85ab9e9e29ab 100644
> --- a/arch/arm/dts/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dts
> +++ b/arch/arm/dts/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dts
> @@ -51,7 +51,7 @@
> /* microSD card slot */
> &sdhci1 {
> status = "okay";
> - xlnx,mio_bank = <1>;
> + xlnx,mio-bank = <1>;
> clock-frequency = <199998000>;
> max-frequency = <50000000>;
> no-1-8-v;
> diff --git a/arch/arm/dts/avnet-ultrazedev-som-v1.0.dtsi
> b/arch/arm/dts/avnet-ultrazedev-som-v1.0.dtsi
> index b635db649f43..cbcb290a5c83 100644
> --- a/arch/arm/dts/avnet-ultrazedev-som-v1.0.dtsi
> +++ b/arch/arm/dts/avnet-ultrazedev-som-v1.0.dtsi
> @@ -51,6 +51,6 @@
> /* Micron MTFC8GAKAJCN-4M 8 GB eMMC */
> &sdhci0 {
> status = "okay";
> - xlnx,mio_bank = <0>;
> + xlnx,mio-bank = <0>;
> clock-frequency = <199998000>;
> };
> diff --git a/arch/arm/dts/versal-mini-emmc0.dts
> b/arch/arm/dts/versal-mini-emmc0.dts
> index 7f57d232b7f9..7826a282134b 100644
> --- a/arch/arm/dts/versal-mini-emmc0.dts
> +++ b/arch/arm/dts/versal-mini-emmc0.dts
> @@ -43,7 +43,7 @@
> clocks = <&clk25 &clk25>;
> xlnx,device_id = <0>;
> no-1-8-v;
> - xlnx,mio_bank = <0>;
> + xlnx,mio-bank = <0>;
> #stream-id-cells = <1>;
> };
> };
> diff --git a/arch/arm/dts/versal-mini-emmc1.dts
> b/arch/arm/dts/versal-mini-emmc1.dts
> index 4e0758f61893..2f28f856a6a3 100644
> --- a/arch/arm/dts/versal-mini-emmc1.dts
> +++ b/arch/arm/dts/versal-mini-emmc1.dts
> @@ -43,7 +43,7 @@
> clocks = <&clk25 &clk25>;
> xlnx,device_id = <1>;
> no-1-8-v;
> - xlnx,mio_bank = <0>;
> + xlnx,mio-bank = <0>;
> #stream-id-cells = <1>;
> };
> };
> diff --git a/arch/arm/dts/zynqmp-e-a2197-00-revA.dts
> b/arch/arm/dts/zynqmp-e-a2197-00-revA.dts
> index c260411d7571..a8bbb14f6cd1 100644
> --- a/arch/arm/dts/zynqmp-e-a2197-00-revA.dts
> +++ b/arch/arm/dts/zynqmp-e-a2197-00-revA.dts
> @@ -131,7 +131,7 @@
> status = "okay";
> no-1-8-v;
> disable-wp;
> - xlnx,mio_bank = <1>;
> + xlnx,mio-bank = <1>;
> };
>
> &gem0 {
> diff --git a/arch/arm/dts/zynqmp-g-a2197-00-revA.dts
> b/arch/arm/dts/zynqmp-g-a2197-00-revA.dts
> index 09da60b10072..9468dc574fd8 100644
> --- a/arch/arm/dts/zynqmp-g-a2197-00-revA.dts
> +++ b/arch/arm/dts/zynqmp-g-a2197-00-revA.dts
> @@ -70,7 +70,7 @@
> non-removable;
> disable-wp;
> bus-width = <8>;
> - xlnx,mio_bank = <0>;
> + xlnx,mio-bank = <0>;
> };
>
> &uart0 { /* uart0 MIO38-39 */
> diff --git a/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
> b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
> index e295bac128cb..66ea02e5be7f 100644
> --- a/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
> +++ b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
> @@ -89,7 +89,7 @@
> non-removable;
> disable-wp;
> bus-width = <8>;
> - xlnx,mio_bank = <0>; /* FIXME tap delay */
> + xlnx,mio-bank = <0>; /* FIXME tap delay */
> };
>
> &uart0 { /* uart0 MIO38-39 */
> @@ -106,7 +106,7 @@
> status = "disable";
> no-1-8-v;
> disable-wp;
> - xlnx,mio_bank = <1>;
> + xlnx,mio-bank = <1>;
> };
>
> &gem0 {
> diff --git a/arch/arm/dts/zynqmp-m-a2197-02-revA.dts
> b/arch/arm/dts/zynqmp-m-a2197-02-revA.dts
> index bd2c1a46bd84..46ec427648fa 100644
> --- a/arch/arm/dts/zynqmp-m-a2197-02-revA.dts
> +++ b/arch/arm/dts/zynqmp-m-a2197-02-revA.dts
> @@ -85,7 +85,7 @@
> non-removable;
> disable-wp;
> bus-width = <8>;
> - xlnx,mio_bank = <0>; /* FIXME tap delay */
> + xlnx,mio-bank = <0>; /* FIXME tap delay */
> };
>
> &uart0 { /* uart0 MIO38-39 */
> @@ -102,7 +102,7 @@
> status = "disable";
> no-1-8-v;
> disable-wp;
> - xlnx,mio_bank = <1>;
> + xlnx,mio-bank = <1>;
> };
>
> &gem0 {
> diff --git a/arch/arm/dts/zynqmp-m-a2197-03-revA.dts
> b/arch/arm/dts/zynqmp-m-a2197-03-revA.dts
> index 700197c1f3e4..6eb58e6701ad 100644
> --- a/arch/arm/dts/zynqmp-m-a2197-03-revA.dts
> +++ b/arch/arm/dts/zynqmp-m-a2197-03-revA.dts
> @@ -85,7 +85,7 @@
> non-removable;
> disable-wp;
> bus-width = <8>;
> - xlnx,mio_bank = <0>; /* FIXME tap delay */
> + xlnx,mio-bank = <0>; /* FIXME tap delay */
> };
>
> &uart0 { /* uart0 MIO38-39 */
> @@ -102,7 +102,7 @@
> status = "disable";
> no-1-8-v;
> disable-wp;
> - xlnx,mio_bank = <1>;
> + xlnx,mio-bank = <1>;
> };
>
> &gem0 {
> diff --git a/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
> b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
> index d49b632a1d3c..4f7824ae4007 100644
> --- a/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
> +++ b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
> @@ -50,7 +50,7 @@
> non-removable;
> disable-wp;
> bus-width = <8>;
> - xlnx,mio_bank = <0>;
> + xlnx,mio-bank = <0>;
> };
>
> &uart0 { /* uart0 MIO38-39 */
> @@ -67,7 +67,7 @@
> status = "okay";
> no-1-8-v;
> disable-wp;
> - xlnx,mio_bank = <1>;
> + xlnx,mio-bank = <1>;
> };
>
> &gem0 {
> diff --git a/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts
> b/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts
> index 0ee8c62f6b9a..a377f27c50d4 100644
> --- a/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts
> +++ b/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts
> @@ -97,13 +97,13 @@
> non-removable;
> disable-wp; /* We don't have a write-protect detection */
> bus-width = <8>;
> - xlnx,mio_bank = <0>;
> + xlnx,mio-bank = <0>;
> };
>
> /* SD1 with level shifter */
> &sdhci1 {
> status = "okay";
> - xlnx,mio_bank = <1>;
> + xlnx,mio-bank = <1>;
> disable-wp; /* We don't have a write-protect detection */
> bus-width = <4>;
> };
> diff --git a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
> b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
> index 0805b93c4ac9..e2428ec974a3 100644
> --- a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
> +++ b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
> @@ -148,7 +148,7 @@
> &sdhci0 {
> status = "okay";
> bus-width = <8>;
> - xlnx,mio_bank = <0>;
> + xlnx,mio-bank = <0>;
> };
>
> /* SD1 with level shifter */
> @@ -158,7 +158,7 @@
> * This property should be removed for supporting UHS mode
> */
> no-1-8-v;
> - xlnx,mio_bank = <1>;
> + xlnx,mio-bank = <1>;
> };
>
> &uart0 {
> diff --git a/arch/arm/dts/zynqmp-zcu100-revC.dts
> b/arch/arm/dts/zynqmp-zcu100-revC.dts
> index 1726edf78ed2..d6c914c917f5 100644
> --- a/arch/arm/dts/zynqmp-zcu100-revC.dts
> +++ b/arch/arm/dts/zynqmp-zcu100-revC.dts
> @@ -259,13 +259,13 @@
> status = "okay";
> no-1-8-v;
> disable-wp;
> - xlnx,mio_bank = <0>;
> + xlnx,mio-bank = <0>;
> };
>
> &sdhci1 {
> status = "okay";
> bus-width = <0x4>;
> - xlnx,mio_bank = <0>;
> + xlnx,mio-bank = <0>;
> non-removable;
> disable-wp;
> cap-power-off-card;
> diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts
> b/arch/arm/dts/zynqmp-zcu102-revA.dts
> index d250681600a8..ed036e68f5e3 100644
> --- a/arch/arm/dts/zynqmp-zcu102-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu102-revA.dts
> @@ -660,7 +660,7 @@
> * removed for supporting UHS mode
> */
> no-1-8-v;
> - xlnx,mio_bank = <1>;
> + xlnx,mio-bank = <1>;
> };
>
> &serdes {
> diff --git a/arch/arm/dts/zynqmp-zcu104-revA.dts
> b/arch/arm/dts/zynqmp-zcu104-revA.dts
> index 78949c313445..770ed6167465 100644
> --- a/arch/arm/dts/zynqmp-zcu104-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu104-revA.dts
> @@ -268,7 +268,7 @@
> &sdhci1 {
> status = "okay";
> no-1-8-v;
> - xlnx,mio_bank = <1>;
> + xlnx,mio-bank = <1>;
> disable-wp;
> };
>
> diff --git a/arch/arm/dts/zynqmp-zcu104-revC.dts
> b/arch/arm/dts/zynqmp-zcu104-revC.dts
> index 0ca0dcf43237..eed7605dddd8 100644
> --- a/arch/arm/dts/zynqmp-zcu104-revC.dts
> +++ b/arch/arm/dts/zynqmp-zcu104-revC.dts
> @@ -291,7 +291,7 @@
> &sdhci1 {
> status = "okay";
> no-1-8-v;
> - xlnx,mio_bank = <1>;
> + xlnx,mio-bank = <1>;
> disable-wp;
> };
>
> diff --git a/arch/arm/dts/zynqmp-zcu106-revA.dts
> b/arch/arm/dts/zynqmp-zcu106-revA.dts
> index 5f4cd17505e1..fd9341c52ea8 100644
> --- a/arch/arm/dts/zynqmp-zcu106-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu106-revA.dts
> @@ -678,7 +678,7 @@
> * This property should be removed for supporting UHS mode
> */
> no-1-8-v;
> - xlnx,mio_bank = <1>;
> + xlnx,mio-bank = <1>;
> };
>
> &serdes {
> diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts
> b/arch/arm/dts/zynqmp-zcu111-revA.dts
> index cae83222bd90..8fc266d7c430 100644
> --- a/arch/arm/dts/zynqmp-zcu111-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
> @@ -589,7 +589,7 @@
> * This property should be removed for supporting UHS mode
> */
> no-1-8-v;
> - xlnx,mio_bank = <1>;
> + xlnx,mio-bank = <1>;
> };
>
> &serdes {
> diff --git a/arch/arm/dts/zynqmp-zcu1275-revB.dts
> b/arch/arm/dts/zynqmp-zcu1275-revB.dts
> index 430fc5adb423..b612215f40e7 100644
> --- a/arch/arm/dts/zynqmp-zcu1275-revB.dts
> +++ b/arch/arm/dts/zynqmp-zcu1275-revB.dts
> @@ -80,5 +80,5 @@
> * removed for supporting UHS mode
> */
> no-1-8-v;
> - xlnx,mio_bank = <1>;
> + xlnx,mio-bank = <1>;
> };
> diff --git a/arch/arm/dts/zynqmp-zcu1285-revA.dts
> b/arch/arm/dts/zynqmp-zcu1285-revA.dts
> index 3e6737edcfaf..7a006cac1c97 100644
> --- a/arch/arm/dts/zynqmp-zcu1285-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu1285-revA.dts
> @@ -266,5 +266,5 @@
> * This property should be removed for supporting UHS mode
> */
> no-1-8-v;
> - xlnx,mio_bank = <1>;
> + xlnx,mio-bank = <1>;
> };
> diff --git a/arch/arm/dts/zynqmp-zcu208-revA.dts
> b/arch/arm/dts/zynqmp-zcu208-revA.dts
> index e6e99cf8be96..edb5592c50f3 100644
> --- a/arch/arm/dts/zynqmp-zcu208-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu208-revA.dts
> @@ -586,7 +586,7 @@
> * This property should be removed for supporting UHS mode
> */
> no-1-8-v;
> - xlnx,mio_bank = <1>;
> + xlnx,mio-bank = <1>;
> };
>
> &serdes {
> diff --git a/arch/arm/dts/zynqmp-zcu216-revA.dts
> b/arch/arm/dts/zynqmp-zcu216-revA.dts
> index b55defff6e45..a95804079ce9 100644
> --- a/arch/arm/dts/zynqmp-zcu216-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu216-revA.dts
> @@ -590,7 +590,7 @@
> * This property should be removed for supporting UHS mode
> */
> no-1-8-v;
> - xlnx,mio_bank = <1>;
> + xlnx,mio-bank = <1>;
> };
>
> &serdes {
> diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
> index 43b9f215229a..6505527616d1 100644
> --- a/drivers/mmc/zynq_sdhci.c
> +++ b/drivers/mmc/zynq_sdhci.c
> @@ -276,7 +276,7 @@ static int arasan_sdhci_ofdata_to_platdata(struct udevice
> *dev)
> return PTR_ERR(priv->host->ioaddr);
>
> priv->deviceid = dev_read_u32_default(dev, "xlnx,device_id", -1);
> - priv->bank = dev_read_u32_default(dev, "xlnx,mio_bank", -1);
> + priv->bank = dev_read_u32_default(dev, "xlnx,mio-bank", -1);
>
> return 0;
> }
> --
> 2.27.0
>
Applied.
M
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
