From 471e716a8fc96f7e61839f061729bdd31927ac8a Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 27 Mar 2018 10:47:26 +0200 Subject: [PATCH] arm64: zynqmp: Remove u-boot commands from dts files U-Boot commands shouldn't be the part of kernel DTS files. Signed-off-by: Michal Simek --- arch/arm/dts/zynqmp-zcu100-revC.dts | 18 +++++++++--------- arch/arm/dts/zynqmp-zcu102-revA.dts | 26 ++++++++++---------------- arch/arm/dts/zynqmp-zcu104-revA.dts | 14 +++++++------- arch/arm/dts/zynqmp-zcu104-revC.dts | 12 ++++++------ arch/arm/dts/zynqmp-zcu106-revA.dts | 28 +++++++++++----------------- arch/arm/dts/zynqmp-zcu111-revA.dts | 22 +++++++++++----------- 6 files changed, 54 insertions(+), 66 deletions(-) diff --git a/arch/arm/dts/zynqmp-zcu100-revC.dts b/arch/arm/dts/zynqmp-zcu100-revC.dts index 44c3fcdea11..afe47bf4f0a 100644 --- a/arch/arm/dts/zynqmp-zcu100-revC.dts +++ b/arch/arm/dts/zynqmp-zcu100-revC.dts @@ -74,7 +74,7 @@ compatible = "gpio-leds"; ds2 { label = "ds2"; - gpios = <&gpio 20 GPIO_ACTIVE_HIGH>; /* uboot: gpio toggle 20 */ + gpios = <&gpio 20 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; @@ -185,7 +185,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <0x75>; - i2csw_0: i2c@0 { /* i2c mw 75 0 1 */ + i2csw_0: i2c@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; @@ -193,7 +193,7 @@ * LSEXP_I2C0 */ }; - i2csw_1: i2c@1 { /* i2c mw 75 0 2 */ + i2csw_1: i2c@1 { #address-cells = <1>; #size-cells = <0>; reg = <1>; @@ -201,7 +201,7 @@ * LSEXP_I2C1 */ }; - i2csw_2: i2c@2 { /* i2c mw 75 0 4 */ + i2csw_2: i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; @@ -209,7 +209,7 @@ * HSEXP_I2C2 */ }; - i2csw_3: i2c@3 { /* i2c mw 75 0 8 */ + i2csw_3: i2c@3 { #address-cells = <1>; #size-cells = <0>; reg = <3>; @@ -217,7 +217,7 @@ * HSEXP_I2C3 */ }; - i2csw_4: i2c@4 { /* i2c mw 75 0 10 */ + i2csw_4: i2c@4 { #address-cells = <1>; #size-cells = <0>; reg = <0x4>; @@ -343,7 +343,7 @@ */ }; }; - i2csw_5: i2c@5 { /* i2c mw 75 0 20 */ + i2csw_5: i2c@5 { #address-cells = <1>; #size-cells = <0>; reg = <5>; @@ -355,7 +355,7 @@ /* MIO31 is alert which should be routed to PMUFW */ }; }; - i2csw_6: i2c@6 { /* i2c mw 75 0 40 */ + i2csw_6: i2c@6 { #address-cells = <1>; #size-cells = <0>; reg = <6>; @@ -363,7 +363,7 @@ * Not Connected */ }; - i2csw_7: i2c@7 { /* i2c mw 75 0 80 */ + i2csw_7: i2c@7 { #address-cells = <1>; #size-cells = <0>; reg = <7>; diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts index 47aa76cfcf6..66547324d89 100644 --- a/arch/arm/dts/zynqmp-zcu102-revA.dts +++ b/arch/arm/dts/zynqmp-zcu102-revA.dts @@ -146,12 +146,6 @@ sda-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; tca6416_u97: gpio@20 { - /* - * Enable all GTs to out from U-Boot - * i2c mw 20 6 0 - setup IO to output - * i2c mw 20 2 ef - setup output values on pins 0-7 - * i2c mw 20 3 ff - setup output values on pins 10-17 - */ compatible = "ti,tca6416"; reg = <0x20>; gpio-controller; @@ -195,7 +189,7 @@ }; }; - tca6416_u61: gpio@21 { /* FIXME enable it by i2c mw 21 6 0 */ + tca6416_u61: gpio@21 { compatible = "ti,tca6416"; reg = <0x21>; gpio-controller; @@ -226,7 +220,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <0x75>; - i2c@0 { /* i2c mw 75 0 1 */ + i2c@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; @@ -282,7 +276,7 @@ shunt-resistor = <5000>; }; }; - i2c@1 { /* i2c mw 75 0 1 */ + i2c@1 { #address-cells = <1>; #size-cells = <0>; reg = <1>; @@ -328,7 +322,7 @@ shunt-resistor = <5000>; }; }; - i2c@2 { /* i2c mw 75 0 1 */ + i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; @@ -418,7 +412,7 @@ drivers/hwmon/pmbus/Makefile:11:obj-$(CONFIG_SENSORS_MAX20751) += max20751.o #address-cells = <1>; #size-cells = <0>; reg = <0x74>; - i2c@0 { /* i2c mw 74 0 1 */ + i2c@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; @@ -435,7 +429,7 @@ drivers/hwmon/pmbus/Makefile:11:obj-$(CONFIG_SENSORS_MAX20751) += max20751.o reg = <0x54>; }; }; - i2c@1 { /* i2c mw 74 0 2 */ + i2c@1 { #address-cells = <1>; #size-cells = <0>; reg = <1>; @@ -445,7 +439,7 @@ drivers/hwmon/pmbus/Makefile:11:obj-$(CONFIG_SENSORS_MAX20751) += max20751.o }; }; - i2c@2 { /* i2c mw 74 0 4 */ + i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; @@ -458,7 +452,7 @@ drivers/hwmon/pmbus/Makefile:11:obj-$(CONFIG_SENSORS_MAX20751) += max20751.o clock-frequency = <300000000>; }; }; - i2c@3 { /* i2c mw 74 0 8 */ + i2c@3 { #address-cells = <1>; #size-cells = <0>; reg = <3>; @@ -471,7 +465,7 @@ drivers/hwmon/pmbus/Makefile:11:obj-$(CONFIG_SENSORS_MAX20751) += max20751.o clock-frequency = <148500000>; }; }; - i2c@4 { /* i2c mw 74 0 10 */ + i2c@4 { #address-cells = <1>; #size-cells = <0>; reg = <4>; @@ -512,7 +506,7 @@ drivers/hwmon/pmbus/Makefile:11:obj-$(CONFIG_SENSORS_MAX20751) += max20751.o reg = <2>; /* SYSMON */ }; - i2c@3 { /* i2c mw 75 0 8 */ + i2c@3 { #address-cells = <1>; #size-cells = <0>; reg = <3>; diff --git a/arch/arm/dts/zynqmp-zcu104-revA.dts b/arch/arm/dts/zynqmp-zcu104-revA.dts index 455a01e2b79..0f7494dd655 100644 --- a/arch/arm/dts/zynqmp-zcu104-revA.dts +++ b/arch/arm/dts/zynqmp-zcu104-revA.dts @@ -92,7 +92,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <0x74>; - i2c@0 { /* i2c mw 74 0 1 */ + i2c@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; @@ -112,7 +112,7 @@ }; }; - i2c@1 { /* i2c mw 74 0 2 */ + i2c@1 { #address-cells = <1>; #size-cells = <0>; reg = <1>; @@ -122,7 +122,7 @@ }; }; - i2c@2 { /* i2c mw 74 0 4 */ + i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; @@ -138,12 +138,12 @@ }; }; - i2c@4 { /* i2c mw 74 0 8 */ + i2c@4 { #address-cells = <1>; #size-cells = <0>; reg = <4>; /* FIXME Npt detected */ - tca6416_u97: gpio@21 { /* FIXME enable it by i2c mw 21 6 0 */ + tca6416_u97: gpio@21 { compatible = "ti,tca6416"; reg = <0x21>; gpio-controller; @@ -163,13 +163,13 @@ }; }; - i2c@5 { /* i2c mw 74 0 10 */ /* FMC_LPC */ + i2c@5 { #address-cells = <1>; #size-cells = <0>; reg = <5>; }; - i2c@7 { /* i2c mw 74 0 14 */ /* DDR4_SODIMM */ + i2c@7 { #address-cells = <1>; #size-cells = <0>; reg = <7>; diff --git a/arch/arm/dts/zynqmp-zcu104-revC.dts b/arch/arm/dts/zynqmp-zcu104-revC.dts index 674ed53f5ac..be1129e3f84 100644 --- a/arch/arm/dts/zynqmp-zcu104-revC.dts +++ b/arch/arm/dts/zynqmp-zcu104-revC.dts @@ -111,7 +111,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <0x74>; - i2c@0 { /* i2c mw 74 0 1 */ + i2c@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; @@ -131,7 +131,7 @@ }; }; - i2c@1 { /* i2c mw 74 0 2 */ + i2c@1 { #address-cells = <1>; #size-cells = <0>; reg = <1>; @@ -141,7 +141,7 @@ }; }; - i2c@2 { /* i2c mw 74 0 4 */ + i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; @@ -157,19 +157,19 @@ }; }; - i2c@4 { /* i2c mw 74 0 8 */ + i2c@4 { #address-cells = <1>; #size-cells = <0>; reg = <4>; }; - i2c@5 { /* i2c mw 74 0 10 */ /* FMC_LPC */ + i2c@5 { #address-cells = <1>; #size-cells = <0>; reg = <5>; }; - i2c@7 { /* i2c mw 74 0 14 */ /* DDR4_SODIMM */ + i2c@7 { #address-cells = <1>; #size-cells = <0>; reg = <7>; diff --git a/arch/arm/dts/zynqmp-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts index 77cb041df65..699a6e6ae73 100644 --- a/arch/arm/dts/zynqmp-zcu106-revA.dts +++ b/arch/arm/dts/zynqmp-zcu106-revA.dts @@ -146,12 +146,6 @@ sda-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; tca6416_u97: gpio@20 { - /* - * Enable all GTs to out from U-Boot - * i2c mw 20 6 0 - setup IO to output - * i2c mw 20 2 ef - setup output values on pins 0-7 - * i2c mw 20 3 ff - setup output values on pins 10-17 - */ compatible = "ti,tca6416"; reg = <0x20>; gpio-controller; /* interrupt not connected */ @@ -169,7 +163,7 @@ */ }; - tca6416_u61: gpio@21 { /* FIXME enable it by i2c mw 21 6 0 */ + tca6416_u61: gpio@21 { compatible = "ti,tca6416"; reg = <0x21>; gpio-controller; @@ -200,7 +194,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <0x75>; - i2c@0 { /* i2c mw 75 0 1 */ + i2c@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; @@ -256,7 +250,7 @@ shunt-resistor = <5000>; }; }; - i2c@1 { /* i2c mw 75 0 1 */ + i2c@1 { #address-cells = <1>; #size-cells = <0>; reg = <1>; @@ -302,7 +296,7 @@ shunt-resistor = <5000>; }; }; - i2c@2 { /* i2c mw 75 0 1 */ + i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; @@ -388,7 +382,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <0x74>; - i2c@0 { /* i2c mw 74 0 1 */ + i2c@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; @@ -405,7 +399,7 @@ reg = <0x54>; }; }; - i2c@1 { /* i2c mw 74 0 2 */ + i2c@1 { #address-cells = <1>; #size-cells = <0>; reg = <1>; @@ -415,7 +409,7 @@ }; }; - i2c@2 { /* i2c mw 74 0 4 */ + i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; @@ -428,7 +422,7 @@ clock-frequency = <300000000>; }; }; - i2c@3 { /* i2c mw 74 0 8 */ + i2c@3 { #address-cells = <1>; #size-cells = <0>; reg = <3>; @@ -441,7 +435,7 @@ clock-frequency = <148500000>; }; }; - i2c@4 { /* i2c mw 74 0 10 */ + i2c@4 { #address-cells = <1>; #size-cells = <0>; reg = <4>; @@ -450,7 +444,7 @@ reg = <0x69>; }; }; - i2c@5 { /* i2c mw 74 0 11 */ + i2c@5 { #address-cells = <1>; #size-cells = <0>; reg = <5>; /* FAN controller */ @@ -486,7 +480,7 @@ reg = <2>; /* SYSMON */ }; - i2c@3 { /* i2c mw 75 0 8 */ + i2c@3 { #address-cells = <1>; #size-cells = <0>; reg = <3>; diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts index ee21d0ad579..c2e851c4668 100644 --- a/arch/arm/dts/zynqmp-zcu111-revA.dts +++ b/arch/arm/dts/zynqmp-zcu111-revA.dts @@ -167,7 +167,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <0x75>; - i2c@0 { /* i2c mw 75 0 1 */ + i2c@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; @@ -250,7 +250,7 @@ reg = <1>; /* NC */ }; - i2c@2 { /* i2c mw 75 0 4 */ + i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; @@ -276,7 +276,7 @@ /* J19 header too */ }; - i2c@3 { /* i2c mw 75 0 8 */ + i2c@3 { #address-cells = <1>; #size-cells = <0>; reg = <3>; @@ -299,7 +299,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <0x74>; - i2c@0 { /* i2c mw 74 0 1 */ + i2c@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; @@ -316,7 +316,7 @@ reg = <0x54>; }; }; - i2c@1 { /* i2c mw 74 0 2 */ + i2c@1 { #address-cells = <1>; #size-cells = <0>; reg = <1>; @@ -326,7 +326,7 @@ }; }; - i2c@2 { /* i2c mw 74 0 4 */ + i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; @@ -339,7 +339,7 @@ clock-frequency = <300000000>; }; }; - i2c@3 { /* i2c mw 74 0 8 */ + i2c@3 { #address-cells = <1>; #size-cells = <0>; reg = <3>; @@ -352,7 +352,7 @@ clock-frequency = <148500000>; }; }; - i2c@4 { /* i2c mw 74 0 10 */ + i2c@4 { #address-cells = <1>; #size-cells = <0>; reg = <4>; @@ -361,7 +361,7 @@ reg = <0x69>; }; }; - i2c@5 { /* i2c mw 74 0 11 */ + i2c@5 { #address-cells = <1>; #size-cells = <0>; reg = <5>; @@ -378,7 +378,7 @@ */ }; }; - i2c@6 { /* i2c mw 74 0 11 */ + i2c@6 { #address-cells = <1>; #size-cells = <0>; reg = <6>; @@ -411,7 +411,7 @@ reg = <2>; /* SYSMON */ }; - i2c@3 { /* i2c mw 75 0 8 */ + i2c@3 { #address-cells = <1>; #size-cells = <0>; reg = <3>; -- 2.47.3