From patchwork Wed Sep 18 07:13:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Krzysztof_Ha=C5=82asa?= X-Patchwork-Id: 275610 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C7C052C009A for ; Wed, 18 Sep 2013 17:14:52 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VMBy0-00011E-Pu; Wed, 18 Sep 2013 07:14:29 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VMBxy-0001a6-K4; Wed, 18 Sep 2013 07:14:26 +0000 Received: from ni.piap.pl ([195.187.100.4]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VMBxu-0001Yz-8y for linux-arm-kernel@lists.infradead.org; Wed, 18 Sep 2013 07:14:23 +0000 Received: from ni.piap.pl (localhost.localdomain [127.0.0.1]) by ni.piap.pl (Postfix) with ESMTP id 817B5440DAE for ; Wed, 18 Sep 2013 09:13:55 +0200 (CEST) Received: by ni.piap.pl (Postfix, from userid 1015) id 7CA98440DAF; Wed, 18 Sep 2013 09:13:55 +0200 (CEST) From: khalasa@piap.pl (Krzysztof =?utf-8?Q?Ha=C5=82asa?=) To: linux-arm-kernel@lists.infradead.org Date: Wed, 18 Sep 2013 09:13:55 +0200 MIME-Version: 1.0 Message-ID: Subject: [PATCH] IXP4xx: Add Gateworks Cambria support. X-Anti-Virus: Kaspersky Anti-Virus for Linux Mail Server 5.6.44/RELEASE, bases: 20130918 #11078514, check: 20130918 clean X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130918_031422_539225_462DB780 X-CRM114-Status: GOOD ( 12.24 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Signed-off-by: Krzysztof Hałasa diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig index 676e144..70c5cb9 100644 --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig @@ -25,6 +25,14 @@ config MACH_AVILA Avila Network Platform. For more information on this platform, see . +config MACH_CAMBRIA + bool "Cambria" + select PCI + help + Say 'Y' here if you want your kernel to support the Gateworks + Cambria GW2350 board. For more information on this platform, + see . + config MACH_LOFT bool "Loft" depends on MACH_AVILA @@ -158,7 +166,7 @@ config CPU_IXP46X config CPU_IXP43X bool - depends on MACH_KIXRP435 + depends on MACH_KIXRP435 || MACH_CAMBRIA default y config MACH_GTWX5715 diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile index eded94c..a7aa6a5 100644 --- a/arch/arm/mach-ixp4xx/Makefile +++ b/arch/arm/mach-ixp4xx/Makefile @@ -23,6 +23,7 @@ obj-y += common.o obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-setup.o obj-$(CONFIG_MACH_AVILA) += avila-setup.o +obj-$(CONFIG_MACH_CAMBRIA) += cambria.o obj-$(CONFIG_MACH_IXDPG425) += coyote-setup.o obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o diff --git a/arch/arm/mach-ixp4xx/cambria.c b/arch/arm/mach-ixp4xx/cambria.c new file mode 100644 index 0000000..30ddfe0 --- /dev/null +++ b/arch/arm/mach-ixp4xx/cambria.c @@ -0,0 +1,245 @@ +/* + * Gateworks Cambria GW2350 platform support + * Portions based on OpenWRT. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static struct platform_device cambria_flash = { + .name = "IXP4XX-Flash", + .id = 0, + .num_resources = 1, + .resource = &(struct resource) { + .start = IXP4XX_EXP_BUS_BASE(0), + .end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1, + .flags = IORESOURCE_MEM, + }, + .dev.platform_data = &(struct flash_platform_data) { + .map_name = "cfi_probe", + .width = 2, + }, +}; + +static struct platform_device cambria_i2c = { + .name = "i2c-gpio", + .id = 0, + .dev.platform_data = &(struct i2c_gpio_platform_data) { + .sda_pin = 7, + .scl_pin = 6, + }, +}; + +static struct eth_plat_info cambria_eth0_pdata = { + .phy = 1, + .rxq = 4, + .txreadyq = 21, +}; + +static struct eth_plat_info cambria_eth1_pdata = { + .phy = 2, + .rxq = 2, + .txreadyq = 19, +}; + +static struct platform_device cambria_eth0 = { + .name = "ixp4xx_eth", + .id = IXP4XX_ETH_NPEC, + .dev.platform_data = &cambria_eth0_pdata, +}; + +static struct platform_device cambria_eth1 = { + .name = "ixp4xx_eth", + .id = IXP4XX_ETH_NPEA, + .dev.platform_data = &cambria_eth1_pdata, +}; + +static struct platform_device cambria_uart = { + .name = "serial8250", + .id = PLAT8250_DEV_PLATFORM, + .num_resources = 1, + .resource = &(struct resource) { + .start = IXP4XX_UART1_BASE_PHYS, + .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, + .flags = IORESOURCE_MEM, + }, + .dev.platform_data = (struct plat_serial8250_port[]) { + { + .mapbase = IXP4XX_UART1_BASE_PHYS, + .membase = (char __iomem *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, + .irq = IRQ_IXP4XX_UART1, + .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, + .iotype = UPIO_MEM, + .regshift = 2, + .uartclk = IXP4XX_UART_XTAL, + }, + { }, + } +}; + +static struct platform_device cambria_leds = { + .name = "leds-gpio", + .id = -1, + .dev.platform_data = &(struct gpio_led_platform_data) { + .num_leds = 1, + .leds = &(struct gpio_led) { + .name = "user", + .gpio = 5, + .active_low = 1, + }, + }, +}; + +static struct usb_ehci_pdata cambria_usb_pdata = { + .caps_offset = 0x100, + .has_tt = 1, + .big_endian_desc = 1, + .big_endian_mmio = 1, +}; + +static struct platform_device cambria_usb0 = { + .name = "ehci-platform", + .id = 0, + .resource = (struct resource[]) { + { + .start = IXP4XX_EHCI1_BASE_PHYS, + .end = IXP4XX_EHCI1_BASE_PHYS + IXP4XX_EHCI_REGION_SIZE - 1, + .flags = IORESOURCE_MEM, + }, + { + .start = 32, + .flags = IORESOURCE_IRQ, + }, + }, + .num_resources = 2, + .dev.platform_data = &cambria_usb_pdata, +}; + +static struct platform_device cambria_usb1 = { + .name = "ehci-platform", + .id = 1, + .resource = (struct resource[]) { + { + .start = IXP4XX_EHCI2_BASE_PHYS, + .end = IXP4XX_EHCI2_BASE_PHYS + IXP4XX_EHCI_REGION_SIZE - 1, + .flags = IORESOURCE_MEM, + }, + { + .start = 33, + .flags = IORESOURCE_IRQ, + }, + }, + .num_resources = 2, + .dev.platform_data = &cambria_usb_pdata, +}; + +static struct platform_device *cambria_devices[] __initdata = { + &cambria_flash, + &cambria_i2c, + &cambria_eth0, + &cambria_eth1, + &cambria_uart, + &cambria_leds, + &cambria_usb0, + &cambria_usb1, +}; + +static void at24_setup(struct memory_accessor *mem_acc, void *context) +{ + char mac_addr[ETH_ALEN]; + + /* Read MAC addresses */ + if (mem_acc->read(mem_acc, mac_addr, 0x100, ETH_ALEN) == ETH_ALEN) + memcpy(&cambria_eth0_pdata.hwaddr, mac_addr, ETH_ALEN); + + if (mem_acc->read(mem_acc, mac_addr, 0x106, ETH_ALEN) == ETH_ALEN) + memcpy(&cambria_eth1_pdata.hwaddr, mac_addr, ETH_ALEN); +} + +static struct at24_platform_data cambria_eeprom_info = { + .byte_len = 1024, + .page_size = 16, + .flags = AT24_FLAG_READONLY, + .setup = at24_setup, +}; + +static struct i2c_board_info __initdata cambria_i2c_board_info[] = { + { + I2C_BOARD_INFO("ad7418", 0x28), + }, + { + I2C_BOARD_INFO("24c08", 0x50), + .platform_data = &cambria_eeprom_info, + }, +}; + +static void __init cambria_init(void) +{ + ixp4xx_sys_init(); + platform_add_devices(cambria_devices, ARRAY_SIZE(cambria_devices)); + i2c_register_board_info(0, cambria_i2c_board_info, + ARRAY_SIZE(cambria_i2c_board_info)); +} + +#ifdef CONFIG_PCI +void __init cambria_pci_preinit(void) +{ + irq_set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW); + ixp4xx_pci_preinit(); +} + +static int __init cambria_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) +{ + switch (slot) { + case 1: + return IRQ_IXP4XX_GPIO11; + default: + return -1; + } +} + +struct hw_pci cambria_pci __initdata = { + .nr_controllers = 1, + .ops = &ixp4xx_ops, + .preinit = cambria_pci_preinit, + .setup = ixp4xx_setup, + .map_irq = cambria_map_irq, +}; + +int __init cambria_pci_init(void) +{ + if (machine_is_cambria()) + pci_common_init(&cambria_pci); + return 0; +} + +subsys_initcall(cambria_pci_init); +#endif /* CONFIG_PCI */ + +MACHINE_START(CAMBRIA, "Gateworks Cambria") + /* Maintainer: Krzysztof Halasa */ + .map_io = ixp4xx_map_io, + .init_early = ixp4xx_init_early, + .init_irq = ixp4xx_init_irq, + .init_time = ixp4xx_timer_init, + .atag_offset = 0x0100, + .init_machine = cambria_init, +#ifdef CONFIG_PCI + .dma_zone_size = SZ_64M, +#endif + .restart = ixp4xx_restart, +MACHINE_END diff --git a/arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h b/arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h index c5bae9c..f6ced67 100644 --- a/arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h +++ b/arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h @@ -595,6 +595,13 @@ #define DCMD_LENGTH 0x01fff /* length mask (max = 8K - 1) */ +/* + * EHCI USB host registers + */ +#define IXP4XX_EHCI1_BASE_PHYS 0xCD000000 +#define IXP4XX_EHCI2_BASE_PHYS 0xCE000000 +#define IXP4XX_EHCI_REGION_SIZE 0x00000200 + /* "fuse" bits of IXP_EXP_CFG2 */ /* All IXP4xx CPUs */ #define IXP4XX_FEATURE_RCOMP (1 << 0) diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types index a10297d..9ada1a7 100644 --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types @@ -261,6 +261,7 @@ halibut MACH_HALIBUT HALIBUT 1439 trout MACH_TROUT TROUT 1440 tct_hammer MACH_TCT_HAMMER TCT_HAMMER 1460 herald MACH_HERALD HERALD 1461 +cambria MACH_CAMBRIA CAMBRIA 1468 sim_one MACH_SIM_ONE SIM_ONE 1476 jive MACH_JIVE JIVE 1490 sam9_l9260 MACH_SAM9_L9260 SAM9_L9260 1501