From: Stephen Rothwell Date: Wed, 20 Feb 2013 04:25:06 +0000 (+1100) Subject: Merge remote-tracking branch 'driver-core/driver-core-next' X-Git-Tag: next-20130220~29 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6801d6523358ccda0280ebf47764ed828b74195a;p=karo-tx-linux.git Merge remote-tracking branch 'driver-core/driver-core-next' Conflicts: drivers/acpi/Kconfig drivers/dma/dw_dmac.c drivers/i2c/busses/i2c-s3c2410.c drivers/iommu/tegra-smmu.c drivers/net/ethernet/8390/Kconfig drivers/net/ethernet/fujitsu/Kconfig drivers/net/ethernet/i825xx/Kconfig drivers/net/ethernet/intel/Kconfig drivers/net/ethernet/racal/Kconfig drivers/net/ethernet/seeq/Kconfig drivers/net/wan/Kconfig drivers/net/wireless/rtlwifi/Kconfig drivers/spi/Kconfig drivers/spi/spi-s3c64xx.c drivers/vhost/Kconfig drivers/vhost/Kconfig.tcm net/wanrouter/Kconfig --- 6801d6523358ccda0280ebf47764ed828b74195a diff --cc arch/mips/Kconfig index c048dfd940f6,e96cf7a06d9f..eef7ca82fd3c --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@@ -384,9 -384,18 +384,8 @@@ config NXP_STB22 help Support for NXP Semiconductors STB225 Development Board. -config PNX8550_JBS - bool "NXP PNX8550 based JBS board" - select PNX8550 - select SYS_SUPPORTS_LITTLE_ENDIAN - -config PNX8550_STB810 - bool "NXP PNX8550 based STB810 board" - select PNX8550 - select SYS_SUPPORTS_LITTLE_ENDIAN - config PMC_MSP bool "PMC-Sierra MSP chipsets" - depends on EXPERIMENTAL select CEVT_R4K select CSRC_R4K select DMA_NONCOHERENT diff --cc drivers/acpi/Kconfig index 940b24af8ab1,7ec178e03379..320006019e68 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@@ -334,8 -335,7 +332,7 @@@ config X86_PM_TIME systems require this timer. config ACPI_CONTAINER - bool "Container and Module Devices (EXPERIMENTAL)" - depends on EXPERIMENTAL - tristate "Container and Module Devices" ++ bool "Container and Module Devices" default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO) help This driver supports ACPI Container and Module devices (IDs diff --cc drivers/dma/dw_dmac.c index fe20f04be6a1,b33d1f6e1333..51c3ea2ed41a --- a/drivers/dma/dw_dmac.c +++ b/drivers/dma/dw_dmac.c @@@ -14,7 -14,7 +14,8 @@@ #include #include #include +#include + #include #include #include #include @@@ -1657,16 -1490,10 +1658,16 @@@ static int dw_probe(struct platform_dev if (irq < 0) return irq; - regs = devm_request_and_ioremap(&pdev->dev, io); - if (!regs) - return -EBUSY; + regs = devm_ioremap_resource(&pdev->dev, io); + if (IS_ERR(regs)) + return PTR_ERR(regs); + /* Apply default dma_mask if needed */ + if (!pdev->dev.dma_mask) { + pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; + pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); + } + dw_params = dma_read_byaddr(regs, DW_PARAMS); autocfg = dw_params >> DW_PARAMS_EN & 0x1; diff --cc drivers/i2c/busses/i2c-s3c2410.c index 5e33df7c6c82,c807a6d14f0c..f6b880ba1932 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@@ -1038,15 -1038,16 +1038,13 @@@ static int s3c24xx_i2c_probe(struct pla res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (res == NULL) { dev_err(&pdev->dev, "cannot find IO resource\n"); - ret = -ENOENT; - goto err_clk; + return -ENOENT; } - i2c->regs = devm_request_and_ioremap(&pdev->dev, res); + i2c->regs = devm_ioremap_resource(&pdev->dev, res); - if (i2c->regs == NULL) { - dev_err(&pdev->dev, "cannot request and map IO\n"); - return -ENXIO; - if (IS_ERR(i2c->regs)) { - ret = PTR_ERR(i2c->regs); - goto err_clk; -- } ++ if (IS_ERR(i2c->regs)) ++ return PTR_ERR(i2c->regs); dev_dbg(&pdev->dev, "registers %p (%p)\n", i2c->regs, res); diff --cc drivers/iommu/tegra-smmu.c index 8b1d9f758076,f08dbcd2f175..eb0109f98946 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@@ -1185,13 -1177,10 +1186,13 @@@ static int tegra_smmu_probe(struct plat res = platform_get_resource(pdev, IORESOURCE_MEM, i); if (!res) return -ENODEV; - smmu->regs[i] = devm_request_and_ioremap(&pdev->dev, res); - if (!smmu->regs[i]) - return -EBUSY; + smmu->regs[i] = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(smmu->regs[i])) + return PTR_ERR(smmu->regs[i]); + smmu->rege[i] = smmu->regs[i] + resource_size(res) - 1; } + /* Same as "mc" 1st regiter block start address */ + smmu->regbase = (void __iomem *)((u32)smmu->regs[0] & PAGE_MASK); err = of_get_dma_window(dev->of_node, NULL, 0, NULL, &base, &size); if (err) diff --cc drivers/net/wan/Kconfig index 0c077b0f7a2b,c0cd88dd6bb5..13daec88d918 --- a/drivers/net/wan/Kconfig +++ b/drivers/net/wan/Kconfig @@@ -356,9 -356,63 +356,9 @@@ config SDL To compile this driver as a module, choose M here: the module will be called sdla. -# Wan router core. -config WAN_ROUTER_DRIVERS - tristate "WAN router drivers" - depends on WAN_ROUTER - ---help--- - Connect LAN to WAN via Linux box. - - Select driver your card and remember to say Y to "Wan Router." - You will need the wan-tools package which is available from - . - - Note that the answer to this question won't directly affect the - kernel except for how subordinate drivers may be built: - saying N will just cause the configurator to skip all - the questions about WAN router drivers. - - If unsure, say N. - -config CYCLADES_SYNC - tristate "Cyclom 2X(tm) cards" - depends on WAN_ROUTER_DRIVERS && (PCI || ISA) - ---help--- - Cyclom 2X from Cyclades Corporation is an - intelligent multiprotocol WAN adapter with data transfer rates up to - 512 Kbps. These cards support the X.25 and SNA related protocols. - - While no documentation is available at this time please grab the - wanconfig tarball in - (with minor changes - to make it compile with the current wanrouter include files; efforts - are being made to use the original package available at - ). - - Feel free to contact me or the cycsyn-devel mailing list at - and for - additional details, I hope to have documentation available as soon as - possible. (Cyclades Brazil is writing the Documentation). - - The next questions will ask you about the protocols you want the - driver to support (for now only X.25 is supported). - - If you have one or more of these cards, say Y to this option. - - To compile this driver as a module, choose M here: the - module will be called cyclomx. - -config CYCLOMX_X25 - bool "Cyclom 2X X.25 support" - depends on CYCLADES_SYNC - help - Connect a Cyclom 2X card to an X.25 network. - - Enabling X.25 support will enlarge your kernel by about 11 kB. - # X.25 network drivers config LAPBETHER - tristate "LAPB over Ethernet driver (EXPERIMENTAL)" + tristate "LAPB over Ethernet driver" depends on LAPB && X25 ---help--- Driver for a pseudo device (typically called /dev/lapb0) which allows diff --cc drivers/platform/x86/Kconfig index 12b8594f5342,7ab0b2fba503..585db6fa64b8 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@@ -79,22 -79,10 +79,21 @@@ config ASUS_LAPTO If you have an ACPI-compatible ASUS laptop, say Y or M here. +config CHROMEOS_LAPTOP + tristate "Chrome OS Laptop" + depends on I2C + depends on DMI + ---help--- + This driver instantiates i2c and smbus devices such as + light sensors and touchpads. + + If you have a supported Chromebook, choose Y or M here. + The module will be called chromeos_laptop. + config DELL_LAPTOP - tristate "Dell Laptop Extras (EXPERIMENTAL)" + tristate "Dell Laptop Extras" depends on X86 depends on DCDBAS - depends on EXPERIMENTAL depends on BACKLIGHT_CLASS_DEVICE depends on RFKILL || RFKILL = n depends on SERIO_I8042 diff --cc drivers/spi/spi-s3c64xx.c index 7cfbe9d3381f,3d4a7c48d74d..e862ab8853aa --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@@ -1241,11 -1276,10 +1241,10 @@@ static int s3c64xx_spi_probe(struct pla /* the spi->mode bits understood by this driver: */ master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; - sdd->regs = devm_request_and_ioremap(&pdev->dev, mem_res); - if (sdd->regs == NULL) { - dev_err(&pdev->dev, "Unable to remap IO\n"); - ret = -ENXIO; + sdd->regs = devm_ioremap_resource(&pdev->dev, mem_res); + if (IS_ERR(sdd->regs)) { + ret = PTR_ERR(sdd->regs); - goto err1; + goto err0; } if (!sci->cfg_gpio && pdev->dev.of_node) { diff --cc drivers/vhost/Kconfig index 613b074c3a5d,bf243177ffe1..85b773a93a5d --- a/drivers/vhost/Kconfig +++ b/drivers/vhost/Kconfig @@@ -1,7 -1,6 +1,7 @@@ config VHOST_NET - tristate "Host kernel accelerator for virtio net (EXPERIMENTAL)" - depends on NET && EVENTFD && (TUN || !TUN) && (MACVTAP || !MACVTAP) && EXPERIMENTAL + tristate "Host kernel accelerator for virtio net" + depends on NET && EVENTFD && (TUN || !TUN) && (MACVTAP || !MACVTAP) + select VHOST_RING ---help--- This kernel module can be loaded in host kernel to accelerate guest networking with virtio_net. Not to be confused with virtio_net diff --cc drivers/vhost/Kconfig.tcm index 0218f77a3464,7e3aa28d999e..c3a8cfa1de72 --- a/drivers/vhost/Kconfig.tcm +++ b/drivers/vhost/Kconfig.tcm @@@ -1,7 -1,6 +1,7 @@@ config TCM_VHOST - tristate "TCM_VHOST fabric module (EXPERIMENTAL)" - depends on TARGET_CORE && EVENTFD && EXPERIMENTAL && m + tristate "TCM_VHOST fabric module" + depends on TARGET_CORE && EVENTFD && m + select VHOST_RING default n ---help--- Say M here to enable the TCM_VHOST fabric module for use with virtio-scsi guests diff --cc drivers/watchdog/pnx4008_wdt.c index bbc249a3aa35,de1f3fa1d787..a3684a30eb69 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c @@@ -152,12 -151,13 +152,12 @@@ static int pnx4008_wdt_probe(struct pla struct resource *r; int ret = 0; - if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT) - heartbeat = DEFAULT_HEARTBEAT; + watchdog_init_timeout(&pnx4008_wdd, heartbeat, &pdev->dev); r = platform_get_resource(pdev, IORESOURCE_MEM, 0); - wdt_base = devm_request_and_ioremap(&pdev->dev, r); - if (!wdt_base) - return -EADDRINUSE; + wdt_base = devm_ioremap_resource(&pdev->dev, r); + if (IS_ERR(wdt_base)) + return PTR_ERR(wdt_base); wdt_clk = clk_get(&pdev->dev, NULL); if (IS_ERR(wdt_clk)) diff --cc net/netfilter/Kconfig index d4dd702574e4,456833d7aaea..56d22cae5906 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@@ -124,15 -124,8 +124,14 @@@ config NF_CONNTRACK_TIMESTAM If unsure, say `N'. +config NF_CONNTRACK_LABELS + bool + help + This option enables support for assigning user-defined flag bits + to connection tracking entries. It selected by the connlabel match. + config NF_CT_PROTO_DCCP - tristate 'DCCP protocol connection tracking support (EXPERIMENTAL)' - depends on EXPERIMENTAL + tristate 'DCCP protocol connection tracking support' depends on NETFILTER_ADVANCED default IP_DCCP help