* [PATCH 1/6] arm64: zynqmp: Fix address for tca6416_u97 chip on zcu104
2020-01-09 13:39 [PATCH 0/6] arm64: zynqmp: Various DT fixes Michal Simek
@ 2020-01-09 13:39 ` Michal Simek
2020-01-09 13:39 ` [PATCH 2/6] arm64: zynqmp: Turn comment to gpio-line-names Michal Simek
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Michal Simek @ 2020-01-09 13:39 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Anurag Kumar Vulisha, Harini Katakam, Mark Rutland, Rajan Vaja,
Rob Herring, devicetree, linux-kernel
I2c address is not 0x21 but 0x20.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts
index 2d71b4431cce..7a4614e3f5fa 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts
@@ -118,9 +118,9 @@ i2c@4 {
#address-cells = <1>;
#size-cells = <0>;
reg = <4>;
- tca6416_u97: gpio@21 {
+ tca6416_u97: gpio@20 {
compatible = "ti,tca6416";
- reg = <0x21>;
+ reg = <0x20>;
gpio-controller;
#gpio-cells = <2>;
/*
--
2.24.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/6] arm64: zynqmp: Turn comment to gpio-line-names
2020-01-09 13:39 [PATCH 0/6] arm64: zynqmp: Various DT fixes Michal Simek
2020-01-09 13:39 ` [PATCH 1/6] arm64: zynqmp: Fix address for tca6416_u97 chip on zcu104 Michal Simek
@ 2020-01-09 13:39 ` Michal Simek
2020-01-09 13:39 ` [PATCH 3/6] arm64: zynqmp: Setup clock-output-names for si570 chips Michal Simek
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Michal Simek @ 2020-01-09 13:39 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Anurag Kumar Vulisha, Harini Katakam, Mark Rutland, Rajan Vaja,
Rob Herring, devicetree, linux-kernel
Label gpio lines properly.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
.../boot/dts/xilinx/zynqmp-zcu102-revA.dts | 43 ++++---------------
1 file changed, 9 insertions(+), 34 deletions(-)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
index 7c6b538490f8..c96e8416fa7e 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
@@ -125,21 +125,11 @@ &i2c0 {
tca6416_u97: gpio@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>;
@@ -169,27 +159,12 @@ gtr-sel3 {
tca6416_u61: gpio@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@75 { /* u60 */
--
2.24.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/6] arm64: zynqmp: Setup clock-output-names for si570 chips
2020-01-09 13:39 [PATCH 0/6] arm64: zynqmp: Various DT fixes Michal Simek
2020-01-09 13:39 ` [PATCH 1/6] arm64: zynqmp: Fix address for tca6416_u97 chip on zcu104 Michal Simek
2020-01-09 13:39 ` [PATCH 2/6] arm64: zynqmp: Turn comment to gpio-line-names Michal Simek
@ 2020-01-09 13:39 ` Michal Simek
2020-01-09 13:39 ` [PATCH 4/6] arm64: zynqmp: Fix the si570 clock frequency on zcu111 Michal Simek
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Michal Simek @ 2020-01-09 13:39 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Anurag Kumar Vulisha, Harini Katakam, Mark Rutland, Rajan Vaja,
Rob Herring, Venkatesh Yadav Abbarapu, devicetree, linux-kernel
If there are more instances of si570 clock-output-names property
should be used for differentiation of clock output.
The patch is adding this optional properties for all zynqmp boards with
si570 chip.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 2 ++
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 2 ++
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 2 ++
3 files changed, 6 insertions(+)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
index c96e8416fa7e..845671447f60 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
@@ -389,6 +389,7 @@ si570_1: clock-generator@5d { /* USER SI570 - u42 */
temperature-stability = <50>;
factory-fout = <300000000>;
clock-frequency = <300000000>;
+ clock-output-names = "si570_user";
};
};
i2c@3 {
@@ -402,6 +403,7 @@ si570_2: clock-generator@5d { /* USER MGT SI570 - u56 */
temperature-stability = <50>; /* copy from zc702 */
factory-fout = <156250000>;
clock-frequency = <148500000>;
+ clock-output-names = "si570_mgt";
};
};
i2c@4 {
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
index ae62fe4287c2..822de6f04725 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
@@ -388,6 +388,7 @@ si570_1: clock-generator@5d { /* USER SI570 - u42 */
temperature-stability = <50>;
factory-fout = <300000000>;
clock-frequency = <300000000>;
+ clock-output-names = "si570_user";
};
};
i2c@3 {
@@ -401,6 +402,7 @@ si570_2: clock-generator@5d { /* USER MGT SI570 - u56 */
temperature-stability = <50>; /* copy from zc702 */
factory-fout = <156250000>;
clock-frequency = <148500000>;
+ clock-output-names = "si570_mgt";
};
};
i2c@4 {
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts
index b3c29947d6b3..022c732005ee 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts
@@ -304,6 +304,7 @@ si570_1: clock-generator@5d { /* USER SI570 - u47 */
temperature-stability = <50>;
factory-fout = <300000000>;
clock-frequency = <300000000>;
+ clock-output-names = "si570_user";
};
};
i2c@3 {
@@ -317,6 +318,7 @@ si570_2: clock-generator@5d { /* USER MGT SI570 - u49 */
temperature-stability = <50>;
factory-fout = <156250000>;
clock-frequency = <148500000>;
+ clock-output-names = "si570_mgt";
};
};
i2c@4 {
--
2.24.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/6] arm64: zynqmp: Fix the si570 clock frequency on zcu111
2020-01-09 13:39 [PATCH 0/6] arm64: zynqmp: Various DT fixes Michal Simek
` (2 preceding siblings ...)
2020-01-09 13:39 ` [PATCH 3/6] arm64: zynqmp: Setup clock-output-names for si570 chips Michal Simek
@ 2020-01-09 13:39 ` Michal Simek
2020-01-09 13:39 ` [PATCH 5/6] arm64: zynqmp: Remove broken-cd from zcu100-revC Michal Simek
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Michal Simek @ 2020-01-09 13:39 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Venkatesh Yadav Abbarapu, Anurag Kumar Vulisha, Harini Katakam,
Mark Rutland, Rajan Vaja, Rob Herring, devicetree, linux-kernel
From: Venkatesh Yadav Abbarapu <venkatesh.abbarapu@xilinx.com>
The si570 clock frequency should be 156.25MHz as per datasheet.
Signed-off-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts
index 022c732005ee..cb2e46833a7b 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts
@@ -317,7 +317,7 @@ si570_2: clock-generator@5d { /* USER MGT SI570 - u49 */
reg = <0x5d>;
temperature-stability = <50>;
factory-fout = <156250000>;
- clock-frequency = <148500000>;
+ clock-frequency = <156250000>;
clock-output-names = "si570_mgt";
};
};
--
2.24.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 5/6] arm64: zynqmp: Remove broken-cd from zcu100-revC
2020-01-09 13:39 [PATCH 0/6] arm64: zynqmp: Various DT fixes Michal Simek
` (3 preceding siblings ...)
2020-01-09 13:39 ` [PATCH 4/6] arm64: zynqmp: Fix the si570 clock frequency on zcu111 Michal Simek
@ 2020-01-09 13:39 ` Michal Simek
2020-01-09 13:39 ` [PATCH 6/6] arm64: zynqmp: Setup default number of chipselects for zcu100 Michal Simek
2020-01-09 13:51 ` [PATCH 0/6] arm64: zynqmp: Various DT fixes Michal Simek
6 siblings, 0 replies; 8+ messages in thread
From: Michal Simek @ 2020-01-09 13:39 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Anurag Kumar Vulisha, Jan Kiszka, Mark Rutland, Rajan Vaja,
Rob Herring, Ulf Hansson, devicetree, linux-kernel
Card detect bit was broken on revA and it is working fine with revC
board that's why this property can be removed.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
index dd60f7d85cc8..2b3757dd74cc 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
@@ -226,7 +226,6 @@ &rtc {
&sdhci0 {
status = "okay";
no-1-8-v;
- broken-cd; /* CD has to be enabled by default */
disable-wp;
};
--
2.24.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 6/6] arm64: zynqmp: Setup default number of chipselects for zcu100
2020-01-09 13:39 [PATCH 0/6] arm64: zynqmp: Various DT fixes Michal Simek
` (4 preceding siblings ...)
2020-01-09 13:39 ` [PATCH 5/6] arm64: zynqmp: Remove broken-cd from zcu100-revC Michal Simek
@ 2020-01-09 13:39 ` Michal Simek
2020-01-09 13:51 ` [PATCH 0/6] arm64: zynqmp: Various DT fixes Michal Simek
6 siblings, 0 replies; 8+ messages in thread
From: Michal Simek @ 2020-01-09 13:39 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Anurag Kumar Vulisha, Jan Kiszka, Mark Rutland, Rajan Vaja,
Rob Herring, Ulf Hansson, devicetree, linux-kernel
There is only one chipselect on each connector.
Define it directly in board dts file.
There should be an option to use more chipselects via gpios.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
index 2b3757dd74cc..a109e82982ae 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
@@ -250,11 +250,13 @@ wlcore: wifi@2 {
&spi0 { /* Low Speed connector */
status = "okay";
label = "LS-SPI0";
+ num-cs = <1>;
};
&spi1 { /* High Speed connector */
status = "okay";
label = "HS-SPI1";
+ num-cs = <1>;
};
&uart0 {
--
2.24.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 0/6] arm64: zynqmp: Various DT fixes
2020-01-09 13:39 [PATCH 0/6] arm64: zynqmp: Various DT fixes Michal Simek
` (5 preceding siblings ...)
2020-01-09 13:39 ` [PATCH 6/6] arm64: zynqmp: Setup default number of chipselects for zcu100 Michal Simek
@ 2020-01-09 13:51 ` Michal Simek
6 siblings, 0 replies; 8+ messages in thread
From: Michal Simek @ 2020-01-09 13:51 UTC (permalink / raw)
To: linux-arm
Cc: Anurag Kumar Vulisha, Harini Katakam, Jan Kiszka, Mark Rutland,
Rajan Vaja, Rob Herring, Ulf Hansson, Venkatesh Yadav Abbarapu,
DTML, LKML
čt 9. 1. 2020 v 14:39 odesílatel Michal Simek <michal.simek@xilinx.com> napsal:
>
> Hi,
>
> I am sending various DT fixes which have been found over the xilinx
> release.
> 1-2 patches are fixing reported description issues
> 3-6 patches are actual fixes.
>
> Thanks,
> Michal
>
>
> Michal Simek (5):
> arm64: zynqmp: Fix address for tca6416_u97 chip on zcu104
> arm64: zynqmp: Turn comment to gpio-line-names
> arm64: zynqmp: Setup clock-output-names for si570 chips
> arm64: zynqmp: Remove broken-cd from zcu100-revC
> arm64: zynqmp: Setup default number of chipselects for zcu100
>
> Venkatesh Yadav Abbarapu (1):
> arm64: zynqmp: Fix the si570 clock frequency on zcu111
>
> .../boot/dts/xilinx/zynqmp-zcu100-revC.dts | 3 +-
> .../boot/dts/xilinx/zynqmp-zcu102-revA.dts | 45 +++++--------------
> .../boot/dts/xilinx/zynqmp-zcu104-revA.dts | 4 +-
> .../boot/dts/xilinx/zynqmp-zcu106-revA.dts | 2 +
> .../boot/dts/xilinx/zynqmp-zcu111-revA.dts | 4 +-
> 5 files changed, 20 insertions(+), 38 deletions(-)
>
> --
> 2.24.0
>
Please ignore this patchset. I sent just 6 patches instead of 8 that's
why description here is not correct.
Thanks,
Michal
--
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
^ permalink raw reply [flat|nested] 8+ messages in thread