Author: hauke Date: 2014-07-18 22:45:49 +0200 (Fri, 18 Jul 2014) New Revision: 41737
Added: trunk/target/linux/pxa/config-3.10 trunk/target/linux/pxa/patches-3.10/ Modified: trunk/target/linux/pxa/patches-3.10/001-gumstix_verdex_pro_arch_support.patch trunk/target/linux/pxa/patches-3.10/002-verdex_lcd_support.patch trunk/target/linux/pxa/patches-3.10/004-smsc911x_verdex_pro_support.patch trunk/target/linux/pxa/patches-3.10/005-verdex_pcmcia_support.patch trunk/target/linux/pxa/patches-3.10/a01-arm-debugll-printk.patch Log: pxa: add support for kernel 3.10 This is compile tested only, please run test and report back. Signed-off-by: Hauke Mehrtens <[email protected]> Copied: trunk/target/linux/pxa/config-3.10 (from rev 41736, trunk/target/linux/pxa/config-3.3) =================================================================== --- trunk/target/linux/pxa/config-3.10 (rev 0) +++ trunk/target/linux/pxa/config-3.10 2014-07-18 20:45:49 UTC (rev 41737) @@ -0,0 +1,232 @@ +CONFIG_ALIGNMENT_TRAP=y +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y +CONFIG_ARCH_GUMSTIX=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_ARCH_HAS_CPUFREQ=y +CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y +# CONFIG_ARCH_LUBBOCK is not set +CONFIG_ARCH_MTD_XIP=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set +CONFIG_ARCH_NR_GPIO=0 +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_PXA_ESERIES is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_PXA_PALM is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_ARCH_VIPER is not set +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_ARM=y +# CONFIG_ARM_APPENDED_DTB is not set +# CONFIG_ARM_CPU_SUSPEND is not set +CONFIG_ARM_L1_CACHE_SHIFT=5 +CONFIG_ARM_NR_BANKS=8 +CONFIG_ARM_PATCH_PHYS_VIRT=y +# CONFIG_ARM_THUMB is not set +# CONFIG_ARPD is not set +CONFIG_ATAGS=y +CONFIG_AUTO_ZRELADDR=y +# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_CACHE_L2X0 is not set +CONFIG_CACHE_XSC3L2=y +CONFIG_CLKDEV_LOOKUP=y +CONFIG_CLKSRC_MMIO=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200" +CONFIG_CMDLINE_FROM_BOOTLOADER=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y +CONFIG_CPU_PABRT_LEGACY=y +CONFIG_CPU_PXA300=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_USE_DOMAINS=y +CONFIG_CPU_XSC3=y +CONFIG_CPU_XSCALE=y +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" +# CONFIG_DEBUG_USER is not set +CONFIG_DTC=y +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_EPOLL is not set +CONFIG_FRAME_POINTER=y +CONFIG_GENERIC_ATOMIC64=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_IDLE_POLL_SETUP=y +CONFIG_GENERIC_IO=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_DEVRES=y +CONFIG_GPIO_PXA=y +# CONFIG_HAMRADIO is not set +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_HAS_DMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_PFN_VALID=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +CONFIG_HAVE_BPF_JIT=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_HAVE_DEBUG_KMEMLEAK=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_HAVE_GENERIC_HARDIRQS=y +CONFIG_HAVE_IDE=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_NET_DSA=y +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_HAVE_PWM=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_UID16=y +CONFIG_HZ_PERIODIC=y +CONFIG_IO_36=y +CONFIG_IRQCHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_WORK=y +CONFIG_IWMMXT=y +CONFIG_KTIME_SCALAR=y +# CONFIG_MACH_ARCOM_ZEUS is not set +# CONFIG_MACH_ARMCORE is not set +# CONFIG_MACH_BALLOON3 is not set +# CONFIG_MACH_CAPC7117 is not set +# CONFIG_MACH_CM_X300 is not set +# CONFIG_MACH_COLIBRI is not set +# CONFIG_MACH_COLIBRI300 is not set +# CONFIG_MACH_COLIBRI320 is not set +# CONFIG_MACH_CSB726 is not set +# CONFIG_MACH_EM_X270 is not set +# CONFIG_MACH_EXEDA is not set +# CONFIG_MACH_GUMSTIX_F is not set +CONFIG_MACH_GUMSTIX_VERDEX=y +# CONFIG_MACH_H4700 is not set +# CONFIG_MACH_H5000 is not set +# CONFIG_MACH_HIMALAYA is not set +# CONFIG_MACH_ICONTROL is not set +# CONFIG_MACH_INTELMOTE2 is not set +# CONFIG_MACH_LITTLETON is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set +# CONFIG_MACH_MAGICIAN is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_MACH_MIOA701 is not set +# CONFIG_MACH_MP900C is not set +# CONFIG_MACH_PCM027 is not set +CONFIG_MACH_PXA3XX_DT=y +# CONFIG_MACH_RAUMFELD_CONNECTOR is not set +# CONFIG_MACH_RAUMFELD_RC is not set +# CONFIG_MACH_RAUMFELD_SPEAKER is not set +# CONFIG_MACH_SAAR is not set +# CONFIG_MACH_STARGATE2 is not set +# CONFIG_MACH_TAVOREVB is not set +# CONFIG_MACH_VPAC270 is not set +# CONFIG_MACH_XCEP is not set +# CONFIG_MACH_ZIPIT2 is not set +# CONFIG_MACH_ZYLONITE300 is not set +# CONFIG_MACH_ZYLONITE320 is not set +CONFIG_MDIO_BOARDINFO=y +CONFIG_MMC=y +CONFIG_MMC_BLOCK=y +CONFIG_MMC_PXA=y +CONFIG_MODULES_USE_ELF_REL=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +# CONFIG_MTD_CFI_AMDSTD is not set +CONFIG_MTD_CFI_GEOMETRY=y +# CONFIG_MTD_CFI_I2 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set +CONFIG_MTD_OF_PARTS=y +CONFIG_MTD_PHYSMAP=y +# CONFIG_MTD_PHYSMAP_OF is not set +CONFIG_MTD_PXA2XX=y +# CONFIG_MTD_XIP is not set +CONFIG_MULTI_IRQ_HANDLER=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_KUSER_HELPERS=y +CONFIG_NEED_MACH_GPIO_H=y +CONFIG_NEED_PER_CPU_KM=y +CONFIG_OF=y +CONFIG_OF_ADDRESS=y +CONFIG_OF_DEVICE=y +CONFIG_OF_EARLY_FLATTREE=y +CONFIG_OF_FLATTREE=y +CONFIG_OF_GPIO=y +CONFIG_OF_IRQ=y +CONFIG_OF_MDIO=y +CONFIG_OF_MTD=y +CONFIG_OF_NET=y +CONFIG_OLD_SIGACTION=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_OUTER_CACHE=y +# CONFIG_PACKET is not set +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_PAGE_OFFSET=0xC0000000 +# CONFIG_PCI_SYSCALL is not set +CONFIG_PERF_USE_VMALLOC=y +CONFIG_PHYLIB=y +CONFIG_PLAT_PXA=y +CONFIG_POWER_SUPPLY=y +# CONFIG_PREEMPT_RCU is not set +CONFIG_PXA27x=y +CONFIG_PXA3xx=y +# CONFIG_PXA_EZX is not set +# CONFIG_PXA_SHARPSL is not set +# CONFIG_RCU_STALL_COMMON is not set +# CONFIG_SA1100_WATCHDOG is not set +CONFIG_SCHED_HRTICK=y +# CONFIG_SCSI_DMA is not set +# CONFIG_SERIAL_8250 is not set +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SMSC911X=y +# CONFIG_SMSC911X_ARCH_HOOKS is not set +CONFIG_SPARSE_IRQ=y +CONFIG_SPLIT_PTLOCK_CPUS=999999 +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_TRIZEPS_PXA is not set +CONFIG_UID16=y +CONFIG_UIDGID_CONVERTED=y +CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h" +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB_ARCH_HAS_XHCI is not set +CONFIG_USE_OF=y +CONFIG_VECTORS_BASE=0xffff0000 +# CONFIG_VLAN_8021Q is not set +CONFIG_XSCALE_PMU=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZONE_DMA_FLAG=0 Modified: trunk/target/linux/pxa/patches-3.10/001-gumstix_verdex_pro_arch_support.patch =================================================================== --- trunk/target/linux/pxa/patches-3.3/001-gumstix_verdex_pro_arch_support.patch 2014-07-18 19:03:16 UTC (rev 41736) +++ trunk/target/linux/pxa/patches-3.10/001-gumstix_verdex_pro_arch_support.patch 2014-07-18 20:45:49 UTC (rev 41737) @@ -17,7 +17,7 @@ --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig -@@ -134,23 +134,34 @@ config MACH_CAPC7117 +@@ -129,23 +129,34 @@ config MACH_CAPC7117 select PXA3xx config ARCH_GUMSTIX @@ -63,7 +63,7 @@ bool "Intel Mote 2 Platform" --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile -@@ -51,7 +51,8 @@ endif +@@ -45,7 +45,8 @@ endif obj-$(CONFIG_MACH_EM_X270) += em-x270.o obj-$(CONFIG_MACH_CM_X300) += cm-x300.o obj-$(CONFIG_MACH_CAPC7117) += capc7117.o mxm8x10.o @@ -117,10 +117,10 @@ +#include <asm/mach/irq.h> +#include <asm/mach/flash.h> + -+#include <mach/mmc.h> ++#include <linux/platform_data/mmc-pxamci.h> +#include <mach/udc.h> -+#include <mach/pxafb.h> -+#include <mach/ohci.h> ++#include <linux/platform_data/video-pxafb.h> ++#include <linux/platform_data/usb-ohci-pxa27x.h> +#include <mach/pxa27x.h> +#include <mach/pxa27x-udc.h> +#include <mach/gpio.h> @@ -866,7 +866,7 @@ + .map_io = pxa27x_map_io, + .init_irq = pxa27x_init_irq, + .handle_irq = pxa27x_handle_irq, -+ .timer = &pxa_timer, ++ .init_time = pxa_timer_init, + .init_machine = verdex_init, + .restart = pxa_restart, +MACHINE_END Modified: trunk/target/linux/pxa/patches-3.10/002-verdex_lcd_support.patch =================================================================== --- trunk/target/linux/pxa/patches-3.3/002-verdex_lcd_support.patch 2014-07-18 19:03:16 UTC (rev 41736) +++ trunk/target/linux/pxa/patches-3.10/002-verdex_lcd_support.patch 2014-07-18 20:45:49 UTC (rev 41737) @@ -12,7 +12,7 @@ --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig -@@ -1892,6 +1892,37 @@ config FB_PXA +@@ -1905,6 +1905,37 @@ config FB_PXA say M here and read <file:Documentation/kbuild/modules.txt>. If unsure, say N. Modified: trunk/target/linux/pxa/patches-3.10/004-smsc911x_verdex_pro_support.patch =================================================================== --- trunk/target/linux/pxa/patches-3.3/004-smsc911x_verdex_pro_support.patch 2014-07-18 19:03:16 UTC (rev 41736) +++ trunk/target/linux/pxa/patches-3.10/004-smsc911x_verdex_pro_support.patch 2014-07-18 20:45:49 UTC (rev 41737) @@ -15,7 +15,15 @@ --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c -@@ -1485,7 +1485,7 @@ static int smsc911x_open(struct net_devi +@@ -60,6 +60,7 @@ + #include <linux/of_device.h> + #include <linux/of_gpio.h> + #include <linux/of_net.h> ++#include <asm/system_info.h> + #include "smsc911x.h" + + #define SMSC_CHIPNAME "smsc911x" +@@ -1514,7 +1515,7 @@ static int smsc911x_open(struct net_devi SMSC_WARN(pdata, ifup, "Timed out waiting for EEPROM busy bit to clear"); @@ -24,9 +32,9 @@ /* The soft reset above cleared the device's MAC address, * restore it from local copy (set in probe) */ -@@ -1497,8 +1497,8 @@ static int smsc911x_open(struct net_devi - smsc911x_reg_write(pdata, INT_EN, 0); - smsc911x_reg_write(pdata, INT_STS, 0xFFFFFFFF); +@@ -1525,8 +1526,8 @@ static int smsc911x_open(struct net_devi + /* Initialise irqs, but leave all sources disabled */ + smsc911x_disable_irq_chip(dev); - /* Set interrupt deassertion to 100uS */ - intcfg = ((10 << 24) | INT_CFG_IRQ_EN_); @@ -35,7 +43,7 @@ if (pdata->config.irq_polarity) { SMSC_TRACE(pdata, ifup, "irq polarity: active high"); -@@ -1524,7 +1524,7 @@ static int smsc911x_open(struct net_devi +@@ -1552,7 +1553,7 @@ static int smsc911x_open(struct net_devi temp |= INT_EN_SW_INT_EN_; smsc911x_reg_write(pdata, INT_EN, temp); @@ -44,7 +52,7 @@ while (timeout--) { if (pdata->software_irq_signal) break; -@@ -2332,6 +2332,38 @@ static inline int smsc911x_probe_config_ +@@ -2370,6 +2371,38 @@ static inline int smsc911x_probe_config_ } #endif /* CONFIG_OF */ @@ -80,20 +88,20 @@ + } +} + - static int __devinit smsc911x_drv_probe(struct platform_device *pdev) + static int smsc911x_drv_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; -@@ -2481,11 +2513,11 @@ static int __devinit smsc911x_drv_probe( +@@ -2516,11 +2549,11 @@ static int smsc911x_drv_probe(struct pla SMSC_TRACE(pdata, probe, "Mac Address is read from LAN911x EEPROM"); } else { - /* eeprom values are invalid, generate random MAC */ -- random_ether_addr(dev->dev_addr); +- eth_hw_addr_random(dev); + /* eeprom values are invalid, generate MAC from serial number */ + gen_serial_ether_addr(dev->dev_addr); smsc911x_set_hw_mac_address(pdata, dev->dev_addr); SMSC_TRACE(pdata, probe, -- "MAC Address is set to random_ether_addr"); +- "MAC Address is set to eth_random_addr"); + "MAC Address is derived from system serial number"); } } Modified: trunk/target/linux/pxa/patches-3.10/005-verdex_pcmcia_support.patch =================================================================== --- trunk/target/linux/pxa/patches-3.3/005-verdex_pcmcia_support.patch 2014-07-18 19:03:16 UTC (rev 41736) +++ trunk/target/linux/pxa/patches-3.10/005-verdex_pcmcia_support.patch 2014-07-18 20:45:49 UTC (rev 41737) @@ -15,20 +15,20 @@ --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig -@@ -212,7 +212,7 @@ config PCMCIA_PXA2XX +@@ -217,7 +217,7 @@ config PCMCIA_PXA2XX || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \ || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2 \ || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI \ -- || MACH_COLIBRI320) -+ || MACH_COLIBRI320 || ARCH_GUMSTIX) +- || MACH_COLIBRI320 || MACH_H4700) ++ || MACH_COLIBRI320 || MACH_H4700 || ARCH_GUMSTIX) + select PCMCIA_SA1111 if ARCH_LUBBOCK && SA1111 select PCMCIA_SOC_COMMON help - Say Y here to include support for the PXA2xx PCMCIA controller --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile -@@ -70,6 +70,9 @@ pxa2xx-obj-$(CONFIG_MACH_BALLOON3) += p - pxa2xx-obj-$(CONFIG_MACH_COLIBRI) += pxa2xx_colibri.o +@@ -71,6 +71,9 @@ pxa2xx-obj-$(CONFIG_MACH_COLIBRI) += px pxa2xx-obj-$(CONFIG_MACH_COLIBRI320) += pxa2xx_colibri.o + pxa2xx-obj-$(CONFIG_MACH_H4700) += pxa2xx_hx4700.o +pxa2xx-obj-$(CONFIG_MACH_GUMSTIX_VERDEX) += pxa2xx_cs.o +pxa2xx_cs-objs := pxa2xx_gumstix.o @@ -38,7 +38,7 @@ obj-$(CONFIG_PCMCIA_XXS1500) += xxs1500_ss.o --- /dev/null +++ b/drivers/pcmcia/pxa2xx_gumstix.c -@@ -0,0 +1,195 @@ +@@ -0,0 +1,168 @@ +/* + * linux/drivers/pcmcia/pxa2xx_gumstix.c + * @@ -81,17 +81,6 @@ +#define BANK_OFF(n) (((n) < 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2)) +#define GPLR(x) __REG2(0x40E00000, BANK_OFF((x) >> 5)) + -+static struct pcmcia_irqs gumstix_pcmcia_irqs0[] = { -+ { 0, GUMSTIX_S0_nCD_IRQ, "CF0 nCD" }, -+ { 0, GUMSTIX_S0_nSTSCHG_IRQ, "CF0 nSTSCHG" }, -+}; -+ -+static struct pcmcia_irqs gumstix_pcmcia_irqs1[] = { -+ { 1, GUMSTIX_S1_nCD_IRQ, "CF1 nCD" }, -+ { 1, GUMSTIX_S1_nSTSCHG_IRQ, "CF1 nSTSCHG" }, -+}; -+ -+ +static int net_cf_vx_mode = 0; + +static int gumstix_pcmcia_hw_init(struct soc_pcmcia_socket *skt) @@ -99,21 +88,25 @@ +/* Note: The verdex_pcmcia_pin_config is moved to gumstix_verdex.c in order to use mfp_pxa2xx_config + for board-specific pin configuration instead of the old deprecated pxa_gpio_mode function. Thus, + only the IRQ init is still needed to be done here. */ -+ skt->socket.pci_irq = (skt->nr == 0) ? ((net_cf_vx_mode == 0) ? GUMSTIX_S0_PRDY_nBSY_IRQ : GUMSTIX_S0_PRDY_nBSY_OLD_IRQ) : GUMSTIX_S1_PRDY_nBSY_IRQ; -+ -+ return (skt->nr == 0) ? soc_pcmcia_request_irqs(skt, gumstix_pcmcia_irqs0, ARRAY_SIZE(gumstix_pcmcia_irqs0)) : -+ soc_pcmcia_request_irqs(skt, gumstix_pcmcia_irqs1, ARRAY_SIZE(gumstix_pcmcia_irqs1)); ++ if (skt->nr == 0) { ++ skt->socket.pci_irq = (net_cf_vx_mode == 0) ? GUMSTIX_S0_PRDY_nBSY_IRQ : GUMSTIX_S0_PRDY_nBSY_OLD_IRQ; ++ skt->stat[SOC_STAT_CD].gpio = GUMSTIX_S0_nCD_IRQ; ++ skt->stat[SOC_STAT_CD].name = "CF0 nCD"; ++ skt->stat[SOC_STAT_RDY].gpio = GUMSTIX_S0_nSTSCHG_IRQ; ++ skt->stat[SOC_STAT_RDY].name = "CF0 nSTSCHG"; ++ } else { ++ skt->socket.pci_irq = GUMSTIX_S1_PRDY_nBSY_IRQ; ++ skt->stat[SOC_STAT_CD].gpio = GUMSTIX_S1_nCD_IRQ; ++ skt->stat[SOC_STAT_CD].name = "CF1 nCD"; ++ skt->stat[SOC_STAT_RDY].gpio = GUMSTIX_S1_nSTSCHG_IRQ; ++ skt->stat[SOC_STAT_RDY].name = "CF1 nSTSCHG"; ++ } ++ ++ return 0; +} + +static void gumstix_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt) +{ -+ if(skt->nr == 0) -+ { -+ soc_pcmcia_free_irqs(skt, gumstix_pcmcia_irqs0, ARRAY_SIZE(gumstix_pcmcia_irqs0)); -+ } else { -+ soc_pcmcia_free_irqs(skt, gumstix_pcmcia_irqs1, ARRAY_SIZE(gumstix_pcmcia_irqs1)); -+ } -+ + if (net_cf_vx_mode) { + gpio_free(GPIO_GUMSTIX_CF_OLD_RESET); + } else { @@ -154,32 +147,12 @@ + return 0; +} + -+static void gumstix_pcmcia_socket_init(struct soc_pcmcia_socket *skt) -+{ -+ if(skt->nr) { -+ soc_pcmcia_enable_irqs(skt, gumstix_pcmcia_irqs0, ARRAY_SIZE(gumstix_pcmcia_irqs0)); -+ } else { -+ soc_pcmcia_enable_irqs(skt, gumstix_pcmcia_irqs1, ARRAY_SIZE(gumstix_pcmcia_irqs1)); -+ } -+} -+ -+static void gumstix_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) -+{ -+ if(skt->nr) { -+ soc_pcmcia_disable_irqs(skt, gumstix_pcmcia_irqs0, ARRAY_SIZE(gumstix_pcmcia_irqs0)); -+ } else { -+ soc_pcmcia_disable_irqs(skt, gumstix_pcmcia_irqs1, ARRAY_SIZE(gumstix_pcmcia_irqs1)); -+ } -+} -+ +static struct pcmcia_low_level gumstix_pcmcia_ops = { + .owner = THIS_MODULE, + .hw_init = gumstix_pcmcia_hw_init, + .hw_shutdown = gumstix_pcmcia_hw_shutdown, + .socket_state = gumstix_pcmcia_socket_state, + .configure_socket = gumstix_pcmcia_configure_socket, -+ .socket_init = gumstix_pcmcia_socket_init, -+ .socket_suspend = gumstix_pcmcia_socket_suspend, + .nr = 2, +}; + Modified: trunk/target/linux/pxa/patches-3.10/a01-arm-debugll-printk.patch =================================================================== --- trunk/target/linux/pxa/patches-3.3/a01-arm-debugll-printk.patch 2014-07-18 19:03:16 UTC (rev 41736) +++ trunk/target/linux/pxa/patches-3.10/a01-arm-debugll-printk.patch 2014-07-18 20:45:49 UTC (rev 41737) @@ -1,6 +1,6 @@ --- a/kernel/printk.c +++ b/kernel/printk.c -@@ -44,6 +44,10 @@ +@@ -48,6 +48,10 @@ #include <asm/uaccess.h> @@ -8,10 +8,10 @@ +extern void printascii(char *); +#endif /* CONFIG_DEBUG_LL */ + - /* - * Architectures can override it: - */ -@@ -900,6 +904,10 @@ asmlinkage int vprintk(const char *fmt, + #define CREATE_TRACE_POINTS + #include <trace/events/printk.h> + +@@ -1578,6 +1582,10 @@ asmlinkage int vprintk_emit(int facility } } @@ -19,6 +19,6 @@ + printascii(printk_buf); +#endif + - /* - * Copy the output into log_buf. If the caller didn't provide - * the appropriate log prefix, we insert them here + if (level == -1) + level = default_message_loglevel; + _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
