* [PATCH AUTOSEL 4.4 01/10] ARM: brcmstb: dts: fix NAND nodes names
@ 2021-07-14 19:48 Sasha Levin
2021-07-14 19:48 ` [PATCH AUTOSEL 4.4 02/10] ARM: dts: BCM63xx: Fix " Sasha Levin
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Sasha Levin @ 2021-07-14 19:48 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Rafał Miłecki, Florian Fainelli, Sasha Levin,
linux-arm-kernel, devicetree
From: Rafał Miłecki <rafal@milecki.pl>
[ Upstream commit 9a800ce1aada6e0f56b78e4713f4858c8990c1f7 ]
This matches nand-controller.yaml requirements.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/boot/dts/bcm7445-bcm97445svmb.dts | 4 ++--
arch/arm/boot/dts/bcm7445.dtsi | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts b/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts
index 0bb8d17e4c2d..e51c9b079432 100644
--- a/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts
+++ b/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts
@@ -13,10 +13,10 @@ memory {
};
};
-&nand {
+&nand_controller {
status = "okay";
- nandcs@1 {
+ nand@1 {
compatible = "brcm,nandcs";
reg = <1>;
nand-ecc-step-size = <512>;
diff --git a/arch/arm/boot/dts/bcm7445.dtsi b/arch/arm/boot/dts/bcm7445.dtsi
index 4791321969b3..3f002f2047f1 100644
--- a/arch/arm/boot/dts/bcm7445.dtsi
+++ b/arch/arm/boot/dts/bcm7445.dtsi
@@ -149,7 +149,7 @@ aon-ctrl@410000 {
reg-names = "aon-ctrl", "aon-sram";
};
- nand: nand@3e2800 {
+ nand_controller: nand-controller@3e2800 {
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH AUTOSEL 4.4 02/10] ARM: dts: BCM63xx: Fix NAND nodes names
2021-07-14 19:48 [PATCH AUTOSEL 4.4 01/10] ARM: brcmstb: dts: fix NAND nodes names Sasha Levin
@ 2021-07-14 19:48 ` Sasha Levin
2021-07-14 19:48 ` [PATCH AUTOSEL 4.4 03/10] ARM: dts: imx6: phyFLEX: Fix UART hardware flow control Sasha Levin
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Sasha Levin @ 2021-07-14 19:48 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Rafał Miłecki, Florian Fainelli, Sasha Levin, devicetree
From: Rafał Miłecki <rafal@milecki.pl>
[ Upstream commit 75e2f012f6e34b93124d1d86eaa8f27df48e9ea0 ]
This matches nand-controller.yaml requirements.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/boot/dts/bcm63138.dtsi | 2 +-
arch/arm/boot/dts/bcm963138dvt.dts | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi
index 34cd64051250..84efc3d16f58 100644
--- a/arch/arm/boot/dts/bcm63138.dtsi
+++ b/arch/arm/boot/dts/bcm63138.dtsi
@@ -152,7 +152,7 @@ serial1: serial@620 {
status = "disabled";
};
- nand: nand@2000 {
+ nand_controller: nand-controller@2000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand";
diff --git a/arch/arm/boot/dts/bcm963138dvt.dts b/arch/arm/boot/dts/bcm963138dvt.dts
index 370aa2cfddf2..439cff69e948 100644
--- a/arch/arm/boot/dts/bcm963138dvt.dts
+++ b/arch/arm/boot/dts/bcm963138dvt.dts
@@ -29,10 +29,10 @@ &serial1 {
status = "okay";
};
-&nand {
+&nand_controller {
status = "okay";
- nandcs@0 {
+ nand@0 {
compatible = "brcm,nandcs";
reg = <0>;
nand-ecc-strength = <4>;
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH AUTOSEL 4.4 03/10] ARM: dts: imx6: phyFLEX: Fix UART hardware flow control
2021-07-14 19:48 [PATCH AUTOSEL 4.4 01/10] ARM: brcmstb: dts: fix NAND nodes names Sasha Levin
2021-07-14 19:48 ` [PATCH AUTOSEL 4.4 02/10] ARM: dts: BCM63xx: Fix " Sasha Levin
@ 2021-07-14 19:48 ` Sasha Levin
2021-07-14 19:48 ` [PATCH AUTOSEL 4.4 05/10] ARM: dts: am437x: align gpio hog names with dt-schema Sasha Levin
2021-07-14 19:48 ` [PATCH AUTOSEL 4.4 06/10] ARM: dts: omap5-board-common: " Sasha Levin
3 siblings, 0 replies; 5+ messages in thread
From: Sasha Levin @ 2021-07-14 19:48 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Primoz Fiser, Shawn Guo, Sasha Levin, devicetree, linux-arm-kernel
From: Primoz Fiser <primoz.fiser@norik.com>
[ Upstream commit 14cdc1f243d79e0b46be150502b7dba9c5a6bdfd ]
Serial interface uart3 on phyFLEX board is capable of 5-wire connection
including signals RTS and CTS for hardware flow control.
Fix signals UART3_CTS_B and UART3_RTS_B padmux assignments and add
missing property "uart-has-rtscts" to allow serial interface to be
configured and used with the hardware flow control.
Signed-off-by: Primoz Fiser <primoz.fiser@norik.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
index cae04e806036..e3e3a7a08d08 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -307,8 +307,8 @@ pinctrl_uart3: uart3grp {
fsl,pins = <
MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
- MX6QDL_PAD_EIM_D30__UART3_RTS_B 0x1b0b1
- MX6QDL_PAD_EIM_D31__UART3_CTS_B 0x1b0b1
+ MX6QDL_PAD_EIM_D31__UART3_RTS_B 0x1b0b1
+ MX6QDL_PAD_EIM_D30__UART3_CTS_B 0x1b0b1
>;
};
@@ -383,6 +383,7 @@ &pcie {
&uart3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart3>;
+ uart-has-rtscts;
status = "disabled";
};
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH AUTOSEL 4.4 05/10] ARM: dts: am437x: align gpio hog names with dt-schema
2021-07-14 19:48 [PATCH AUTOSEL 4.4 01/10] ARM: brcmstb: dts: fix NAND nodes names Sasha Levin
2021-07-14 19:48 ` [PATCH AUTOSEL 4.4 02/10] ARM: dts: BCM63xx: Fix " Sasha Levin
2021-07-14 19:48 ` [PATCH AUTOSEL 4.4 03/10] ARM: dts: imx6: phyFLEX: Fix UART hardware flow control Sasha Levin
@ 2021-07-14 19:48 ` Sasha Levin
2021-07-14 19:48 ` [PATCH AUTOSEL 4.4 06/10] ARM: dts: omap5-board-common: " Sasha Levin
3 siblings, 0 replies; 5+ messages in thread
From: Sasha Levin @ 2021-07-14 19:48 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Grygorii Strashko, Tony Lindgren, Sasha Levin, linux-omap, devicetree
From: Grygorii Strashko <grygorii.strashko@ti.com>
[ Upstream commit bd551acdde3ad40da1a97391abd6e0db7852bf66 ]
The GPIO Hog dt-schema node naming convention expect GPIO hogs node names
to end with a 'hog' suffix.
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/boot/dts/am437x-gp-evm.dts | 4 ++--
arch/arm/boot/dts/am43x-epos-evm.dts | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
index 3293484028ad..b5863cc13cfd 100644
--- a/arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@ -660,7 +660,7 @@ &gpio0 {
pinctrl-0 = <&gpio0_pins>;
status = "okay";
- p23 {
+ sel-emmc-nand-hog {
gpio-hog;
gpios = <23 GPIO_ACTIVE_HIGH>;
/* SelEMMCorNAND selects between eMMC and NAND:
@@ -693,7 +693,7 @@ &gpio5 {
status = "okay";
ti,no-reset-on-init;
- p8 {
+ sel-lcd-hdmi-hog {
/*
* SelLCDorHDMI selects between display and audio paths:
* Low: HDMI display with audio via HDMI
diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index a74b09f17a1a..b61feb994526 100644
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -536,7 +536,7 @@ &gpio2 {
pinctrl-0 = <&display_mux_pins>;
status = "okay";
- p1 {
+ sel-lcd-hdmi-hog {
/*
* SelLCDorHDMI selects between display and audio paths:
* Low: HDMI display with audio via HDMI
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH AUTOSEL 4.4 06/10] ARM: dts: omap5-board-common: align gpio hog names with dt-schema
2021-07-14 19:48 [PATCH AUTOSEL 4.4 01/10] ARM: brcmstb: dts: fix NAND nodes names Sasha Levin
` (2 preceding siblings ...)
2021-07-14 19:48 ` [PATCH AUTOSEL 4.4 05/10] ARM: dts: am437x: align gpio hog names with dt-schema Sasha Levin
@ 2021-07-14 19:48 ` Sasha Levin
3 siblings, 0 replies; 5+ messages in thread
From: Sasha Levin @ 2021-07-14 19:48 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Grygorii Strashko, Tony Lindgren, Sasha Levin, linux-omap, devicetree
From: Grygorii Strashko <grygorii.strashko@ti.com>
[ Upstream commit 4823117cb80eedf31ddbc126b9bd92e707bd9a26 ]
The GPIO Hog dt-schema node naming convention expect GPIO hogs node names
to end with a 'hog' suffix.
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/boot/dts/omap5-board-common.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
index 41e80e7f20be..282d393b63b6 100644
--- a/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@ -132,7 +132,7 @@ sound: sound {
&gpio8 {
/* TI trees use GPIO instead of msecure, see also muxing */
- p234 {
+ msecure-hog {
gpio-hog;
gpios = <10 GPIO_ACTIVE_HIGH>;
output-high;
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-07-14 19:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-14 19:48 [PATCH AUTOSEL 4.4 01/10] ARM: brcmstb: dts: fix NAND nodes names Sasha Levin
2021-07-14 19:48 ` [PATCH AUTOSEL 4.4 02/10] ARM: dts: BCM63xx: Fix " Sasha Levin
2021-07-14 19:48 ` [PATCH AUTOSEL 4.4 03/10] ARM: dts: imx6: phyFLEX: Fix UART hardware flow control Sasha Levin
2021-07-14 19:48 ` [PATCH AUTOSEL 4.4 05/10] ARM: dts: am437x: align gpio hog names with dt-schema Sasha Levin
2021-07-14 19:48 ` [PATCH AUTOSEL 4.4 06/10] ARM: dts: omap5-board-common: " Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).