[U-Boot] [PATCH 0/6] arm: Fix zynq DTS file with mainline Linux kernel
Hi,
with reviewing new Xilinx platforms for Linux kernel some issues were found which should be fixed. Also Kernel adopted SPDX that's why position has changed. Based on my talk with Tom it is not a problem to adopt Linux kernel style and keep these dts in sync.
Thanks, Michal
Javier Martinez Canillas (1): ARM: dts: zynq: Add generic compatible string for I2C EEPROM
Michal Simek (5): arm: zynq: Remove 0x prefixes from cc108 arm: zynq: Sync up licenses with mainline kernel arm: zynq: Use i2c-mux instead of i2cswitch for pca9548 arm: zynq: Fix eeprom dt nodes arm: zynq: Use fixed partitions for spi flash for zc770 xm010
arch/arm/dts/zynq-cc108.dts | 15 +++++++-------- arch/arm/dts/zynq-zc702.dts | 9 +++------ arch/arm/dts/zynq-zc706.dts | 9 +++------ arch/arm/dts/zynq-zc770-xm010.dts | 24 +++++++++++++----------- arch/arm/dts/zynq-zc770-xm011.dts | 9 ++++----- arch/arm/dts/zynq-zc770-xm012.dts | 13 ++++++------- arch/arm/dts/zynq-zc770-xm013.dts | 5 ++--- arch/arm/dts/zynq-zed.dts | 5 +---- arch/arm/dts/zynq-zybo.dts | 5 +---- 9 files changed, 40 insertions(+), 54 deletions(-)
The patch fixing issues reported by DTC: zynq-cc108.dtb: Warning (unit_address_format): Node /amba/spi@e000d000/flash@0/partition@0x400000 unit name should not have leading "0x" zynq-cc108.dtb: Warning (unit_address_format): Node /amba/spi@e000d000/flash@0/partition@0x800000 unit name should not have leading "0x" zynq-cc108.dtb: Warning (unit_address_format): Node /amba/spi@e000d000/flash@0/partition@0xc00000 unit name should not have leading "0x" zynq-cc108.dtb: Warning (unit_address_format): Node /amba/spi@e000d000/flash@0/partition@0xd00000 unit name should not have leading "0x" zynq-cc108.dtb: Warning (unit_address_format): Node /amba/spi@e000d000/flash@0/partition@0xf00000 unit name should not have leading "0x"
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
arch/arm/dts/zynq-cc108.dts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/dts/zynq-cc108.dts b/arch/arm/dts/zynq-cc108.dts index 4804da5235dd..b9cc000a33e9 100644 --- a/arch/arm/dts/zynq-cc108.dts +++ b/arch/arm/dts/zynq-cc108.dts @@ -70,23 +70,23 @@ label = "qspi-fsbl-uboot-bs"; reg = <0x0 0x400000>; /* 4MB */ }; - partition@0x400000 { + partition@400000 { label = "qspi-linux"; reg = <0x400000 0x400000>; /* 4MB */ }; - partition@0x800000 { + partition@800000 { label = "qspi-rootfs"; reg = <0x800000 0x400000>; /* 4MB */ }; - partition@0xc00000 { + partition@c00000 { label = "qspi-devicetree"; reg = <0xc00000 0x100000>; /* 1MB */ }; - partition@0xd00000 { + partition@d00000 { label = "qspi-scratch"; reg = <0xd00000 0x200000>; /* 2MB */ }; - partition@0xf00000 { + partition@f00000 { label = "qspi-uboot-env"; reg = <0xf00000 0x100000>; /* 1MB */ };
Use different location for SPDX line. Also update dates for new mainline DTS files.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
arch/arm/dts/zynq-cc108.dts | 5 ++--- arch/arm/dts/zynq-zc702.dts | 5 +---- arch/arm/dts/zynq-zc706.dts | 5 +---- arch/arm/dts/zynq-zc770-xm010.dts | 5 ++--- arch/arm/dts/zynq-zc770-xm011.dts | 5 ++--- arch/arm/dts/zynq-zc770-xm012.dts | 5 ++--- arch/arm/dts/zynq-zc770-xm013.dts | 3 +-- arch/arm/dts/zynq-zed.dts | 5 +---- arch/arm/dts/zynq-zybo.dts | 5 +---- 9 files changed, 13 insertions(+), 30 deletions(-)
diff --git a/arch/arm/dts/zynq-cc108.dts b/arch/arm/dts/zynq-cc108.dts index b9cc000a33e9..5f8a0d255529 100644 --- a/arch/arm/dts/zynq-cc108.dts +++ b/arch/arm/dts/zynq-cc108.dts @@ -1,13 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Xilinx CC108 board DTS * - * (C) Copyright 2007-2013 Xilinx, Inc. + * (C) Copyright 2007-2018 Xilinx, Inc. * (C) Copyright 2007-2013 Michal Simek * (C) Copyright 2007-2012 PetaLogix Qld Pty Ltd * * Michal SIMEK monstr@monstr.eu - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; /include/ "zynq-7000.dtsi" diff --git a/arch/arm/dts/zynq-zc702.dts b/arch/arm/dts/zynq-zc702.dts index da698a19ccd1..b95c1608d220 100644 --- a/arch/arm/dts/zynq-zc702.dts +++ b/arch/arm/dts/zynq-zc702.dts @@ -1,10 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* - * Xilinx ZC702 board DTS - * * Copyright (C) 2011 - 2015 Xilinx * Copyright (C) 2012 National Instruments Corp. - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; #include "zynq-7000.dtsi" diff --git a/arch/arm/dts/zynq-zc706.dts b/arch/arm/dts/zynq-zc706.dts index a88a83c16650..dbb57445ca7c 100644 --- a/arch/arm/dts/zynq-zc706.dts +++ b/arch/arm/dts/zynq-zc706.dts @@ -1,10 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* - * Xilinx ZC706 board DTS - * * Copyright (C) 2011 - 2015 Xilinx * Copyright (C) 2012 National Instruments Corp. - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; #include "zynq-7000.dtsi" diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts index cc5ba98d6bd9..0c364dfcc14f 100644 --- a/arch/arm/dts/zynq-zc770-xm010.dts +++ b/arch/arm/dts/zynq-zc770-xm010.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Xilinx ZC770 XM010 board DTS * - * Copyright (C) 2013 - 2015 Xilinx, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ + * Copyright (C) 2013-2018 Xilinx, Inc. */ /dts-v1/; #include "zynq-7000.dtsi" diff --git a/arch/arm/dts/zynq-zc770-xm011.dts b/arch/arm/dts/zynq-zc770-xm011.dts index 7f08961491a6..f711675dd88e 100644 --- a/arch/arm/dts/zynq-zc770-xm011.dts +++ b/arch/arm/dts/zynq-zc770-xm011.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Xilinx ZC770 XM013 board DTS * - * Copyright (C) 2013 Xilinx, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ + * Copyright (C) 2013-2018 Xilinx, Inc. */ /dts-v1/; #include "zynq-7000.dtsi" diff --git a/arch/arm/dts/zynq-zc770-xm012.dts b/arch/arm/dts/zynq-zc770-xm012.dts index 699cd2c0fb1c..ee6809d51bcf 100644 --- a/arch/arm/dts/zynq-zc770-xm012.dts +++ b/arch/arm/dts/zynq-zc770-xm012.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Xilinx ZC770 XM012 board DTS * - * Copyright (C) 2013 - 2015 Xilinx, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ + * Copyright (C) 2013-2018 Xilinx, Inc. */ /dts-v1/; #include "zynq-7000.dtsi" diff --git a/arch/arm/dts/zynq-zc770-xm013.dts b/arch/arm/dts/zynq-zc770-xm013.dts index 81a6aa562a94..88a7ef068219 100644 --- a/arch/arm/dts/zynq-zc770-xm013.dts +++ b/arch/arm/dts/zynq-zc770-xm013.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Xilinx ZC770 XM013 board DTS * * Copyright (C) 2013 Xilinx, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; #include "zynq-7000.dtsi" diff --git a/arch/arm/dts/zynq-zed.dts b/arch/arm/dts/zynq-zed.dts index a9ff0e6fa814..24eccf1633d8 100644 --- a/arch/arm/dts/zynq-zed.dts +++ b/arch/arm/dts/zynq-zed.dts @@ -1,10 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* - * Xilinx ZED board DTS - * * Copyright (C) 2011 - 2015 Xilinx * Copyright (C) 2012 National Instruments Corp. - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; #include "zynq-7000.dtsi" diff --git a/arch/arm/dts/zynq-zybo.dts b/arch/arm/dts/zynq-zybo.dts index 52ec5a45667a..38448223055c 100644 --- a/arch/arm/dts/zynq-zybo.dts +++ b/arch/arm/dts/zynq-zybo.dts @@ -1,10 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* - * Digilent ZYBO board DTS - * * Copyright (C) 2011 - 2015 Xilinx * Copyright (C) 2012 National Instruments Corp. - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; #include "zynq-7000.dtsi"
i2c muxes should described like this.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
arch/arm/dts/zynq-zc702.dts | 2 +- arch/arm/dts/zynq-zc706.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/zynq-zc702.dts b/arch/arm/dts/zynq-zc702.dts index b95c1608d220..1410c4d7b6bd 100644 --- a/arch/arm/dts/zynq-zc702.dts +++ b/arch/arm/dts/zynq-zc702.dts @@ -111,7 +111,7 @@ scl-gpios = <&gpio0 50 0>; sda-gpios = <&gpio0 51 0>;
- i2cswitch@74 { + i2c-mux@74 { compatible = "nxp,pca9548"; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/dts/zynq-zc706.dts b/arch/arm/dts/zynq-zc706.dts index dbb57445ca7c..c782064a8036 100644 --- a/arch/arm/dts/zynq-zc706.dts +++ b/arch/arm/dts/zynq-zc706.dts @@ -62,7 +62,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c0_default>;
- i2cswitch@74 { + i2c-mux@74 { compatible = "nxp,pca9548"; #address-cells = <1>; #size-cells = <0>;
From: Javier Martinez Canillas javier@dowhile0.org
The at24 driver allows to register I2C EEPROM chips using different vendor and devices, but the I2C subsystem does not take the vendor into account when matching using the I2C table since it only has device entries.
But when matching using an OF table, both the vendor and device has to be taken into account so the driver defines only a set of compatible strings using the "atmel" vendor as a generic fallback for compatible I2C devices.
So add this generic fallback to the device node compatible string to make the device to match the driver using the OF device ID table.
Signed-off-by: Javier Martinez Canillas javier@dowhile0.org Signed-off-by: Michal Simek michal.simek@xilinx.com ---
arch/arm/dts/zynq-zc702.dts | 2 +- arch/arm/dts/zynq-zc706.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/zynq-zc702.dts b/arch/arm/dts/zynq-zc702.dts index 1410c4d7b6bd..bb224662bb77 100644 --- a/arch/arm/dts/zynq-zc702.dts +++ b/arch/arm/dts/zynq-zc702.dts @@ -151,7 +151,7 @@ #size-cells = <0>; reg = <2>; eeprom@54 { - compatible = "at,24c08"; + compatible = "atmel,24c08"; reg = <0x54>; }; }; diff --git a/arch/arm/dts/zynq-zc706.dts b/arch/arm/dts/zynq-zc706.dts index c782064a8036..f24364b3853a 100644 --- a/arch/arm/dts/zynq-zc706.dts +++ b/arch/arm/dts/zynq-zc706.dts @@ -102,7 +102,7 @@ #size-cells = <0>; reg = <2>; eeprom@54 { - compatible = "at,24c08"; + compatible = "atmel,24c08"; reg = <0x54>; }; };
- Use eeprom for node name - Use atmel compatible string instead of at. - Add missing labels
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
arch/arm/dts/zynq-zc770-xm010.dts | 4 ++-- arch/arm/dts/zynq-zc770-xm011.dts | 4 ++-- arch/arm/dts/zynq-zc770-xm012.dts | 8 ++++---- arch/arm/dts/zynq-zc770-xm013.dts | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts index 0c364dfcc14f..2c594b7ecc6c 100644 --- a/arch/arm/dts/zynq-zc770-xm010.dts +++ b/arch/arm/dts/zynq-zc770-xm010.dts @@ -54,8 +54,8 @@ status = "okay"; clock-frequency = <400000>;
- m24c02_eeprom@52 { - compatible = "at,24c02"; + eeprom: eeprom@52 { + compatible = "atmel,24c02"; reg = <0x52>; };
diff --git a/arch/arm/dts/zynq-zc770-xm011.dts b/arch/arm/dts/zynq-zc770-xm011.dts index f711675dd88e..3fe6eb559ea7 100644 --- a/arch/arm/dts/zynq-zc770-xm011.dts +++ b/arch/arm/dts/zynq-zc770-xm011.dts @@ -41,8 +41,8 @@ status = "okay"; clock-frequency = <400000>;
- m24c02_eeprom@52 { - compatible = "at,24c02"; + eeprom: eeprom@52 { + compatible = "atmel,24c02"; reg = <0x52>; }; }; diff --git a/arch/arm/dts/zynq-zc770-xm012.dts b/arch/arm/dts/zynq-zc770-xm012.dts index ee6809d51bcf..19d5b275ae06 100644 --- a/arch/arm/dts/zynq-zc770-xm012.dts +++ b/arch/arm/dts/zynq-zc770-xm012.dts @@ -37,8 +37,8 @@ status = "okay"; clock-frequency = <400000>;
- m24c02_eeprom@52 { - compatible = "at,24c02"; + eeprom0: eeprom@52 { + compatible = "atmel,24c02"; reg = <0x52>; }; }; @@ -47,8 +47,8 @@ status = "okay"; clock-frequency = <400000>;
- m24c02_eeprom@52 { - compatible = "at,24c02"; + eeprom1: eeprom@52 { + compatible = "atmel,24c02"; reg = <0x52>; }; }; diff --git a/arch/arm/dts/zynq-zc770-xm013.dts b/arch/arm/dts/zynq-zc770-xm013.dts index 88a7ef068219..efd0833eab91 100644 --- a/arch/arm/dts/zynq-zc770-xm013.dts +++ b/arch/arm/dts/zynq-zc770-xm013.dts @@ -67,7 +67,7 @@ status = "okay"; num-cs = <4>; is-decoded-cs = <0>; - eeprom: at25@0 { + eeprom: eeprom@0 { at25,byte-len = <8192>; at25,addr-mode = <2>; at25,page-size = <32>;
Sync with mainline.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
arch/arm/dts/zynq-zc770-xm010.dts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts index 2c594b7ecc6c..a779672f3add 100644 --- a/arch/arm/dts/zynq-zc770-xm010.dts +++ b/arch/arm/dts/zynq-zc770-xm010.dts @@ -74,14 +74,17 @@ num-cs = <4>; is-decoded-cs = <0>; flash@0 { - compatible = "sst25wf080"; + compatible = "sst25wf080", "jedec,spi-nor"; reg = <1>; spi-max-frequency = <1000000>; - #address-cells = <1>; - #size-cells = <1>; - partition@test { - label = "spi-flash"; - reg = <0x0 0x100000>; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + partition@0 { + label = "data"; + reg = <0x0 0x100000>; + }; }; }; };
participants (1)
-
Michal Simek