target/linux/kirkwood/patches-3.10/0014-arm-kirkwood-convert-ZyXEL-NSA310-to-use-DT-for-the-.patch

   1 From 86310ed36ec224b248b5169371f44250ce8c2275 Mon Sep 17 00:00:00 2001
   2 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
   3 Date: Wed, 10 Apr 2013 23:07:27 +0200
   4 Subject: [PATCH 14/29] arm: kirkwood: convert ZyXEL NSA310 to use DT for the
   5  PCIe interface
   6
   7 Now that the PCIe mvebu driver is usable on Kirkwood, use it instead
   8 of the legacy PCIe code, since it allows to describe the PCIe
   9 interfaces in the Device Tree.
  10
  11 Since it was the only device left that prevented this platform to use
  12 the Device Tree only, we remove the board-nsa310.c file and the
  13 related Kconfig/Makefile bits.
  14
  15 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  16 ---
  17  arch/arm/boot/dts/kirkwood-nsa310.dts |  8 ++++++++
  18  arch/arm/mach-kirkwood/Kconfig        |  8 --------
  19  arch/arm/mach-kirkwood/Makefile       |  1 -
  20  arch/arm/mach-kirkwood/board-nsa310.c | 25 -------------------------
  21  4 files changed, 8 insertions(+), 34 deletions(-)
  22  delete mode 100644 arch/arm/mach-kirkwood/board-nsa310.c
  23
  24 diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts
  25 index a7412b9..9ddf218 100644
  26 --- a/arch/arm/boot/dts/kirkwood-nsa310.dts
  27 +++ b/arch/arm/boot/dts/kirkwood-nsa310.dts
  28 @@ -176,6 +176,14 @@
  29                                 reg = <0x5040000 0x2fc0000>;
  30                         };
  31                 };
  32 +
  33 +               pcie-controller {
  34 +                       status = "okay";
  35 +
  36 +                       pcie@1,0 {
  37 +                               status = "okay";
  38 +                       };
  39 +               };
  40         };
  41
  42         gpio_keys {
  43 diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
  44 index 7509a89..267ca95 100644
  45 --- a/arch/arm/mach-kirkwood/Kconfig
  46 +++ b/arch/arm/mach-kirkwood/Kconfig
  47 @@ -272,14 +272,6 @@ config MACH_NETSPACE_V2_DT
  48           Say 'Y' here if you want your kernel to support the LaCie
  49           Network Space v2 NAS, using Flattened Device Tree.
  50
  51 -config MACH_NSA310_DT
  52 -       bool "ZyXEL NSA-310 (Flattened Device Tree)"
  53 -       select ARCH_KIRKWOOD_DT
  54 -       select ARM_ATAG_DTB_COMPAT
  55 -       help
  56 -         Say 'Y' here if you want your kernel to support the
  57 -         ZyXEL NSA-310 board (Flattened Device Tree).
  58 -
  59  config MACH_OPENBLOCKS_A6_DT
  60         bool "Plat'Home OpenBlocks A6 (Flattened Device Tree)"
  61         select ARCH_KIRKWOOD_DT
  62 diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
  63 index e1f3735..794366e 100644
  64 --- a/arch/arm/mach-kirkwood/Makefile
  65 +++ b/arch/arm/mach-kirkwood/Makefile
  66 @@ -37,7 +37,6 @@ obj-$(CONFIG_MACH_NETSPACE_LITE_V2_DT)        += board-ns2.o
  67  obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT)  += board-ns2.o
  68  obj-$(CONFIG_MACH_NETSPACE_MINI_V2_DT) += board-ns2.o
  69  obj-$(CONFIG_MACH_NETSPACE_V2_DT)      += board-ns2.o
  70 -obj-$(CONFIG_MACH_NSA310_DT)           += board-nsa310.o
  71  obj-$(CONFIG_MACH_OPENBLOCKS_A6_DT)    += board-openblocks_a6.o
  72  obj-$(CONFIG_MACH_READYNAS_DT)         += board-readynas.o
  73  obj-$(CONFIG_MACH_TOPKICK_DT)          += board-usi_topkick.o
  74 diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c
  75 deleted file mode 100644
  76 index 55ade93..0000000
  77 --- a/arch/arm/mach-kirkwood/board-nsa310.c
  78 +++ /dev/null
  79 @@ -1,25 +0,0 @@
  80 -/*
  81 - * arch/arm/mach-kirkwood/nsa-310-setup.c
  82 - *
  83 - * ZyXEL NSA-310 Setup
  84 - *
  85 - * This file is licensed under the terms of the GNU General Public
  86 - * License version 2.  This program is licensed "as is" without any
  87 - * warranty of any kind, whether express or implied.
  88 - */
  89 -
  90 -#include <linux/kernel.h>
  91 -#include <linux/init.h>
  92 -#include <mach/kirkwood.h>
  93 -#include <linux/of.h>
  94 -#include "common.h"
  95 -
  96 -static int __init nsa310_pci_init(void)
  97 -{
  98 -       if (of_machine_is_compatible("zyxel,nsa310"))
  99 -               kirkwood_pcie_init(KW_PCIE0);
 100 -
 101 -       return 0;
 102 -}
 103 -
 104 -subsys_initcall(nsa310_pci_init);
 105 --
 106 1.8.4.rc1
 107