Author: hauke Date: 2014-12-29 18:11:13 +0100 (Mon, 29 Dec 2014) New Revision: 43797
Added: trunk/target/linux/mpc83xx/config-3.14 trunk/target/linux/mpc83xx/patches-3.14/ Modified: trunk/target/linux/mpc83xx/patches-3.14/100-powerpc_create_fit_uImages.patch trunk/target/linux/mpc83xx/patches-3.14/101-mpc8377_wlan-dts-add-gpio-leds.patch trunk/target/linux/mpc83xx/patches-3.14/110-vitesse_8601.patch trunk/target/linux/mpc83xx/patches-3.14/111-etsec27_war.patch trunk/target/linux/mpc83xx/patches-3.14/200-powerpc-add-rbppc-support.patch trunk/target/linux/mpc83xx/patches-3.14/201-powerpc-add-rb_iomap.patch trunk/target/linux/mpc83xx/patches-3.14/202-ata-add-pata_rbppc_cf-driver.patch trunk/target/linux/mpc83xx/patches-3.14/203-mtd-add-rbppc_nand-driver.patch trunk/target/linux/mpc83xx/patches-3.14/300-mpc8377_wlan-dts-add-openwrt-hacks.patch Log: mpc83xx: add support for kernel 3.14 This is compile tested only, please run test and report back. Signed-off-by: Hauke Mehrtens <[email protected]> Copied: trunk/target/linux/mpc83xx/config-3.14 (from rev 43795, trunk/target/linux/mpc83xx/config-3.10) =================================================================== --- trunk/target/linux/mpc83xx/config-3.14 (rev 0) +++ trunk/target/linux/mpc83xx/config-3.14 2014-12-29 17:11:13 UTC (rev 43797) @@ -0,0 +1,356 @@ +# CONFIG_40x is not set +# CONFIG_44x is not set +CONFIG_6xx=y +CONFIG_8xxx_WDT=y +# CONFIG_ADVANCED_OPTIONS is not set +# CONFIG_ALTIVEC is not set +# CONFIG_AMIGAONE is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_ARCH_HAS_ILOG2_U32=y +CONFIG_ARCH_HAS_WALK_MEMORY=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set +# CONFIG_ARCH_RANDOM is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +# CONFIG_ASP834x is not set +CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y +CONFIG_ATA=y +CONFIG_AUDIT_ARCH=y +CONFIG_BLK_DEV_SD=y +# CONFIG_BOOTX_TEXT is not set +CONFIG_BOUNCE=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,yaffs2,jffs2" +CONFIG_CMDLINE_BOOL=y +CONFIG_COMPAT_BRK=y +CONFIG_CPU_BIG_ENDIAN=y +# CONFIG_CPU_LITTLE_ENDIAN is not set +CONFIG_CRC_CCITT=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_AUTHENC=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_DEV_TALITOS=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_RNG2=y +# CONFIG_CRYPTO_SHA1_PPC is not set +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_DEFAULT_UIMAGE=y +CONFIG_DEVPTS_MULTIPLE_INSTANCES=y +CONFIG_DMADEVICES=y +CONFIG_DMA_ENGINE=y +CONFIG_DMA_OF=y +CONFIG_DTC=y +# CONFIG_DW_DMAC_CORE is not set +# CONFIG_DW_DMAC_PCI is not set +# CONFIG_E200 is not set +CONFIG_EARLY_PRINTK=y +# CONFIG_EMBEDDED6xx is not set +# CONFIG_ENABLE_WARN_DEPRECATED is not set +# CONFIG_EPAPR_BOOT is not set +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_FIXED_PHY=y +CONFIG_FSL_DMA=y +CONFIG_FSL_EMB_PERFMON=y +CONFIG_FSL_GTM=y +CONFIG_FSL_LBC=y +CONFIG_FSL_PCI=y +CONFIG_FSL_PQ_MDIO=y +CONFIG_FSL_SOC=y +# CONFIG_FSL_ULI1575 is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_GENERIC_ATOMIC64=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CMOS_UPDATE=y +# CONFIG_GENERIC_CSUM is not set +CONFIG_GENERIC_IO=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_SHOW_LEVEL=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_NVRAM=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +# CONFIG_GENERIC_TBSYNC is not set +CONFIG_GENERIC_TIME_VSYSCALL_OLD=y +CONFIG_GEN_RTC=y +# CONFIG_GEN_RTC_X is not set +# CONFIG_GE_FPGA is not set +CONFIG_GIANFAR=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_DEVRES=y +CONFIG_GPIO_MPC8XXX=y +CONFIG_GPIO_SYSFS=y +# CONFIG_HAMRADIO is not set +CONFIG_HAS_DMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +# CONFIG_HAS_RAPIDIO is not set +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y +CONFIG_HAVE_DEBUG_STACKOVERFLOW=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_HAVE_IDE=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_HAVE_NET_DSA=y +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HW_RANDOM=y +CONFIG_HZ=250 +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +CONFIG_HZ_PERIODIC=y +CONFIG_INET_LRO=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_INPUT=y +# CONFIG_INPUT_MISC is not set +# CONFIG_IOMMU_HELPER is not set +CONFIG_IOSCHED_CFQ=y +CONFIG_IPIC=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +CONFIG_IRQCHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_IRQ_WORK=y +CONFIG_ISA_DMA_API=y +# CONFIG_ISDN is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +# CONFIG_JFFS2_LZMA is not set +# CONFIG_JFFS2_SUMMARY is not set +CONFIG_JFFS2_ZLIB=y +CONFIG_KERNEL_START=0xc0000000 +# CONFIG_KMETER1 is not set +# CONFIG_LBDAF is not set +# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set +# CONFIG_LEDS_TRIGGER_NETDEV is not set +# CONFIG_LEDS_TRIGGER_TIMER is not set +CONFIG_LIBCRC32C=y +CONFIG_LOG_BUF_SHIFT=15 +CONFIG_LOWMEM_SIZE=0x30000000 +# CONFIG_MATH_EMULATION is not set +CONFIG_MDIO_BITBANG=y +CONFIG_MDIO_BOARDINFO=y +CONFIG_MDIO_GPIO=y +# CONFIG_MMIO_NVRAM is not set +CONFIG_MODULES_USE_ELF_RELA=y +# CONFIG_MPC512X_DMA is not set +CONFIG_MPC830x_RDB=y +CONFIG_MPC831x_RDB=y +CONFIG_MPC832x_MDS=y +CONFIG_MPC832x_RDB=y +CONFIG_MPC834x_ITX=y +CONFIG_MPC834x_MDS=y +CONFIG_MPC836x_MDS=y +CONFIG_MPC836x_RDK=y +CONFIG_MPC837x_MDS=y +CONFIG_MPC837x_RDB=y +# CONFIG_MPIC is not set +# CONFIG_MPIC_U3_HT_IRQS is not set +# CONFIG_MPIC_WEIRD is not set +CONFIG_MTD_BLOCK2MTD=y +# CONFIG_MTD_CFI_INTELEXT is not set +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_ECC=y +CONFIG_MTD_NAND_FSL_ELBC=y +CONFIG_MTD_NAND_FSL_UPM=y +CONFIG_MTD_NAND_RB_PPC=y +# CONFIG_MTD_SM_COMMON is not set +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_BLOCK is not set +# CONFIG_MTD_UBI_FASTMAP is not set +# CONFIG_MTD_UBI_GLUEBI is not set +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +# CONFIG_NEED_DMA_MAP_STATE is not set +# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set +CONFIG_NEED_PER_CPU_KM=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_NET_EMATCH=y +# CONFIG_NONSTATIC_KERNEL is not set +CONFIG_NR_IRQS=512 +CONFIG_OF=y +CONFIG_OF_ADDRESS=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_OF_PCI=y +CONFIG_OF_PCI_IRQ=y +CONFIG_OLD_SIGACTION=y +CONFIG_OLD_SIGSUSPEND=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_PAGE_OFFSET=0xc0000000 +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_PATA_RB_PPC=y +CONFIG_PCI=y +CONFIG_PCI_DISABLE_COMMON_QUIRKS=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_MSI=y +CONFIG_PHYLIB=y +CONFIG_PHYSICAL_START=0x00000000 +CONFIG_PPC=y +CONFIG_PPC32=y +# CONFIG_PPC64 is not set +# CONFIG_PPC_82xx is not set +CONFIG_PPC_83xx=y +# CONFIG_PPC_85xx is not set +# CONFIG_PPC_86xx is not set +# CONFIG_PPC_8xx is not set +# CONFIG_PPC_970_NAP is not set +CONFIG_PPC_BOOK3S=y +CONFIG_PPC_BOOK3S_32=y +# CONFIG_PPC_CELL is not set +# CONFIG_PPC_CELL_NATIVE is not set +# CONFIG_PPC_CHRP is not set +# CONFIG_PPC_DCR_MMIO is not set +# CONFIG_PPC_DCR_NATIVE is not set +CONFIG_PPC_DISABLE_WERROR=y +# CONFIG_PPC_DOORBELL is not set +# CONFIG_PPC_EARLY_DEBUG is not set +# CONFIG_PPC_EPAPR_HV_PIC is not set +CONFIG_PPC_FPU=y +CONFIG_PPC_HAVE_PMU_SUPPORT=y +# CONFIG_PPC_I8259 is not set +# CONFIG_PPC_ICP_HV is not set +# CONFIG_PPC_ICP_NATIVE is not set +# CONFIG_PPC_ICS_RTAS is not set +CONFIG_PPC_INDIRECT_PCI=y +CONFIG_PPC_LIB_RHEAP=y +# CONFIG_PPC_MM_SLICES is not set +# CONFIG_PPC_MPC106 is not set +# CONFIG_PPC_MPC512x is not set +# CONFIG_PPC_MPC52xx is not set +CONFIG_PPC_MPC831x=y +CONFIG_PPC_MPC832x=y +CONFIG_PPC_MPC834x=y +CONFIG_PPC_MPC837x=y +CONFIG_PPC_MSI_BITMAP=y +CONFIG_PPC_OF=y +CONFIG_PPC_OF_BOOT_TRAMPOLINE=y +# CONFIG_PPC_P7_NAP is not set +CONFIG_PPC_PCI_CHOICE=y +# CONFIG_PPC_PMAC is not set +# CONFIG_PPC_RTAS is not set +CONFIG_PPC_STD_MMU=y +CONFIG_PPC_STD_MMU_32=y +CONFIG_PPC_UDBG_16550=y +# CONFIG_PPC_WSP is not set +# CONFIG_PPC_XICS is not set +# CONFIG_PQ2ADS is not set +# CONFIG_PREEMPT_RCU is not set +CONFIG_PROC_DEVICETREE=y +CONFIG_PROC_PAGE_MONITOR=y +# CONFIG_PTP_1588_CLOCK_GIANFAR is not set +CONFIG_QE_GPIO=y +CONFIG_QUICC_ENGINE=y +CONFIG_RB_IOMAP=y +CONFIG_RB_PPC=y +# CONFIG_RCU_STALL_COMMON is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +# CONFIG_SBC834x is not set +CONFIG_SCHED_HRTICK=y +CONFIG_SCSI=y +# CONFIG_SCSI_LOWLEVEL is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_PROC_FS is not set +CONFIG_SERIAL_8250_FSL=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_QE=y +CONFIG_SERIO=y +# CONFIG_SERIO_APBPS2 is not set +CONFIG_SERIO_I8042=y +# CONFIG_SERIO_OLPC_APSP is not set +CONFIG_SERIO_PCIPS2=y +CONFIG_SERIO_RAW=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_XILINX_XPS_PS2 is not set +CONFIG_SIMPLE_GPIO=y +# CONFIG_SLAB is not set +CONFIG_SLOB=y +CONFIG_SPARSE_IRQ=y +CONFIG_SPI=y +CONFIG_SPI_MASTER=y +# CONFIG_SWAP is not set +# CONFIG_SWIOTLB is not set +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_TASK_SIZE=0xc0000000 +# CONFIG_TAU is not set +CONFIG_TICK_CPU_ACCOUNTING=y +CONFIG_TMPFS_POSIX_ACL=y +# CONFIG_UBIFS_FS is not set +CONFIG_UCC=y +CONFIG_UCC_FAST=y +CONFIG_UCC_GETH=y +CONFIG_UCC_SLOW=y +# CONFIG_UCC_TDM is not set +# CONFIG_UGETH_TX_ON_DEMAND is not set +CONFIG_VIA_VELOCITY=y +CONFIG_VITESSE_PHY=y +CONFIG_VITESSE_PHY_8601_SKEW=y +CONFIG_WATCHDOG_CORE=y +CONFIG_WORD_SIZE=32 +CONFIG_XZ_DEC_BCJ=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_YAFFS_9BYTE_TAGS=y +# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set +CONFIG_YAFFS_AUTO_YAFFS2=y +# CONFIG_YAFFS_DISABLE_BACKGROUND is not set +# CONFIG_YAFFS_DISABLE_BLOCK_REFRESHING is not set +CONFIG_YAFFS_DISABLE_TAGS_ECC=y +# CONFIG_YAFFS_EMPTY_LOST_AND_FOUND is not set +CONFIG_YAFFS_FS=y +CONFIG_YAFFS_XATTR=y +CONFIG_YAFFS_YAFFS1=y +CONFIG_YAFFS_YAFFS2=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_ZLIB_INFLATE=y Modified: trunk/target/linux/mpc83xx/patches-3.14/100-powerpc_create_fit_uImages.patch =================================================================== --- trunk/target/linux/mpc83xx/patches-3.10/100-powerpc_create_fit_uImages.patch 2014-12-29 13:55:59 UTC (rev 43795) +++ trunk/target/linux/mpc83xx/patches-3.14/100-powerpc_create_fit_uImages.patch 2014-12-29 17:11:13 UTC (rev 43797) @@ -1,6 +1,6 @@ --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile -@@ -177,7 +177,9 @@ all: zImage +@@ -228,7 +228,9 @@ all: zImage # With make 3.82 we cannot mix normal and wildcard targets BOOT_TARGETS1 := zImage zImage.initrd uImage @@ -11,7 +11,7 @@ PHONY += $(BOOT_TARGETS1) $(BOOT_TARGETS2) -@@ -210,6 +212,7 @@ define archhelp +@@ -261,6 +263,7 @@ define archhelp @echo '* zImage - Build default images selected by kernel config' @echo ' zImage.* - Compressed kernel image (arch/$(ARCH)/boot/zImage.*)' @echo ' uImage - U-Boot native image format' @@ -28,10 +28,10 @@ +uImage.fit.* cuImage.* dtbImage.* - treeImage.* + *.dtb --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -338,6 +338,9 @@ $(obj)/uImage.initrd.%: vmlinux $(obj)/% +@@ -340,6 +340,9 @@ $(obj)/uImage.initrd.%: vmlinux $(obj)/% $(obj)/uImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) $(call if_changed,wrap,uboot-$*,,$(obj)/$*.dtb) @@ -41,7 +41,7 @@ $(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) $(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz) -@@ -375,6 +378,7 @@ install: $(CONFIGURE) $(addprefix $(obj) +@@ -377,6 +380,7 @@ install: $(CONFIGURE) $(addprefix $(obj) # anything not in $(targets) clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \ @@ -61,7 +61,7 @@ # directory for object and other files used by this script object=arch/powerpc/boot objbin=$object -@@ -336,6 +339,21 @@ uboot-obs600) +@@ -349,6 +352,21 @@ uboot-obs600) if [ -z "$cacheit" ]; then rm -f "$vmz" fi Modified: trunk/target/linux/mpc83xx/patches-3.14/101-mpc8377_wlan-dts-add-gpio-leds.patch =================================================================== --- trunk/target/linux/mpc83xx/patches-3.10/101-mpc8377_wlan-dts-add-gpio-leds.patch 2014-12-29 13:55:59 UTC (rev 43795) +++ trunk/target/linux/mpc83xx/patches-3.14/101-mpc8377_wlan-dts-add-gpio-leds.patch 2014-12-29 17:11:13 UTC (rev 43797) @@ -1,6 +1,6 @@ --- a/arch/powerpc/boot/dts/mpc8377_wlan.dts +++ b/arch/powerpc/boot/dts/mpc8377_wlan.dts -@@ -462,4 +462,18 @@ +@@ -460,4 +460,18 @@ 0 0x00800000>; }; }; Modified: trunk/target/linux/mpc83xx/patches-3.14/110-vitesse_8601.patch =================================================================== --- trunk/target/linux/mpc83xx/patches-3.10/110-vitesse_8601.patch 2014-12-29 13:55:59 UTC (rev 43795) +++ trunk/target/linux/mpc83xx/patches-3.14/110-vitesse_8601.patch 2014-12-29 17:11:13 UTC (rev 43797) @@ -15,7 +15,7 @@ ---help--- --- a/drivers/net/phy/vitesse.c +++ b/drivers/net/phy/vitesse.c -@@ -26,6 +26,11 @@ +@@ -31,6 +31,11 @@ #define MII_VSC8244_EXTCON1_TX_SKEW 0x0800 #define MII_VSC8244_EXTCON1_RX_SKEW 0x0200 @@ -27,15 +27,15 @@ /* Vitesse Interrupt Mask Register */ #define MII_VSC8244_IMASK 0x19 #define MII_VSC8244_IMASK_IEN 0x8000 -@@ -56,6 +61,7 @@ - - #define PHY_ID_VSC8244 0x000fc6c0 +@@ -69,6 +74,7 @@ + #define PHY_ID_VSC8662 0x00070660 #define PHY_ID_VSC8221 0x000fc550 + #define PHY_ID_VSC8211 0x000fc4b0 +#define PHY_ID_VSC8601 0x00070420 MODULE_DESCRIPTION("Vitesse PHY driver"); MODULE_AUTHOR("Kriston Carson"); -@@ -97,10 +103,34 @@ static int vsc824x_config_init(struct ph +@@ -110,6 +116,30 @@ static int vsc824x_config_init(struct ph return err; } @@ -66,12 +66,7 @@ static int vsc824x_ack_interrupt(struct phy_device *phydev) { int err = 0; -- -+ - /* - * Don't bother to ACK the interrupts if interrupts - * are disabled. The 824x cannot clear the interrupts -@@ -176,6 +206,19 @@ static struct phy_driver vsc82xx_driver[ +@@ -309,6 +339,19 @@ static struct phy_driver vsc82xx_driver[ .ack_interrupt = &vsc824x_ack_interrupt, .config_intr = &vsc82xx_config_intr, .driver = { .owner = THIS_MODULE,}, Modified: trunk/target/linux/mpc83xx/patches-3.14/111-etsec27_war.patch =================================================================== --- trunk/target/linux/mpc83xx/patches-3.10/111-etsec27_war.patch 2014-12-29 13:55:59 UTC (rev 43795) +++ trunk/target/linux/mpc83xx/patches-3.14/111-etsec27_war.patch 2014-12-29 17:11:13 UTC (rev 43797) @@ -1,20 +1,23 @@ --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c -@@ -1016,7 +1016,16 @@ static int gfar_probe(struct platform_de - /* We need to delay at least 3 TX clocks */ +@@ -1050,10 +1050,16 @@ static int gfar_probe(struct platform_de udelay(2); -- tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW); + tempval = 0; +- if (!priv->pause_aneg_en && priv->tx_pause_en) +- tempval |= MACCFG1_TX_FLOW; +- if (!priv->pause_aneg_en && priv->rx_pause_en) +- tempval |= MACCFG1_RX_FLOW; ++ /* ++ * Do not enable flow control on chips earlier than rev 1.1, ++ * because of the eTSEC27 erratum ++ */ + if ((mfspr(SPRN_SVR) & 0xffff) >= 0x0011) { -+ tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW); -+ } else { -+ /* -+ * Do not enable flow control on chips earlier than rev 1.1, -+ * because of the eTSEC27 erratum -+ */ -+ tempval = 0; ++ if (!priv->pause_aneg_en && priv->tx_pause_en) ++ tempval |= MACCFG1_TX_FLOW; ++ if (!priv->pause_aneg_en && priv->rx_pause_en) ++ tempval |= MACCFG1_RX_FLOW; + } -+ - gfar_write(®s->maccfg1, tempval); - - /* Initialize MACCFG2. */ + /* the soft reset bit is not self-resetting, so we need to + * clear it before resuming normal operation + */ Modified: trunk/target/linux/mpc83xx/patches-3.14/200-powerpc-add-rbppc-support.patch =================================================================== --- trunk/target/linux/mpc83xx/patches-3.10/200-powerpc-add-rbppc-support.patch 2014-12-29 13:55:59 UTC (rev 43795) +++ trunk/target/linux/mpc83xx/patches-3.14/200-powerpc-add-rbppc-support.patch 2014-12-29 17:11:13 UTC (rev 43797) @@ -1,6 +1,6 @@ --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -89,7 +89,8 @@ src-plat-$(CONFIG_44x) += treeboot-ebony +@@ -90,7 +90,8 @@ src-plat-$(CONFIG_44x) += treeboot-ebony src-plat-$(CONFIG_8xx) += cuboot-8xx.c fixed-head.S ep88xc.c redboot-8xx.c src-plat-$(CONFIG_PPC_MPC52xx) += cuboot-52xx.c src-plat-$(CONFIG_PPC_82xx) += cuboot-pq2.c fixed-head.S ep8248e.c cuboot-824x.c @@ -10,7 +10,7 @@ src-plat-$(CONFIG_FSL_SOC_BOOKE) += cuboot-85xx.c cuboot-85xx-cpm2.c src-plat-$(CONFIG_EMBEDDED6xx) += cuboot-pq2.c cuboot-mpc7448hpc2.c \ cuboot-c2k.c gamecube-head.S \ -@@ -261,6 +262,8 @@ image-$(CONFIG_MPC834x_ITX) += cuImage. +@@ -262,6 +263,8 @@ image-$(CONFIG_MPC834x_ITX) += cuImage. image-$(CONFIG_MPC834x_MDS) += cuImage.mpc834x_mds image-$(CONFIG_MPC836x_MDS) += cuImage.mpc836x_mds image-$(CONFIG_ASP834x) += dtbImage.asp834x-redboot @@ -380,7 +380,7 @@ +} --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper -@@ -217,7 +217,7 @@ ps3) +@@ -225,7 +225,7 @@ ps3) make_space=n pie= ;; Modified: trunk/target/linux/mpc83xx/patches-3.14/201-powerpc-add-rb_iomap.patch =================================================================== --- trunk/target/linux/mpc83xx/patches-3.10/201-powerpc-add-rb_iomap.patch 2014-12-29 13:55:59 UTC (rev 43795) +++ trunk/target/linux/mpc83xx/patches-3.14/201-powerpc-add-rb_iomap.patch 2014-12-29 17:11:13 UTC (rev 43797) @@ -1,11 +1,11 @@ --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile -@@ -117,9 +117,11 @@ obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace. +@@ -116,9 +116,11 @@ obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o + obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o + obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o - obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o - +ifneq ($(CONFIG_RB_IOMAP),y) - ifneq ($(CONFIG_PPC_INDIRECT_IO),y) + ifneq ($(CONFIG_PPC_INDIRECT_PIO),y) obj-y += iomap.o endif +endif @@ -24,7 +24,7 @@ obj-$(CONFIG_MPC836x_MDS) += mpc836x_mds.o --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig -@@ -191,6 +191,10 @@ config PPC_INDIRECT_MMIO +@@ -212,6 +212,10 @@ config PPC_INDIRECT_MMIO config PPC_IO_WORKAROUNDS bool @@ -34,10 +34,10 @@ + source "drivers/cpufreq/Kconfig" - menu "CPU Frequency drivers" + menu "CPUIdle driver" --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile -@@ -71,3 +71,6 @@ subdir-ccflags-$(CONFIG_PPC_WERROR) := - +@@ -73,3 +73,6 @@ subdir-ccflags-$(CONFIG_PPC_WERROR) := - obj-$(CONFIG_PPC_XICS) += xics/ obj-$(CONFIG_GE_FPGA) += ge/ Modified: trunk/target/linux/mpc83xx/patches-3.14/202-ata-add-pata_rbppc_cf-driver.patch =================================================================== --- trunk/target/linux/mpc83xx/patches-3.10/202-ata-add-pata_rbppc_cf-driver.patch 2014-12-29 13:55:59 UTC (rev 43795) +++ trunk/target/linux/mpc83xx/patches-3.14/202-ata-add-pata_rbppc_cf-driver.patch 2014-12-29 17:11:13 UTC (rev 43797) @@ -1,6 +1,6 @@ --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig -@@ -938,5 +938,12 @@ config PATA_LEGACY +@@ -963,5 +963,12 @@ config PATA_LEGACY If unsure, say N. @@ -15,7 +15,7 @@ endif # ATA --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile -@@ -92,6 +92,7 @@ obj-$(CONFIG_PATA_PALMLD) += pata_palmld +@@ -93,6 +93,7 @@ obj-$(CONFIG_PATA_PALMLD) += pata_palmld obj-$(CONFIG_PATA_PLATFORM) += pata_platform.o obj-$(CONFIG_PATA_OF_PLATFORM) += pata_of_platform.o obj-$(CONFIG_PATA_RB532) += pata_rb532_cf.o @@ -25,7 +25,7 @@ --- /dev/null +++ b/drivers/ata/pata_rbppc_cf.c -@@ -0,0 +1,699 @@ +@@ -0,0 +1,701 @@ +/* + * Copyright (C) 2008-2009 Noah Fontes <[email protected]> + * Copyright (C) Mikrotik 2007 @@ -44,6 +44,8 @@ +#include <linux/of_platform.h> +#include <linux/ata_platform.h> +#include <linux/slab.h> ++#include <linux/of_address.h> ++#include <linux/of_irq.h> + +#define DEBUG_UPM 0 + Modified: trunk/target/linux/mpc83xx/patches-3.14/203-mtd-add-rbppc_nand-driver.patch =================================================================== --- trunk/target/linux/mpc83xx/patches-3.10/203-mtd-add-rbppc_nand-driver.patch 2014-12-29 13:55:59 UTC (rev 43795) +++ trunk/target/linux/mpc83xx/patches-3.14/203-mtd-add-rbppc_nand-driver.patch 2014-12-29 17:11:13 UTC (rev 43797) @@ -1,6 +1,6 @@ --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig -@@ -432,6 +432,13 @@ config MTD_NAND_PLATFORM +@@ -405,6 +405,13 @@ config MTD_NAND_PLATFORM devices. You will need to provide platform-specific functions via platform_data. @@ -11,9 +11,9 @@ + This option enables support for the NAND device on MikroTik + RouterBOARD 333/600 series boards. + - config MTD_ALAUDA - tristate "MTD driver for Olympus MAUSB-10 and Fujifilm DPC-R1" - depends on USB + config MTD_NAND_ORION + tristate "NAND Flash support for Marvell Orion SoC" + depends on PLAT_ORION --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -31,6 +31,7 @@ obj-$(CONFIG_MTD_NAND_CM_X270) += cmx27 @@ -21,12 +21,12 @@ obj-$(CONFIG_MTD_NAND_TMIO) += tmio_nand.o obj-$(CONFIG_MTD_NAND_PLATFORM) += plat_nand.o +obj-$(CONFIG_MTD_NAND_RB_PPC) += rbppc_nand.o - obj-$(CONFIG_MTD_ALAUDA) += alauda.o obj-$(CONFIG_MTD_NAND_PASEMI) += pasemi_nand.o obj-$(CONFIG_MTD_NAND_ORION) += orion_nand.o + obj-$(CONFIG_MTD_NAND_FSL_ELBC) += fsl_elbc_nand.o --- /dev/null +++ b/drivers/mtd/nand/rbppc_nand.c -@@ -0,0 +1,250 @@ +@@ -0,0 +1,251 @@ +/* + * Copyright (C) 2008-2009 Noah Fontes <[email protected]> + * Copyright (C) 2009 Michael Guntsche <[email protected]> @@ -47,6 +47,7 @@ +#include <linux/of_device.h> +#include <linux/slab.h> +#include <linux/delay.h> ++#include <linux/of_address.h> +#include <asm/io.h> + +#define DRV_NAME "rbppc_nand" Modified: trunk/target/linux/mpc83xx/patches-3.14/300-mpc8377_wlan-dts-add-openwrt-hacks.patch =================================================================== --- trunk/target/linux/mpc83xx/patches-3.10/300-mpc8377_wlan-dts-add-openwrt-hacks.patch 2014-12-29 13:55:59 UTC (rev 43795) +++ trunk/target/linux/mpc83xx/patches-3.14/300-mpc8377_wlan-dts-add-openwrt-hacks.patch 2014-12-29 17:11:13 UTC (rev 43797) @@ -12,7 +12,7 @@ }; }; -@@ -476,4 +481,8 @@ +@@ -474,4 +479,8 @@ default-state = "off"; }; }; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
