* [PATCH] ARM: dts: i.MX: Use single naming style for i.MX WEIM devices
@ 2014-04-08 15:54 Alexander Shiyan
2014-04-09 3:21 ` Shawn Guo
0 siblings, 1 reply; 2+ messages in thread
From: Alexander Shiyan @ 2014-04-08 15:54 UTC (permalink / raw)
To: linux-arm-kernel
This patch converts all i.MX WEIM users to use single naming style
for devices.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
Documentation/devicetree/bindings/bus/imx-weim.txt | 4 ++--
arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 2 +-
arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 4 ++--
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Documentation/devicetree/bindings/bus/imx-weim.txt b/Documentation/devicetree/bindings/bus/imx-weim.txt
index 6630d84..73aa2f3 100644
--- a/Documentation/devicetree/bindings/bus/imx-weim.txt
+++ b/Documentation/devicetree/bindings/bus/imx-weim.txt
@@ -70,9 +70,9 @@ Example for an imx6q-sabreauto board, the NOR flash connected to the WEIM:
ranges = <0 0 0x08000000 0x08000000>;
fsl,weim-cs-gpr = <&gpr>;
- nor at 0,0 {
+ nor at 0,00000000 {
compatible = "cfi-flash";
- reg = <0 0 0x02000000>;
+ reg = <0 0x00000000 0x02000000>;
#address-cells = <1>;
#size-cells = <1>;
bank-width = <2>;
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
index 9117a3c..e501aa9 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
@@ -280,7 +280,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_weim>;
- can at d4000000 {
+ can at 4,00000000 {
compatible = "nxp,sja1000";
reg = <4 0x00000000 0x00000100>;
interrupt-parent = <&gpio5>;
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
index 8e10aef..758612a 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
@@ -311,7 +311,7 @@
&weim {
status = "okay";
- nor: nor at c0000000 {
+ nor: nor at 0,00000000 {
compatible = "cfi-flash";
reg = <0 0x00000000 0x02000000>;
bank-width = <2>;
@@ -321,7 +321,7 @@
#size-cells = <1>;
};
- sram: sram at c8000000 {
+ sram: sram at 1,00000000 {
compatible = "mtd-ram";
reg = <1 0x00000000 0x00800000>;
bank-width = <2>;
diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
index 009abd6..fde8b31 100644
--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@@ -446,9 +446,9 @@
ranges = <0 0 0x08000000 0x08000000>;
status = "disabled"; /* pin conflict with SPI NOR */
- nor at 0,0 {
+ nor at 0,00000000 {
compatible = "cfi-flash";
- reg = <0 0 0x02000000>;
+ reg = <0 0x00000000 0x02000000>;
#address-cells = <1>;
#size-cells = <1>;
bank-width = <2>;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] ARM: dts: i.MX: Use single naming style for i.MX WEIM devices
2014-04-08 15:54 [PATCH] ARM: dts: i.MX: Use single naming style for i.MX WEIM devices Alexander Shiyan
@ 2014-04-09 3:21 ` Shawn Guo
0 siblings, 0 replies; 2+ messages in thread
From: Shawn Guo @ 2014-04-09 3:21 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Apr 08, 2014 at 07:54:43PM +0400, Alexander Shiyan wrote:
> This patch converts all i.MX WEIM users to use single naming style
> for devices.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
> Documentation/devicetree/bindings/bus/imx-weim.txt | 4 ++--
> arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 2 +-
> arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 4 ++--
> arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 4 ++--
> 4 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/bus/imx-weim.txt b/Documentation/devicetree/bindings/bus/imx-weim.txt
> index 6630d84..73aa2f3 100644
> --- a/Documentation/devicetree/bindings/bus/imx-weim.txt
> +++ b/Documentation/devicetree/bindings/bus/imx-weim.txt
> @@ -70,9 +70,9 @@ Example for an imx6q-sabreauto board, the NOR flash connected to the WEIM:
> ranges = <0 0 0x08000000 0x08000000>;
> fsl,weim-cs-gpr = <&gpr>;
>
> - nor at 0,0 {
> + nor at 0,00000000 {
Hmm, I think the idiom for unit-address is that the number has neither
'0x' nor leading zeros. That said, the existing form is just good.
Shawn
> compatible = "cfi-flash";
> - reg = <0 0 0x02000000>;
> + reg = <0 0x00000000 0x02000000>;
> #address-cells = <1>;
> #size-cells = <1>;
> bank-width = <2>;
> diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
> index 9117a3c..e501aa9 100644
> --- a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
> +++ b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
> @@ -280,7 +280,7 @@
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_weim>;
>
> - can at d4000000 {
> + can at 4,00000000 {
> compatible = "nxp,sja1000";
> reg = <4 0x00000000 0x00000100>;
> interrupt-parent = <&gpio5>;
> diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
> index 8e10aef..758612a 100644
> --- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
> +++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
> @@ -311,7 +311,7 @@
> &weim {
> status = "okay";
>
> - nor: nor at c0000000 {
> + nor: nor at 0,00000000 {
> compatible = "cfi-flash";
> reg = <0 0x00000000 0x02000000>;
> bank-width = <2>;
> @@ -321,7 +321,7 @@
> #size-cells = <1>;
> };
>
> - sram: sram at c8000000 {
> + sram: sram at 1,00000000 {
> compatible = "mtd-ram";
> reg = <1 0x00000000 0x00800000>;
> bank-width = <2>;
> diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
> index 009abd6..fde8b31 100644
> --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
> @@ -446,9 +446,9 @@
> ranges = <0 0 0x08000000 0x08000000>;
> status = "disabled"; /* pin conflict with SPI NOR */
>
> - nor at 0,0 {
> + nor at 0,00000000 {
> compatible = "cfi-flash";
> - reg = <0 0 0x02000000>;
> + reg = <0 0x00000000 0x02000000>;
> #address-cells = <1>;
> #size-cells = <1>;
> bank-width = <2>;
> --
> 1.8.3.2
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-04-09 3:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-08 15:54 [PATCH] ARM: dts: i.MX: Use single naming style for i.MX WEIM devices Alexander Shiyan
2014-04-09 3:21 ` Shawn Guo
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).