From patchwork Thu Aug 4 09:06:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1663597 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=QXT6Zcvl; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lz2sz5Krbz9s2R for ; Thu, 4 Aug 2022 19:07:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 05AE9847EC; Thu, 4 Aug 2022 11:06:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QXT6Zcvl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 004BD847EB; Thu, 4 Aug 2022 11:06:49 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 58B288461A for ; Thu, 4 Aug 2022 11:06:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=judge.packham@gmail.com Received: by mail-pf1-x42e.google.com with SMTP id h28so12456801pfq.11 for ; Thu, 04 Aug 2022 02:06:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=8yAXhDGajCBA05FfOWOmF6SuoGDFr4g+mbIuwUky6U4=; b=QXT6ZcvlKYeMZp80H0IymMBIsbX0sHtcjJwYTg2hqJmU2RrQ1sy9IWtXJGTvINk3+N 1kIKacp/diEkuwUsGAb7wCEOMzOjxTWl8TJpbAu0puVSimbZzvPkmImFWIY8JhHEK/Dn +9kFSjomNzWbX10cWXIWAjJE9F87H44RIN9QZtzAwI3klqFE78lyjgIhtyzaEjkb4tt3 RQoCZXj0AqIyliKHSobwGsYQ0B2hg/jrE+he0j9Jt26IDugXS8NcCo0bDSPdPwB8kSCa MoEFBZ+mrv1kLoyPlpNYeBbeBIMpHwMjWHErAD+YpKFg3WuCsXhqSzx62Js26B470voC 6Fug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=8yAXhDGajCBA05FfOWOmF6SuoGDFr4g+mbIuwUky6U4=; b=fhehhVoqGU/ddy/wgGoNkIr7XO2wuGhBqEw+o/c6JemxbBjr8cSzBNHGMZHYglE9/e FlQ8P8MkRqVG7AQoYjznLhM+0D10zNKAEPxJAHVnkpPH4zvHb1gI/VRgiVsQ3CfHs3EX fTDuIkSnWoqBp84vgDzTOIxfzsVhMeBzPvxKlyKcFyMQ/aszRD+aofrMHS0XQvAj5AKC i7ZdSMNtRtWlsQmmk/VOvwEzzQGLh84swd2EXUsp01kCKndyADjpiZcC3yYfJ0azIfoo o63OUVaDmnRllF37QABJ0+DjkifXnA/e8ZgAv+kvV+026B9GPloALgJi03Q0XKdeLB1S 77eQ== X-Gm-Message-State: ACgBeo2hIgkyhg9CmbXFe8Jafjf8OBVqUneKButcX37UlNcp3yIh7kQU Gp/Ccwx9TJOTc9vorENZvvcXXguRnS/llw== X-Google-Smtp-Source: AA6agR4m5DuZvYtPnlaheVX6oLDFXs3qRt9bAbtRDqYHlBONo3KKeS0bLCGJIqpLqL8Mf3Tjd6HLhQ== X-Received: by 2002:a63:346:0:b0:41b:dae4:8a7b with SMTP id 67-20020a630346000000b0041bdae48a7bmr846300pgd.145.1659604001007; Thu, 04 Aug 2022 02:06:41 -0700 (PDT) Received: from chrisp-dl.atlnz.lc ([2001:df5:b000:22:c438:8b97:a371:7f07]) by smtp.gmail.com with ESMTPSA id 12-20020a170902c10c00b0016bb24f5d19sm314660pli.209.2022.08.04.02.06.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 02:06:40 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Cc: Chris Packham , Chris Packham , Stefan Roese , Tom Rini Subject: [PATCH 1/6] ARM: kirkwood: SBx81LIFKW: remove direct access of GPIO registers Date: Thu, 4 Aug 2022 21:06:23 +1200 Message-Id: <20220804090629.75183-2-judge.packham@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220804090629.75183-1-judge.packham@gmail.com> References: <20220804090629.75183-1-judge.packham@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Replace code that accessed the GPIO registers directly with code that makes use of the LED_GPIO driver. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- arch/arm/dts/kirkwood-atl-sbx81lifkw.dts | 14 ++++++ board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c | 50 +++++---------------- configs/SBx81LIFKW_defconfig | 2 + 3 files changed, 27 insertions(+), 39 deletions(-) diff --git a/arch/arm/dts/kirkwood-atl-sbx81lifkw.dts b/arch/arm/dts/kirkwood-atl-sbx81lifkw.dts index 4ae74f4316e5..3837c8f77fe2 100644 --- a/arch/arm/dts/kirkwood-atl-sbx81lifkw.dts +++ b/arch/arm/dts/kirkwood-atl-sbx81lifkw.dts @@ -70,6 +70,20 @@ }; }; }; + + gpio-leds { + compatible = "gpio-leds"; + + ledn { + label = "status:ledn"; + gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; + }; + + ledp { + label = "status:ledp"; + gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>; + }; + }; }; &spi0 { diff --git a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c index d8b9fdfe356f..feb8b6b83f00 100644 --- a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c +++ b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -41,41 +41,6 @@ DECLARE_GLOBAL_DATA_PTR; -struct led { - u32 reg; - u32 value; - u32 mask; -}; - -struct led amber_solid = { - MVEBU_GPIO0_BASE, - BIT(10), - BIT(18) | BIT(10) -}; - -struct led green_solid = { - MVEBU_GPIO0_BASE, - BIT(18) | BIT(10), - BIT(18) | BIT(10) -}; - -struct led amber_flash = { - MVEBU_GPIO0_BASE, - 0, - BIT(18) | BIT(10) -}; - -struct led green_flash = { - MVEBU_GPIO0_BASE, - BIT(18), - BIT(18) | BIT(10) -}; - -static void status_led_set(struct led *led) -{ - clrsetbits_le32(led->reg, led->mask, led->value); -} - int board_early_init_f(void) { /* @@ -165,8 +130,6 @@ int board_init(void) /* address of boot parameters */ gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100; - status_led_set(&amber_solid); - return 0; } @@ -196,7 +159,16 @@ int mv88e61xx_hw_reset(struct phy_device *phydev) #ifdef CONFIG_MISC_INIT_R int misc_init_r(void) { - status_led_set(&green_flash); + struct udevice *dev; + int ret; + + ret = led_get_by_label("status:ledp", &dev); + if (!ret) + led_set_state(dev, LEDST_ON); + + ret = led_get_by_label("status:ledn", &dev); + if (!ret) + led_set_state(dev, LEDST_OFF); return 0; } diff --git a/configs/SBx81LIFKW_defconfig b/configs/SBx81LIFKW_defconfig index f186f247eb63..90800e2dd3ee 100644 --- a/configs/SBx81LIFKW_defconfig +++ b/configs/SBx81LIFKW_defconfig @@ -46,6 +46,8 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_MVTWSI=y CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y +CONFIG_LED=y +CONFIG_LED_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y