With the device tree support in place, probe the PCIe controller from
the device tree and remove the corresponding workaround in the board
file.
Signed-off-by: Thierry Reding <thierry.red...@avionic-design.de>
---
Changes in v3:
- update for new DT binding
Changes in v2:
- new patch
---
arch/arm/boot/dts/tegra20-trimslice.dts | 12 ++++++++++++
arch/arm/mach-tegra/board-dt-tegra20.c | 8 --------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts
b/arch/arm/boot/dts/tegra20-trimslice.dts
index 4b6c486..ebb4c17 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -301,6 +301,18 @@
};
};
+ pcie-controller {
+ status = "okay";
+
+ pci@0 {
+ status = "okay";
+ };
+
+ pci@1 {
+ status = "okay";
+ };
+ };
+
usb@c5000000 {
status = "okay";
nvidia,vbus-gpio = <&gpio 170 0>; /* gpio PV2 */
diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c
b/arch/arm/mach-tegra/board-dt-tegra20.c
index 9e8256ab..67090fe 100644
--- a/arch/arm/mach-tegra/board-dt-tegra20.c
+++ b/arch/arm/mach-tegra/board-dt-tegra20.c
@@ -145,13 +145,6 @@ static void __init tegra_dt_init(void)
tegra20_auxdata_lookup, NULL);
}
-static void __init trimslice_init(void)
-{
-#ifdef CONFIG_TEGRA_PCI
- platform_device_register(&tegra_pcie_device);
-#endif
-}
-
static void __init paz00_init(void)
{
tegra_paz00_wifikill_init();
@@ -161,7 +154,6 @@ static struct {
char *machine;
void (*init)(void);
} board_init_funcs[] = {
- { "compulab,trimslice", trimslice_init },
{ "compal,paz00", paz00_init },
};
--
1.8.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
