From patchwork Mon Jun 29 21:03:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karsten Merker X-Patchwork-Id: 489425 X-Patchwork-Delegate: hdegoede@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id D7AFD14077E for ; Tue, 30 Jun 2015 07:04:47 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C397B4B667; Mon, 29 Jun 2015 23:04:45 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bUFNjNqamAme; Mon, 29 Jun 2015 23:04:45 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 51D6B4B65F; Mon, 29 Jun 2015 23:04:45 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D5CD14B65F for ; Mon, 29 Jun 2015 23:04:42 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dOHft_mhHclG for ; Mon, 29 Jun 2015 23:04:42 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.131]) by theia.denx.de (Postfix) with ESMTPS id AE32A4B652 for ; Mon, 29 Jun 2015 23:04:37 +0200 (CEST) Received: from excalibur.cnev.de ([84.44.151.215]) by mrelayeu.kundenserver.de (mreue005) with ESMTPSA (Nemesis) id 0MOmRO-1Z6unk2BSo-0063NS; Mon, 29 Jun 2015 23:04:26 +0200 Received: from localhost ([127.0.0.1] helo=excalibur.cnev.de) by excalibur.cnev.de with esmtp (Exim 4.84) (envelope-from ) id 1Z9gE5-0005gs-Ez; Mon, 29 Jun 2015 23:04:25 +0200 From: Karsten Merker To: Hans De Goede , Ian Campbell Date: Mon, 29 Jun 2015 23:03:20 +0200 Message-Id: <1435611800-21833-1-git-send-email-merker@debian.org> X-Mailer: git-send-email 2.1.4 X-Provags-ID: V03:K0:Q1bHZ4sE6gt0k2RQMWINVGU9dhnxLsztoqildWLQ7NiUpH39c3y BhOExyof1aXi+21GOjIT05dYt5jGzKJiq3ujvSoodcoWZdyWK4EZzBKqeG/ocKuCqoJfVEF hGymLLiUcUQ1O02v4Os1zUThmM6aLXKs1nW5Yj8VTx/vXYj3cdV7du1aDoBMgyWy64VHtkh gGjEO5ChBKKe9PtesgmvQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:D4UsYFDDWJs=:TQuu2MC6tDY4/q3UEd2ILK 2C3m6/8Vs5DDy517eG7KiNcxC+0eaWy7EFiRYQbml2RgClvcDbAmC8oVhB1wPozuhKX2rjGyt Q/vH5aZ9E30Gw8kAiS7USv2oTbCNgAIorF4fuvsFFOxNTA2X4J9F9DIUNrOQY944t2kYWH8x9 By/1pR3IWl8/lqZ/EZOyX7QiCVl+j0eCuYfj6QmRGY6rLivHfXYH6Kyc72YZbN2lfiJHZ0trA 13kO0qaCpBkkOOReRAk3VXL2iPP/Q9TdVhfob3eKo0kJuloi8q0QGLVHp1i5T66HDoUeC+KSt WXXqR9uRjldFCs1XRNc4h7v99ym9NoV/4RWRVsxost55QOwAmR6w0YKEKm0nrb3d4sq0OlYXD 5C1NtjF2dZbNT1HkdieNHx0lfQivBXFT9Jh4mAmXf3upqxiROW0owGhTyKGLpa4st8bC9fZb1 GTUMydJbGyPwosL0FCwKgmV4Toq04G4wOLcPJf71oQQKBKJ2+ctuS3O5JGnggBn2IvjtUBA6D gpMv9CPSRiYVuBZ+lGtawhXwZWqMLjZy7DRwKAZ9cz5Op+a94y4vKqkj1oOqbkTx59N9Ea+fn wkGHwV96pRb9dhXhgb/9/uwG+NCqcyA8F/wt/R5QeO8vDrrVRG26+tuUMhp2pcvm41SbaSRmm JuzMajEhepPvcGU3Z46lCF4SDvPWtIOLULM1pzlFL/z9tQw== Cc: Karsten Merker , u-boot@lists.denx.de Subject: [U-Boot] [PATCH] sunxi: Fix wrong pinmux names in arch/arm/cpu/armv7/sunxi/board.c X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Commit 487b3277d4f70bcb2e4a1930beb6438565f25910 (sunxi: GPIO pin mux hardware-feature-specific function index defines) has removed and/or changed the names of various pinmux definitions, but has missed two instances in arch/arm/cpu/armv7/sunxi/board.c that still refer to the old-style names, which can now no longer be resolved. Use the new-style pinmux names instead. Signed-off-by: Karsten Merker --- arch/arm/cpu/armv7/sunxi/board.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c index 0344362..1c26865 100644 --- a/arch/arm/cpu/armv7/sunxi/board.c +++ b/arch/arm/cpu/armv7/sunxi/board.c @@ -45,11 +45,11 @@ static int gpio_init(void) sunxi_gpio_set_cfgpin(SUNXI_GPB(23), SUNXI_GPIO_INPUT); #endif #if defined(CONFIG_MACH_SUN8I) - sunxi_gpio_set_cfgpin(SUNXI_GPF(2), SUN8I_GPF_UART0_TX); - sunxi_gpio_set_cfgpin(SUNXI_GPF(4), SUN8I_GPF_UART0_RX); + sunxi_gpio_set_cfgpin(SUNXI_GPF(2), SUN8I_GPF_UART0); + sunxi_gpio_set_cfgpin(SUNXI_GPF(4), SUN8I_GPF_UART0); #else - sunxi_gpio_set_cfgpin(SUNXI_GPF(2), SUNXI_GPF_UART0_TX); - sunxi_gpio_set_cfgpin(SUNXI_GPF(4), SUNXI_GPF_UART0_RX); + sunxi_gpio_set_cfgpin(SUNXI_GPF(2), SUNXI_GPF_UART0); + sunxi_gpio_set_cfgpin(SUNXI_GPF(4), SUNXI_GPF_UART0); #endif sunxi_gpio_set_pull(SUNXI_GPF(4), 1); #elif CONFIG_CONS_INDEX == 1 && (defined(CONFIG_MACH_SUN4I) || defined(CONFIG_MACH_SUN7I))