From: Anton Vorontsov <avorontsov@ru.mvista.com>
To: Kumar Gala <galak@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org
Subject: [PATCH 4/4] [POWERPC] fsl_spi_init and users: stop using device_type = "spi"
Date: Wed, 19 Dec 2007 23:38:17 +0300 [thread overview]
Message-ID: <20071219203817.GD20861@localhost.localdomain> (raw)
In-Reply-To: <20071219203447.GA18285@localhost.localdomain>
Also rename "fsl_spi" to "fsl,spi".
Per http://ozlabs.org/pipermail/linuxppc-dev/2007-December/048388.html
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---
arch/powerpc/boot/dts/mpc8313erdb.dts | 3 +--
arch/powerpc/boot/dts/mpc832x_mds.dts | 6 ++----
arch/powerpc/boot/dts/mpc832x_rdb.dts | 6 ++----
arch/powerpc/boot/dts/mpc8349emitx.dts | 3 +--
arch/powerpc/boot/dts/mpc8349emitxgp.dts | 3 +--
arch/powerpc/boot/dts/mpc834x_mds.dts | 3 +--
arch/powerpc/boot/dts/mpc836x_mds.dts | 6 ++----
arch/powerpc/boot/dts/mpc8568mds.dts | 6 ++----
arch/powerpc/sysdev/fsl_soc.c | 2 +-
9 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index c5b6665..127cf57 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -82,8 +82,7 @@
};
spi@7000 {
- device_type = "spi";
- compatible = "fsl_spi";
+ compatible = "fsl,spi";
reg = <7000 1000>;
interrupts = <10 8>;
interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 97757ed..517e433 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -192,8 +192,7 @@
};
spi@4c0 {
- device_type = "spi";
- compatible = "fsl_spi";
+ compatible = "fsl,spi";
reg = <4c0 40>;
interrupts = <2>;
interrupt-parent = < &qeic >;
@@ -201,8 +200,7 @@
};
spi@500 {
- device_type = "spi";
- compatible = "fsl_spi";
+ compatible = "fsl,spi";
reg = <500 40>;
interrupts = <1>;
interrupt-parent = < &qeic >;
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index b1c73f1..a229fab 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -182,8 +182,7 @@
};
spi@4c0 {
- device_type = "spi";
- compatible = "fsl_spi";
+ compatible = "fsl,spi";
reg = <4c0 40>;
interrupts = <2>;
interrupt-parent = <&qeic>;
@@ -191,8 +190,7 @@
};
spi@500 {
- device_type = "spi";
- compatible = "fsl_spi";
+ compatible = "fsl,spi";
reg = <500 40>;
interrupts = <1>;
interrupt-parent = <&qeic>;
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index e354f26..b89dbbf 100644
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -82,8 +82,7 @@
};
spi@7000 {
- device_type = "spi";
- compatible = "fsl_spi";
+ compatible = "fsl,spi";
reg = <7000 1000>;
interrupts = <10 8>;
interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index ebdf0b7..123c34e 100644
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -80,8 +80,7 @@
};
spi@7000 {
- device_type = "spi";
- compatible = "fsl_spi";
+ compatible = "fsl,spi";
reg = <7000 1000>;
interrupts = <10 8>;
interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index 0ba13eb..eb532f3 100644
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -93,8 +93,7 @@
};
spi@7000 {
- device_type = "spi";
- compatible = "fsl_spi";
+ compatible = "fsl,spi";
reg = <7000 1000>;
interrupts = <10 8>;
interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 330212d..decbafe 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -223,8 +223,7 @@
};
spi@4c0 {
- device_type = "spi";
- compatible = "fsl_spi";
+ compatible = "fsl,spi";
reg = <4c0 40>;
interrupts = <2>;
interrupt-parent = < &qeic >;
@@ -232,8 +231,7 @@
};
spi@500 {
- device_type = "spi";
- compatible = "fsl_spi";
+ compatible = "fsl,spi";
reg = <500 40>;
interrupts = <1>;
interrupt-parent = < &qeic >;
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index c00aec9..2b79f8b 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -300,8 +300,7 @@
};
spi@4c0 {
- device_type = "spi";
- compatible = "fsl_spi";
+ compatible = "fsl,spi";
reg = <4c0 40>;
interrupts = <2>;
interrupt-parent = <&qeic>;
@@ -309,8 +308,7 @@
};
spi@500 {
- device_type = "spi";
- compatible = "fsl_spi";
+ compatible = "fsl,spi";
reg = <500 40>;
interrupts = <1>;
interrupt-parent = <&qeic>;
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 3cf84d0..91bac51 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -1242,7 +1242,7 @@ int __init fsl_spi_init(struct spi_board_info *board_infos,
}
for (np = NULL, i = 1;
- (np = of_find_compatible_node(np, "spi", "fsl_spi")) != NULL;
+ (np = of_find_compatible_node(np, NULL, "fsl,spi")) != NULL;
i++) {
int ret = 0;
unsigned int j;
--
1.5.2.2
next prev parent reply other threads:[~2007-12-19 20:36 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-19 20:34 [PATCH 0/4] device_type/compatible cleanups Anton Vorontsov
2007-12-19 20:34 ` Scott Wood
2007-12-19 20:48 ` Anton Vorontsov
2007-12-19 21:07 ` Scott Wood
2007-12-19 20:37 ` [PATCH 1/4] [POWERPC] qe_lib and users: get rid of device_type and model Anton Vorontsov
2007-12-19 20:37 ` [PATCH 2/4] [POWERPC][NET] ucc_geth_mii and users: get rid of device_type Anton Vorontsov
2007-12-19 20:38 ` [PATCH 3/4] [POWERPC][SPI] use brg-frequency for SPI in QE Anton Vorontsov
2007-12-19 20:58 ` Scott Wood
2007-12-19 23:27 ` Stephen Rothwell
2007-12-19 20:38 ` Anton Vorontsov [this message]
2007-12-19 20:54 ` [PATCH 4/4] [POWERPC] fsl_spi_init and users: stop using device_type = "spi" Kumar Gala
2007-12-19 21:02 ` Anton Vorontsov
2007-12-19 21:04 ` Timur Tabi
2007-12-19 21:12 ` Anton Vorontsov
2007-12-19 21:15 ` Timur Tabi
2007-12-19 21:38 ` Grant Likely
2007-12-19 23:50 ` Olof Johansson
-- strict thread matches above, loose matches on Subject: below --
2007-12-21 20:18 [PATCH v3 0/4] device_type/compatible cleanups Anton Vorontsov
2007-12-21 20:21 ` [PATCH 4/4] [POWERPC] fsl_spi_init and users: stop using device_type = "spi" Anton Vorontsov
2008-01-08 14:26 [PATCH v4 0/4] device_type/compatible cleanups Anton Vorontsov
2008-01-08 14:30 ` [PATCH 4/4] [POWERPC] fsl_spi_init and users: stop using device_type = "spi" Anton Vorontsov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071219203817.GD20861@localhost.localdomain \
--to=avorontsov@ru.mvista.com \
--cc=galak@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).