ARM: kirkwood: Remove all remaining trace of DNS-320/325 platform code (844703c1) · Commits · 戴 / test

arch/arm/configs/kirkwood_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ CONFIG_MACH_SHEEVAPLUG=y
		CONFIG_MACH_T5325=y
		CONFIG_MACH_TS219=y
		CONFIG_MACH_TS41X=y
		CONFIG_MACH_DLINK_KIRKWOOD_DT=y
		# CONFIG_CPU_FEROCEON_OLD_ID is not set
		CONFIG_PCI_MVEBU=y
		CONFIG_PREEMPT=y

+0 −8

Original line number	Diff line number	Diff line
		@@ -105,14 +105,6 @@ config ARCH_KIRKWOOD_DT
		Say 'Y' here if you want your kernel to support the
		Marvell Kirkwood using flattened device tree.

		config MACH_DLINK_KIRKWOOD_DT
		bool "D-Link Kirkwood-based NAS (Flattened Device Tree)"
		select ARCH_KIRKWOOD_DT
		help
		Say 'Y' here if you want your kernel to support the
		Kirkwood-based D-Link NASes such as DNS-320 & DNS-325,
		using Flattened Device Tree.

		config MACH_MV88F6281GTW_GE_DT
		bool "Marvell 88F6281 GTW GE Board (Flattened Device Tree)"
		select ARCH_KIRKWOOD_DT

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,5 +11,4 @@ obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o
		obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o

		obj-$(CONFIG_ARCH_KIRKWOOD_DT) += board-dt.o
		obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += board-dnskw.o
		obj-$(CONFIG_MACH_MV88F6281GTW_GE_DT) += board-mv88f6281gtw_ge.o

deleted100644 → 0

+0 −36

Original line number	Diff line number	Diff line
		/*
		* Copyright 2012 (C), Jamie Lentin <jm@lentin.co.uk>
		*
		* arch/arm/mach-kirkwood/board-dnskw.c
		*
		* D-link DNS-320 & DNS-325 NAS Init for drivers not converted to
		* flattened device tree yet.
		*
		* This file is licensed under the terms of the GNU General Public
		* License version 2. This program is licensed "as is" without any
		* warranty of any kind, whether express or implied.
		*/

		#include <linux/kernel.h>
		#include <linux/init.h>
		#include <linux/platform_device.h>
		#include <linux/gpio.h>
		#include "common.h"

		/* Register any GPIO for output and set the value */
		static void __init dnskw_gpio_register(unsigned gpio, char *name, int def)
		{
		if (gpio_request(gpio, name) == 0 &&
		gpio_direction_output(gpio, 0) == 0) {
		gpio_set_value(gpio, def);
		if (gpio_export(gpio, 0) != 0)
		pr_err("dnskw: Failed to export GPIO %s\n", name);
		} else
		pr_err("dnskw: Failed to register %s\n", name);
		}

		void __init dnskw_init(void)
		{
		/* Set NAS to turn back on after a power failure */
		dnskw_gpio_register(37, "dnskw:power:recover", 1);
		}

+0 −3

Original line number	Diff line number	Diff line
		@@ -106,9 +106,6 @@ static void __init kirkwood_dt_init(void)
		kexec_reinit = kirkwood_enable_pcie;
		#endif

		if (of_machine_is_compatible("dlink,dns-kirkwood"))
		dnskw_init();

		if (of_machine_is_compatible("marvell,mv88f6281gtw-ge"))
		mv88f6281gtw_ge_init();