From patchwork Fri Jun 10 06:00:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Linz X-Patchwork-Id: 633545 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rQs6F6fnqz9sdQ for ; Fri, 10 Jun 2016 16:03:01 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=li-pro.net header.i=@li-pro.net header.b=tHx6ynVq; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932219AbcFJGCi (ORCPT ); Fri, 10 Jun 2016 02:02:38 -0400 Received: from mo4-p00-ob.smtp.rzone.de ([81.169.146.221]:11355 "EHLO mo4-p00-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752289AbcFJGCh (ORCPT ); Fri, 10 Jun 2016 02:02:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1465538554; l=1353; s=domk; d=li-pro.net; h=References:In-Reply-To:Date:Subject:Cc:To:From; bh=8EmxnOI5dOaKqHGjl3D1UDyCKFHK/F8MkjCquYuJaCg=; b=tHx6ynVqSdLKNB209a0voUhZPFzbv+ZHkd31IlmfKcM056qFUeeHUs15CJMU8eNb1Dz CoGZJpuFdmMr3BppWTfHWBg3ehVZgzZAwFZEqjxuP/z8Bi38iRUYR41k2OyMx/dmLs/c6 c0vRbVgK8UIqgJ5tWgDcbxulqOGLTZcryQc= X-RZG-AUTH: :IGUKb2CkcrLHmZv+FHarxbxlXmVV62wuQa970vlgN/Vm4aURpaOv9ql7EmfwzQ== X-RZG-CLASS-ID: mo00 Received: from li-pro.net (p54B1609A.dip0.t-ipconnect.de [84.177.96.154]) by smtp.strato.de (RZmta 38.2 DYNA|AUTH) with ESMTPSA id t07466s5A62SPJU (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Fri, 10 Jun 2016 08:02:28 +0200 (CEST) From: Stephan Linz To: linux-leds@vger.kernel.org, linux-ide@vger.kernel.org Cc: Stephan Linz , Guan Xuetao , linux-kernel@vger.kernel.org Subject: [PATCH v4 7/7] unicore32: use the new LED disk activity trigger Date: Fri, 10 Jun 2016 08:00:02 +0200 Message-Id: <20160610060021.12382-7-linz@li-pro.net> X-Mailer: git-send-email 2.8.4 In-Reply-To: <20160610060021.12382-1-linz@li-pro.net> References: <20160610060021.12382-1-linz@li-pro.net> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org - platform: rename 'ide-disk' to 'disk-activity' - defconfig: rename 'LEDS_TRIGGER_IDE_DISK' to 'LEDS_TRIGGER_DISK' Signed-off-by: Stephan Linz Acked-by: GUAN Xuetao --- arch/unicore32/configs/unicore32_defconfig | 2 +- arch/unicore32/kernel/gpio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/unicore32/configs/unicore32_defconfig b/arch/unicore32/configs/unicore32_defconfig index 45f47f8..aebd01f 100644 --- a/arch/unicore32/configs/unicore32_defconfig +++ b/arch/unicore32/configs/unicore32_defconfig @@ -161,7 +161,7 @@ CONFIG_LEDS_GPIO=y # LED Triggers CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_IDE_DISK=y +CONFIG_LEDS_TRIGGER_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y # Real Time Clock diff --git a/arch/unicore32/kernel/gpio.c b/arch/unicore32/kernel/gpio.c index 49347a0..bf164bb 100644 --- a/arch/unicore32/kernel/gpio.c +++ b/arch/unicore32/kernel/gpio.c @@ -27,7 +27,7 @@ static const struct gpio_led puv3_gpio_leds[] = { { .name = "cpuhealth", .gpio = GPO_CPU_HEALTH, .active_low = 0, .default_trigger = "heartbeat", }, { .name = "hdd_led", .gpio = GPO_HDD_LED, .active_low = 1, - .default_trigger = "ide-disk", }, + .default_trigger = "disk-activity", }, }; static const struct gpio_led_platform_data puv3_gpio_led_data = {