s6gmac: xtensa s6000 on-chip ethernet driver
Subsystems (3)
PATCH 1/3 s6gmac: xtensa s6000 on-chip ethernet driver
The s6000 on-chip MAC supports 10/100/1000Mbit and is connected to an external PHY via MII or RGMII interface.
Signed-off-by Oskar Schirmer <[email protected]>
Signed-off-by Daniel Glöckner <[email protected]>
--- drivers/net/Kconfig | 11 + drivers/net/Makefile | 1 + drivers/net/s6gmac.c | 1073 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1085 insertions(+), 0 deletions(-) create mode 100644 drivers/net/s6gmac.c
drivers/net/Kconfig +11 -0
@@ -2365,6 +2365,17 @@ config JME To compile this driver as a module, choose M here. The module will be called jme. +config S6GMAC + tristate "S6105 GMAC ethernet support" + depends on XTENSA_VARIANT_S6000 + select PHYLIB + help + This driver supports the on chip ethernet device on the + S6105 xtensa processor. + + To compile this driver as a module, choose M here. The module + will be called s6gmac. + endif # NETDEV_1000 #
drivers/net/Makefile +1 -0
@@ -232,6 +232,7 @@ obj-$(CONFIG_ENC28J60) += enc28j60.o obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o obj-$(CONFIG_MACB) += macb.o +obj-$(CONFIG_S6GMAC) += s6gmac.o obj-$(CONFIG_ARM) += arm/ obj-$(CONFIG_DEV_APPLETALK) += appletalk/
drivers/net/s6gmac.c new file +1073 -0
1,073 lines not on this page · raw message
Signature · 1 line
1.6.2.107.ge47ee
PATCH 2/3 xtensa: s6105 specific configuration for s6gmac
Platform-specific configuration for the s6gmac driver, including the PHY interrupt line.
Signed-off-by Daniel Glöckner <[email protected]>
Signed-off-by Oskar Schirmer <[email protected]>
--- arch/xtensa/platforms/s6105/device.c | 91 ++++++++++++++++++++++++++++++++++ arch/xtensa/platforms/s6105/setup.c | 9 +++ 2 files changed, 100 insertions(+), 0 deletions(-)
arch/xtensa/platforms/s6105/device.c +91 -0
@@ -5,14 +5,27 @@*/ #include <linux/kernel.h> +#include <linux/gpio.h> #include <linux/init.h> +#include <linux/irq.h> +#include <linux/phy.h> #include <linux/platform_device.h> #include <linux/serial.h> #include <linux/serial_8250.h> #include <variant/hardware.h> +#include <variant/dmac.h> +#include <platform/gpio.h> + +#define GPIO3_INTNUM 3#define UART_INTNUM 4 +#define GMAC_INTNUM 5 + +static const signed char gpio3_irq_mappings[] = { +S6_INTC_GPIO (3 ), +-1 +};static const signed char uart_irq_mappings[] = {S6_INTC_UART (0 ),
@@ -20,8 +33,18 @@ static const signed char uart_irq_mappings[] = { -1, }; +static const signed char gmac_irq_mappings[] = { +S6_INTC_GMAC_STAT , +S6_INTC_GMAC_ERR , +S6_INTC_DMA_HOSTTERMCNT (0 ), +S6_INTC_DMA_HOSTTERMCNT (1 ), +-1 +}; +const signed char *platform_irq_mappings[NR_IRQS ] = { + [GPIO3_INTNUM ] = gpio3_irq_mappings, [UART_INTNUM ] = uart_irq_mappings, + [GMAC_INTNUM ] = gmac_irq_mappings, };static struct plat_serial8250_port serial_platform_data[] = {
@@ -46,6 +69,66 @@ static struct plat_serial8250_port serial_platform_data[] = { { }, }; +static struct resource s6_gmac_resource[] = { + { + .name ="mem" , + .start = (resource_size_t )S6_REG_GMAC , + .end = (resource_size_t )S6_REG_GMAC +0x10000 -1 , + .flags =IORESOURCE_MEM , + }, + { + .name ="dma" , + .start = (resource_size_t ) +DMA_CHNL (S6_REG_HIFDMA ,S6_HIFDMA_GMACTX ), + .end = (resource_size_t ) +DMA_CHNL (S6_REG_HIFDMA ,S6_HIFDMA_GMACTX ) +0x100 -1 , + .flags =IORESOURCE_DMA , + }, + { + .name ="dma" , + .start = (resource_size_t ) +DMA_CHNL (S6_REG_HIFDMA ,S6_HIFDMA_GMACRX ), + .end = (resource_size_t ) +DMA_CHNL (S6_REG_HIFDMA ,S6_HIFDMA_GMACRX ) +0x100 -1 , + .flags =IORESOURCE_DMA , + }, + { + .name ="io" , + .start = (resource_size_t )S6_MEM_GMAC , + .end = (resource_size_t )S6_MEM_GMAC +0x2000000 -1 , + .flags =IORESOURCE_IO , + }, + { + .name ="irq" , + .start = (resource_size_t )GMAC_INTNUM , + .flags =IORESOURCE_IRQ , + }, + { + .name ="irq" , + .start = (resource_size_t )PHY_POLL , + .flags =IORESOURCE_IRQ , + }, +}; + +static int __init prepare_phy_irq (int pin) +{ +int irq; +if (gpio_request (pin,"s6gmac_phy" ) <0 ) + goto fail; +if (gpio_direction_input (pin) <0 ) + goto free; + irq =gpio_to_irq (pin); +if (irq <0 ) + goto free; +if (set_irq_type (irq,IRQ_TYPE_LEVEL_LOW ) <0 ) + goto free; +return irq; +free: +gpio_free (pin); +fail: +return PHY_POLL ; +} +static struct platform_device platform_devices[] = { { .name ="serial8250" ,
@@ -54,12 +137,20 @@ static struct platform_device platform_devices[] = { .platform_data = serial_platform_data, }, }, + { + .name = "s6gmac", + .id = 0, + .resource = s6_gmac_resource, + .num_resources = ARRAY_SIZE(s6_gmac_resource), + }, };static int __init device_init (void ) {int i; + s6_gmac_resource[5 ].start =prepare_phy_irq (GPIO_PHY_IRQ ); +for (i =0 ; i <ARRAY_SIZE (platform_devices); i++)platform_device_register (&platform_devices[i]);return 0 ;
arch/xtensa/platforms/s6105/setup.c +9 -0
@@ -35,12 +35,21 @@ void __init platform_setup(char **cmdline) {unsigned long reg; + reg =readl (S6_REG_GREG1 +S6_GREG1_PLLSEL ); + reg &= ~(S6_GREG1_PLLSEL_GMAC_MASK <<S6_GREG1_PLLSEL_GMAC | +S6_GREG1_PLLSEL_GMII_MASK <<S6_GREG1_PLLSEL_GMII ); + reg |=S6_GREG1_PLLSEL_GMAC_125MHZ <<S6_GREG1_PLLSEL_GMAC | +S6_GREG1_PLLSEL_GMII_125MHZ <<S6_GREG1_PLLSEL_GMII ; +writel (reg,S6_REG_GREG1 +S6_GREG1_PLLSEL ); + reg =readl (S6_REG_GREG1 +S6_GREG1_CLKGATE ); reg &= ~(1 <<S6_GREG1_BLOCK_SB ); + reg &= ~(1 <<S6_GREG1_BLOCK_GMAC );writel (reg,S6_REG_GREG1 +S6_GREG1_CLKGATE ); reg =readl (S6_REG_GREG1 +S6_GREG1_BLOCKENA ); reg |=1 <<S6_GREG1_BLOCK_SB ; + reg |=1 <<S6_GREG1_BLOCK_GMAC ;writel (reg,S6_REG_GREG1 +S6_GREG1_BLOCKENA ); printk(KERN_NOTICE "S6105 on Stretch S6000 - "
Signature · 1 line
1.6.2.107.ge47ee
PATCH 3/3 xtensa: enable s6gmac in s6105_defconfig
In reply to Oskar SchirmerFrom: Daniel Glöckner <[email protected]>
Signed-off-by Daniel Glöckner <[email protected]>
--- arch/xtensa/configs/s6105_defconfig | 49 ++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-)
arch/xtensa/configs/s6105_defconfig +48 -1
@@ -264,7 +264,54 @@ CONFIG_HAVE_IDE=y # CONFIG_SCSI_NETLINK is not set # CONFIG_ATA is not set # CONFIG_MD is not set -# CONFIG_NETDEVICES is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +CONFIG_SMSC_PHY=y +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +# CONFIG_NET_ETHERNET is not set +CONFIG_NETDEV_1000=y +CONFIG_S6GMAC=y +# CONFIG_NETDEV_10000 is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set +# CONFIG_IWLWIFI_LEDS is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# +# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_ISDN is not set # CONFIG_PHONE is not set
Signature · 1 line
1.6.2.107.ge47ee