diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-05-15 15:37:01 +0200 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-05-27 16:02:13 +0000 |
commit | 0d0632f523fa040b307688ae421a1debf79af2d7 (patch) | |
tree | 70acd8920e5ba356890dcad0e81dafd679419f64 /arch/arm/mach-kirkwood/common.h | |
parent | 259e234608dbc6c6a673efb5d58a1c036eb9b47a (diff) | |
download | blackbird-op-linux-0d0632f523fa040b307688ae421a1debf79af2d7.tar.gz blackbird-op-linux-0d0632f523fa040b307688ae421a1debf79af2d7.zip |
arm: kirkwood: convert db-88f6281/db-88f6282 to the Device Tree
This commit converts the Marvell DB-88F6281/DB-88F6282 board to the
Device Tree. In fact, the code was supporting two different boards:
one with the 6281 SoC variant, and one with the 6282 SoC variant. The
difference between the two being that the 6281 has one PCIe interface,
and the 6282 has two PCIe interfaces.
In order to handle that with the Device Tree, we create a
'kirkwood-db.dtsi' file that contains the definitions common to both
boards, and 'kirkwood-db-88f6281.dts' and 'kirkwood-db-88f6282.dts'
for the definitions specific to each board. This is similar to what is
done for the QNAP TS219 Kirkwood platform.
We have kept one single Kconfig option, just like it was before.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-kirkwood/common.h')
-rw-r--r-- | arch/arm/mach-kirkwood/common.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h index 21da3b1ebd7b..cbbc0b80d4a1 100644 --- a/arch/arm/mach-kirkwood/common.h +++ b/arch/arm/mach-kirkwood/common.h @@ -119,6 +119,12 @@ void km_kirkwood_init(void); static inline void km_kirkwood_init(void) {}; #endif +#ifdef CONFIG_MACH_DB88F628X_BP_DT +void db88f628x_init(void); +#else +static inline void db88f628x_init(void) {}; +#endif + #ifdef CONFIG_MACH_MPLCEC4_DT void mplcec4_init(void); #else |