summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-06-14ARM: dts: kzm9g: Name serial port pfc subnode after device nameGeert Uytterhoeven
Name the Pin Function Controller subnode for SCIFA4 after its device name, instead of after the serial port alias. This avoids conflicts when adding support for more serial ports later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: silk: Name spi pfc subnode after device nameGeert Uytterhoeven
Name the Pin Function Controller subnode for QSPI after its device name, instead of after the spi interface alias. This avoids conflicts when enabling support for more spi interfaces later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: silk: Name serial port pfc subnode after device nameGeert Uytterhoeven
Name the Pin Function Controller subnode for SCIF2 after its device name, instead of using some arbitrary name that looks like a serial port alias, but differs from the actual alias. This avoids conflicts when enabling support for more serial ports later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: alt: Name spi pfc subnode after device nameGeert Uytterhoeven
Name the Pin Function Controller subnode for QSPI after its device name, instead of after the spi interface alias. This avoids conflicts when enabling support for more spi interfaces later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: alt: Name serial port pfc subnode after device nameGeert Uytterhoeven
Name the Pin Function Controller subnode for SCIF2 after its device name, instead of using some arbitrary name that looks like a serial port alias, but differs from the actual alias. This avoids conflicts when enabling support for more serial ports later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: gose: Name spi pfc subnode after device nameGeert Uytterhoeven
Name the Pin Function Controller subnode for QSPI after its device name, instead of after the spi interface alias. This avoids conflicts when enabling support for more spi interfaces later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: gose: Name serial port pfc subnodes after device namesGeert Uytterhoeven
Name the Pin Function Controller subnodes for SCIF0 and SCIF1 after their device names, instead of after the serial port aliases. This avoids conflicts when enabling support for more serial ports later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: porter: Name spi pfc subnode after device nameGeert Uytterhoeven
Name the Pin Function Controller subnode for QSPI after its device name, instead of after the spi interface alias. This avoids conflicts when enabling support for more spi interfaces later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: porter: Name serial port pfc subnode after device nameGeert Uytterhoeven
Name the Pin Function Controller subnode for SCIF0 after its device name, instead of after the serial port alias. This avoids conflicts when enabling support for more serial ports later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: koelsch: Name spi pfc subnodes after device namesGeert Uytterhoeven
Name the Pin Function Controller subnodes for QSPI and MSIOF0 after their device names, instead of after the spi interface aliases. This avoids conflicts when enabling support for more spi interfaces later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: koelsch: Name serial port pfc subnodes after device namesGeert Uytterhoeven
Name the Pin Function Controller subnodes for SCIF0 and SCIF1 after their device names, instead of after the serial port aliases. This avoids conflicts when enabling support for more serial ports later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: lager: Name vin pfc subnode after device nameGeert Uytterhoeven
Name the Pin Function Controller subnode for VIN1 after its device name, instead of using the generic and indexless "vin". This avoids conflicts when enabling support for more video inputs later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: lager: Name spi pfc subnodes after device namesGeert Uytterhoeven
Name the Pin Function Controller subnodes for QSPI and MSIOF1 after their device names, instead of after the spi interface aliases. This avoids conflicts when enabling support for more spi interfaces later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: lager: Name serial port pfc subnodes after device namesGeert Uytterhoeven
Name the Pin Function Controller subnodes for SCIF0 and SCIFA1 after their device names, instead of after the serial port aliases. This avoids conflicts when enabling support for more serial ports later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: marzen: Name serial port pfc subnodes after device namesGeert Uytterhoeven
Name the Pin Function Controller subnodes for SCIF2 and SCIF4 after their device names, instead of using some arbitrary names that look like serial port aliases, but differ from the actual aliases. This avoids conflicts when enabling support for more serial ports later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: bockw: Name serial port pfc subnode after device nameGeert Uytterhoeven
Name the Pin Function Controller subnode for SCIF0 after its device name, instead of after the serial port alias. This avoids conflicts when enabling support for more serial ports later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: armadillo800eva: Name serial port pfc subnode after device nameGeert Uytterhoeven
Name the Pin Function Controller subnode for SCIFA1 after its device name, instead of after the serial port alias. This avoids conflicts when enabling support for more serial ports later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: ape6evm: Name mmc pfc subnode after device nameGeert Uytterhoeven
Name the Pin Function Controller subnode for MMC0 after its device name, instead of using the generic and indexless "mmc". This avoids conflicts when enabling support for more MMC interfaces later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14ARM: dts: ape6evm: Name serial port pfc subnode after device nameGeert Uytterhoeven
Name the Pin Function Controller subnode for SCIFA0 after its device name, instead of after the serial port alias. This avoids conflicts when enabling support for more serial ports later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-13Merge tag 'socfpga_updates_v4.8' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt SoCFPGA DTS updates for v4.8 - Update Arria10 ECC manager - Add ethernet alias for Arria10 - Update serial alias for Arria10 * tag 'socfpga_updates_v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: ARM: dts: socfpga: fix definitions of serial console ARM: dts: socfpga: add ethernet alias on Arria10 ARM: dts: Move Arria10 SDRAM as child of ECC Manager ARM: dts: Arria10 ECC Manager IRQ controller changes Signed-off-by: Olof Johansson <olof@lixom.net>
2016-06-13Merge tag 'ux500-dt-asoc-1' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt Ux500 devicetree patches: - Move the ab8500 compatible string from the board to the chipset. - Define GPIO line names for the boards. * tag 'ux500-dt-asoc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: dts: UX500: name the GPIO lines on HREFv60plus ARM: dts: Ux500: name the GPIO lines on Snowball ARM: dts: Ux500: move compatible string to chipset Signed-off-by: Olof Johansson <olof@lixom.net>
2016-06-13Merge tag 'renesas-dt-for-v4.8' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Renesas ARM Based SoC DT Updates for v4.8 * Fix W=1 dtc warnings * Reverence both DMA controllers on R-Car Gen 2 SoCs * Remove nonexistent thermal sensor clock from r8a7794 SoC * Correct unit names for cpu nodes on r8a7790 SoC * Add MMCIF0 to r8a7793 SoC * RTS/CTS hardware flow control for kzm9g and bockw boards * tag 'renesas-dt-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (30 commits) ARM: dts: silk: Fix W=1 dtc warnings ARM: dts: porter: Fix W=1 dtc warnings ARM: dts: marzen: Fix W=1 dtc warnings ARM: dts: lager: Fix W=1 dtc warnings ARM: dts: kzm9g: Fix W=1 dtc warnings ARM: dts: kzm9d: Fix W=1 dtc warnings ARM: dts: koelsch: Fix W=1 dtc warnings ARM: dts: gose: Fix W=1 dtc warnings ARM: dts: genmai: Fix W=1 dtc warnings ARM: dts: bockw: Fix W=1 dtc warnings ARM: dts: armadillo800eva: Fix W=1 dtc warnings ARM: dts: ape6evm: Fix W=1 dtc warnings ARM: dts: sh73a0: Fix W=1 dtc warnings ARM: dts: r8a7794: Fix W=1 dtc warnings ARM: dts: r8a7793: Fix W=1 dtc warnings ARM: dts: r8a7791: Fix W=1 dtc warnings ARM: dts: r8a7790: Fix W=1 dtc warnings ARM: dts: r8a7778: Fix W=1 dtc warnings ARM: dts: r8a7740: Fix W=1 dtc warnings ARM: dts: r8a73a4: Fix W=1 dtc warnings ... Signed-off-by: Olof Johansson <olof@lixom.net>
2016-06-13Merge tag 'samsung-dt-odroid-xu-4.8' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt Topic branch for adding Exynos 5410 Odroid XU board for v4.8. This brings support for Hardkernel's Odroid XU board. It was the first design with big.LITTLE SoC from Samsung: Exynos5410. The board is not very popular. Newer XU3 and XU4 got more attention. Board details: 1. Exynos5410 octa-core (A15+A7, however as of now only one cluster is enabled), 2. 2 GB DDR3 RAM, 3. PowerVR SGX544MP3 GPU (not enabled in DTS), 4. USB 3.0 Host x 1, USB 3.0 OTG x 1, USB 2.0 Host x 4, 5. HDMI 1.4a, MIPI DSI and Display Port (Display Port not on all of revisions though), 6. eMMC 4.5 and microSD slots. * tag 'samsung-dt-odroid-xu-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: (28 commits) ARM: dts: exynos: Add watchdog and Security SubSystem to Exynos5410 ARM: dts: exynos: Configure PWM, usb3503, PMIC and thermal on Odroid XU board ARM: dts: exynos: Add Thermal Management Unit to Exynos5410 ARM: dts: exynos: Interrupt for USB DWC3-1 differs between Exynos5420 and 5410 dt-bindings: clock: Add watchdog and SSS clock IDs to Exynos5410 dt-bindings: clock: Add TMU clock ID to Exynos5410 ARM: dts: exynos: Add RTC and I2C to Exynos5410 ARM: dts: exynos: Add I2C, PWM and UART pinctrl to Exynos5410 ARM: dts: exynos: Move HSI2C nodes to exynos54xx.dtsi ARM: dts: exynos: Add initial support for Odroid XU board ARM: dts: exynos: Add USB to Exynos5410 ARM: dts: exynos: Move common Exynos5410/542x/5800 nodes to new DTSI ARM: dts: exynos: MCT is not an interrupt controller and extend length of iomap ARM: dts: exynos: Enable UART3 on Exynos5410 ARM: dts: exynos: Include common exynos5 in exynos5410.dtsi ARM: dts: exynos: Move Exynos5250 and Exynos5420 nodes under soc ARM: dts: exynos: Use phandle to get parent node in exynos5250-snow ARM: dts: exynos: Prepare for inclusion of exynos5.dtsi in exynos5410.dtsi ARM: dts: exynos: Move common nodes to exynos5.dtsi ARM: dts: exynos: Split Odroid XU3 LEDs to separate DTSI ... Signed-off-by: Olof Johansson <olof@lixom.net>
2016-06-13Merge tag 'samsung-dt-4.8' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt Samsung DeviceTree update for v4.8: 1. Add missing async bridge for MFC power domain on Exynos5420. This fixes imprecise abort on s5p-mfc re-bind. 2. Define regulator supplies for MMC nodes on Exynos4412 Odroid boards and for TMU on Exynos542x Peach boards. 3. Thermal cleanups on Odroid XU3-family (Exynos5422). 4. Enable AX88760 USB hub on Origen board (Exynos4412). 5. Minor cleanups. * tag 'samsung-dt-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: dts: exynos: No need to enable TMU nodes on Odroid XU3 family ARM: dts: exynos: Add TMU nodes regulator supply for Peach boards ARM: dts: exynos: Use new compatible string for thermistors in Trats2 ARM: dts: exynos: Remove unneded always-on for regulators on Peach boards ARM: dts: exynos: Enable AX88760 USB hub on Origen board ARM: dts: exynos: Only Odroid XU3-family boards use DTSI with CPU thermal nodes ARM: dts: exynos: Lower SD card interface voltage to 2.8 V on Odroid X/X2/U3 ARM: dts: exynos: Define vqmmc for eMMC card on Odroid X/X2/U3 ARM: dts: exynos: Define vqmmc for SD card and allow disabling regulators on Odroid X/X2/U3 ARM: dts: exynos: Add async-bridge clock to MFC power domain for Exynos5420 Signed-off-by: Olof Johansson <olof@lixom.net>
2016-06-13ARM: dts: BCM5310x: Enable switch ports on SmartRG SR400ACFlorian Fainelli
Define the port mapping for the SmartRG SR400ACE device. Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-06-13ARM: dts: BCM5301X: Add SRAB interruptsFlorian Fainelli
Add interrupt mapping for the Switch Register Access Block. Only 12 interrupts are usable at the moment even though up to 32 are dedicated to the SRAB. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-06-13ARM: dts: Enable SRAB switch and GMACs on 5301x DTSFlorian Fainelli
Add the Switch Register Access Block which is a special piece of hardware allowing us to perform indirect read/writes towards the integrated BCM5301X Ethernet switch. We also add the 4 Gigabit MAC Device Tree nodes within the brcm,bus-axi bus node to get proper binding between the BCMA instantiated core and the Device Tree nodes. We will need that to be able to reference Ethernet Device Tree nodes in a future patch adding the switch ports layout. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-06-12Linux 4.7-rc3Linus Torvalds
2016-06-12Merge branch 'for-rc' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux Pull thermal management fixes from Zhang Rui: - fix an ordering issue in cpu cooling that cooling device is registered before it's ready (freq_table being populated). (Lukasz Luba) - fix a missing comment update (Caesar Wang) * 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: thermal: add the note for set_trip_temp thermal: cpu_cooling: fix improper order during initialization
2016-06-11dt: binding: Add Qualcomm WCNSS control bindingBjorn Andersson
This binding describes the control interface for the Qualcomm WCNSS. Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Andy Gross <andy.gross@linaro.org>
2016-06-11dts: qcom: apq8064: Add SCM firmware nodeAndy Gross
This patch adds the firmware node for the APQ8064 Signed-off-by: Andy Gross <andy.gross@linaro.org> Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
2016-06-11dts: qcom: msm8974: Add SCM firmware nodeAndy Gross
This patch adds the Qualcomm SCM firmware node. Signed-off-by: Andy Gross <andy.gross@linaro.org> Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
2016-06-11dts: qcom: apq8084: Add SCM firmware nodeAndy Gross
This patch adds the firmware node for the SCM Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Andy Gross <andy.gross@linaro.org> Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
2016-06-11dt/bindings: firmware: Add Qualcomm SCM bindingAndy Gross
This patch adds the device tree support for the Qualcomm SCM firmware. Signed-off-by: Andy Gross <andy.gross@linaro.org> Reviewed-by: Stephen Boyd <sboyd@codeaurora.org> Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org> Acked-by: Rob Herring <robh@kernel.org>
2016-06-11ARM: dts: qcom: pma8084: Add pwrkey entryAndy Gross
This patch adds the power key device tree node. Signed-off-by: Andy Gross <andy.gross@linaro.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
2016-06-11ARM: dts: qcom: Remove size elements from pmic regAndy Gross
The #size-cells for the pmics are 0, but we specify a size in the reg property so that MPP and GPIO modules can figure out how many pins there are. Now that we've done that by counting irqs, we can remove the size elements in the reg properties and be DT compliant. Signed-off-by: Andy Gross <andy.gross@linaro.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
2016-06-11ARM: dts: qcom: Enable sdcard and emmc on apq8074 dragonboardStephen Boyd
Enable the sdcard slot and wire up the regulators for the two storage controllers found on the apq8074 dragonboard. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Andy Gross <andy.gross@linaro.org>
2016-06-11ARM: dts: qcom: Enable RPM regulators on apq8074 dragonboardStephen Boyd
Add the appropriate min/max voltages for the regulators on the apq8074 dragonboard so that they can be used by clients properly. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Andy Gross <andy.gross@linaro.org>
2016-06-11Merge branch 'for-linus' of git://git.kernel.dk/linux-blockLinus Torvalds
Pull block layer fixes from Jens Axboe: "A small collection of fixes for the current series. This contains: - Two fixes for xen-blkfront, from Bob Liu. - A bug fix for NVMe, releasing only the specific resources we requested. - Fix for a debugfs flags entry for nbd, from Josef. - Plug fix from Omar, fixing up a case of code being switched between two functions. - A missing bio_put() for the new discard callers of submit_bio_wait(), fixing a regression causing a leak of the bio. From Shaun. - Improve dirty limit calculation precision in the writeback code, fixing a case where setting a limit lower than 1% of memory would end up being zero. From Tejun" * 'for-linus' of git://git.kernel.dk/linux-block: NVMe: Only release requested regions xen-blkfront: fix resume issues after a migration xen-blkfront: don't call talk_to_blkback when already connected to blkback nbd: pass the nbd pointer for flags debugfs block: missing bio_put following submit_bio_wait blk-mq: really fix plug list flushing for nomerge queues writeback: use higher precision calculation in domain_dirty_limits()
2016-06-11Merge tag 'gpio-v4.7-3' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio Pull GPIO fixes from Linus Walleij: "A new bunch of GPIO fixes for v4.7. This time I am very grateful that Ricardo Ribalda Delgado went in and fixed my stupid refcounting mistakes in the removal path for GPIO chips. I had a feeling something was wrong here and so it was. It exploded on OMAP and it fixes their problem. Now it should be (more) solid. The rest i compilation, Kconfig and driver fixes. Some tagged for stable. Summary: - Fix a NULL pointer dereference when we are searching the GPIO device list but one of the devices have been removed (struct gpio_chip pointer is NULL). - Fix unaligned reference counters: we were ending on +3 after all said and done. It should be 0. Remove an extraneous get_device(), and call cdev_del() followed by device_del() in gpiochip_remove() instead and the count goes to zero and calls the release() function properly. - Fix a compile warning due to a missing #include in the OF/device tree portions. - Select ANON_INODES for GPIOLIB, we're using that for our character device. Some randconfig tests disclosed the problem. - Make sure the Zynq driver clock runs also without CONFIG_PM enabled - Fix an off-by-one error in the 104-DIO-48E driver - Fix warnings in bcm_kona_gpio_reset()" * tag 'gpio-v4.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: gpio: bcm-kona: fix bcm_kona_gpio_reset() warnings gpio: select ANON_INODES gpio: include <linux/io-mapping.h> in gpiolib-of gpiolib: Fix unaligned used of reference counters gpiolib: Fix NULL pointer deference gpio: zynq: initialize clock even without CONFIG_PM gpio: 104-dio-48e: Fix control port offset computation off-by-one error
2016-06-11Merge tag 'scsi-fixes' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi Pull SCSI fixes from James Bottomley: "Two current fixes: - one affects Qemu CD ROM emulation, which stopped working after the updates in SCSI to require VPD pages from all conformant devices. Fix temporarily by blacklisting Qemu (we can relax later when they come into compliance). - The other is a fix to the optimal transfer size. We set up a minefield for ourselves by being confused about whether the limits are in bytes or sectors (SCSI optimal is in blocks and the queue parameter is in bytes). This tries to fix the problem (wrong setting for queue limits max_sectors) and make the problem more obvious by introducing a wrapper function" * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: sd: Fix rw_max for devices that report an optimal xfer size scsi: Add QEMU CD-ROM to VPD Inquiry Blacklist
2016-06-11Merge branch 'i2c/for-current' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux Pull i2c fixes from Wolfram Sang: - a bigger fix for i801 to finally be able to be loaded on some machines again - smaller driver fixes - documentation update because of a renamed file * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: mux: reg: Provide of_match_table i2c: mux: refer to i2c-mux.txt i2c: octeon: Avoid printk after too long SMBUS message i2c: octeon: Missing AAK flag in case of I2C_M_RECV_LEN i2c: i801: Allow ACPI SystemIO OpRegion to conflict with PCI BAR
2016-06-11Merge tag 'devicetree-fixes-for-4.7' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux Pull DeviceTree fixes from Rob Herring: - fix unflatten_dt_nodes when dad parameter is set. - add vendor prefixes for TechNexion and UniWest - documentation fix for Marvell BT - OF IRQ kerneldoc fixes - restrict CMA alignment adjustments to non dma-coherent - a couple of warning fixes in reserved-memory code - DT maintainers updates * tag 'devicetree-fixes-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: drivers: of: add definition of early_init_dt_alloc_reserved_memory_arch drivers/of: Fix depth for sub-tree blob in unflatten_dt_nodes() drivers: of: Fix of_pci.h header guard dt-bindings: Add vendor prefix for TechNexion of: add vendor prefix for UniWest dt: bindings: fix documentation for MARVELL's bt-sd8xxx wireless device of: add missing const for of_parse_phandle_with_args() in !CONFIG_OF of: silence warnings due to max() usage drivers: of: of_reserved_mem: fixup the CMA alignment not to affect dma-coherent of: irq: fix of_irq_get[_byname]() kernel-doc MAINTAINERS: DeviceTree maintainer updates
2016-06-11Merge tag '20160610_uvc_compat_for_linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux Pull uvc compat XU ioctl fixes from Andy Lutomirski: "uvc's compat XU ioctls go through tons of potentially buggy indirection. The first patch removes the indirection. The second one cleans up the code. Compile-tested only. I have the hardware, but I have absolutely no idea what XU does, how to use it, what software to recompile as 32-bit, or what to test in that software" * tag '20160610_uvc_compat_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux: uvc_v4l2: Simplify compat ioctl implementation uvc: Forward compat ioctls to their handlers directly
2016-06-11ARM: dts: ls1021a: Add dis_rxdet_inp3_quirk property to USB3 nodeRajesh Bhagat
Add "dis_rxdet_inp3_quirk" boolean property to USB3 node. This property is used to disable rx detection in P3 PHY mode. Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2016-06-11ARM: dts: imx6qdl-sabresd: Pass the correct PCI reset polarityFabio Estevam
The PCI reset GPIO is active low, so represent it with the GPIO_ACTIVE_LOW flag. Even though the imx6 PCI driver will not take the polarity into account in this case, it is better to provide a correct description in device-tree. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2016-06-11ARM: dts: imx6q-cm-fx6: Relicense under GPLv2/X11Christopher Spinrath
GPLv2-only devicetrees make reuse difficult for software components licensed under a different license. In particular, the Utilite Pro devicetree file (which includes imx6q-cm-fx6.dts) is already dual licensed under GPLv2/X11. Hence, relicense imx6q-cm-fx6.dts under GPLv2/X11 dual license. Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> Acked-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2016-06-11ARM: dts: imx6q: add support for the Utilite ProChristopher Spinrath
The CompuLab Utilite Pro is a miniature fanless desktop pc based on the i.MX6 Quad powered cm-fx6 module. It features two serial ports, USB OTG, 4x USB, analog audio and S/PDIF, 2x Gb Ethernet, HDMI and DVI ports, an on-board 32GB SSD, a mmc slot, and on-board wifi/bt. Add initial support for it including USB, Ethernet (both ports), sata and HDMI support. Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> Acked-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2016-06-11ARM: dts: imx6q: extend support for the cm-fx6Christopher Spinrath
The cm-fx6 module has an on-board spi-flash chip for its firmware, an eeprom (containing e.g. the mac address of the on-board Ethernet), a sata port, a pcie controller, an USB hub, and an USB otg port. Enable support for them. In addition, enable syscon poweroff support. Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Acked-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2016-06-11ARM: dts: imx6q-cm-fx6: remove iomuxc container nodeChristopher Spinrath
The imx6q-cm-fx6 iomuxc container node is not required. Remove it. Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> Acked-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Shawn Guo <shawnguo@kernel.org>