From patchwork Thu Nov 14 23:21:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 3185701 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 71701C045B for ; Thu, 14 Nov 2013 22:21:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2DE7A20944 for ; Thu, 14 Nov 2013 22:21:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E607A20942 for ; Thu, 14 Nov 2013 22:21:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756408Ab3KNWVE (ORCPT ); Thu, 14 Nov 2013 17:21:04 -0500 Received: from mail-la0-f41.google.com ([209.85.215.41]:37653 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757572Ab3KNWVD (ORCPT ); Thu, 14 Nov 2013 17:21:03 -0500 Received: by mail-la0-f41.google.com with SMTP id hp15so2160966lab.0 for ; Thu, 14 Nov 2013 14:21:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:organization:to:subject:date:user-agent:cc :references:in-reply-to:mime-version:content-type :content-transfer-encoding:message-id; bh=bkYyIaMnGagWNetcFOB1WF5UuHsnopPy7qYNBHNmur4=; b=ZtAXhSwlY6ZmahATq6z2O0QCrIz8CsMRW/MtiCg2/21DqwNolgLRj7awnblO8GhGxy yu+UduOTQ+mxa9ghI79000u5sHKh3SyLm8pv/J73+sukpnUGXoFuytc8BRIz1yRbjdIf r4bT7W36fE7D27/js2ZE9MW69kbOa179PG7Nz1dW6+LlfMrkpJYUa4LA7Cb7yo02zdnh 3zgWLO8+uF2CiwV1+WQDbWgVZS5d2d5YuhKqZqx8mPa4FZ3zPLqLRZwVOt9qSPqmb7Ph X9nDl2kqMCtXgzxgP/3SEsO39jyRg2ZYy9OgA3uc1Gavmo+qIUHqVXO4CDZSEqvTvgAj hZBQ== X-Gm-Message-State: ALoCoQmg2oT1XvhRyd3VzXf6HjG2j1/yYT1GBTSISn9UsuqbScPyxOYzJREMIzcv22dWmRKgwCS8 X-Received: by 10.112.13.72 with SMTP id f8mr1993685lbc.40.1384467661903; Thu, 14 Nov 2013 14:21:01 -0800 (PST) Received: from wasted.dev.rtsoft.ru (ppp83-237-55-178.pppoe.mtu-net.ru. [83.237.55.178]) by mx.google.com with ESMTPSA id x2sm4890361lae.4.2013.11.14.14.21.01 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 14 Nov 2013 14:21:01 -0800 (PST) From: Sergei Shtylyov Organization: Cogent Embedded To: horms@verge.net.au, linux-sh@vger.kernel.org Subject: [PATCH v2 2/3] ARM: shmobile: Koelsch: add Ether support Date: Fri, 15 Nov 2013 02:21:11 +0300 User-Agent: KMail/1.13.5 (Linux/2.6.32.26-175.fc12.i686.PAE; KDE/4.4.5; i686; ; ) Cc: magnus.damm@gmail.com, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org References: <201311150217.23563.sergei.shtylyov@cogentembedded.com> In-Reply-To: <201311150217.23563.sergei.shtylyov@cogentembedded.com> MIME-Version: 1.0 Message-Id: <201311150221.12125.sergei.shtylyov@cogentembedded.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Register Ether platform device and pin data on the Koelsch board. Register platform fixup for Micrel KSZ8041 PHY, just like on the Lager board. Signed-off-by: Sergei Shtylyov --- Changes in version 2: - added *if* (IS_ENABLED(CONFIG_PHYLIB)) around phy_register_fixup_for_id() call; - changed Ether device name to "r8a779x-ether". arch/arm/mach-shmobile/board-koelsch.c | 63 ++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: renesas/arch/arm/mach-shmobile/board-koelsch.c =================================================================== --- renesas.orig/arch/arm/mach-shmobile/board-koelsch.c +++ renesas/arch/arm/mach-shmobile/board-koelsch.c @@ -24,14 +24,31 @@ #include #include #include +#include +#include #include #include +#include #include +#include #include #include #include #include +/* Ether */ +static const struct sh_eth_plat_data ether_pdata __initconst = { + .phy = 0x1, + .edmac_endian = EDMAC_LITTLE_ENDIAN, + .phy_interface = PHY_INTERFACE_MODE_RMII, + .ether_link_active_low = 1, +}; + +static const struct resource ether_resources[] __initconst = { + DEFINE_RES_MEM(0xee700000, 0x400), + DEFINE_RES_IRQ(gic_spi(162)), +}; + /* LEDS */ static struct gpio_led koelsch_leds[] = { { @@ -71,11 +88,29 @@ static const struct gpio_keys_platform_d .nbuttons = ARRAY_SIZE(gpio_buttons), }; +static const struct pinctrl_map koelsch_pinctrl_map[] = { + /* Ether */ + PIN_MAP_MUX_GROUP_DEFAULT("r8a779x-ether", "pfc-r8a7791", + "eth_link", "eth"), + PIN_MAP_MUX_GROUP_DEFAULT("r8a779x-ether", "pfc-r8a7791", + "eth_mdio", "eth"), + PIN_MAP_MUX_GROUP_DEFAULT("r8a779x-ether", "pfc-r8a7791", + "eth_rmii", "eth"), +}; + static void __init koelsch_add_standard_devices(void) { r8a7791_clock_init(); + + pinctrl_register_mappings(koelsch_pinctrl_map, + ARRAY_SIZE(koelsch_pinctrl_map)); r8a7791_pinmux_init(); + r8a7791_add_standard_devices(); + platform_device_register_resndata(&platform_bus, "r8a779x-ether", -1, + ether_resources, + ARRAY_SIZE(ether_resources), + ðer_pdata, sizeof(ether_pdata)); platform_device_register_data(&platform_bus, "leds-gpio", -1, &koelsch_leds_pdata, sizeof(koelsch_leds_pdata)); @@ -84,6 +119,32 @@ static void __init koelsch_add_standard_ sizeof(koelsch_keys_pdata)); } +/* + * Ether LEDs on the Koelsch board are named LINK and ACTIVE which corresponds + * to non-default 01 setting of the Micrel KSZ8041 PHY control register 1 bits + * 14-15. We have to set them back to 01 from the default 00 value each time + * the PHY is reset. It's also important because the PHY's LED0 signal is + * connected to SoC's ETH_LINK signal and in the PHY's default mode it will + * bounce on and off after each packet, which we apparently want to avoid. + */ +static int koelsch_ksz8041_fixup(struct phy_device *phydev) +{ + u16 phyctrl1 = phy_read(phydev, 0x1e); + + phyctrl1 &= ~0xc000; + phyctrl1 |= 0x4000; + return phy_write(phydev, 0x1e, phyctrl1); +} + +static void __init koelsch_init(void) +{ + koelsch_add_standard_devices(); + + if (IS_ENABLED(CONFIG_PHYLIB)) + phy_register_fixup_for_id("r8a779x-ether-ff:01", + koelsch_ksz8041_fixup); +} + static const char * const koelsch_boards_compat_dt[] __initconst = { "renesas,koelsch", NULL, @@ -92,7 +153,7 @@ static const char * const koelsch_boards DT_MACHINE_START(KOELSCH_DT, "koelsch") .smp = smp_ops(r8a7791_smp_ops), .init_early = r8a7791_init_early, - .init_machine = koelsch_add_standard_devices, + .init_machine = koelsch_init, .init_time = rcar_gen2_timer_init, .dt_compat = koelsch_boards_compat_dt, MACHINE_END