| Message ID | 1465466656-30002-1-git-send-email-ben.dooks@codethink.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jun 09, 2016 at 11:04:16AM +0100, Ben Dooks wrote: > Either this has been mis-converted (and needs to be fixed) or > is no longer referenced and can be safely removed. Hi Thomas You added this code, which Ben is removing. It does look like you forgot to call d2net_init() from orion5x_dt_init(). Please could you look at this. Thanks Andrew
Hello, On Thu, 9 Jun 2016 15:31:16 +0200, Andrew Lunn wrote: > On Thu, Jun 09, 2016 at 11:04:16AM +0100, Ben Dooks wrote: > > Either this has been mis-converted (and needs to be fixed) or > > is no longer referenced and can be safely removed. > > Hi Thomas > > You added this code, which Ben is removing. It does look like you > forgot to call d2net_init() from orion5x_dt_init(). > > Please could you look at this. You are correct: d2net_init() should be called from orion5x_dt_init(), or called through some initcall mechanism. That being said, this has been broken more than 2 years ago, and nobody noticed. Doesn't this mean that we could get rid of the support for this board entirely? :) Thomas
Hi Thomas > That being said, this has been broken more than 2 years ago, and nobody > noticed. Doesn't this mean that we could get rid of the support for > this board entirely? :) Well, all it means is the LEDs don't blink. If the disk was not spinning, or the ethernet device missing, i would agree with you. But somebody could be using this device and don't notice the difference with the LEDs. Andrew
Hello, On Thu, 9 Jun 2016 16:10:06 +0200, Andrew Lunn wrote: > > That being said, this has been broken more than 2 years ago, and nobody > > noticed. Doesn't this mean that we could get rid of the support for > > this board entirely? :) > > Well, all it means is the LEDs don't blink. If the disk was not > spinning, or the ethernet device missing, i would agree with you. But > somebody could be using this device and don't notice the difference > with the LEDs. True. I'm probably trying to hard to clean up the dust :) Thomas
On 09/06/16 15:12, Thomas Petazzoni wrote: > Hello, > > On Thu, 9 Jun 2016 16:10:06 +0200, Andrew Lunn wrote: > >>> That being said, this has been broken more than 2 years ago, and nobody >>> noticed. Doesn't this mean that we could get rid of the support for >>> this board entirely? :) >> >> Well, all it means is the LEDs don't blink. If the disk was not >> spinning, or the ethernet device missing, i would agree with you. But >> somebody could be using this device and don't notice the difference >> with the LEDs. Surely DT can manage blinking LEDs?? > True. I'm probably trying to hard to clean up the dust :) > > Thomas >
On Thu, Jun 09, 2016 at 04:52:35PM +0100, Ben Dooks wrote: > On 09/06/16 15:12, Thomas Petazzoni wrote: > > Hello, > > > > On Thu, 9 Jun 2016 16:10:06 +0200, Andrew Lunn wrote: > > > >>> That being said, this has been broken more than 2 years ago, and nobody > >>> noticed. Doesn't this mean that we could get rid of the support for > >>> this board entirely? :) > >> > >> Well, all it means is the LEDs don't blink. If the disk was not > >> spinning, or the ethernet device missing, i would agree with you. But > >> somebody could be using this device and don't notice the difference > >> with the LEDs. > > Surely DT can manage blinking LEDs?? There is an additional GPIO needed. However, i think a pin hog should allow this to be represented in DT. Two years ago, i don't think this sort of hogging existed. Andrew
On Thu, Jun 09, 2016 at 06:36:08PM +0200, Andrew Lunn wrote: > On Thu, Jun 09, 2016 at 04:52:35PM +0100, Ben Dooks wrote: > > On 09/06/16 15:12, Thomas Petazzoni wrote: > > > Hello, > > > > > > On Thu, 9 Jun 2016 16:10:06 +0200, Andrew Lunn wrote: > > > > > >>> That being said, this has been broken more than 2 years ago, and nobody > > >>> noticed. Doesn't this mean that we could get rid of the support for > > >>> this board entirely? :) > > >> > > >> Well, all it means is the LEDs don't blink. If the disk was not > > >> spinning, or the ethernet device missing, i would agree with you. But > > >> somebody could be using this device and don't notice the difference > > >> with the LEDs. > > > > Surely DT can manage blinking LEDs?? > > There is an additional GPIO needed. However, i think a pin hog should > allow this to be represented in DT. Two years ago, i don't think this > sort of hogging existed. I think this LED device is compatible with the leds-ns2 driver. If it is true, then the LED definition can be moved into the DT file. I'll look at that. Simon
Hi Thomas, On jeu., juin 09 2016, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > Hello, > > On Thu, 9 Jun 2016 15:31:16 +0200, Andrew Lunn wrote: >> On Thu, Jun 09, 2016 at 11:04:16AM +0100, Ben Dooks wrote: >> > Either this has been mis-converted (and needs to be fixed) or >> > is no longer referenced and can be safely removed. >> >> Hi Thomas >> >> You added this code, which Ben is removing. It does look like you >> forgot to call d2net_init() from orion5x_dt_init(). >> >> Please could you look at this. > > You are correct: d2net_init() should be called from orion5x_dt_init(), > or called through some initcall mechanism. So should we apply the patch as is or wait for the needed fix for this board? Gregory
diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig index a2af158..32897e8 100644 --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig @@ -130,13 +130,6 @@ config MACH_MV2120 Say 'Y' here if you want your kernel to support the HP Media Vault mv2120 or mv5100. -config MACH_D2NET_DT - bool "LaCie d2 Network / Big Disk Network (Flattened Device Tree)" - select ARCH_ORION5X_DT - help - Say 'Y' here if you want your kernel to support the - LaCie d2 Network NAS. - config MACH_NET2BIG bool "LaCie 2Big Network" select I2C_BOARDINFO if I2C diff --git a/arch/arm/mach-orion5x/Makefile b/arch/arm/mach-orion5x/Makefile index 4b2502b..cf0ca8b 100644 --- a/arch/arm/mach-orion5x/Makefile +++ b/arch/arm/mach-orion5x/Makefile @@ -21,6 +21,5 @@ obj-$(CONFIG_MACH_RD88F6183AP_GE) += rd88f6183ap-ge-setup.o obj-$(CONFIG_MACH_LINKSTATION_LSCHL) += ls-chl-setup.o obj-$(CONFIG_ARCH_ORION5X_DT) += board-dt.o -obj-$(CONFIG_MACH_D2NET_DT) += board-d2net.o obj-$(CONFIG_MACH_MSS2_DT) += board-mss2.o obj-$(CONFIG_MACH_RD88F5182_DT) += board-rd88f5182.o diff --git a/arch/arm/mach-orion5x/board-d2net.c b/arch/arm/mach-orion5x/board-d2net.c deleted file mode 100644 index a89376a..0000000 --- a/arch/arm/mach-orion5x/board-d2net.c +++ /dev/null @@ -1,109 +0,0 @@ -/* - * arch/arm/mach-orion5x/board-d2net.c - * - * LaCie d2Network and Big Disk Network NAS setup - * - * Copyright (C) 2009 Simon Guinot <sguinot@lacie.com> - * - * 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/pci.h> -#include <linux/irq.h> -#include <linux/leds.h> -#include <linux/gpio.h> -#include <asm/mach-types.h> -#include <asm/mach/arch.h> -#include <asm/mach/pci.h> -#include <plat/orion-gpio.h> -#include "common.h" -#include "orion5x.h" - -/***************************************************************************** - * LaCie d2 Network Info - ****************************************************************************/ - -/***************************************************************************** - * GPIO LED's - ****************************************************************************/ - -/* - * The blue front LED is wired to the CPLD and can blink in relation with the - * SATA activity. - * - * The following array detail the different LED registers and the combination - * of their possible values: - * - * led_off | blink_ctrl | SATA active | LED state - * | | | - * 1 | x | x | off - * 0 | 0 | 0 | off - * 0 | 1 | 0 | blink (rate 300ms) - * 0 | x | 1 | on - * - * Notes: The blue and the red front LED's can't be on at the same time. - * Red LED have priority. - */ - -#define D2NET_GPIO_RED_LED 6 -#define D2NET_GPIO_BLUE_LED_BLINK_CTRL 16 -#define D2NET_GPIO_BLUE_LED_OFF 23 - -static struct gpio_led d2net_leds[] = { - { - .name = "d2net:blue:sata", - .default_trigger = "default-on", - .gpio = D2NET_GPIO_BLUE_LED_OFF, - .active_low = 1, - }, - { - .name = "d2net:red:fail", - .gpio = D2NET_GPIO_RED_LED, - }, -}; - -static struct gpio_led_platform_data d2net_led_data = { - .num_leds = ARRAY_SIZE(d2net_leds), - .leds = d2net_leds, -}; - -static struct platform_device d2net_gpio_leds = { - .name = "leds-gpio", - .id = -1, - .dev = { - .platform_data = &d2net_led_data, - }, -}; - -static void __init d2net_gpio_leds_init(void) -{ - int err; - - /* Configure register blink_ctrl to allow SATA activity LED blinking. */ - err = gpio_request(D2NET_GPIO_BLUE_LED_BLINK_CTRL, "blue LED blink"); - if (err == 0) { - err = gpio_direction_output(D2NET_GPIO_BLUE_LED_BLINK_CTRL, 1); - if (err) - gpio_free(D2NET_GPIO_BLUE_LED_BLINK_CTRL); - } - if (err) - pr_err("d2net: failed to configure blue LED blink GPIO\n"); - - platform_device_register(&d2net_gpio_leds); -} - -/***************************************************************************** - * General Setup - ****************************************************************************/ - -void __init d2net_init(void) -{ - d2net_gpio_leds_init(); - - pr_notice("d2net: Flash write are not yet supported.\n"); -}
Either this has been mis-converted (and needs to be fixed) or is no longer referenced and can be safely removed. Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> --- Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Cc: Gregory Clement <gregory.clement@free-electrons.com> Cc: linux-arm-kernel@lists.infradead.org --- arch/arm/mach-orion5x/Kconfig | 7 --- arch/arm/mach-orion5x/Makefile | 1 - arch/arm/mach-orion5x/board-d2net.c | 109 ------------------------------------ 3 files changed, 117 deletions(-) delete mode 100644 arch/arm/mach-orion5x/board-d2net.c