From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] ARM: shmobile: Koelsch: add Ether support Date: Wed, 30 Oct 2013 22:20:06 +0000 [thread overview] Message-ID: <201310310219.58963.sergei.shtylyov@cogentembedded.com> (raw) In-Reply-To: <201310310216.28673.sergei.shtylyov@cogentembedded.com> 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 <sergei.shtylyov@cogentembedded.com> --- arch/arm/mach-shmobile/board-koelsch.c | 61 ++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) 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 <linux/input.h> #include <linux/kernel.h> #include <linux/leds.h> +#include <linux/phy.h> +#include <linux/pinctrl/machine.h> #include <linux/platform_data/gpio-rcar.h> #include <linux/platform_device.h> +#include <linux/sh_eth.h> #include <mach/common.h> +#include <mach/irqs.h> #include <mach/r8a7791.h> #include <mach/rcar-gen2.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> +/* 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[] = { { @@ -70,11 +87,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("r8a7790-ether", "pfc-r8a7791", + "eth_link", "eth"), + PIN_MAP_MUX_GROUP_DEFAULT("r8a7790-ether", "pfc-r8a7791", + "eth_mdio", "eth"), + PIN_MAP_MUX_GROUP_DEFAULT("r8a7790-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, "r8a7790-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)); @@ -83,6 +118,30 @@ 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(); + + phy_register_fixup_for_id("r8a7790-ether-ff:01", koelsch_ksz8041_fixup); +} + static const char * const koelsch_boards_compat_dt[] __initconst = { "renesas,koelsch", NULL, @@ -91,7 +150,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
WARNING: multiple messages have this Message-ID (diff)
From: sergei.shtylyov@cogentembedded.com (Sergei Shtylyov) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] ARM: shmobile: Koelsch: add Ether support Date: Thu, 31 Oct 2013 02:19:58 +0300 [thread overview] Message-ID: <201310310219.58963.sergei.shtylyov@cogentembedded.com> (raw) In-Reply-To: <201310310216.28673.sergei.shtylyov@cogentembedded.com> 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 <sergei.shtylyov@cogentembedded.com> --- arch/arm/mach-shmobile/board-koelsch.c | 61 ++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) 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 <linux/input.h> #include <linux/kernel.h> #include <linux/leds.h> +#include <linux/phy.h> +#include <linux/pinctrl/machine.h> #include <linux/platform_data/gpio-rcar.h> #include <linux/platform_device.h> +#include <linux/sh_eth.h> #include <mach/common.h> +#include <mach/irqs.h> #include <mach/r8a7791.h> #include <mach/rcar-gen2.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> +/* 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[] = { { @@ -70,11 +87,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("r8a7790-ether", "pfc-r8a7791", + "eth_link", "eth"), + PIN_MAP_MUX_GROUP_DEFAULT("r8a7790-ether", "pfc-r8a7791", + "eth_mdio", "eth"), + PIN_MAP_MUX_GROUP_DEFAULT("r8a7790-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, "r8a7790-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)); @@ -83,6 +118,30 @@ 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(); + + phy_register_fixup_for_id("r8a7790-ether-ff:01", koelsch_ksz8041_fixup); +} + static const char * const koelsch_boards_compat_dt[] __initconst = { "renesas,koelsch", NULL, @@ -91,7 +150,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
next prev parent reply other threads:[~2013-10-30 22:20 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-10-30 22:16 [PATCH 0/2] Add Ether support for R8A7791/Koelsch board Sergei Shtylyov 2013-10-30 23:16 ` Sergei Shtylyov 2013-10-30 22:18 ` [PATCH 1/2] ARM: shmobile: r8a7791: add Ether clock Sergei Shtylyov 2013-10-30 23:18 ` Sergei Shtylyov 2013-10-31 6:06 ` Simon Horman 2013-10-31 6:06 ` Simon Horman 2013-10-31 20:50 ` Sergei Shtylyov 2013-10-31 21:50 ` Sergei Shtylyov 2013-11-01 6:29 ` Simon Horman 2013-11-01 6:29 ` Simon Horman 2013-12-19 17:59 ` [PATCH 1/2] arm: shmobile: r8a7791: Add SATA clocks Valentine Barshak 2014-01-09 8:25 ` Simon Horman 2014-02-06 21:12 ` [PATCH 1/2] ARM: shmobile: r8a7791: add Ether DT support Sergei Shtylyov 2014-02-06 22:12 ` Sergei Shtylyov 2014-02-06 22:12 ` Sergei Shtylyov 2014-02-10 12:54 ` Ben Dooks 2014-02-10 12:54 ` Ben Dooks 2014-02-10 12:54 ` Ben Dooks 2014-02-10 13:24 ` Sergei Shtylyov 2014-02-10 13:24 ` Sergei Shtylyov 2014-02-10 13:24 ` Sergei Shtylyov 2014-05-29 11:05 ` [PATCH 1/2] arm: shmobile: r8a7791: add USB3.0 clocks to device tree Yoshihiro Shimoda 2014-05-29 11:05 ` Yoshihiro Shimoda 2014-05-29 11:05 ` Yoshihiro Shimoda 2013-10-30 22:20 ` Sergei Shtylyov [this message] 2013-10-30 23:19 ` [PATCH 2/2] ARM: shmobile: Koelsch: add Ether support Sergei Shtylyov 2013-10-31 5:02 ` Simon Horman 2013-10-31 5:02 ` Simon Horman 2013-10-31 20:25 ` Sergei Shtylyov 2013-10-31 21:24 ` Sergei Shtylyov 2013-10-31 8:06 ` Magnus Damm 2013-10-31 8:06 ` Magnus Damm 2013-10-31 18:03 ` Sergei Shtylyov 2013-10-31 19:03 ` Sergei Shtylyov 2013-12-09 18:58 ` Sergei Shtylyov 2013-12-09 19:57 ` Sergei Shtylyov 2013-12-09 21:14 ` Sergei Shtylyov 2013-12-09 22:14 ` Sergei Shtylyov 2013-12-18 20:23 ` Sergei Shtylyov 2013-12-18 21:23 ` Sergei Shtylyov 2013-10-31 8:10 ` Magnus Damm 2013-10-31 8:10 ` Magnus Damm 2013-10-31 18:47 ` Sergei Shtylyov 2013-10-31 19:46 ` Sergei Shtylyov 2013-12-19 17:59 ` [PATCH 2/2] arm: shmobile: koelsch: Add SATA support Valentine Barshak 2014-11-11 4:37 ` [PATCH 2/2] ARM: shmobile: koelsch: add Volume Ramp usage on comment Kuninori Morimoto
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=201310310219.58963.sergei.shtylyov@cogentembedded.com \ --to=sergei.shtylyov@cogentembedded.com \ --cc=linux-arm-kernel@lists.infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.