Hi,
This is one part of cleanups meant for make W=2 dtbs for 5.10 on TI
dtbs. Hopefully we dont see node_name_chars_strict warnings anymore.
As part of this cleanup, I ran a cross check of nodes that are
part of K3 as of right now, Vs what is "generic" definition as per 0.3
dt specification:
https://pastebin.ubuntu.com/p/kp3g4ktBYp/
I dont think the remaining have a good reference, at least in my
subjective view.
In possibly some cases, bootloaders may need to sync before doing DT
fixup etc.
Nishanth Menon (7):
arm64: dts: ti: k3-am65*: Use generic gpio for node names
arm64: dts: ti: k3-am65*: Use generic clock for serdes clock name
arm64: dts: ti: k3-*: Use generic pinctrl for node names
arm64: dts: ti: k3-am65-base-board Use generic camera for node name
instead of ov5640
arm64: dts: ti: k3-am65-wakeup: Use generic temperature-sensor for
node name
arm64: dts: ti: k3-*: Use generic adc for node names
arm64: dts: ti: k3-*: Fix up node_name_chars_strict errors
arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 18 +++++++++---------
arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 8 ++++----
arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 6 +++---
arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 18 +++++++++---------
.../dts/ti/k3-am654-industrial-thermal.dtsi | 12 ++++++------
.../boot/dts/ti/k3-j721e-common-proc-board.dts | 18 +++++++++---------
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 8 ++++----
.../arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 8 ++++----
arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 2 +-
9 files changed, 49 insertions(+), 49 deletions(-)
--
2.17.1
Building with W=2 throws up a bunch of easy to fixup errors..
node_name_chars_strict is one of them.. Knock those out.
Signed-off-by: Nishanth Menon <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 6 +++---
arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 4 ++--
arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 16 ++++++++--------
.../dts/ti/k3-am654-industrial-thermal.dtsi | 12 ++++++------
.../boot/dts/ti/k3-j721e-common-proc-board.dts | 18 +++++++++---------
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 6 +++---
.../arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 2 +-
arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 2 +-
8 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 9c96e3f58c86..ff3e38408dbc 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -305,7 +305,7 @@
no-1-8-v;
};
- scm_conf: scm_conf@100000 {
+ scm_conf: scm-conf@100000 {
compatible = "syscon", "simple-mfd";
reg = <0 0x00100000 0 0x1c000>;
#address-cells = <1>;
@@ -344,7 +344,7 @@
<0x4090 0x3>; /* SERDES1 lane select */
};
- dss_oldi_io_ctrl: dss_oldi_io_ctrl@41E0 {
+ dss_oldi_io_ctrl: dss-oldi-io-ctrl@41E0 {
compatible = "syscon";
reg = <0x0000041E0 0x14>;
};
@@ -445,7 +445,7 @@
ti,interrupt-ranges = <0 392 32>;
};
- main_navss {
+ main-navss {
compatible = "simple-mfd";
#address-cells = <2>;
#size-cells = <2>;
diff --git a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
index 6dfec68ac865..435e51019287 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
@@ -6,7 +6,7 @@
*/
&cbass_mcu {
- mcu_conf: scm_conf@40f00000 {
+ mcu_conf: scm-conf@40f00000 {
compatible = "syscon", "simple-mfd";
reg = <0x0 0x40f00000 0x0 0x20000>;
#address-cells = <1>;
@@ -116,7 +116,7 @@
};
};
- mcu_navss {
+ mcu-navss {
compatible = "simple-mfd";
#address-cells = <2>;
#size-cells = <2>;
diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
index 86c9074cb070..d12dd89f3405 100644
--- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
@@ -29,7 +29,7 @@
#address-cells = <2>;
#size-cells = <2>;
ranges;
- secure_ddr: secure_ddr@9e800000 {
+ secure_ddr: secure-ddr@9e800000 {
reg = <0 0x9e800000 0 0x01800000>; /* for OP-TEE */
alignment = <0x1000>;
no-map;
@@ -70,14 +70,14 @@
>;
};
- push_button_pins_default: push_button__pins_default {
+ push_button_pins_default: push-button-pins-default {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x0030, PIN_INPUT, 7) /* (R5) WKUP_GPIO0_24 */
AM65X_WKUP_IOPAD(0x003c, PIN_INPUT, 7) /* (P2) WKUP_GPIO0_27 */
>;
};
- mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-pins_default {
+ mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-pins-default {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x0000, PIN_OUTPUT, 0) /* (V1) MCU_OSPI0_CLK */
AM65X_WKUP_IOPAD(0x0008, PIN_INPUT, 0) /* (U2) MCU_OSPI0_DQS */
@@ -93,13 +93,13 @@
>;
};
- wkup_pca554_default: wkup_pca554_default {
+ wkup_pca554_default: wkup-pca554-default {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x0034, PIN_INPUT, 7) /* (T1) MCU_OSPI1_CLK.WKUP_GPIO0_25 */
>;
};
- mcu_cpsw_pins_default: mcu_cpsw_pins_default {
+ mcu_cpsw_pins_default: mcu-cpsw-pins-default {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x0058, PIN_OUTPUT, 0) /* (N4) MCU_RGMII1_TX_CTL */
AM65X_WKUP_IOPAD(0x005c, PIN_INPUT, 0) /* (N5) MCU_RGMII1_RX_CTL */
@@ -116,7 +116,7 @@
>;
};
- mcu_mdio_pins_default: mcu_mdio1_pins_default {
+ mcu_mdio_pins_default: mcu-mdio1-pins-default {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x008c, PIN_OUTPUT, 0) /* (L1) MCU_MDIO0_MDC */
AM65X_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */
@@ -167,7 +167,7 @@
>;
};
- main_mmc1_pins_default: main_mmc1_pins_default {
+ main_mmc1_pins_default: main-mmc1-pins-default {
pinctrl-single,pins = <
AM65X_IOPAD(0x02d4, PIN_INPUT_PULLDOWN, 0) /* (C27) MMC1_CLK */
AM65X_IOPAD(0x02d8, PIN_INPUT_PULLUP, 0) /* (C28) MMC1_CMD */
@@ -180,7 +180,7 @@
>;
};
- usb1_pins_default: usb1_pins_default {
+ usb1_pins_default: usb1-pins-default {
pinctrl-single,pins = <
AM65X_IOPAD(0x02c0, PIN_OUTPUT, 0) /* (AC8) USB1_DRVVBUS */
>;
diff --git a/arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi b/arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi
index cdc3d40c3f60..9021c738056b 100644
--- a/arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi
@@ -2,13 +2,13 @@
#include <dt-bindings/thermal/thermal.h>
-mpu0_thermal: mpu0_thermal {
+mpu0_thermal: mpu0-thermal {
polling-delay-passive = <250>; /* milliseconds */
polling-delay = <500>; /* milliseconds */
thermal-sensors = <&wkup_vtm0 0>;
trips {
- mpu0_crit: mpu0_crit {
+ mpu0_crit: mpu0-crit {
temperature = <125000>; /* milliCelsius */
hysteresis = <2000>; /* milliCelsius */
type = "critical";
@@ -16,13 +16,13 @@ mpu0_thermal: mpu0_thermal {
};
};
-mpu1_thermal: mpu1_thermal {
+mpu1_thermal: mpu1-thermal {
polling-delay-passive = <250>; /* milliseconds */
polling-delay = <500>; /* milliseconds */
thermal-sensors = <&wkup_vtm0 1>;
trips {
- mpu1_crit: mpu1_crit {
+ mpu1_crit: mpu1-crit {
temperature = <125000>; /* milliCelsius */
hysteresis = <2000>; /* milliCelsius */
type = "critical";
@@ -30,13 +30,13 @@ mpu1_thermal: mpu1_thermal {
};
};
-mcu_thermal: mcu_thermal {
+mcu_thermal: mcu-thermal {
polling-delay-passive = <250>; /* milliseconds */
polling-delay = <500>; /* milliseconds */
thermal-sensors = <&wkup_vtm0 2>;
trips {
- mcu_crit: mcu_crit {
+ mcu_crit: mcu-crit {
temperature = <125000>; /* milliCelsius */
hysteresis = <2000>; /* milliCelsius */
type = "critical";
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
index c355692796a9..648267284582 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
@@ -86,13 +86,13 @@
};
&main_pmx0 {
- sw10_button_pins_default: sw10_button_pins_default {
+ sw10_button_pins_default: sw10-button-pins-default {
pinctrl-single,pins = <
J721E_IOPAD(0x0, PIN_INPUT, 7) /* (AC18) EXTINTn.GPIO0_0 */
>;
};
- main_mmc1_pins_default: main_mmc1_pins_default {
+ main_mmc1_pins_default: main-mmc1-pins-default {
pinctrl-single,pins = <
J721E_IOPAD(0x254, PIN_INPUT, 0) /* (R29) MMC1_CMD */
J721E_IOPAD(0x250, PIN_INPUT, 0) /* (P25) MMC1_CLK */
@@ -106,14 +106,14 @@
>;
};
- main_usbss0_pins_default: main_usbss0_pins_default {
+ main_usbss0_pins_default: main-usbss0-pins-default {
pinctrl-single,pins = <
J721E_IOPAD(0x290, PIN_OUTPUT, 0) /* (U6) USB0_DRVVBUS */
J721E_IOPAD(0x210, PIN_INPUT, 7) /* (W3) MCAN1_RX.GPIO1_3 */
>;
};
- main_usbss1_pins_default: main_usbss1_pins_default {
+ main_usbss1_pins_default: main-usbss1-pins-default {
pinctrl-single,pins = <
J721E_IOPAD(0x214, PIN_OUTPUT, 4) /* (V4) MCAN1_TX.USB1_DRVVBUS */
>;
@@ -153,7 +153,7 @@
>;
};
- mcasp10_pins_default: mcasp10_pins_default {
+ mcasp10_pins_default: mcasp10-pins-default {
pinctrl-single,pins = <
J721E_IOPAD(0x158, PIN_OUTPUT_PULLDOWN, 12) /* (U23) RGMII5_TX_CTL.MCASP10_ACLKX */
J721E_IOPAD(0x15c, PIN_OUTPUT_PULLDOWN, 12) /* (U26) RGMII5_RX_CTL.MCASP10_AFSX */
@@ -167,7 +167,7 @@
>;
};
- audi_ext_refclk2_pins_default: audi_ext_refclk2_pins_default {
+ audi_ext_refclk2_pins_default: audi-ext-refclk2-pins-default {
pinctrl-single,pins = <
J721E_IOPAD(0x1a4, PIN_OUTPUT, 3) /* (W26) RGMII6_RXC.AUDIO_EXT_REFCLK2 */
>;
@@ -175,7 +175,7 @@
};
&wkup_pmx0 {
- sw11_button_pins_default: sw11_button_pins_default {
+ sw11_button_pins_default: sw11-button-pins-default {
pinctrl-single,pins = <
J721E_WKUP_IOPAD(0xcc, PIN_INPUT, 7) /* (G28) WKUP_GPIO0_7 */
>;
@@ -194,7 +194,7 @@
>;
};
- mcu_cpsw_pins_default: mcu_cpsw_pins_default {
+ mcu_cpsw_pins_default: mcu-cpsw-pins-default {
pinctrl-single,pins = <
J721E_WKUP_IOPAD(0x0058, PIN_OUTPUT, 0) /* MCU_RGMII1_TX_CTL */
J721E_WKUP_IOPAD(0x005c, PIN_INPUT, 0) /* MCU_RGMII1_RX_CTL */
@@ -211,7 +211,7 @@
>;
};
- mcu_mdio_pins_default: mcu_mdio1_pins_default {
+ mcu_mdio_pins_default: mcu-mdio1-pins-default {
pinctrl-single,pins = <
J721E_WKUP_IOPAD(0x008c, PIN_OUTPUT, 0) /* MCU_MDIO0_MDC */
J721E_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* MCU_MDIO0_MDIO */
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index 1d2a7c05b6f3..ea57d07777ba 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -86,7 +86,7 @@
ti,interrupt-ranges = <8 392 56>;
};
- main_navss {
+ main-navss {
compatible = "simple-mfd";
#address-cells = <2>;
#size-cells = <2>;
@@ -888,7 +888,7 @@
no-1-8-v;
};
- usbss0: cdns_usb@4104000 {
+ usbss0: cdns-usb@4104000 {
compatible = "ti,j721e-usb";
reg = <0x00 0x4104000 0x00 0x100>;
dma-coherent;
@@ -918,7 +918,7 @@
};
};
- usbss1: cdns_usb@4114000 {
+ usbss1: cdns-usb@4114000 {
compatible = "ti,j721e-usb";
reg = <0x00 0x4114000 0x00 0x100>;
dma-coherent;
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
index 81801f519a61..03fa69c0a038 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
@@ -249,7 +249,7 @@
};
};
- mcu_navss {
+ mcu-navss {
compatible = "simple-mfd";
#address-cells = <2>;
#size-cells = <2>;
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi
index d69d90c8b5e3..5dc3ba739131 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi
@@ -71,7 +71,7 @@
};
&wkup_pmx0 {
- wkup_i2c0_pins_default: wkup_i2c0_pins_default {
+ wkup_i2c0_pins_default: wkup-i2c0-pins-default {
pinctrl-single,pins = <
J721E_WKUP_IOPAD(0xf8, PIN_INPUT_PULLUP, 0) /* (J25) WKUP_I2C0_SCL */
J721E_WKUP_IOPAD(0xfc, PIN_INPUT_PULLUP, 0) /* (H24) WKUP_I2C0_SDA */
--
2.17.1
Use pinctrl@ naming for nodes following standard conventions of device
tree (section 2.2.2 Generic Names recommendation in [1]).
[1] https://github.com/devicetree-org/devicetree-specification/tree/v0.3
Suggested-by: Suman Anna <[email protected]>
Signed-off-by: Nishanth Menon <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 ++--
arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 2 +-
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 2 +-
arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 03e28fc256de..9c96e3f58c86 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -134,7 +134,7 @@
};
};
- main_pmx0: pinmux@11c000 {
+ main_pmx0: pinctrl@11c000 {
compatible = "pinctrl-single";
reg = <0x0 0x11c000 0x0 0x2e4>;
#pinctrl-cells = <1>;
@@ -142,7 +142,7 @@
pinctrl-single,function-mask = <0xffffffff>;
};
- main_pmx1: pinmux@11c2e8 {
+ main_pmx1: pinctrl@11c2e8 {
compatible = "pinctrl-single";
reg = <0x0 0x11c2e8 0x0 0x24>;
#pinctrl-cells = <1>;
diff --git a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
index 0765700a8ba8..bb498be2f0a4 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
@@ -39,7 +39,7 @@
reg = <0x43000014 0x4>;
};
- wkup_pmx0: pinmux@4301c000 {
+ wkup_pmx0: pinctrl@4301c000 {
compatible = "pinctrl-single";
reg = <0x4301c000 0x118>;
#pinctrl-cells = <1>;
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index 00a36a14efe7..1d2a7c05b6f3 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -327,7 +327,7 @@
};
};
- main_pmx0: pinmux@11c000 {
+ main_pmx0: pinctrl@11c000 {
compatible = "pinctrl-single";
/* Proxy 0 addressing */
reg = <0x0 0x11c000 0x0 0x2b4>;
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
index c4a48e8d420a..9ad0266598ad 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
@@ -53,7 +53,7 @@
reg = <0x0 0x43000014 0x0 0x4>;
};
- wkup_pmx0: pinmux@4301c000 {
+ wkup_pmx0: pinctrl@4301c000 {
compatible = "pinctrl-single";
/* Proxy 0 addressing */
reg = <0x00 0x4301c000 0x00 0x178>;
--
2.17.1
Use clock@ naming for nodes following standard conventions of device
tree (section 2.2.2 Generic Names recommendation in [1]).
[1] https://github.com/devicetree-org/devicetree-specification/tree/v0.3
Suggested-by: Suman Anna <[email protected]>
Signed-off-by: Nishanth Menon <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 336d09d6fec7..03e28fc256de 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -327,12 +327,12 @@
reg = <0x00000210 0x4>;
};
- serdes0_clk: serdes_clk@4080 {
+ serdes0_clk: clock@4080 {
compatible = "syscon";
reg = <0x00004080 0x4>;
};
- serdes1_clk: serdes_clk@4090 {
+ serdes1_clk: clock@4090 {
compatible = "syscon";
reg = <0x00004090 0x4>;
};
--
2.17.1
On 02/09/20 4:00 am, Nishanth Menon wrote:
> Hi,
>
> This is one part of cleanups meant for make W=2 dtbs for 5.10 on TI
> dtbs. Hopefully we dont see node_name_chars_strict warnings anymore.
>
> As part of this cleanup, I ran a cross check of nodes that are
> part of K3 as of right now, Vs what is "generic" definition as per 0.3
> dt specification:
> https://pastebin.ubuntu.com/p/kp3g4ktBYp/
>
> I dont think the remaining have a good reference, at least in my
> subjective view.
>
> In possibly some cases, bootloaders may need to sync before doing DT
> fixup etc.
>
> Nishanth Menon (7):
> arm64: dts: ti: k3-am65*: Use generic gpio for node names
> arm64: dts: ti: k3-am65*: Use generic clock for serdes clock name
> arm64: dts: ti: k3-*: Use generic pinctrl for node names
> arm64: dts: ti: k3-am65-base-board Use generic camera for node name
> instead of ov5640
> arm64: dts: ti: k3-am65-wakeup: Use generic temperature-sensor for
> node name
> arm64: dts: ti: k3-*: Use generic adc for node names
> arm64: dts: ti: k3-*: Fix up node_name_chars_strict errors
Series looks good to me,
Reviewed-by: Lokesh Vutla <[email protected]>
Thanks and regards,
Lokesh
On 9/1/20 5:30 PM, Nishanth Menon wrote:
> Use pinctrl@ naming for nodes following standard conventions of device
> tree (section 2.2.2 Generic Names recommendation in [1]).
>
> [1] https://github.com/devicetree-org/devicetree-specification/tree/v0.3
>
> Suggested-by: Suman Anna <[email protected]>
> Signed-off-by: Nishanth Menon <[email protected]>
Acked-by: Suman Anna <[email protected]>
> ---
> arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 ++--
> arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 2 +-
> arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 2 +-
> arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 2 +-
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> index 03e28fc256de..9c96e3f58c86 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> @@ -134,7 +134,7 @@
> };
> };
>
> - main_pmx0: pinmux@11c000 {
> + main_pmx0: pinctrl@11c000 {
> compatible = "pinctrl-single";
> reg = <0x0 0x11c000 0x0 0x2e4>;
> #pinctrl-cells = <1>;
> @@ -142,7 +142,7 @@
> pinctrl-single,function-mask = <0xffffffff>;
> };
>
> - main_pmx1: pinmux@11c2e8 {
> + main_pmx1: pinctrl@11c2e8 {
> compatible = "pinctrl-single";
> reg = <0x0 0x11c2e8 0x0 0x24>;
> #pinctrl-cells = <1>;
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
> index 0765700a8ba8..bb498be2f0a4 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
> @@ -39,7 +39,7 @@
> reg = <0x43000014 0x4>;
> };
>
> - wkup_pmx0: pinmux@4301c000 {
> + wkup_pmx0: pinctrl@4301c000 {
> compatible = "pinctrl-single";
> reg = <0x4301c000 0x118>;
> #pinctrl-cells = <1>;
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> index 00a36a14efe7..1d2a7c05b6f3 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> @@ -327,7 +327,7 @@
> };
> };
>
> - main_pmx0: pinmux@11c000 {
> + main_pmx0: pinctrl@11c000 {
> compatible = "pinctrl-single";
> /* Proxy 0 addressing */
> reg = <0x0 0x11c000 0x0 0x2b4>;
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> index c4a48e8d420a..9ad0266598ad 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> @@ -53,7 +53,7 @@
> reg = <0x0 0x43000014 0x0 0x4>;
> };
>
> - wkup_pmx0: pinmux@4301c000 {
> + wkup_pmx0: pinctrl@4301c000 {
> compatible = "pinctrl-single";
> /* Proxy 0 addressing */
> reg = <0x00 0x4301c000 0x00 0x178>;
>
On 9/1/20 5:30 PM, Nishanth Menon wrote:
> Building with W=2 throws up a bunch of easy to fixup errors..
> node_name_chars_strict is one of them.. Knock those out.
>
> Signed-off-by: Nishanth Menon <[email protected]>
> ---
> arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 6 +++---
> arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 4 ++--
> arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 16 ++++++++--------
> .../dts/ti/k3-am654-industrial-thermal.dtsi | 12 ++++++------
> .../boot/dts/ti/k3-j721e-common-proc-board.dts | 18 +++++++++---------
> arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 6 +++---
> .../arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 2 +-
> arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 2 +-
> 8 files changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> index 9c96e3f58c86..ff3e38408dbc 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> @@ -305,7 +305,7 @@
> no-1-8-v;
> };
>
> - scm_conf: scm_conf@100000 {
> + scm_conf: scm-conf@100000 {
> compatible = "syscon", "simple-mfd";
> reg = <0 0x00100000 0 0x1c000>;
> #address-cells = <1>;
> @@ -344,7 +344,7 @@
> <0x4090 0x3>; /* SERDES1 lane select */
> };
>
> - dss_oldi_io_ctrl: dss_oldi_io_ctrl@41E0 {
> + dss_oldi_io_ctrl: dss-oldi-io-ctrl@41E0 {
> compatible = "syscon";
> reg = <0x0000041E0 0x14>;
We should %s/41E0/41e0/, but that change is not directly associated with the
patch subject line. Perhaps, an additional patch? Remember seeing similar
warning on some downstream crypto nodes, but strangely I am not seeing on these
upstream nodes.
Otherwise,
Reviewed-by: Suman Anna <[email protected]>
regards
Suman
> };
> @@ -445,7 +445,7 @@
> ti,interrupt-ranges = <0 392 32>;
> };
>
> - main_navss {
> + main-navss {
> compatible = "simple-mfd";
> #address-cells = <2>;
> #size-cells = <2>;
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
> index 6dfec68ac865..435e51019287 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
> @@ -6,7 +6,7 @@
> */
>
> &cbass_mcu {
> - mcu_conf: scm_conf@40f00000 {
> + mcu_conf: scm-conf@40f00000 {
> compatible = "syscon", "simple-mfd";
> reg = <0x0 0x40f00000 0x0 0x20000>;
> #address-cells = <1>;
> @@ -116,7 +116,7 @@
> };
> };
>
> - mcu_navss {
> + mcu-navss {
> compatible = "simple-mfd";
> #address-cells = <2>;
> #size-cells = <2>;
> diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
> index 86c9074cb070..d12dd89f3405 100644
> --- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
> @@ -29,7 +29,7 @@
> #address-cells = <2>;
> #size-cells = <2>;
> ranges;
> - secure_ddr: secure_ddr@9e800000 {
> + secure_ddr: secure-ddr@9e800000 {
> reg = <0 0x9e800000 0 0x01800000>; /* for OP-TEE */
> alignment = <0x1000>;
> no-map;
> @@ -70,14 +70,14 @@
> >;
> };
>
> - push_button_pins_default: push_button__pins_default {
> + push_button_pins_default: push-button-pins-default {
> pinctrl-single,pins = <
> AM65X_WKUP_IOPAD(0x0030, PIN_INPUT, 7) /* (R5) WKUP_GPIO0_24 */
> AM65X_WKUP_IOPAD(0x003c, PIN_INPUT, 7) /* (P2) WKUP_GPIO0_27 */
> >;
> };
>
> - mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-pins_default {
> + mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-pins-default {
> pinctrl-single,pins = <
> AM65X_WKUP_IOPAD(0x0000, PIN_OUTPUT, 0) /* (V1) MCU_OSPI0_CLK */
> AM65X_WKUP_IOPAD(0x0008, PIN_INPUT, 0) /* (U2) MCU_OSPI0_DQS */
> @@ -93,13 +93,13 @@
> >;
> };
>
> - wkup_pca554_default: wkup_pca554_default {
> + wkup_pca554_default: wkup-pca554-default {
> pinctrl-single,pins = <
> AM65X_WKUP_IOPAD(0x0034, PIN_INPUT, 7) /* (T1) MCU_OSPI1_CLK.WKUP_GPIO0_25 */
> >;
> };
>
> - mcu_cpsw_pins_default: mcu_cpsw_pins_default {
> + mcu_cpsw_pins_default: mcu-cpsw-pins-default {
> pinctrl-single,pins = <
> AM65X_WKUP_IOPAD(0x0058, PIN_OUTPUT, 0) /* (N4) MCU_RGMII1_TX_CTL */
> AM65X_WKUP_IOPAD(0x005c, PIN_INPUT, 0) /* (N5) MCU_RGMII1_RX_CTL */
> @@ -116,7 +116,7 @@
> >;
> };
>
> - mcu_mdio_pins_default: mcu_mdio1_pins_default {
> + mcu_mdio_pins_default: mcu-mdio1-pins-default {
> pinctrl-single,pins = <
> AM65X_WKUP_IOPAD(0x008c, PIN_OUTPUT, 0) /* (L1) MCU_MDIO0_MDC */
> AM65X_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */
> @@ -167,7 +167,7 @@
> >;
> };
>
> - main_mmc1_pins_default: main_mmc1_pins_default {
> + main_mmc1_pins_default: main-mmc1-pins-default {
> pinctrl-single,pins = <
> AM65X_IOPAD(0x02d4, PIN_INPUT_PULLDOWN, 0) /* (C27) MMC1_CLK */
> AM65X_IOPAD(0x02d8, PIN_INPUT_PULLUP, 0) /* (C28) MMC1_CMD */
> @@ -180,7 +180,7 @@
> >;
> };
>
> - usb1_pins_default: usb1_pins_default {
> + usb1_pins_default: usb1-pins-default {
> pinctrl-single,pins = <
> AM65X_IOPAD(0x02c0, PIN_OUTPUT, 0) /* (AC8) USB1_DRVVBUS */
> >;
> diff --git a/arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi b/arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi
> index cdc3d40c3f60..9021c738056b 100644
> --- a/arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi
> @@ -2,13 +2,13 @@
>
> #include <dt-bindings/thermal/thermal.h>
>
> -mpu0_thermal: mpu0_thermal {
> +mpu0_thermal: mpu0-thermal {
> polling-delay-passive = <250>; /* milliseconds */
> polling-delay = <500>; /* milliseconds */
> thermal-sensors = <&wkup_vtm0 0>;
>
> trips {
> - mpu0_crit: mpu0_crit {
> + mpu0_crit: mpu0-crit {
> temperature = <125000>; /* milliCelsius */
> hysteresis = <2000>; /* milliCelsius */
> type = "critical";
> @@ -16,13 +16,13 @@ mpu0_thermal: mpu0_thermal {
> };
> };
>
> -mpu1_thermal: mpu1_thermal {
> +mpu1_thermal: mpu1-thermal {
> polling-delay-passive = <250>; /* milliseconds */
> polling-delay = <500>; /* milliseconds */
> thermal-sensors = <&wkup_vtm0 1>;
>
> trips {
> - mpu1_crit: mpu1_crit {
> + mpu1_crit: mpu1-crit {
> temperature = <125000>; /* milliCelsius */
> hysteresis = <2000>; /* milliCelsius */
> type = "critical";
> @@ -30,13 +30,13 @@ mpu1_thermal: mpu1_thermal {
> };
> };
>
> -mcu_thermal: mcu_thermal {
> +mcu_thermal: mcu-thermal {
> polling-delay-passive = <250>; /* milliseconds */
> polling-delay = <500>; /* milliseconds */
> thermal-sensors = <&wkup_vtm0 2>;
>
> trips {
> - mcu_crit: mcu_crit {
> + mcu_crit: mcu-crit {
> temperature = <125000>; /* milliCelsius */
> hysteresis = <2000>; /* milliCelsius */
> type = "critical";
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
> index c355692796a9..648267284582 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
> @@ -86,13 +86,13 @@
> };
>
> &main_pmx0 {
> - sw10_button_pins_default: sw10_button_pins_default {
> + sw10_button_pins_default: sw10-button-pins-default {
> pinctrl-single,pins = <
> J721E_IOPAD(0x0, PIN_INPUT, 7) /* (AC18) EXTINTn.GPIO0_0 */
> >;
> };
>
> - main_mmc1_pins_default: main_mmc1_pins_default {
> + main_mmc1_pins_default: main-mmc1-pins-default {
> pinctrl-single,pins = <
> J721E_IOPAD(0x254, PIN_INPUT, 0) /* (R29) MMC1_CMD */
> J721E_IOPAD(0x250, PIN_INPUT, 0) /* (P25) MMC1_CLK */
> @@ -106,14 +106,14 @@
> >;
> };
>
> - main_usbss0_pins_default: main_usbss0_pins_default {
> + main_usbss0_pins_default: main-usbss0-pins-default {
> pinctrl-single,pins = <
> J721E_IOPAD(0x290, PIN_OUTPUT, 0) /* (U6) USB0_DRVVBUS */
> J721E_IOPAD(0x210, PIN_INPUT, 7) /* (W3) MCAN1_RX.GPIO1_3 */
> >;
> };
>
> - main_usbss1_pins_default: main_usbss1_pins_default {
> + main_usbss1_pins_default: main-usbss1-pins-default {
> pinctrl-single,pins = <
> J721E_IOPAD(0x214, PIN_OUTPUT, 4) /* (V4) MCAN1_TX.USB1_DRVVBUS */
> >;
> @@ -153,7 +153,7 @@
> >;
> };
>
> - mcasp10_pins_default: mcasp10_pins_default {
> + mcasp10_pins_default: mcasp10-pins-default {
> pinctrl-single,pins = <
> J721E_IOPAD(0x158, PIN_OUTPUT_PULLDOWN, 12) /* (U23) RGMII5_TX_CTL.MCASP10_ACLKX */
> J721E_IOPAD(0x15c, PIN_OUTPUT_PULLDOWN, 12) /* (U26) RGMII5_RX_CTL.MCASP10_AFSX */
> @@ -167,7 +167,7 @@
> >;
> };
>
> - audi_ext_refclk2_pins_default: audi_ext_refclk2_pins_default {
> + audi_ext_refclk2_pins_default: audi-ext-refclk2-pins-default {
> pinctrl-single,pins = <
> J721E_IOPAD(0x1a4, PIN_OUTPUT, 3) /* (W26) RGMII6_RXC.AUDIO_EXT_REFCLK2 */
> >;
> @@ -175,7 +175,7 @@
> };
>
> &wkup_pmx0 {
> - sw11_button_pins_default: sw11_button_pins_default {
> + sw11_button_pins_default: sw11-button-pins-default {
> pinctrl-single,pins = <
> J721E_WKUP_IOPAD(0xcc, PIN_INPUT, 7) /* (G28) WKUP_GPIO0_7 */
> >;
> @@ -194,7 +194,7 @@
> >;
> };
>
> - mcu_cpsw_pins_default: mcu_cpsw_pins_default {
> + mcu_cpsw_pins_default: mcu-cpsw-pins-default {
> pinctrl-single,pins = <
> J721E_WKUP_IOPAD(0x0058, PIN_OUTPUT, 0) /* MCU_RGMII1_TX_CTL */
> J721E_WKUP_IOPAD(0x005c, PIN_INPUT, 0) /* MCU_RGMII1_RX_CTL */
> @@ -211,7 +211,7 @@
> >;
> };
>
> - mcu_mdio_pins_default: mcu_mdio1_pins_default {
> + mcu_mdio_pins_default: mcu-mdio1-pins-default {
> pinctrl-single,pins = <
> J721E_WKUP_IOPAD(0x008c, PIN_OUTPUT, 0) /* MCU_MDIO0_MDC */
> J721E_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* MCU_MDIO0_MDIO */
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> index 1d2a7c05b6f3..ea57d07777ba 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> @@ -86,7 +86,7 @@
> ti,interrupt-ranges = <8 392 56>;
> };
>
> - main_navss {
> + main-navss {
> compatible = "simple-mfd";
> #address-cells = <2>;
> #size-cells = <2>;
> @@ -888,7 +888,7 @@
> no-1-8-v;
> };
>
> - usbss0: cdns_usb@4104000 {
> + usbss0: cdns-usb@4104000 {
> compatible = "ti,j721e-usb";
> reg = <0x00 0x4104000 0x00 0x100>;
> dma-coherent;
> @@ -918,7 +918,7 @@
> };
> };
>
> - usbss1: cdns_usb@4114000 {
> + usbss1: cdns-usb@4114000 {
> compatible = "ti,j721e-usb";
> reg = <0x00 0x4114000 0x00 0x100>;
> dma-coherent;
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> index 81801f519a61..03fa69c0a038 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> @@ -249,7 +249,7 @@
> };
> };
>
> - mcu_navss {
> + mcu-navss {
> compatible = "simple-mfd";
> #address-cells = <2>;
> #size-cells = <2>;
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi
> index d69d90c8b5e3..5dc3ba739131 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi
> @@ -71,7 +71,7 @@
> };
>
> &wkup_pmx0 {
> - wkup_i2c0_pins_default: wkup_i2c0_pins_default {
> + wkup_i2c0_pins_default: wkup-i2c0-pins-default {
> pinctrl-single,pins = <
> J721E_WKUP_IOPAD(0xf8, PIN_INPUT_PULLUP, 0) /* (J25) WKUP_I2C0_SCL */
> J721E_WKUP_IOPAD(0xfc, PIN_INPUT_PULLUP, 0) /* (H24) WKUP_I2C0_SDA */
>
On 9/1/20 5:30 PM, Nishanth Menon wrote:
> Use clock@ naming for nodes following standard conventions of device
> tree (section 2.2.2 Generic Names recommendation in [1]).
>
> [1] https://github.com/devicetree-org/devicetree-specification/tree/v0.3
>
> Suggested-by: Suman Anna <[email protected]>
> Signed-off-by: Nishanth Menon <[email protected]>
Acked-by: Suman Anna <[email protected]>
> ---
> arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> index 336d09d6fec7..03e28fc256de 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> @@ -327,12 +327,12 @@
> reg = <0x00000210 0x4>;
> };
>
> - serdes0_clk: serdes_clk@4080 {
> + serdes0_clk: clock@4080 {
> compatible = "syscon";
> reg = <0x00004080 0x4>;
> };
>
> - serdes1_clk: serdes_clk@4090 {
> + serdes1_clk: clock@4090 {
> compatible = "syscon";
> reg = <0x00004090 0x4>;
> };
>
Btw, there is also ehrpwm_tbclk alongside these nodes which is currently defined
as a syscon, but is actually a clock.
regards
Suman
On 11:54-20200902, Suman Anna wrote:
> On 9/1/20 5:30 PM, Nishanth Menon wrote:
> > Building with W=2 throws up a bunch of easy to fixup errors..
> > node_name_chars_strict is one of them.. Knock those out.
> >
> > Signed-off-by: Nishanth Menon <[email protected]>
> > ---
> > arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 6 +++---
> > arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 4 ++--
> > arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 16 ++++++++--------
> > .../dts/ti/k3-am654-industrial-thermal.dtsi | 12 ++++++------
> > .../boot/dts/ti/k3-j721e-common-proc-board.dts | 18 +++++++++---------
> > arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 6 +++---
> > .../arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 2 +-
> > arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 2 +-
> > 8 files changed, 33 insertions(+), 33 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> > index 9c96e3f58c86..ff3e38408dbc 100644
> > --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> > +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> > @@ -305,7 +305,7 @@
> > no-1-8-v;
> > };
> >
> > - scm_conf: scm_conf@100000 {
> > + scm_conf: scm-conf@100000 {
> > compatible = "syscon", "simple-mfd";
> > reg = <0 0x00100000 0 0x1c000>;
> > #address-cells = <1>;
> > @@ -344,7 +344,7 @@
> > <0x4090 0x3>; /* SERDES1 lane select */
> > };
> >
> > - dss_oldi_io_ctrl: dss_oldi_io_ctrl@41E0 {
> > + dss_oldi_io_ctrl: dss-oldi-io-ctrl@41E0 {
> > compatible = "syscon";
> > reg = <0x0000041E0 0x14>;
>
> We should %s/41E0/41e0/, but that change is not directly associated with the
> patch subject line. Perhaps, an additional patch? Remember seeing similar
> warning on some downstream crypto nodes, but strangely I am not seeing on these
> upstream nodes.
yeah - probably a separate patch, but thanks, i can fix it as well(will
check if there are similar ones around as well).
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
On 12:45-20200902, Suman Anna wrote:
> On 9/1/20 5:30 PM, Nishanth Menon wrote:
> > Use clock@ naming for nodes following standard conventions of device
> > tree (section 2.2.2 Generic Names recommendation in [1]).
> >
> > [1] https://github.com/devicetree-org/devicetree-specification/tree/v0.3
> >
> > Suggested-by: Suman Anna <[email protected]>
> > Signed-off-by: Nishanth Menon <[email protected]>
>
> Acked-by: Suman Anna <[email protected]>
>
> > ---
> > arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> > index 336d09d6fec7..03e28fc256de 100644
> > --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> > +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> > @@ -327,12 +327,12 @@
> > reg = <0x00000210 0x4>;
> > };
> >
> > - serdes0_clk: serdes_clk@4080 {
> > + serdes0_clk: clock@4080 {
> > compatible = "syscon";
> > reg = <0x00004080 0x4>;
> > };
> >
> > - serdes1_clk: serdes_clk@4090 {
> > + serdes1_clk: clock@4090 {
> > compatible = "syscon";
> > reg = <0x00004090 0x4>;
> > };
> >
>
> Btw, there is also ehrpwm_tbclk alongside these nodes which is currently defined
> as a syscon, but is actually a clock.
aah, good catch.. I can fix that in the follow on V2.
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Building with W=2 throws up a bunch of easy to fixup warnings..
node_name_chars_strict is one of them.. Knock those out.
Signed-off-by: Nishanth Menon <[email protected]>
Reviewed-by: Lokesh Vutla <[email protected]>
Reviewed-by: Suman Anna <[email protected]>
---
Changes:
v2: None (rebase) (picked acks/reviews) - comment on hex usage split as
seperate patch
v1: https://lore.kernel.org/linux-arm-kernel/[email protected]/
arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 6 +++---
arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 4 ++--
arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 16 ++++++++--------
.../dts/ti/k3-am654-industrial-thermal.dtsi | 12 ++++++------
.../boot/dts/ti/k3-j721e-common-proc-board.dts | 18 +++++++++---------
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 6 +++---
.../arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 2 +-
arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 2 +-
8 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 1dd488cb15c6..533525229a8d 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -305,7 +305,7 @@
no-1-8-v;
};
- scm_conf: scm_conf@100000 {
+ scm_conf: scm-conf@100000 {
compatible = "syscon", "simple-mfd";
reg = <0 0x00100000 0 0x1c000>;
#address-cells = <1>;
@@ -344,7 +344,7 @@
<0x4090 0x3>; /* SERDES1 lane select */
};
- dss_oldi_io_ctrl: dss_oldi_io_ctrl@41e0 {
+ dss_oldi_io_ctrl: dss-oldi-io-ctrl@41e0 {
compatible = "syscon";
reg = <0x0000041e0 0x14>;
};
@@ -445,7 +445,7 @@
ti,interrupt-ranges = <0 392 32>;
};
- main_navss {
+ main-navss {
compatible = "simple-mfd";
#address-cells = <2>;
#size-cells = <2>;
diff --git a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
index 51ca4b4d4c21..29aaf8dca6f6 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
@@ -6,7 +6,7 @@
*/
&cbass_mcu {
- mcu_conf: scm_conf@40f00000 {
+ mcu_conf: scm-conf@40f00000 {
compatible = "syscon", "simple-mfd";
reg = <0x0 0x40f00000 0x0 0x20000>;
#address-cells = <1>;
@@ -116,7 +116,7 @@
};
};
- mcu_navss {
+ mcu-navss {
compatible = "simple-mfd";
#address-cells = <2>;
#size-cells = <2>;
diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
index 86c9074cb070..d12dd89f3405 100644
--- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
@@ -29,7 +29,7 @@
#address-cells = <2>;
#size-cells = <2>;
ranges;
- secure_ddr: secure_ddr@9e800000 {
+ secure_ddr: secure-ddr@9e800000 {
reg = <0 0x9e800000 0 0x01800000>; /* for OP-TEE */
alignment = <0x1000>;
no-map;
@@ -70,14 +70,14 @@
>;
};
- push_button_pins_default: push_button__pins_default {
+ push_button_pins_default: push-button-pins-default {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x0030, PIN_INPUT, 7) /* (R5) WKUP_GPIO0_24 */
AM65X_WKUP_IOPAD(0x003c, PIN_INPUT, 7) /* (P2) WKUP_GPIO0_27 */
>;
};
- mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-pins_default {
+ mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-pins-default {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x0000, PIN_OUTPUT, 0) /* (V1) MCU_OSPI0_CLK */
AM65X_WKUP_IOPAD(0x0008, PIN_INPUT, 0) /* (U2) MCU_OSPI0_DQS */
@@ -93,13 +93,13 @@
>;
};
- wkup_pca554_default: wkup_pca554_default {
+ wkup_pca554_default: wkup-pca554-default {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x0034, PIN_INPUT, 7) /* (T1) MCU_OSPI1_CLK.WKUP_GPIO0_25 */
>;
};
- mcu_cpsw_pins_default: mcu_cpsw_pins_default {
+ mcu_cpsw_pins_default: mcu-cpsw-pins-default {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x0058, PIN_OUTPUT, 0) /* (N4) MCU_RGMII1_TX_CTL */
AM65X_WKUP_IOPAD(0x005c, PIN_INPUT, 0) /* (N5) MCU_RGMII1_RX_CTL */
@@ -116,7 +116,7 @@
>;
};
- mcu_mdio_pins_default: mcu_mdio1_pins_default {
+ mcu_mdio_pins_default: mcu-mdio1-pins-default {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x008c, PIN_OUTPUT, 0) /* (L1) MCU_MDIO0_MDC */
AM65X_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */
@@ -167,7 +167,7 @@
>;
};
- main_mmc1_pins_default: main_mmc1_pins_default {
+ main_mmc1_pins_default: main-mmc1-pins-default {
pinctrl-single,pins = <
AM65X_IOPAD(0x02d4, PIN_INPUT_PULLDOWN, 0) /* (C27) MMC1_CLK */
AM65X_IOPAD(0x02d8, PIN_INPUT_PULLUP, 0) /* (C28) MMC1_CMD */
@@ -180,7 +180,7 @@
>;
};
- usb1_pins_default: usb1_pins_default {
+ usb1_pins_default: usb1-pins-default {
pinctrl-single,pins = <
AM65X_IOPAD(0x02c0, PIN_OUTPUT, 0) /* (AC8) USB1_DRVVBUS */
>;
diff --git a/arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi b/arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi
index cdc3d40c3f60..9021c738056b 100644
--- a/arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi
@@ -2,13 +2,13 @@
#include <dt-bindings/thermal/thermal.h>
-mpu0_thermal: mpu0_thermal {
+mpu0_thermal: mpu0-thermal {
polling-delay-passive = <250>; /* milliseconds */
polling-delay = <500>; /* milliseconds */
thermal-sensors = <&wkup_vtm0 0>;
trips {
- mpu0_crit: mpu0_crit {
+ mpu0_crit: mpu0-crit {
temperature = <125000>; /* milliCelsius */
hysteresis = <2000>; /* milliCelsius */
type = "critical";
@@ -16,13 +16,13 @@ mpu0_thermal: mpu0_thermal {
};
};
-mpu1_thermal: mpu1_thermal {
+mpu1_thermal: mpu1-thermal {
polling-delay-passive = <250>; /* milliseconds */
polling-delay = <500>; /* milliseconds */
thermal-sensors = <&wkup_vtm0 1>;
trips {
- mpu1_crit: mpu1_crit {
+ mpu1_crit: mpu1-crit {
temperature = <125000>; /* milliCelsius */
hysteresis = <2000>; /* milliCelsius */
type = "critical";
@@ -30,13 +30,13 @@ mpu1_thermal: mpu1_thermal {
};
};
-mcu_thermal: mcu_thermal {
+mcu_thermal: mcu-thermal {
polling-delay-passive = <250>; /* milliseconds */
polling-delay = <500>; /* milliseconds */
thermal-sensors = <&wkup_vtm0 2>;
trips {
- mcu_crit: mcu_crit {
+ mcu_crit: mcu-crit {
temperature = <125000>; /* milliCelsius */
hysteresis = <2000>; /* milliCelsius */
type = "critical";
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
index c355692796a9..648267284582 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
@@ -86,13 +86,13 @@
};
&main_pmx0 {
- sw10_button_pins_default: sw10_button_pins_default {
+ sw10_button_pins_default: sw10-button-pins-default {
pinctrl-single,pins = <
J721E_IOPAD(0x0, PIN_INPUT, 7) /* (AC18) EXTINTn.GPIO0_0 */
>;
};
- main_mmc1_pins_default: main_mmc1_pins_default {
+ main_mmc1_pins_default: main-mmc1-pins-default {
pinctrl-single,pins = <
J721E_IOPAD(0x254, PIN_INPUT, 0) /* (R29) MMC1_CMD */
J721E_IOPAD(0x250, PIN_INPUT, 0) /* (P25) MMC1_CLK */
@@ -106,14 +106,14 @@
>;
};
- main_usbss0_pins_default: main_usbss0_pins_default {
+ main_usbss0_pins_default: main-usbss0-pins-default {
pinctrl-single,pins = <
J721E_IOPAD(0x290, PIN_OUTPUT, 0) /* (U6) USB0_DRVVBUS */
J721E_IOPAD(0x210, PIN_INPUT, 7) /* (W3) MCAN1_RX.GPIO1_3 */
>;
};
- main_usbss1_pins_default: main_usbss1_pins_default {
+ main_usbss1_pins_default: main-usbss1-pins-default {
pinctrl-single,pins = <
J721E_IOPAD(0x214, PIN_OUTPUT, 4) /* (V4) MCAN1_TX.USB1_DRVVBUS */
>;
@@ -153,7 +153,7 @@
>;
};
- mcasp10_pins_default: mcasp10_pins_default {
+ mcasp10_pins_default: mcasp10-pins-default {
pinctrl-single,pins = <
J721E_IOPAD(0x158, PIN_OUTPUT_PULLDOWN, 12) /* (U23) RGMII5_TX_CTL.MCASP10_ACLKX */
J721E_IOPAD(0x15c, PIN_OUTPUT_PULLDOWN, 12) /* (U26) RGMII5_RX_CTL.MCASP10_AFSX */
@@ -167,7 +167,7 @@
>;
};
- audi_ext_refclk2_pins_default: audi_ext_refclk2_pins_default {
+ audi_ext_refclk2_pins_default: audi-ext-refclk2-pins-default {
pinctrl-single,pins = <
J721E_IOPAD(0x1a4, PIN_OUTPUT, 3) /* (W26) RGMII6_RXC.AUDIO_EXT_REFCLK2 */
>;
@@ -175,7 +175,7 @@
};
&wkup_pmx0 {
- sw11_button_pins_default: sw11_button_pins_default {
+ sw11_button_pins_default: sw11-button-pins-default {
pinctrl-single,pins = <
J721E_WKUP_IOPAD(0xcc, PIN_INPUT, 7) /* (G28) WKUP_GPIO0_7 */
>;
@@ -194,7 +194,7 @@
>;
};
- mcu_cpsw_pins_default: mcu_cpsw_pins_default {
+ mcu_cpsw_pins_default: mcu-cpsw-pins-default {
pinctrl-single,pins = <
J721E_WKUP_IOPAD(0x0058, PIN_OUTPUT, 0) /* MCU_RGMII1_TX_CTL */
J721E_WKUP_IOPAD(0x005c, PIN_INPUT, 0) /* MCU_RGMII1_RX_CTL */
@@ -211,7 +211,7 @@
>;
};
- mcu_mdio_pins_default: mcu_mdio1_pins_default {
+ mcu_mdio_pins_default: mcu-mdio1-pins-default {
pinctrl-single,pins = <
J721E_WKUP_IOPAD(0x008c, PIN_OUTPUT, 0) /* MCU_MDIO0_MDC */
J721E_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* MCU_MDIO0_MDIO */
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index 1d2a7c05b6f3..ea57d07777ba 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -86,7 +86,7 @@
ti,interrupt-ranges = <8 392 56>;
};
- main_navss {
+ main-navss {
compatible = "simple-mfd";
#address-cells = <2>;
#size-cells = <2>;
@@ -888,7 +888,7 @@
no-1-8-v;
};
- usbss0: cdns_usb@4104000 {
+ usbss0: cdns-usb@4104000 {
compatible = "ti,j721e-usb";
reg = <0x00 0x4104000 0x00 0x100>;
dma-coherent;
@@ -918,7 +918,7 @@
};
};
- usbss1: cdns_usb@4114000 {
+ usbss1: cdns-usb@4114000 {
compatible = "ti,j721e-usb";
reg = <0x00 0x4114000 0x00 0x100>;
dma-coherent;
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
index 9ad0266598ad..e581cb1d87ee 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
@@ -249,7 +249,7 @@
};
};
- mcu_navss {
+ mcu-navss {
compatible = "simple-mfd";
#address-cells = <2>;
#size-cells = <2>;
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi
index d69d90c8b5e3..5dc3ba739131 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi
@@ -71,7 +71,7 @@
};
&wkup_pmx0 {
- wkup_i2c0_pins_default: wkup_i2c0_pins_default {
+ wkup_i2c0_pins_default: wkup-i2c0-pins-default {
pinctrl-single,pins = <
J721E_WKUP_IOPAD(0xf8, PIN_INPUT_PULLUP, 0) /* (J25) WKUP_I2C0_SCL */
J721E_WKUP_IOPAD(0xfc, PIN_INPUT_PULLUP, 0) /* (H24) WKUP_I2C0_SDA */
--
2.17.1
Use pinctrl@ naming for nodes following standard conventions of device
tree (section 2.2.2 Generic Names recommendation in [1]).
[1] https://github.com/devicetree-org/devicetree-specification/tree/v0.3
Suggested-by: Suman Anna <[email protected]>
Signed-off-by: Nishanth Menon <[email protected]>
Reviewed-by: Lokesh Vutla <[email protected]>
Acked-by: Suman Anna <[email protected]>
---
Changes:
v2: None (picked acks/reviews)
v1: https://lore.kernel.org/linux-arm-kernel/[email protected]/
arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 ++--
arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 2 +-
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 2 +-
arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 63a1299cb0b2..1dd488cb15c6 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -134,7 +134,7 @@
};
};
- main_pmx0: pinmux@11c000 {
+ main_pmx0: pinctrl@11c000 {
compatible = "pinctrl-single";
reg = <0x0 0x11c000 0x0 0x2e4>;
#pinctrl-cells = <1>;
@@ -142,7 +142,7 @@
pinctrl-single,function-mask = <0xffffffff>;
};
- main_pmx1: pinmux@11c2e8 {
+ main_pmx1: pinctrl@11c2e8 {
compatible = "pinctrl-single";
reg = <0x0 0x11c2e8 0x0 0x24>;
#pinctrl-cells = <1>;
diff --git a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
index 0765700a8ba8..bb498be2f0a4 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
@@ -39,7 +39,7 @@
reg = <0x43000014 0x4>;
};
- wkup_pmx0: pinmux@4301c000 {
+ wkup_pmx0: pinctrl@4301c000 {
compatible = "pinctrl-single";
reg = <0x4301c000 0x118>;
#pinctrl-cells = <1>;
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index 00a36a14efe7..1d2a7c05b6f3 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -327,7 +327,7 @@
};
};
- main_pmx0: pinmux@11c000 {
+ main_pmx0: pinctrl@11c000 {
compatible = "pinctrl-single";
/* Proxy 0 addressing */
reg = <0x0 0x11c000 0x0 0x2b4>;
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
index c4a48e8d420a..9ad0266598ad 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
@@ -53,7 +53,7 @@
reg = <0x0 0x43000014 0x0 0x4>;
};
- wkup_pmx0: pinmux@4301c000 {
+ wkup_pmx0: pinctrl@4301c000 {
compatible = "pinctrl-single";
/* Proxy 0 addressing */
reg = <0x00 0x4301c000 0x00 0x178>;
--
2.17.1
Device tree convention uses lower case a-f for hexadecimals. Fix the
same.
Signed-off-by: Nishanth Menon <[email protected]>
---
Change:
v2: - new
arch/arm64/boot/dts/ti/k3-j721e.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/ti/k3-j721e.dtsi b/arch/arm64/boot/dts/ti/k3-j721e.dtsi
index f787aa73aaae..1bb8235d9ffb 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e.dtsi
@@ -127,7 +127,7 @@
ranges = <0x00 0x00100000 0x00 0x00100000 0x00 0x00020000>, /* ctrl mmr */
<0x00 0x00600000 0x00 0x00600000 0x00 0x00031100>, /* GPIO */
<0x00 0x00900000 0x00 0x00900000 0x00 0x00012000>, /* serdes */
- <0x00 0x00A40000 0x00 0x00A40000 0x00 0x00000800>, /* timesync router */
+ <0x00 0x00a40000 0x00 0x00a40000 0x00 0x00000800>, /* timesync router */
<0x00 0x06000000 0x00 0x06000000 0x00 0x00400000>, /* USBSS0 */
<0x00 0x06400000 0x00 0x06400000 0x00 0x00400000>, /* USBSS1 */
<0x00 0x01000000 0x00 0x01000000 0x00 0x0af02400>, /* Most peripherals */
--
2.17.1
Use gpio@ naming for nodes following standard conventions of device
tree (section 2.2.2 Generic Names recommendation in [1]).
[1] https://github.com/devicetree-org/devicetree-specification/tree/v0.3
Suggested-by: Suman Anna <[email protected]>
Signed-off-by: Nishanth Menon <[email protected]>
Reviewed-by: Lokesh Vutla <[email protected]>
Acked-by: Suman Anna <[email protected]>
---
Change:
v2: No functional change, picked reviews and acks
v1: https://lore.kernel.org/linux-arm-kernel/[email protected]/
arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 ++--
arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index d53d1ead4bb6..a2fc508e59a6 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -661,7 +661,7 @@
};
};
- main_gpio0: main_gpio0@600000 {
+ main_gpio0: gpio@600000 {
compatible = "ti,am654-gpio", "ti,keystone-gpio";
reg = <0x0 0x600000 0x0 0x100>;
gpio-controller;
@@ -676,7 +676,7 @@
clock-names = "gpio";
};
- main_gpio1: main_gpio1@601000 {
+ main_gpio1: gpio@601000 {
compatible = "ti,am654-gpio", "ti,keystone-gpio";
reg = <0x0 0x601000 0x0 0x100>;
gpio-controller;
diff --git a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
index a1ffe88d9664..0765700a8ba8 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
@@ -80,7 +80,7 @@
ti,interrupt-ranges = <0 712 16>;
};
- wkup_gpio0: wkup_gpio0@42110000 {
+ wkup_gpio0: gpio@42110000 {
compatible = "ti,am654-gpio", "ti,keystone-gpio";
reg = <0x42110000 0x100>;
gpio-controller;
--
2.17.1
Device tree convention uses lower case a-f for hexadecimals. Fix the
same.
Signed-off-by: Nishanth Menon <[email protected]>
---
Change:
v2: - new
arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 76e0edc4ad5c..d53d1ead4bb6 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -344,9 +344,9 @@
<0x4090 0x3>; /* SERDES1 lane select */
};
- dss_oldi_io_ctrl: dss_oldi_io_ctrl@41E0 {
+ dss_oldi_io_ctrl: dss_oldi_io_ctrl@41e0 {
compatible = "syscon";
- reg = <0x0000041E0 0x14>;
+ reg = <0x0000041e0 0x14>;
};
ehrpwm_tbclk: syscon@4140 {
--
2.17.1
Use temperature-sensor@ naming for nodes following standard conventions of device
tree (section 2.2.2 Generic Names recommendation in [1]).
[1] https://github.com/devicetree-org/devicetree-specification/tree/v0.3
Suggested-by: Suman Anna <[email protected]>
Suggested-by: Vignesh Raghavendra <[email protected]>
Signed-off-by: Nishanth Menon <[email protected]>
Reviewed-by: Lokesh Vutla <[email protected]>
Reviewed-by: Suman Anna <[email protected]>
---
Changes:
v2: None (picked acks/reviews)
v1: https://lore.kernel.org/linux-arm-kernel/[email protected]/
arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
index bb498be2f0a4..ed42f13e7663 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
@@ -95,7 +95,7 @@
clock-names = "gpio";
};
- wkup_vtm0: thermal@42050000 {
+ wkup_vtm0: temperature-sensor@42050000 {
compatible = "ti,am654-vtm";
reg = <0x42050000 0x25c>;
power-domains = <&k3_pds 80 TI_SCI_PD_EXCLUSIVE>;
--
2.17.1
serdes and ehrpwm_tbclk nodes should be using clock@ naming for nodes
following standard conventions of device tree (section 2.2.2 Generic
Names recommendation in [1]).
[1] https://github.com/devicetree-org/devicetree-specification/tree/v0.3
Suggested-by: Suman Anna <[email protected]>
Signed-off-by: Nishanth Menon <[email protected]>
Reviewed-by: Lokesh Vutla <[email protected]>
Acked-by: Suman Anna <[email protected]>
---
Change:
v2: added ehrpwm_tbclk based on review comments.
v1: https://lore.kernel.org/linux-arm-kernel/[email protected]/
arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index a2fc508e59a6..63a1299cb0b2 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -327,12 +327,12 @@
reg = <0x00000210 0x4>;
};
- serdes0_clk: serdes_clk@4080 {
+ serdes0_clk: clock@4080 {
compatible = "syscon";
reg = <0x00004080 0x4>;
};
- serdes1_clk: serdes_clk@4090 {
+ serdes1_clk: clock@4090 {
compatible = "syscon";
reg = <0x00004090 0x4>;
};
@@ -349,7 +349,7 @@
reg = <0x0000041e0 0x14>;
};
- ehrpwm_tbclk: syscon@4140 {
+ ehrpwm_tbclk: clock@4140 {
compatible = "ti,am654-ehrpwm-tbclk", "syscon";
reg = <0x4140 0x18>;
#clock-cells = <1>;
--
2.17.1
Use camera@ naming for nodes following standard conventions of device
tree (section 2.2.2 Generic Names recommendation in [1]).
[1] https://github.com/devicetree-org/devicetree-specification/tree/v0.3
Suggested-by: Suman Anna <[email protected]>
Signed-off-by: Nishanth Menon <[email protected]>
Reviewed-by: Lokesh Vutla <[email protected]>
Acked-by: Suman Anna <[email protected]>
---
Changes:
v2: None (picked acks/reviews)
v1: https://lore.kernel.org/linux-arm-kernel/[email protected]/
arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
index b8a8a0fcb8af..86c9074cb070 100644
--- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
@@ -257,7 +257,7 @@
pinctrl-0 = <&main_i2c1_pins_default>;
clock-frequency = <400000>;
- ov5640@3c {
+ ov5640: camera@3c {
compatible = "ovti,ov5640";
reg = <0x3c>;
--
2.17.1
Hi,
This is a respin of v2 of the series posted as [1].
As part of this cleanup, I ran a cross check of nodes that are
part of K3 as of right now, Vs what is "generic" definition as per 0.3
dt specification [2].
Changes in v2:
- Based off 20200903
- Picked up Acks and reviewed-by from previous versions (please comment
if you disagree).
- Dropped tsadc rename [3] based on review
- Added 2 patches to fixup hexadecimal usage caught as part of review
- few additional fixups.
Nishanth Menon (8):
arm64: dts: ti: k3-j721e: Use lower case hexadecimal
arm64: dts: ti: k3-am65-main: Use lower case hexadecimal
arm64: dts: ti: k3-am65*: Use generic gpio for node names
arm64: dts: ti: k3-am65*: Use generic clock for syscon clock names
arm64: dts: ti: k3-*: Use generic pinctrl for node names
arm64: dts: ti: k3-am65-base-board Use generic camera for node name
instead of ov5640
arm64: dts: ti: k3-am65-wakeup: Use generic temperature-sensor for
node name
arm64: dts: ti: k3-*: Fix up node_name_chars_strict warnings
arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 22 +++++++++----------
arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 4 ++--
arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 6 ++---
.../arm64/boot/dts/ti/k3-am654-base-board.dts | 18 +++++++--------
.../dts/ti/k3-am654-industrial-thermal.dtsi | 12 +++++-----
.../dts/ti/k3-j721e-common-proc-board.dts | 18 +++++++--------
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 8 +++----
.../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 4 ++--
arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 2 +-
arch/arm64/boot/dts/ti/k3-j721e.dtsi | 2 +-
10 files changed, 48 insertions(+), 48 deletions(-)
[1] v1: https://lore.kernel.org/linux-arm-kernel/[email protected]/
[2] https://pastebin.ubuntu.com/p/Z5zGQydH3G/
[3] https://lore.kernel.org/linux-arm-kernel/[email protected]/
--
2.17.1
<<< No Message Collected >>>
On 03/09/20 6:30 pm, Nishanth Menon wrote:
> Device tree convention uses lower case a-f for hexadecimals. Fix the
> same.
>
> Signed-off-by: Nishanth Menon <[email protected]>
Reviewed-by: Lokesh Vutla <[email protected]>
Thanks and regards,
Lokesh
On 03/09/20 6:30 pm, Nishanth Menon wrote:
> Device tree convention uses lower case a-f for hexadecimals. Fix the
> same.
>
> Signed-off-by: Nishanth Menon <[email protected]>
Reviewed-by: Lokesh Vutla <[email protected]>
Thanks and regards,
Lokesh
On 9/3/20 6:30 PM, Nishanth Menon wrote:
> Use temperature-sensor@ naming for nodes following standard conventions of device
> tree (section 2.2.2 Generic Names recommendation in [1]).
>
> [1] https://github.com/devicetree-org/devicetree-specification/tree/v0.3
>
> Suggested-by: Suman Anna <[email protected]>
> Suggested-by: Vignesh Raghavendra <[email protected]>
> Signed-off-by: Nishanth Menon <[email protected]>
> Reviewed-by: Lokesh Vutla <[email protected]>
> Reviewed-by: Suman Anna <[email protected]>
Acked-by: Vignesh Raghavendra <[email protected]>
> ---
> Changes:
> v2: None (picked acks/reviews)
> v1: https://lore.kernel.org/linux-arm-kernel/[email protected]/
>
> arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
> index bb498be2f0a4..ed42f13e7663 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
> @@ -95,7 +95,7 @@
> clock-names = "gpio";
> };
>
> - wkup_vtm0: thermal@42050000 {
> + wkup_vtm0: temperature-sensor@42050000 {
> compatible = "ti,am654-vtm";
> reg = <0x42050000 0x25c>;
> power-domains = <&k3_pds 80 TI_SCI_PD_EXCLUSIVE>;
>
On 9/3/20 8:00 AM, Nishanth Menon wrote:
> Device tree convention uses lower case a-f for hexadecimals. Fix the
> same.
>
> Signed-off-by: Nishanth Menon <[email protected]>
Acked-by: Suman Anna <[email protected]>
> ---
> Change:
> v2: - new
>
> arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> index 76e0edc4ad5c..d53d1ead4bb6 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> @@ -344,9 +344,9 @@
> <0x4090 0x3>; /* SERDES1 lane select */
> };
>
> - dss_oldi_io_ctrl: dss_oldi_io_ctrl@41E0 {
> + dss_oldi_io_ctrl: dss_oldi_io_ctrl@41e0 {
> compatible = "syscon";
> - reg = <0x0000041E0 0x14>;
> + reg = <0x0000041e0 0x14>;
> };
>
> ehrpwm_tbclk: syscon@4140 {
>
On 9/3/20 6:30 PM, Nishanth Menon wrote:
> serdes and ehrpwm_tbclk nodes should be using clock@ naming for nodes
> following standard conventions of device tree (section 2.2.2 Generic
> Names recommendation in [1]).
>
> [1] https://github.com/devicetree-org/devicetree-specification/tree/v0.3
>
> Suggested-by: Suman Anna <[email protected]>
> Signed-off-by: Nishanth Menon <[email protected]>
> Reviewed-by: Lokesh Vutla <[email protected]>
> Acked-by: Suman Anna <[email protected]>
> ---
> Change:
> v2: added ehrpwm_tbclk based on review comments.
> v1: https://lore.kernel.org/linux-arm-kernel/[email protected]/
>
> arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> index a2fc508e59a6..63a1299cb0b2 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> @@ -327,12 +327,12 @@
> reg = <0x00000210 0x4>;
> };
>
> - serdes0_clk: serdes_clk@4080 {
> + serdes0_clk: clock@4080 {
> compatible = "syscon";
> reg = <0x00004080 0x4>;
> };
>
> - serdes1_clk: serdes_clk@4090 {
> + serdes1_clk: clock@4090 {
> compatible = "syscon";
> reg = <0x00004090 0x4>;
> };
> @@ -349,7 +349,7 @@
> reg = <0x0000041e0 0x14>;
> };
>
> - ehrpwm_tbclk: syscon@4140 {
> + ehrpwm_tbclk: clock@4140 {
> compatible = "ti,am654-ehrpwm-tbclk", "syscon";
> reg = <0x4140 0x18>;
> #clock-cells = <1>;
>
Acked-by: Vignesh Raghavendra <[email protected]>
On 08:00-20200903, Nishanth Menon wrote:
> Hi,
>
> This is a respin of v2 of the series posted as [1].
>
> As part of this cleanup, I ran a cross check of nodes that are
> part of K3 as of right now, Vs what is "generic" definition as per 0.3
> dt specification [2].
>
> Changes in v2:
> - Based off 20200903
> - Picked up Acks and reviewed-by from previous versions (please comment
> if you disagree).
> - Dropped tsadc rename [3] based on review
> - Added 2 patches to fixup hexadecimal usage caught as part of review
> - few additional fixups.
I have applied the following to branch ti-k3-next on [1].
[1/8] arm64: dts: ti: k3-j721e: Use lower case hexadecimal
commit: 1aedefe13ba263d0d7d1cfbb38aadebbd5bab34e
[2/8] arm64: dts: ti: k3-am65-main: Use lower case hexadecimal
commit: 05e393c596c4495d79f0cbeacb0f0a0e0b6f89d5
[3/8] arm64: dts: ti: k3-am65*: Use generic gpio for node names
commit: 91e5f404e42bc189bb0e447d30041de737ad24bf
[4/8] arm64: dts: ti: k3-am65*: Use generic clock for syscon clock names
commit: 86e67b591e6d993d98567143451883a5618c196e
[5/8] arm64: dts: ti: k3-*: Use generic pinctrl for node names
commit: dcccf77067e4274953e8944d9730bb7ae2964c28
[6/8] arm64: dts: ti: k3-am65-base-board Use generic camera for node name instead of ov5640
commit: 4c19fb9ce266561ab122880a02e873ee8c3668e4
[7/8] arm64: dts: ti: k3-am65-wakeup: Use generic temperature-sensor for node name
commit: 9a8ecd414322ceb377cecb4795e3f3d7d7020952
[8/8] arm64: dts: ti: k3-*: Fix up node_name_chars_strict warnings
commit: e5c956c4f36cdd59e775f2285af9a1683374c5a5
[1] git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D