arm64: zynqmp: Update DT files
Subsystems (2)
cover arm64: zynqmp: Update DT files
Hi,
these are patches I have collected in Xilinx repo and which should go to mainline. There are 3 typo of patches.
1. IIO wiring for ina226 and using IIO ina226 driver instead of hwmon
2. DT fixes and small updates
3. Alignments including name synchronization
Thanks,
Michal
Harini Katakam (2):
arm64: zynqmp: dt: Add missing DP83867 quirk
arm64: zynqmp: dt: Add optional gpio phy reset properties
Michal Simek (21):
arm64: zynqmp: Sync names for SC with Versal
arm64: zynqmp: Use ethernet-phy as node name for ethernet phys
arm64: zynqmp: Enable iio-hwmon for ina226 on g-a2197-00
arm64: zynqmp: Add label property to all ina226 on g-a2197-00
arm64: zynqmp: Fix typo in zynqmp-p-a2197-00-revA
arm64: zynqmp: Enable iio-hwmon for ina226 on m-a2197-01
arm64: zynqmp: Add label property to all ina226 on m-a2197-01
arm64: zynqmp: Switch spi-flash to jedec,spi-nor on m-a2197
arm64: zynqmp: Fix m-a2197-01 DT based on latest schematics
arm64: zynqmp: Sync si570 setup and clock names
arm64: zynqmp: Remove fixme about memory size on zynqmp-p-a2197
arm64: zynqmp: Enable iio-hwmon for ina226 on zcu111
arm64: zynqmp: Add label property to all ina226 on zcu111
arm64: zynqmp: Enable iio-hwmon for ina226 on zcu106
arm64: zynqmp: Add label property to all ina226 on zcu106
arm64: zynqmp: Enable iio-hwmon for ina226 on zcu104
arm64: zynqmp: Enable fpd_dma for zcu104 platforms
arm64: zynqmp: Enable iio-hwmon for ina226 on zcu102
arm64: zynqmp: Add label property to all ina226 on zcu102
arm64: zynqmp: Turn comment to gpio-line-names
arm64: zynqmp: Enable iio-hwmon for ina226 on zcu100
Nishant Mittal (2):
arm64: zynqmp: Fix i2c address of u70 on p-a2197-00 board
arm64: zynqmp: Added new tps53679 compatible string for a2197-0x
boards
T Karthik Reddy (1):
arm64: zynqmp: dt: Delete no-1-8-v property from zcu102-rev1.0
Venkatesh Yadav Abbarapu (1):
arm64: zynqmp: Fix the si570 clock frequency on zcu111
arch/arm/dts/Makefile | 6 +-
...-g-revA.dts => zynqmp-g-a2197-00-revA.dts} | 55 ++++-
...-m-revA.dts => zynqmp-m-a2197-01-revA.dts} | 68 +++++--
...-p-revA.dts => zynqmp-p-a2197-00-revA.dts} | 42 ++--
arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 2 +-
arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 3 +-
arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts | 2 +-
arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts | 2 +-
arch/arm/dts/zynqmp-zcu100-revC.dts | 8 +-
arch/arm/dts/zynqmp-zcu102-rev1.0.dts | 4 +
arch/arm/dts/zynqmp-zcu102-revA.dts | 192 +++++++++++++-----
arch/arm/dts/zynqmp-zcu102-revB.dts | 4 +-
arch/arm/dts/zynqmp-zcu104-revA.dts | 35 +++-
arch/arm/dts/zynqmp-zcu104-revC.dts | 43 +++-
arch/arm/dts/zynqmp-zcu106-revA.dts | 148 ++++++++++++--
arch/arm/dts/zynqmp-zcu111-revA.dts | 118 +++++++++--
configs/xilinx_zynqmp_a2197_revA_defconfig | 2 +-
...> xilinx_zynqmp_g_a2197_00_revA_defconfig} | 2 +-
...> xilinx_zynqmp_m_a2197_01_revA_defconfig} | 2 +-
...> xilinx_zynqmp_p_a2197_00_revA_defconfig} | 2 +-
20 files changed, 588 insertions(+), 152 deletions(-)
rename arch/arm/dts/{zynqmp-a2197-g-revA.dts => zynqmp-g-a2197-00-revA.dts} (85%)
rename arch/arm/dts/{zynqmp-a2197-m-revA.dts => zynqmp-m-a2197-01-revA.dts} (86%)
rename arch/arm/dts/{zynqmp-a2197-p-revA.dts => zynqmp-p-a2197-00-revA.dts} (93%)
rename configs/{xilinx_zynqmp_a2197_m_revA_defconfig => xilinx_zynqmp_g_a2197_00_revA_defconfig} (98%)
rename configs/{xilinx_zynqmp_a2197_g_revA_defconfig => xilinx_zynqmp_m_a2197_01_revA_defconfig} (98%)
rename configs/{xilinx_zynqmp_a2197_p_revA_defconfig => xilinx_zynqmp_p_a2197_00_revA_defconfig} (98%)Signature · 1 line
2.17.1
PATCH 1/27 arm64: zynqmp: Sync names for SC with Versal
ZynqMP based System controller is present on Versal boards. This patch is aligning names with Versal to follow the spec.
---
arch/arm/dts/Makefile | 6 +++---
.../{zynqmp-a2197-g-revA.dts => zynqmp-g-a2197-00-revA.dts} | 2 +-
.../{zynqmp-a2197-m-revA.dts => zynqmp-m-a2197-01-revA.dts} | 2 +-
.../{zynqmp-a2197-p-revA.dts => zynqmp-p-a2197-00-revA.dts} | 2 +-
configs/xilinx_zynqmp_a2197_revA_defconfig | 2 +-
...vA_defconfig => xilinx_zynqmp_g_a2197_00_revA_defconfig} | 2 +-
...vA_defconfig => xilinx_zynqmp_m_a2197_01_revA_defconfig} | 2 +-
...vA_defconfig => xilinx_zynqmp_p_a2197_00_revA_defconfig} | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
rename arch/arm/dts/{zynqmp-a2197-g-revA.dts => zynqmp-g-a2197-00-revA.dts} (99%)
rename arch/arm/dts/{zynqmp-a2197-m-revA.dts => zynqmp-m-a2197-01-revA.dts} (99%)
rename arch/arm/dts/{zynqmp-a2197-p-revA.dts => zynqmp-p-a2197-00-revA.dts} (99%)
rename configs/{xilinx_zynqmp_a2197_m_revA_defconfig => xilinx_zynqmp_g_a2197_00_revA_defconfig} (98%)
rename configs/{xilinx_zynqmp_a2197_g_revA_defconfig => xilinx_zynqmp_m_a2197_01_revA_defconfig} (98%)
rename configs/{xilinx_zynqmp_a2197_p_revA_defconfig => xilinx_zynqmp_p_a2197_00_revA_defconfig} (98%)arch/arm/dts/Makefile +3 -3
@@ -248,9 +248,9 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \ avnet-ultra96-rev1.dtb \ avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dtb \ zynqmp-a2197-revA.dtb \ - zynqmp-a2197-g-revA.dtb \ - zynqmp-a2197-m-revA.dtb \ - zynqmp-a2197-p-revA.dtb \ + zynqmp-g-a2197-00-revA.dtb \ + zynqmp-m-a2197-01-revA.dtb \ + zynqmp-p-a2197-00-revA.dtb \ zynqmp-mini.dtb \ zynqmp-mini-emmc0.dtb \ zynqmp-mini-emmc1.dtb \
arch/arm/dts/zynqmp-g-a2197-00-revA.dts renamed from arch/arm/dts/zynqmp-a2197-g-revA.dts +1 -1
@@ -14,7 +14,7 @@ / { model = "Versal System Controller on a2197 MGT Char board RevA"; - compatible = "xlnx,zynqmp-a2197-g-revA", "xlnx,zynqmp-a2197-revA", + compatible = "xlnx,zynqmp-g-a2197-00-revA", "xlnx,zynqmp-a2197-revA", "xlnx,zynqmp-a2197", "xlnx,zynqmp"; aliases {
arch/arm/dts/zynqmp-m-a2197-01-revA.dts renamed from arch/arm/dts/zynqmp-a2197-m-revA.dts +1 -1
@@ -14,7 +14,7 @@ / { model = "Versal System Controller on a2197 Memory Char board RevA"; - compatible = "xlnx,zynqmp-a2197-m-revA", "xlnx,zynqmp-a2197-revA", + compatible = "xlnx,zynqmp-m-a2197-01-revA", "xlnx,zynqmp-a2197-revA", "xlnx,zynqmp-a2197", "xlnx,zynqmp"; aliases {
arch/arm/dts/zynqmp-p-a2197-00-revA.dts renamed from arch/arm/dts/zynqmp-a2197-p-revA.dts +1 -1
@@ -14,7 +14,7 @@ / { model = "Versal System Controller on a2197 Processor Char board RevA"; /* Tenzing */ - compatible = "xlnx,zynqmp-a2197-p-revA", "xlnx,zynqmp-a2197-revA", + compatible = "xlnx,zynqmp-p-a2197-00-revA", "xlnx,zynqmp-a2197-revA", "xlnx,zynqmp-a2197", "xlnx,zynqmp"; aliases {
configs/xilinx_zynqmp_a2197_revA_defconfig +1 -1
@@ -43,7 +43,7 @@ CONFIG_CMD_TIMER=y CONFIG_CMD_EXT4_WRITE=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="zynqmp-a2197-revA" -CONFIG_OF_LIST="zynqmp-a2197-revA zynqmp-a2197-g-revA zynqmp-a2197-p-revA zynqmp-a2197-m-revA" +CONFIG_OF_LIST="zynqmp-a2197-revA zynqmp-g-a2197-00-revA zynqmp-p-a2197-00-revA zynqmp-m-a2197-01-revA" CONFIG_ENV_IS_IN_FAT=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y
configs/xilinx_zynqmp_g_a2197_00_revA_defconfig renamed from configs/xilinx_zynqmp_a2197_m_revA_defconfig +1 -1
@@ -42,7 +42,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_TIMER=y CONFIG_CMD_EXT4_WRITE=y CONFIG_SPL_OF_CONTROL=y -CONFIG_DEFAULT_DEVICE_TREE="zynqmp-a2197-m-revA" +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-g-a2197-00-revA" CONFIG_ENV_IS_IN_FAT=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y
configs/xilinx_zynqmp_m_a2197_01_revA_defconfig renamed from configs/xilinx_zynqmp_a2197_g_revA_defconfig +1 -1
@@ -42,7 +42,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_TIMER=y CONFIG_CMD_EXT4_WRITE=y CONFIG_SPL_OF_CONTROL=y -CONFIG_DEFAULT_DEVICE_TREE="zynqmp-a2197-g-revA" +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-m-a2197-01-revA" CONFIG_ENV_IS_IN_FAT=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y
configs/xilinx_zynqmp_p_a2197_00_revA_defconfig renamed from configs/xilinx_zynqmp_a2197_p_revA_defconfig +1 -1
@@ -43,7 +43,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_TIMER=y CONFIG_CMD_EXT4_WRITE=y CONFIG_SPL_OF_CONTROL=y -CONFIG_DEFAULT_DEVICE_TREE="zynqmp-a2197-p-revA" +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-p-a2197-00-revA" CONFIG_ENV_IS_IN_FAT=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y
Signature · 1 line
2.17.1
PATCH 2/27 arm64: zynqmp: Use ethernet-phy as node name for ethernet phys
In reply to Michal SimekEthernet phys based on devicetree specification should be using ethernet-phy@ node name instead of pure phy at .
---
arch/arm/dts/zynqmp-g-a2197-00-revA.dts | 2 +- arch/arm/dts/zynqmp-m-a2197-01-revA.dts | 2 +- arch/arm/dts/zynqmp-p-a2197-00-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts | 2 +- arch/arm/dts/zynqmp-zcu102-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu102-revB.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 +- 13 files changed, 13 insertions(+), 13 deletions(-)
arch/arm/dts/zynqmp-g-a2197-00-revA.dts +1 -1
@@ -58,7 +58,7 @@ phy-handle = <&phy0>; phy-mode = "sgmii"; is-internal-pcspma; - phy0: phy at 0 { /* marwell m88e1512 */ + phy0: ethernet-phy at 0 { /* marwell m88e1512 */ reg = <0>; reset-gpios = <&gpio 42 GPIO_ACTIVE_LOW>; /* xlnx,phy-type = <PHY_TYPE_SGMII>; */
arch/arm/dts/zynqmp-m-a2197-01-revA.dts +1 -1
@@ -89,7 +89,7 @@ phy-handle = <&phy0>; phy-mode = "sgmii"; /* DTG generates this properly 1512 */ phy-reset-gpios = <&gpio 142 GPIO_ACTIVE_LOW>; - phy0: phy at 0 { /* marwell m88e1512 - SGMII */ + phy0: ethernet-phy at 0 { /* marwell m88e1512 - SGMII */ reg = <0>; /* xlnx,phy-type = <PHY_TYPE_SGMII>; */ };
arch/arm/dts/zynqmp-p-a2197-00-revA.dts +1 -1
@@ -76,7 +76,7 @@ phy-mode = "sgmii"; /* DTG generates this properly 1512 */ is-internal-pcspma; /* phy-reset-gpios = <&gpio 142 GPIO_ACTIVE_LOW>; */ - phy0: phy at 0 { + phy0: ethernet-phy at 0 { reg = <0>; }; };
arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts +1 -1
@@ -75,7 +75,7 @@ status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; - phy0: phy at 0 { + phy0: ethernet-phy at 0 { reg = <0>; }; };
arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts +1 -1
@@ -85,7 +85,7 @@ status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; - phy0: phy at 5 { + phy0: ethernet-phy at 5 { reg = <5>; ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>;
arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts +1 -1
@@ -76,7 +76,7 @@ status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; - phy0: phy at 0 { /* VSC8211 */ + phy0: ethernet-phy at 0 { /* VSC8211 */ reg = <0>; }; };
arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts +1 -1
@@ -73,7 +73,7 @@ status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; - phy0: phy at 0 { + phy0: ethernet-phy at 0 { reg = <0>; }; };
arch/arm/dts/zynqmp-zcu102-revA.dts +1 -1
@@ -110,7 +110,7 @@ status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; - phy0: phy at 21 { + phy0: ethernet-phy at 21 { reg = <21>; ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>;
arch/arm/dts/zynqmp-zcu102-revB.dts +1 -1
@@ -16,7 +16,7 @@ &gem3 { phy-handle = <&phyc>; - phyc: phy at c { + phyc: ethernet-phy at c { reg = <0xc>; ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>;
arch/arm/dts/zynqmp-zcu104-revA.dts +1 -1
@@ -54,7 +54,7 @@ status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; - phy0: phy at c { + phy0: ethernet-phy at c { reg = <0xc>; ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>;
arch/arm/dts/zynqmp-zcu104-revC.dts +1 -1
@@ -55,7 +55,7 @@ status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; - phy0: phy at c { + phy0: ethernet-phy at c { reg = <0xc>; ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>;
arch/arm/dts/zynqmp-zcu106-revA.dts +1 -1
@@ -110,7 +110,7 @@ status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; - phy0: phy at c { + phy0: ethernet-phy at c { reg = <0xc>; ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>;
arch/arm/dts/zynqmp-zcu111-revA.dts +1 -1
@@ -106,7 +106,7 @@ status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; - phy0: phy at c { + phy0: ethernet-phy at c { reg = <0xc>; ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>;
Signature · 1 line
2.17.1
PATCH 3/27 arm64: zynqmp: Enable iio-hwmon for ina226 on g-a2197-00
In reply to Michal Simekina226 hwmon driver is deprecated and it is recommended to use new iio based driver. The patch is enabling iio-hwmon driver to export functionality from IIO to hwmon interface to be able to use lm-sensors package.
---
arch/arm/dts/zynqmp-g-a2197-00-revA.dts | 43 +++++++++++++++++++++---- 1 file changed, 37 insertions(+), 6 deletions(-)
arch/arm/dts/zynqmp-g-a2197-00-revA.dts +37 -6
@@ -38,6 +38,31 @@ device_type = "memory"; reg = <0x0 0x0 0x0 0x80000000>; }; + + ina226-u74 { + compatible = "iio-hwmon"; + io-channels = <&u74 0>, <&u74 1>, <&u74 2>, <&u74 3>; + }; + ina226-u75 { + compatible = "iio-hwmon"; + io-channels = <&u75 0>, <&u75 1>, <&u75 2>, <&u75 3>; + }; + ina226-u78 { + compatible = "iio-hwmon"; + io-channels = <&u78 0>, <&u78 1>, <&u78 2>, <&u78 3>; + }; + ina226-u79 { + compatible = "iio-hwmon"; + io-channels = <&u79 0>, <&u79 1>, <&u79 2>, <&u79 3>; + }; + ina226-u82 { + compatible = "iio-hwmon"; + io-channels = <&u82 0>, <&u82 1>, <&u82 2>, <&u82 3>; + }; + ina226-u84 { + compatible = "iio-hwmon"; + io-channels = <&u84 0>, <&u84 1>, <&u84 2>, <&u84 3>; + }; }; &sdhci0 { /* emmc MIO 13-23 16GB */
@@ -198,33 +223,39 @@ compatible = "ti,tps544b25"; reg = <0x20>; }; - ina226 at 40 { /* u74 */ + u74: ina226 at 40 { /* u74 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x40>; shunt-resistor = <1000>; }; - ina226 at 41 { /* u75 */ + u75: ina226 at 41 { /* u75 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x41>; shunt-resistor = <1000>; }; - ina226 at 42 { /* u78 */ + u78: ina226 at 42 { /* u78 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x42>; shunt-resistor = <5000>; }; - ina226 at 43 { /* u79 */ + u79: ina226 at 43 { /* u79 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x43>; shunt-resistor = <1000>; }; - ina226 at 44 { /* u82 */ + u82: ina226 at 44 { /* u82 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x44>; shunt-resistor = <1000>; }; - ina226 at 45 { /* u84 */ + u84: ina226 at 45 { /* u84 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x45>; shunt-resistor = <5000>; };
Signature · 1 line
2.17.1
PATCH 4/27 arm64: zynqmp: Add label property to all ina226 on g-a2197-00
In reply to Michal SimekLabel property is adding capability to distiguish chips from each other when iio framework is used.
---
arch/arm/dts/zynqmp-g-a2197-00-revA.dts | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/dts/zynqmp-g-a2197-00-revA.dts +6 -0
@@ -226,36 +226,42 @@ u74: ina226 at 40 { /* u74 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u74"; reg = <0x40>; shunt-resistor = <1000>; }; u75: ina226 at 41 { /* u75 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u75"; reg = <0x41>; shunt-resistor = <1000>; }; u78: ina226 at 42 { /* u78 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u78"; reg = <0x42>; shunt-resistor = <5000>; }; u79: ina226 at 43 { /* u79 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u79"; reg = <0x43>; shunt-resistor = <1000>; }; u82: ina226 at 44 { /* u82 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u82"; reg = <0x44>; shunt-resistor = <1000>; }; u84: ina226 at 45 { /* u84 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u84"; reg = <0x45>; shunt-resistor = <5000>; };
Signature · 1 line
2.17.1
PATCH 5/27 arm64: zynqmp: Fix i2c address of u70 on p-a2197-00 board
In reply to Michal SimekFrom: Nishant Mittal <[email protected]>
tps53681 is i2c address 0x60 not 0xc0.
---
arch/arm/dts/zynqmp-p-a2197-00-revA.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/zynqmp-p-a2197-00-revA.dts +2 -2
@@ -155,9 +155,9 @@ compatible = "ti,tps544b25"; /* Documentation/hwmon/pmbus - wiring is missing */ reg = <0xa>; }; - reg_vccint: tps53681 at c0 { /* u70 - FIXME name - don't know what it does - also vcc_io_soc */ + reg_vccint: tps53681 at 60 { /* u70 - FIXME name - don't know what it does - also vcc_io_soc */ compatible = "ti,tps53681"; /* FIXME no linux driver */ - reg = <0xc0>; + reg = <0x60>; /* vccint, vcc_io_soc */ }; };
Signature · 1 line
2.17.1
PATCH 6/27 arm64: zynqmp: Added new tps53679 compatible string for a2197-0x boards
In reply to Michal SimekFrom: Nishant Mittal <[email protected]>
Added tps53679 compatible string to tps53681. They are both compatible to each other and tps53679 has Linux driver already.
---
arch/arm/dts/zynqmp-g-a2197-00-revA.dts | 2 +- arch/arm/dts/zynqmp-m-a2197-01-revA.dts | 2 +- arch/arm/dts/zynqmp-p-a2197-00-revA.dts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/dts/zynqmp-g-a2197-00-revA.dts +1 -1
@@ -266,7 +266,7 @@ shunt-resistor = <5000>; }; tps53681 at c0 { /* u53 - FIXME name - don't know what it does - also vcc_io_soc */ - compatible = "ti,tps53681"; /* FIXME no linux driver */ + compatible = "ti,tps53681", "ti,tps53679"; reg = <0xc0>; }; };
arch/arm/dts/zynqmp-m-a2197-01-revA.dts +1 -1
@@ -217,7 +217,7 @@ #size-cells = <0>; reg = <2>; reg_vccint: tps53681 at c0 { /* u69 */ - compatible = "ti,tps53681"; /* FIXME no linux driver */ + compatible = "ti,tps53681", "ti,tps53679"; reg = <0xc0>; }; reg_vcc_pmc: tps544 at 7 { /* u80 */
arch/arm/dts/zynqmp-p-a2197-00-revA.dts +1 -1
@@ -156,7 +156,7 @@ reg = <0xa>; }; reg_vccint: tps53681 at 60 { /* u70 - FIXME name - don't know what it does - also vcc_io_soc */ - compatible = "ti,tps53681"; /* FIXME no linux driver */ + compatible = "ti,tps53681", "ti,tps53679"; reg = <0x60>; /* vccint, vcc_io_soc */ };
Signature · 1 line
2.17.1
PATCH 7/27 arm64: zynqmp: Fix typo in zynqmp-p-a2197-00-revA
In reply to Michal SimekTrivial fix but not detected by checkpatch.
---
arch/arm/dts/zynqmp-p-a2197-00-revA.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/zynqmp-p-a2197-00-revA.dts +1 -1
@@ -165,7 +165,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <1>; - /* FIXME check alerts comming to SC */ + /* FIXME check alerts coming to SC */ vcc_fmc: ina226 at 42 { /* u81 */ compatible = "ti,ina226"; reg = <0x42>;
Signature · 1 line
2.17.1
PATCH 8/27 arm64: zynqmp: Enable iio-hwmon for ina226 on m-a2197-01
In reply to Michal Simekina226 hwmon driver is deprecated and it is recommended to use new iio based driver. The patch is enabling iio-hwmon driver to export functionality from IIO to hwmon interface to be able to use lm-sensors package.
---
arch/arm/dts/zynqmp-m-a2197-01-revA.dts | 31 +++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
arch/arm/dts/zynqmp-m-a2197-01-revA.dts +31 -0
@@ -43,6 +43,31 @@ device_type = "memory"; reg = <0x0 0x0 0x0 0x80000000>; /* FIXME don't know how big memory is there */ }; + + ina226-vcc-aux { + compatible = "iio-hwmon"; + io-channels = <&vcc_aux 0>, <&vcc_aux 1>, <&vcc_aux 2>, <&vcc_aux 3>; + }; + ina226-vcc-ram { + compatible = "iio-hwmon"; + io-channels = <&vcc_ram 0>, <&vcc_ram 1>, <&vcc_ram 2>, <&vcc_ram 3>; + }; + ina226-vcc1v1-lp4 { + compatible = "iio-hwmon"; + io-channels = <&vcc1v1_lp4 0>, <&vcc1v1_lp4 1>, <&vcc1v1_lp4 2>, <&vcc1v1_lp4 3>; + }; + ina226-vcc1v2-lp4 { + compatible = "iio-hwmon"; + io-channels = <&vcc1v2_lp4 0>, <&vcc1v2_lp4 1>, <&vcc1v2_lp4 2>, <&vcc1v2_lp4 3>; + }; + ina226-vdd1-1v8-lp4 { + compatible = "iio-hwmon"; + io-channels = <&vdd1_1v8_lp4 0>, <&vdd1_1v8_lp4 1>, <&vdd1_1v8_lp4 2>, <&vdd1_1v8_lp4 3>; + }; + ina226-vcc0v6-lp4 { + compatible = "iio-hwmon"; + io-channels = <&vcc0v6_lp4 0>, <&vcc0v6_lp4 1>, <&vcc0v6_lp4 2>, <&vcc0v6_lp4 3>; + }; }; &qspi {
@@ -183,31 +208,37 @@ reg = <1>; vcc_aux: ina226 at 42 { /* u86 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x42>; shunt-resistor = <5000>; }; vcc_ram: ina226 at 43 { /* u81 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x43>; shunt-resistor = <5000>; }; vcc1v1_lp4: ina226 at 46 { /* u96 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x46>; shunt-resistor = <5000>; }; vcc1v2_lp4: ina226 at 47 { /* u98 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x47>; shunt-resistor = <5000>; }; vdd1_1v8_lp4: ina226 at 48 { /* u100 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x48>; shunt-resistor = <5000>; }; vcc0v6_lp4: ina226 at 49 { /* u101 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x49>; shunt-resistor = <5000>; };
Signature · 1 line
2.17.1
PATCH 9/27 arm64: zynqmp: Add label property to all ina226 on m-a2197-01
In reply to Michal SimekLabel property is adding capability to distiguish chips from each other when iio framework is used.
---
arch/arm/dts/zynqmp-m-a2197-01-revA.dts | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/dts/zynqmp-m-a2197-01-revA.dts +6 -0
@@ -209,36 +209,42 @@ vcc_aux: ina226 at 42 { /* u86 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-vcc-aux"; reg = <0x42>; shunt-resistor = <5000>; }; vcc_ram: ina226 at 43 { /* u81 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-vcc-ram"; reg = <0x43>; shunt-resistor = <5000>; }; vcc1v1_lp4: ina226 at 46 { /* u96 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-vcc1v1-lp4"; reg = <0x46>; shunt-resistor = <5000>; }; vcc1v2_lp4: ina226 at 47 { /* u98 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-vcc1v2-lp4"; reg = <0x47>; shunt-resistor = <5000>; }; vdd1_1v8_lp4: ina226 at 48 { /* u100 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-vdd1-1v8-lp4"; reg = <0x48>; shunt-resistor = <5000>; }; vcc0v6_lp4: ina226 at 49 { /* u101 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-vcc0v6-lp4"; reg = <0x49>; shunt-resistor = <5000>; };
Signature · 1 line
2.17.1
PATCH 10/27 arm64: zynqmp: Switch spi-flash to jedec, spi-nor on m-a2197
In reply to Michal SimekMainline has done this switch and there is no reason not to switch it too.
Mainline U-Boot patch which has done that switch:
"dts: switch spi-flash to jedec, spi-nor compatible" (sha1: ffd4c7c2ecb745586239eb98d5dc0fe5e6ebe3bd)
---
arch/arm/dts/zynqmp-m-a2197-01-revA.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/zynqmp-m-a2197-01-revA.dts +1 -1
@@ -74,7 +74,7 @@ status = "okay"; is-dual = <1>; flash at 0 { - compatible = "m25p80", "spi-flash"; /* 32MB */ + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; #size-cells = <1>; reg = <0x0>;
Signature · 1 line
2.17.1
PATCH 11/27 arm64: zynqmp: Fix m-a2197-01 DT based on latest schematics
In reply to Michal SimekRemove some FIXMEs and align it with latest schematics.
---
arch/arm/dts/zynqmp-m-a2197-01-revA.dts | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
arch/arm/dts/zynqmp-m-a2197-01-revA.dts +9 -14
@@ -326,7 +326,7 @@ reg = <0x51>; }; - i2c-mux at 74 { /* u35 */ + i2c-mux at 74 { /* u47 */ compatible = "nxp,pca9548"; #address-cells = <1>; #size-cells = <0>;
@@ -391,19 +391,14 @@ }; }; }; - i2c at 1 { /* UTIL_PMBUS - FIXME incorrect schematics */ - #address-cells = <1>; - #size-cells = <0>; - /* reg = <1>; */ - }; i2c at 2 { /* C0_LP4 */ #address-cells = <1>; #size-cells = <0>; reg = <2>; - si570_c0_lp4: clock-generator at 5d { /* u10 */ + si570_c0_lp4: clock-generator at 55 { /* u10 */ #clock-cells = <0>; compatible = "silabs,si570"; - reg = <0x5d>; /* FIXME addr */ + reg = <0x55>; temperature-stability = <50>; factory-fout = <30000000>; clock-frequency = <30000000>;
@@ -428,10 +423,10 @@ #address-cells = <1>; #size-cells = <0>; reg = <4>; - si570_c2_lp4: clock-generator at 5d { /* u10 */ + si570_c2_lp4: clock-generator at 55 { /* u10 */ #clock-cells = <0>; compatible = "silabs,si570"; - reg = <0x5d>; /* FIXME addr */ + reg = <0x55>; temperature-stability = <50>; factory-fout = <30000000>; clock-frequency = <30000000>;
@@ -442,10 +437,10 @@ #address-cells = <1>; #size-cells = <0>; reg = <5>; - si570_c3_lp4: clock-generator at 5d { /* u15 */ + si570_c3_lp4: clock-generator at 55 { /* u15 */ #clock-cells = <0>; compatible = "silabs,si570"; - reg = <0x5d>; /* FIXME addr */ + reg = <0x55>; temperature-stability = <50>; factory-fout = <30000000>; clock-frequency = <30000000>;
@@ -461,8 +456,8 @@ compatible = "silabs,si570"; reg = <0x5d>; /* FIXME addr */ temperature-stability = <50>; - factory-fout = <156250000>; /* FIXME every chip can be different - 10MHZ_TO_810MHZ */ - clock-frequency = <33333333>; + factory-fout = <156250000>; + clock-frequency = <156250000>; clock-output-names = "HSDP_SI570"; }; };
Signature · 1 line
2.17.1
PATCH 12/27 arm64: zynqmp: Sync si570 setup and clock names
In reply to Michal SimekSetup proper si570 names and default factory setup.
---
arch/arm/dts/zynqmp-p-a2197-00-revA.dts | 28 ++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-)
arch/arm/dts/zynqmp-p-a2197-00-revA.dts +14 -14
@@ -387,9 +387,9 @@ compatible = "silabs,si570"; reg = <0x5d>; /* 570JAC000900DG */ temperature-stability = <50>; - factory-fout = <156250000>; /* FIXME every chip can be different */ + factory-fout = <33333333>; clock-frequency = <33333333>; - clock-output-names = "REF_CLK"; /* FIXME */ + clock-output-names = "ref_clk"; }; /* Connection via Samtec J212D */ /* Use for storing information about X-PRC card */
@@ -455,9 +455,9 @@ compatible = "silabs,si570"; reg = <0x60>; /* 570BAB000299DG */ temperature-stability = <50>; - factory-fout = <156250000>; /* FIXME every chip can be different - 10MHZ_TO_810MHZ */ - clock-frequency = <33333333>; - clock-output-names = "REF_CLK"; /* FIXME */ + factory-fout = <200000000>; + clock-frequency = <200000000>; + clock-output-names = "si570_ddrdimm1_clk"; }; /* 0x50 SPD? */ };
@@ -470,9 +470,9 @@ compatible = "silabs,si570"; reg = <0x60>; /* 570BAB000299DG */ temperature-stability = <50>; - factory-fout = <156250000>; /* FIXME every chip can be different - 10MHZ_TO_810MHZ */ - clock-frequency = <33333333>; - clock-output-names = "REF_CLK"; /* FIXME */ + factory-fout = <200000000>; + clock-frequency = <200000000>; + clock-output-names = "si570_ddrdimm2_clk"; }; /* 0x50 SPD? */ };
@@ -485,9 +485,9 @@ compatible = "silabs,si570"; reg = <0x60>; /* 570BAB000299DG */ temperature-stability = <50>; - factory-fout = <156250000>; /* FIXME every chip can be different - 10MHZ_TO_810MHZ */ - clock-frequency = <33333333>; - clock-output-names = "LPDDR4_SI570_CLK"; + factory-fout = <200000000>; + clock-frequency = <200000000>; + clock-output-names = "si570_lpddr4_clk"; }; }; i2c at 6 { /* HSDP_SI570 */
@@ -499,9 +499,9 @@ compatible = "silabs,si570"; reg = <0x5d>; /* 570JAC000900DG */ temperature-stability = <50>; - factory-fout = <156250000>; /* FIXME every chip can be different - 10MHZ_TO_810MHZ */ - clock-frequency = <33333333>; - clock-output-names = "HSDP_SI570"; + factory-fout = <156250000>; + clock-frequency = <156250000>; + clock-output-names = "si570_hsdp_clk"; }; }; i2c at 7 { /* PCIE_CLK */
Signature · 1 line
2.17.1
PATCH 13/27 arm64: zynqmp: Remove fixme about memory size on zynqmp-p-a2197
In reply to Michal SimekSystem controller has 2GB of memory and fixme can be removed now.
---
arch/arm/dts/zynqmp-p-a2197-00-revA.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/zynqmp-p-a2197-00-revA.dts +1 -1
@@ -41,7 +41,7 @@ memory at 0 { device_type = "memory"; - reg = <0x0 0x0 0x0 0x80000000>; /* FIXME don't know how big memory is there */ + reg = <0x0 0x0 0x0 0x80000000>; }; };
Signature · 1 line
2.17.1
PATCH 14/27 arm64: zynqmp: dt: Delete no-1-8-v property from zcu102-rev1.0
In reply to Michal SimekFrom: T Karthik Reddy <[email protected]>
Currently zcu102 Rev1.0 board includes RevA sdhci dt node which has no-1-8-v property. Since Rev1.0 has level shifters delete this property to enable support for 1.8v.
---
arch/arm/dts/zynqmp-zcu102-rev1.0.dts | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/dts/zynqmp-zcu102-rev1.0.dts +4 -0
@@ -34,3 +34,7 @@ reg = <0xe0 0x3>; }; }; + +&sdhci1 { + /delete-property/ no-1-8-v; +};
Signature · 1 line
2.17.1
PATCH 15/27 arm64: zynqmp: Enable iio-hwmon for ina226 on zcu111
In reply to Michal Simekina226 hwmon driver is deprecated and it is recommended to use new iio based driver. The patch is enabling iio-hwmon driver to export functionality from IIO to hwmon interface to be able to use lm-sensors package.
---
arch/arm/dts/zynqmp-zcu111-revA.dts | 99 +++++++++++++++++++++++++---- 1 file changed, 85 insertions(+), 14 deletions(-)
arch/arm/dts/zynqmp-zcu111-revA.dts +85 -14
@@ -64,6 +64,63 @@ linux,default-trigger = "heartbeat"; }; }; + + ina226-u67 { + compatible = "iio-hwmon"; + io-channels = <&u67 0>, <&u67 1>, <&u67 2>, <&u67 3>; + }; + ina226-u59 { + compatible = "iio-hwmon"; + io-channels = <&u59 0>, <&u59 1>, <&u59 2>, <&u59 3>; + }; + ina226-u61 { + compatible = "iio-hwmon"; + io-channels = <&u61 0>, <&u61 1>, <&u61 2>, <&u61 3>; + }; + ina226-u60 { + compatible = "iio-hwmon"; + io-channels = <&u60 0>, <&u60 1>, <&u60 2>, <&u60 3>; + }; + ina226-u64 { + compatible = "iio-hwmon"; + io-channels = <&u64 0>, <&u64 1>, <&u64 2>, <&u64 3>; + }; + ina226-u69 { + compatible = "iio-hwmon"; + io-channels = <&u69 0>, <&u69 1>, <&u69 2>, <&u69 3>; + }; + ina226-u66 { + compatible = "iio-hwmon"; + io-channels = <&u66 0>, <&u66 1>, <&u66 2>, <&u66 3>; + }; + ina226-u65 { + compatible = "iio-hwmon"; + io-channels = <&u65 0>, <&u65 1>, <&u65 2>, <&u65 3>; + }; + ina226-u63 { + compatible = "iio-hwmon"; + io-channels = <&u63 0>, <&u63 1>, <&u63 2>, <&u63 3>; + }; + ina226-u3 { + compatible = "iio-hwmon"; + io-channels = <&u3 0>, <&u3 1>, <&u3 2>, <&u3 3>; + }; + ina226-u71 { + compatible = "iio-hwmon"; + io-channels = <&u71 0>, <&u71 1>, <&u71 2>, <&u71 3>; + }; + ina226-u77 { + compatible = "iio-hwmon"; + io-channels = <&u77 0>, <&u77 1>, <&u77 2>, <&u77 3>; + }; + ina226-u73 { + compatible = "iio-hwmon"; + io-channels = <&u73 0>, <&u73 1>, <&u73 2>, <&u73 3>; + }; + ina226-u79 { + compatible = "iio-hwmon"; + io-channels = <&u79 0>, <&u79 1>, <&u79 2>, <&u79 3>; + }; }; &dcc {
@@ -160,73 +217,87 @@ reg = <0>; /* PS_PMBUS */ /* PMBUS_ALERT done via pca9544 */ - ina226 at 40 { /* u67 */ + u67: ina226 at 40 { /* u67 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x40>; shunt-resistor = <2000>; }; - ina226 at 41 { /* u59 */ + u59: ina226 at 41 { /* u59 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x41>; shunt-resistor = <5000>; }; - ina226 at 42 { /* u61 */ + u61: ina226 at 42 { /* u61 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x42>; shunt-resistor = <5000>; }; - ina226 at 43 { /* u60 */ + u60: ina226 at 43 { /* u60 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x43>; shunt-resistor = <5000>; }; - ina226 at 45 { /* u64 */ + u64: ina226 at 45 { /* u64 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x45>; shunt-resistor = <5000>; }; - ina226 at 46 { /* u69 */ + u69: ina226 at 46 { /* u69 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x46>; shunt-resistor = <2000>; }; - ina226 at 47 { /* u66 */ + u66: ina226 at 47 { /* u66 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x47>; shunt-resistor = <5000>; }; - ina226 at 48 { /* u65 */ + u65: ina226 at 48 { /* u65 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x48>; shunt-resistor = <5000>; }; - ina226 at 49 { /* u63 */ + u63: ina226 at 49 { /* u63 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x49>; shunt-resistor = <5000>; }; - ina226 at 4a { /* u3 */ + u3: ina226 at 4a { /* u3 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x4a>; shunt-resistor = <5000>; }; - ina226 at 4b { /* u71 */ + u71: ina226 at 4b { /* u71 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x4b>; shunt-resistor = <5000>; }; - ina226 at 4c { /* u77 */ + u77: ina226 at 4c { /* u77 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x4c>; shunt-resistor = <5000>; }; - ina226 at 4d { /* u73 */ + u73: ina226 at 4d { /* u73 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x4d>; shunt-resistor = <5000>; }; - ina226 at 4e { /* u79 */ + u79: ina226 at 4e { /* u79 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x4e>; shunt-resistor = <5000>; };
Signature · 1 line
2.17.1
PATCH 16/27 arm64: zynqmp: Add label property to all ina226 on zcu111
In reply to Michal SimekLabel property is adding capability to distiguish chips from each other when iio framework is used.
---
arch/arm/dts/zynqmp-zcu111-revA.dts | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/arm/dts/zynqmp-zcu111-revA.dts +14 -0
@@ -220,84 +220,98 @@ u67: ina226 at 40 { /* u67 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u67"; reg = <0x40>; shunt-resistor = <2000>; }; u59: ina226 at 41 { /* u59 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u59"; reg = <0x41>; shunt-resistor = <5000>; }; u61: ina226 at 42 { /* u61 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u61"; reg = <0x42>; shunt-resistor = <5000>; }; u60: ina226 at 43 { /* u60 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u60"; reg = <0x43>; shunt-resistor = <5000>; }; u64: ina226 at 45 { /* u64 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u64"; reg = <0x45>; shunt-resistor = <5000>; }; u69: ina226 at 46 { /* u69 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u69"; reg = <0x46>; shunt-resistor = <2000>; }; u66: ina226 at 47 { /* u66 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u66"; reg = <0x47>; shunt-resistor = <5000>; }; u65: ina226 at 48 { /* u65 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u65"; reg = <0x48>; shunt-resistor = <5000>; }; u63: ina226 at 49 { /* u63 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u63"; reg = <0x49>; shunt-resistor = <5000>; }; u3: ina226 at 4a { /* u3 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u3"; reg = <0x4a>; shunt-resistor = <5000>; }; u71: ina226 at 4b { /* u71 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u71"; reg = <0x4b>; shunt-resistor = <5000>; }; u77: ina226 at 4c { /* u77 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u77"; reg = <0x4c>; shunt-resistor = <5000>; }; u73: ina226 at 4d { /* u73 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u73"; reg = <0x4d>; shunt-resistor = <5000>; }; u79: ina226 at 4e { /* u79 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u79"; reg = <0x4e>; shunt-resistor = <5000>; };
Signature · 1 line
2.17.1
PATCH 17/27 arm64: zynqmp: Fix the si570 clock frequency on zcu111
In reply to Michal SimekFrom: Venkatesh Yadav Abbarapu <[email protected]>
The si570 clock frequency should be 156.25MHz as per datasheet.
---
arch/arm/dts/zynqmp-zcu111-revA.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/zynqmp-zcu111-revA.dts +1 -1
@@ -417,7 +417,7 @@ reg = <0x5d>; temperature-stability = <50>; factory-fout = <156250000>; - clock-frequency = <148500000>; + clock-frequency = <156250000>; clock-output-names = "si570_mgt"; }; };
Signature · 1 line
2.17.1
PATCH 18/27 arm64: zynqmp: Enable iio-hwmon for ina226 on zcu106
In reply to Michal Simekina226 hwmon driver is deprecated and it is recommended to use new iio based driver. The patch is enabling iio-hwmon driver to export functionality from IIO to hwmon interface to be able to use lm-sensors package.
---
arch/arm/dts/zynqmp-zcu106-revA.dts | 127 ++++++++++++++++++++++++---- 1 file changed, 109 insertions(+), 18 deletions(-)
arch/arm/dts/zynqmp-zcu106-revA.dts +109 -18
@@ -64,6 +64,79 @@ linux,default-trigger = "heartbeat"; }; }; + + ina226-u76 { + compatible = "iio-hwmon"; + io-channels = <&u76 0>, <&u76 1>, <&u76 2>, <&u76 3>; + }; + ina226-u77 { + compatible = "iio-hwmon"; + io-channels = <&u77 0>, <&u77 1>, <&u77 2>, <&u77 3>; + }; + ina226-u78 { + compatible = "iio-hwmon"; + io-channels = <&u78 0>, <&u78 1>, <&u78 2>, <&u78 3>; + }; + ina226-u87 { + compatible = "iio-hwmon"; + io-channels = <&u87 0>, <&u87 1>, <&u87 2>, <&u87 3>; + }; + ina226-u85 { + compatible = "iio-hwmon"; + io-channels = <&u85 0>, <&u85 1>, <&u85 2>, <&u85 3>; + }; + ina226-u86 { + compatible = "iio-hwmon"; + io-channels = <&u86 0>, <&u86 1>, <&u86 2>, <&u86 3>; + }; + ina226-u93 { + compatible = "iio-hwmon"; + io-channels = <&u93 0>, <&u93 1>, <&u93 2>, <&u93 3>; + }; + ina226-u88 { + compatible = "iio-hwmon"; + io-channels = <&u88 0>, <&u88 1>, <&u88 2>, <&u88 3>; + }; + ina226-u15 { + compatible = "iio-hwmon"; + io-channels = <&u15 0>, <&u15 1>, <&u15 2>, <&u15 3>; + }; + ina226-u92 { + compatible = "iio-hwmon"; + io-channels = <&u92 0>, <&u92 1>, <&u92 2>, <&u92 3>; + }; + ina226-u79 { + compatible = "iio-hwmon"; + io-channels = <&u79 0>, <&u79 1>, <&u79 2>, <&u79 3>; + }; + ina226-u81 { + compatible = "iio-hwmon"; + io-channels = <&u81 0>, <&u81 1>, <&u81 2>, <&u81 3>; + }; + ina226-u80 { + compatible = "iio-hwmon"; + io-channels = <&u80 0>, <&u80 1>, <&u80 2>, <&u80 3>; + }; + ina226-u84 { + compatible = "iio-hwmon"; + io-channels = <&u84 0>, <&u84 1>, <&u84 2>, <&u84 3>; + }; + ina226-u16 { + compatible = "iio-hwmon"; + io-channels = <&u16 0>, <&u16 1>, <&u16 2>, <&u16 3>; + }; + ina226-u65 { + compatible = "iio-hwmon"; + io-channels = <&u65 0>, <&u65 1>, <&u65 2>, <&u65 3>; + }; + ina226-u74 { + compatible = "iio-hwmon"; + io-channels = <&u74 0>, <&u74 1>, <&u74 2>, <&u74 3>; + }; + ina226-u75 { + compatible = "iio-hwmon"; + io-channels = <&u75 0>, <&u75 1>, <&u75 2>, <&u75 3>; + }; }; &can1 {
@@ -184,53 +257,63 @@ #size-cells = <0>; reg = <0>; /* PS_PMBUS */ - ina226 at 40 { /* u76 */ + u76: ina226 at 40 { /* u76 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x40>; shunt-resistor = <5000>; }; - ina226 at 41 { /* u77 */ + u77: ina226 at 41 { /* u77 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x41>; shunt-resistor = <5000>; }; - ina226 at 42 { /* u78 */ + u78: ina226 at 42 { /* u78 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x42>; shunt-resistor = <5000>; }; - ina226 at 43 { /* u87 */ + u87: ina226 at 43 { /* u87 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x43>; shunt-resistor = <5000>; }; - ina226 at 44 { /* u85 */ + u85: ina226 at 44 { /* u85 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x44>; shunt-resistor = <5000>; }; - ina226 at 45 { /* u86 */ + u86: ina226 at 45 { /* u86 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x45>; shunt-resistor = <5000>; }; - ina226 at 46 { /* u93 */ + u93: ina226 at 46 { /* u93 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x46>; shunt-resistor = <5000>; }; - ina226 at 47 { /* u88 */ + u88: ina226 at 47 { /* u88 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x47>; shunt-resistor = <5000>; }; - ina226 at 4a { /* u15 */ + u15: ina226 at 4a { /* u15 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x4a>; shunt-resistor = <5000>; }; - ina226 at 4b { /* u92 */ + u92: ina226 at 4b { /* u92 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x4b>; shunt-resistor = <5000>; };
@@ -240,43 +323,51 @@ #size-cells = <0>; reg = <1>; /* PL_PMBUS */ - ina226 at 40 { /* u79 */ + u79: ina226 at 40 { /* u79 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x40>; shunt-resistor = <2000>; }; - ina226 at 41 { /* u81 */ + u81: ina226 at 41 { /* u81 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x41>; shunt-resistor = <5000>; }; - ina226 at 42 { /* u80 */ + u80: ina226 at 42 { /* u80 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x42>; shunt-resistor = <5000>; }; - ina226 at 43 { /* u84 */ + u84: ina226 at 43 { /* u84 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x43>; shunt-resistor = <5000>; }; - ina226 at 44 { /* u16 */ + u16: ina226 at 44 { /* u16 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x44>; shunt-resistor = <5000>; }; - ina226 at 45 { /* u65 */ + u65: ina226 at 45 { /* u65 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x45>; shunt-resistor = <5000>; }; - ina226 at 46 { /* u74 */ + u74: ina226 at 46 { /* u74 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x46>; shunt-resistor = <5000>; }; - ina226 at 47 { /* u75 */ + u75: ina226 at 47 { /* u75 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x47>; shunt-resistor = <5000>; };
Signature · 1 line
2.17.1
PATCH 19/27 arm64: zynqmp: Add label property to all ina226 on zcu106
In reply to Michal SimekLabel property is adding capability to distiguish chips from each other when iio framework is used.
---
arch/arm/dts/zynqmp-zcu106-revA.dts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
arch/arm/dts/zynqmp-zcu106-revA.dts +18 -0
@@ -260,60 +260,70 @@ u76: ina226 at 40 { /* u76 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u76"; reg = <0x40>; shunt-resistor = <5000>; }; u77: ina226 at 41 { /* u77 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u77"; reg = <0x41>; shunt-resistor = <5000>; }; u78: ina226 at 42 { /* u78 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u78"; reg = <0x42>; shunt-resistor = <5000>; }; u87: ina226 at 43 { /* u87 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u87"; reg = <0x43>; shunt-resistor = <5000>; }; u85: ina226 at 44 { /* u85 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u85"; reg = <0x44>; shunt-resistor = <5000>; }; u86: ina226 at 45 { /* u86 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u86"; reg = <0x45>; shunt-resistor = <5000>; }; u93: ina226 at 46 { /* u93 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u93"; reg = <0x46>; shunt-resistor = <5000>; }; u88: ina226 at 47 { /* u88 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u88"; reg = <0x47>; shunt-resistor = <5000>; }; u15: ina226 at 4a { /* u15 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u15"; reg = <0x4a>; shunt-resistor = <5000>; }; u92: ina226 at 4b { /* u92 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u92"; reg = <0x4b>; shunt-resistor = <5000>; };
@@ -326,48 +336,56 @@ u79: ina226 at 40 { /* u79 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u79"; reg = <0x40>; shunt-resistor = <2000>; }; u81: ina226 at 41 { /* u81 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u81"; reg = <0x41>; shunt-resistor = <5000>; }; u80: ina226 at 42 { /* u80 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u80"; reg = <0x42>; shunt-resistor = <5000>; }; u84: ina226 at 43 { /* u84 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u84"; reg = <0x43>; shunt-resistor = <5000>; }; u16: ina226 at 44 { /* u16 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u16"; reg = <0x44>; shunt-resistor = <5000>; }; u65: ina226 at 45 { /* u65 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u65"; reg = <0x45>; shunt-resistor = <5000>; }; u74: ina226 at 46 { /* u74 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u74"; reg = <0x46>; shunt-resistor = <5000>; }; u75: ina226 at 47 { /* u75 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u75"; reg = <0x47>; shunt-resistor = <5000>; };
Signature · 1 line
2.17.1
PATCH 20/27 arm64: zynqmp: Enable iio-hwmon for ina226 on zcu104
In reply to Michal Simekina226 hwmon driver is deprecated and it is recommended to use new iio based driver. The patch is enabling iio-hwmon driver to export functionality from IIO to hwmon interface to be able to use lm-sensors package.
---
arch/arm/dts/zynqmp-zcu104-revC.dts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
arch/arm/dts/zynqmp-zcu104-revC.dts +7 -1
@@ -41,6 +41,11 @@ device_type = "memory"; reg = <0x0 0x0 0x0 0x80000000>; }; + + ina226 { + compatible = "iio-hwmon"; + io-channels = <&u183 0>, <&u183 1>, <&u183 2>, <&u183 3>; + }; }; &can1 {
@@ -150,8 +155,9 @@ #address-cells = <1>; #size-cells = <0>; reg = <3>; - ina226 at 40 { /* u183 */ + u183: ina226 at 40 { /* u183 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x40>; shunt-resistor = <5000>; };
Signature · 1 line
2.17.1
PATCH 21/27 arm64: zynqmp: Enable fpd_dma for zcu104 platforms
In reply to Michal SimekEnable fpd_dma for these boards.
---
arch/arm/dts/zynqmp-zcu104-revA.dts | 32 +++++++++++++++++++++++++++++ arch/arm/dts/zynqmp-zcu104-revC.dts | 32 +++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+)
arch/arm/dts/zynqmp-zcu104-revA.dts +32 -0
@@ -50,6 +50,38 @@ status = "okay"; }; +&fpd_dma_chan1 { + status = "okay"; +}; + +&fpd_dma_chan2 { + status = "okay"; +}; + +&fpd_dma_chan3 { + status = "okay"; +}; + +&fpd_dma_chan4 { + status = "okay"; +}; + +&fpd_dma_chan5 { + status = "okay"; +}; + +&fpd_dma_chan6 { + status = "okay"; +}; + +&fpd_dma_chan7 { + status = "okay"; +}; + +&fpd_dma_chan8 { + status = "okay"; +}; + &gem3 { status = "okay"; phy-handle = <&phy0>;
arch/arm/dts/zynqmp-zcu104-revC.dts +32 -0
@@ -56,6 +56,38 @@ status = "okay"; }; +&fpd_dma_chan1 { + status = "okay"; +}; + +&fpd_dma_chan2 { + status = "okay"; +}; + +&fpd_dma_chan3 { + status = "okay"; +}; + +&fpd_dma_chan4 { + status = "okay"; +}; + +&fpd_dma_chan5 { + status = "okay"; +}; + +&fpd_dma_chan6 { + status = "okay"; +}; + +&fpd_dma_chan7 { + status = "okay"; +}; + +&fpd_dma_chan8 { + status = "okay"; +}; + &gem3 { status = "okay"; phy-handle = <&phy0>;
Signature · 1 line
2.17.1
PATCH 22/27 arm64: zynqmp: dt: Add missing DP83867 quirk
In reply to Michal SimekFrom: Harini Katakam <[email protected]>
The DP83867 strap control workaround is already present in Linux kernel mainline binding. All these Xilinx boards require this quirk.
---
arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 1 + arch/arm/dts/zynqmp-zcu102-revA.dts | 1 + arch/arm/dts/zynqmp-zcu102-revB.dts | 1 + arch/arm/dts/zynqmp-zcu104-revA.dts | 1 + arch/arm/dts/zynqmp-zcu104-revC.dts | 1 + arch/arm/dts/zynqmp-zcu106-revA.dts | 1 + arch/arm/dts/zynqmp-zcu111-revA.dts | 1 + 7 files changed, 7 insertions(+)
arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts +1 -0
@@ -90,6 +90,7 @@ ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>; ti,fifo-depth = <0x1>; + ti,dp83867-rxctrl-strap-quirk; }; };
arch/arm/dts/zynqmp-zcu102-revA.dts +1 -0
@@ -115,6 +115,7 @@ ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>; ti,fifo-depth = <0x1>; + ti,dp83867-rxctrl-strap-quirk; }; };
arch/arm/dts/zynqmp-zcu102-revB.dts +1 -0
@@ -21,6 +21,7 @@ ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>; ti,fifo-depth = <0x1>; + ti,dp83867-rxctrl-strap-quirk; }; /* Cleanup from RevA */ /delete-node/ phy at 21;
arch/arm/dts/zynqmp-zcu104-revA.dts +1 -0
@@ -91,6 +91,7 @@ ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>; ti,fifo-depth = <0x1>; + ti,dp83867-rxctrl-strap-quirk; }; };
arch/arm/dts/zynqmp-zcu104-revC.dts +1 -0
@@ -97,6 +97,7 @@ ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>; ti,fifo-depth = <0x1>; + ti,dp83867-rxctrl-strap-quirk; }; };
arch/arm/dts/zynqmp-zcu106-revA.dts +1 -0
@@ -188,6 +188,7 @@ ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>; ti,fifo-depth = <0x1>; + ti,dp83867-rxctrl-strap-quirk; }; };
arch/arm/dts/zynqmp-zcu111-revA.dts +1 -0
@@ -168,6 +168,7 @@ ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>; ti,fifo-depth = <0x1>; + ti,dp83867-rxctrl-strap-quirk; }; };
Signature · 1 line
2.17.1
PATCH 23/27 arm64: zynqmp: dt: Add optional gpio phy reset properties
In reply to Michal SimekFrom: Harini Katakam <[email protected]>
Add gpio phy reset via I2C expander TCA6416 on board ZCU102. A warning call trace is observer in probe when this reset is called from context that can sleep. Keep this commented until that is resolved in phylib.
---
arch/arm/dts/zynqmp-zcu102-revA.dts | 1 + arch/arm/dts/zynqmp-zcu102-revB.dts | 1 + 2 files changed, 2 insertions(+)
arch/arm/dts/zynqmp-zcu102-revA.dts +1 -0
@@ -116,6 +116,7 @@ ti,tx-internal-delay = <0xa>; ti,fifo-depth = <0x1>; ti,dp83867-rxctrl-strap-quirk; + /* reset-gpios = <&tca6416_u97 6 GPIO_ACTIVE_LOW>; */ }; };
arch/arm/dts/zynqmp-zcu102-revB.dts +1 -0
@@ -22,6 +22,7 @@ ti,tx-internal-delay = <0xa>; ti,fifo-depth = <0x1>; ti,dp83867-rxctrl-strap-quirk; + /* reset-gpios = <&tca6416_u97 6 GPIO_ACTIVE_LOW>; */ }; /* Cleanup from RevA */ /delete-node/ phy at 21;
Signature · 1 line
2.17.1
PATCH 24/27 arm64: zynqmp: Enable iio-hwmon for ina226 on zcu102
In reply to Michal Simekina226 hwmon driver is deprecated and it is recommended to use new iio based driver. The patch is enabling iio-hwmon driver to export functionality from IIO to hwmon interface to be able to use lm-sensors package.
---
arch/arm/dts/zynqmp-zcu102-revA.dts | 127 ++++++++++++++++++++++++---- 1 file changed, 109 insertions(+), 18 deletions(-)
arch/arm/dts/zynqmp-zcu102-revA.dts +109 -18
@@ -64,6 +64,79 @@ linux,default-trigger = "heartbeat"; }; }; + + ina226-u76 { + compatible = "iio-hwmon"; + io-channels = <&u76 0>, <&u76 1>, <&u76 2>, <&u76 3>; + }; + ina226-u77 { + compatible = "iio-hwmon"; + io-channels = <&u77 0>, <&u77 1>, <&u77 2>, <&u77 3>; + }; + ina226-u78 { + compatible = "iio-hwmon"; + io-channels = <&u78 0>, <&u78 1>, <&u78 2>, <&u78 3>; + }; + ina226-u87 { + compatible = "iio-hwmon"; + io-channels = <&u87 0>, <&u87 1>, <&u87 2>, <&u87 3>; + }; + ina226-u85 { + compatible = "iio-hwmon"; + io-channels = <&u85 0>, <&u85 1>, <&u85 2>, <&u85 3>; + }; + ina226-u86 { + compatible = "iio-hwmon"; + io-channels = <&u86 0>, <&u86 1>, <&u86 2>, <&u86 3>; + }; + ina226-u93 { + compatible = "iio-hwmon"; + io-channels = <&u93 0>, <&u93 1>, <&u93 2>, <&u93 3>; + }; + ina226-u88 { + compatible = "iio-hwmon"; + io-channels = <&u88 0>, <&u88 1>, <&u88 2>, <&u88 3>; + }; + ina226-u15 { + compatible = "iio-hwmon"; + io-channels = <&u15 0>, <&u15 1>, <&u15 2>, <&u15 3>; + }; + ina226-u92 { + compatible = "iio-hwmon"; + io-channels = <&u92 0>, <&u92 1>, <&u92 2>, <&u92 3>; + }; + ina226-u79 { + compatible = "iio-hwmon"; + io-channels = <&u79 0>, <&u79 1>, <&u79 2>, <&u79 3>; + }; + ina226-u81 { + compatible = "iio-hwmon"; + io-channels = <&u81 0>, <&u81 1>, <&u81 2>, <&u81 3>; + }; + ina226-u80 { + compatible = "iio-hwmon"; + io-channels = <&u80 0>, <&u80 1>, <&u80 2>, <&u80 3>; + }; + ina226-u84 { + compatible = "iio-hwmon"; + io-channels = <&u84 0>, <&u84 1>, <&u84 2>, <&u84 3>; + }; + ina226-u16 { + compatible = "iio-hwmon"; + io-channels = <&u16 0>, <&u16 1>, <&u16 2>, <&u16 3>; + }; + ina226-u65 { + compatible = "iio-hwmon"; + io-channels = <&u65 0>, <&u65 1>, <&u65 2>, <&u65 3>; + }; + ina226-u74 { + compatible = "iio-hwmon"; + io-channels = <&u74 0>, <&u74 1>, <&u74 2>, <&u74 3>; + }; + ina226-u75 { + compatible = "iio-hwmon"; + io-channels = <&u75 0>, <&u75 1>, <&u75 2>, <&u75 3>; + }; }; &can1 {
@@ -212,53 +285,63 @@ #size-cells = <0>; reg = <0>; /* PS_PMBUS */ - ina226 at 40 { /* u76 */ + u76: ina226 at 40 { /* u76 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x40>; shunt-resistor = <5000>; }; - ina226 at 41 { /* u77 */ + u77: ina226 at 41 { /* u77 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x41>; shunt-resistor = <5000>; }; - ina226 at 42 { /* u78 */ + u78: ina226 at 42 { /* u78 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x42>; shunt-resistor = <5000>; }; - ina226 at 43 { /* u87 */ + u87: ina226 at 43 { /* u87 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x43>; shunt-resistor = <5000>; }; - ina226 at 44 { /* u85 */ + u85: ina226 at 44 { /* u85 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x44>; shunt-resistor = <5000>; }; - ina226 at 45 { /* u86 */ + u86: ina226 at 45 { /* u86 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x45>; shunt-resistor = <5000>; }; - ina226 at 46 { /* u93 */ + u93: ina226 at 46 { /* u93 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x46>; shunt-resistor = <5000>; }; - ina226 at 47 { /* u88 */ + u88: ina226 at 47 { /* u88 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x47>; shunt-resistor = <5000>; }; - ina226 at 4a { /* u15 */ + u15: ina226 at 4a { /* u15 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x4a>; shunt-resistor = <5000>; }; - ina226 at 4b { /* u92 */ + u92: ina226 at 4b { /* u92 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x4b>; shunt-resistor = <5000>; };
@@ -268,43 +351,51 @@ #size-cells = <0>; reg = <1>; /* PL_PMBUS */ - ina226 at 40 { /* u79 */ + u79: ina226 at 40 { /* u79 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x40>; shunt-resistor = <2000>; }; - ina226 at 41 { /* u81 */ + u81: ina226 at 41 { /* u81 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x41>; shunt-resistor = <5000>; }; - ina226 at 42 { /* u80 */ + u80: ina226 at 42 { /* u80 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x42>; shunt-resistor = <5000>; }; - ina226 at 43 { /* u84 */ + u84: ina226 at 43 { /* u84 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x43>; shunt-resistor = <5000>; }; - ina226 at 44 { /* u16 */ + u16: ina226 at 44 { /* u16 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x44>; shunt-resistor = <5000>; }; - ina226 at 45 { /* u65 */ + u65: ina226 at 45 { /* u65 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x45>; shunt-resistor = <5000>; }; - ina226 at 46 { /* u74 */ + u74: ina226 at 46 { /* u74 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x46>; shunt-resistor = <5000>; }; - ina226 at 47 { /* u75 */ + u75: ina226 at 47 { /* u75 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x47>; shunt-resistor = <5000>; };
Signature · 1 line
2.17.1
PATCH 25/27 arm64: zynqmp: Add label property to all ina226 on zcu102
In reply to Michal SimekLabel property is adding capability to distiguish chips from each other when iio framework is used.
---
arch/arm/dts/zynqmp-zcu102-revA.dts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
arch/arm/dts/zynqmp-zcu102-revA.dts +18 -0
@@ -288,60 +288,70 @@ u76: ina226 at 40 { /* u76 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u76"; reg = <0x40>; shunt-resistor = <5000>; }; u77: ina226 at 41 { /* u77 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u77"; reg = <0x41>; shunt-resistor = <5000>; }; u78: ina226 at 42 { /* u78 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u78"; reg = <0x42>; shunt-resistor = <5000>; }; u87: ina226 at 43 { /* u87 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u87"; reg = <0x43>; shunt-resistor = <5000>; }; u85: ina226 at 44 { /* u85 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u85"; reg = <0x44>; shunt-resistor = <5000>; }; u86: ina226 at 45 { /* u86 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u86"; reg = <0x45>; shunt-resistor = <5000>; }; u93: ina226 at 46 { /* u93 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u93"; reg = <0x46>; shunt-resistor = <5000>; }; u88: ina226 at 47 { /* u88 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u88"; reg = <0x47>; shunt-resistor = <5000>; }; u15: ina226 at 4a { /* u15 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u15"; reg = <0x4a>; shunt-resistor = <5000>; }; u92: ina226 at 4b { /* u92 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u92"; reg = <0x4b>; shunt-resistor = <5000>; };
@@ -354,48 +364,56 @@ u79: ina226 at 40 { /* u79 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u79"; reg = <0x40>; shunt-resistor = <2000>; }; u81: ina226 at 41 { /* u81 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u81"; reg = <0x41>; shunt-resistor = <5000>; }; u80: ina226 at 42 { /* u80 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u80"; reg = <0x42>; shunt-resistor = <5000>; }; u84: ina226 at 43 { /* u84 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u84"; reg = <0x43>; shunt-resistor = <5000>; }; u16: ina226 at 44 { /* u16 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u16"; reg = <0x44>; shunt-resistor = <5000>; }; u65: ina226 at 45 { /* u65 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u65"; reg = <0x45>; shunt-resistor = <5000>; }; u74: ina226 at 46 { /* u74 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u74"; reg = <0x46>; shunt-resistor = <5000>; }; u75: ina226 at 47 { /* u75 */ compatible = "ti,ina226"; #io-channel-cells = <1>; + label = "ina226-u75"; reg = <0x47>; shunt-resistor = <5000>; };
Signature · 1 line
2.17.1
PATCH 26/27 arm64: zynqmp: Turn comment to gpio-line-names
In reply to Michal SimekLabel gpio lines properly.
---
arch/arm/dts/zynqmp-zcu102-revA.dts | 43 ++++++----------------------- 1 file changed, 9 insertions(+), 34 deletions(-)
arch/arm/dts/zynqmp-zcu102-revA.dts +9 -34
@@ -208,21 +208,11 @@ tca6416_u97: gpio at 20 { compatible = "ti,tca6416"; reg = <0x20>; - gpio-controller; + gpio-controller; /* IRQ not connected */ #gpio-cells = <2>; - /* - * IRQ not connected - * Lines: - * 0 - PS_GTR_LAN_SEL0 - * 1 - PS_GTR_LAN_SEL1 - * 2 - PS_GTR_LAN_SEL2 - * 3 - PS_GTR_LAN_SEL3 - * 4 - PCI_CLK_DIR_SEL - * 5 - IIC_MUX_RESET_B - * 6 - GEM3_EXP_RESET_B - * 7, 10 - 17 - not connected - */ - + gpio-line-names = "PS_GTR_LAN_SEL0", "PS_GTR_LAN_SEL1", "PS_GTR_LAN_SEL2", "PS_GTR_LAN_SEL3", + "PCI_CLK_DIR_SEL", "IIC_MUX_RESET_B", "GEM3_EXP_RESET_B", + "", "", "", "", "", "", "", "", ""; gtr_sel0 { gpio-hog; gpios = <0 0>;
@@ -252,27 +242,12 @@ tca6416_u61: gpio at 21 { compatible = "ti,tca6416"; reg = <0x21>; - gpio-controller; + gpio-controller; /* IRQ not connected */ #gpio-cells = <2>; - /* - * IRQ not connected - * Lines: - * 0 - VCCPSPLL_EN - * 1 - MGTRAVCC_EN - * 2 - MGTRAVTT_EN - * 3 - VCCPSDDRPLL_EN - * 4 - MIO26_PMU_INPUT_LS - * 5 - PL_PMBUS_ALERT - * 6 - PS_PMBUS_ALERT - * 7 - MAXIM_PMBUS_ALERT - * 10 - PL_DDR4_VTERM_EN - * 11 - PL_DDR4_VPP_2V5_EN - * 12 - PS_DIMM_VDDQ_TO_PSVCCO_ON - * 13 - PS_DIMM_SUSPEND_EN - * 14 - PS_DDR4_VTERM_EN - * 15 - PS_DDR4_VPP_2V5_EN - * 16 - 17 - not connected - */ + gpio-line-names = "VCCPSPLL_EN", "MGTRAVCC_EN", "MGTRAVTT_EN", "VCCPSDDRPLL_EN", "MIO26_PMU_INPUT_LS", + "PL_PMBUS_ALERT", "PS_PMBUS_ALERT", "MAXIM_PMBUS_ALERT", "PL_DDR4_VTERM_EN", + "PL_DDR4_VPP_2V5_EN", "PS_DIMM_VDDQ_TO_PSVCCO_ON", "PS_DIMM_SUSPEND_EN", + "PS_DDR4_VTERM_EN", "PS_DDR4_VPP_2V5_EN", "", ""; }; i2c-mux at 75 { /* u60 */
Signature · 1 line
2.17.1
PATCH 27/27 arm64: zynqmp: Enable iio-hwmon for ina226 on zcu100
In reply to Michal Simekina226 hwmon driver is deprecated and it is recommended to use new iio based driver. The patch is enabling iio-hwmon driver to export functionality from IIO to hwmon interface to be able to use lm-sensors package.
---
arch/arm/dts/zynqmp-zcu100-revC.dts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
arch/arm/dts/zynqmp-zcu100-revC.dts +7 -1
@@ -124,6 +124,11 @@ compatible = "mmc-pwrseq-simple"; reset-gpios = <&gpio 7 GPIO_ACTIVE_LOW>; /* WIFI_EN */ }; + + ina226 { + compatible = "iio-hwmon"; + io-channels = <&u35 0>, <&u35 1>, <&u35 2>, <&u35 3>; + }; }; &dcc {
@@ -216,8 +221,9 @@ #size-cells = <0>; reg = <5>; /* PS_PMBUS */ - ina226 at 40 { /* u35 */ + u35: ina226 at 40 { /* u35 */ compatible = "ti,ina226"; + #io-channel-cells = <1>; reg = <0x40>; shunt-resistor = <10000>; /* MIO31 is alert which should be routed to PMUFW */
Signature · 1 line
2.17.1
cover arm64: zynqmp: Update DT files
In reply to Michal Simekpo 14. 10. 2019 v 12:16 odesÃlatel Michal Simek
<[email protected]> napsal:
Quoted 79 lines
Hi,
these are patches I have collected in Xilinx repo and which should go to mainline. There are 3 typo of patches.
1. IIO wiring for ina226 and using IIO ina226 driver instead of hwmon
2. DT fixes and small updates
3. Alignments including name synchronizationThanks,
MichalHarini Katakam (2):
arm64: zynqmp: dt: Add missing DP83867 quirk
arm64: zynqmp: dt: Add optional gpio phy reset propertiesMichal Simek (21):
arm64: zynqmp: Sync names for SC with Versal
arm64: zynqmp: Use ethernet-phy as node name for ethernet phys
arm64: zynqmp: Enable iio-hwmon for ina226 on g-a2197-00
arm64: zynqmp: Add label property to all ina226 on g-a2197-00
arm64: zynqmp: Fix typo in zynqmp-p-a2197-00-revA
arm64: zynqmp: Enable iio-hwmon for ina226 on m-a2197-01
arm64: zynqmp: Add label property to all ina226 on m-a2197-01
arm64: zynqmp: Switch spi-flash to jedec,spi-nor on m-a2197
arm64: zynqmp: Fix m-a2197-01 DT based on latest schematics
arm64: zynqmp: Sync si570 setup and clock names
arm64: zynqmp: Remove fixme about memory size on zynqmp-p-a2197
arm64: zynqmp: Enable iio-hwmon for ina226 on zcu111
arm64: zynqmp: Add label property to all ina226 on zcu111
arm64: zynqmp: Enable iio-hwmon for ina226 on zcu106
arm64: zynqmp: Add label property to all ina226 on zcu106
arm64: zynqmp: Enable iio-hwmon for ina226 on zcu104
arm64: zynqmp: Enablefpd_dmafor zcu104 platforms
arm64: zynqmp: Enable iio-hwmon for ina226 on zcu102
arm64: zynqmp: Add label property to all ina226 on zcu102
arm64: zynqmp: Turn comment to gpio-line-names
arm64: zynqmp: Enable iio-hwmon for ina226 on zcu100Nishant Mittal (2):
arm64: zynqmp: Fix i2c address of u70 on p-a2197-00 board
arm64: zynqmp: Added new tps53679 compatible string for a2197-0x
boardsT Karthik Reddy (1):
arm64: zynqmp: dt: Delete no-1-8-v property from zcu102-rev1.0Venkatesh Yadav Abbarapu (1):
arm64: zynqmp: Fix the si570 clock frequency on zcu111arch/arm/dts/Makefile | 6 +- ...-g-revA.dts => zynqmp-g-a2197-00-revA.dts} | 55 ++++- ...-m-revA.dts => zynqmp-m-a2197-01-revA.dts} | 68 +++++-- ...-p-revA.dts => zynqmp-p-a2197-00-revA.dts} | 42 ++-- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 3 +- arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts | 2 +- arch/arm/dts/zynqmp-zcu100-revC.dts | 8 +- arch/arm/dts/zynqmp-zcu102-rev1.0.dts | 4 + arch/arm/dts/zynqmp-zcu102-revA.dts | 192 +++++++++++++----- arch/arm/dts/zynqmp-zcu102-revB.dts | 4 +- arch/arm/dts/zynqmp-zcu104-revA.dts | 35 +++- arch/arm/dts/zynqmp-zcu104-revC.dts | 43 +++- arch/arm/dts/zynqmp-zcu106-revA.dts | 148 ++++++++++++-- arch/arm/dts/zynqmp-zcu111-revA.dts | 118 +++++++++-- configs/xilinx_zynqmp_a2197_revA_defconfig | 2 +- ...> xilinx_zynqmp_g_a2197_00_revA_defconfig} | 2 +- ...> xilinx_zynqmp_m_a2197_01_revA_defconfig} | 2 +- ...> xilinx_zynqmp_p_a2197_00_revA_defconfig} | 2 +- 20 files changed, 588 insertions(+), 152 deletions(-) rename arch/arm/dts/{zynqmp-a2197-g-revA.dts => zynqmp-g-a2197-00-revA.dts} (85%) rename arch/arm/dts/{zynqmp-a2197-m-revA.dts => zynqmp-m-a2197-01-revA.dts} (86%) rename arch/arm/dts/{zynqmp-a2197-p-revA.dts => zynqmp-p-a2197-00-revA.dts} (93%) rename configs/{xilinx_zynqmp_a2197_m_revA_defconfig => xilinx_zynqmp_g_a2197_00_revA_defconfig} (98%) rename configs/{xilinx_zynqmp_a2197_g_revA_defconfig => xilinx_zynqmp_m_a2197_01_revA_defconfig} (98%) rename configs/{xilinx_zynqmp_a2197_p_revA_defconfig => xilinx_zynqmp_p_a2197_00_revA_defconfig} (98%)
Quoted 3 lines
--
2.17.1
Applied all.
M
Signature · 5 lines
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