summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2015-12-22Merge tag 'imx-defconfig-4.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig The i.MX defconfig updates for 4.5: - Drop CONFIG_SOC_LS1021A support, as it needs LPAE which is not available with imx_v6_v7_defconfig. - Enable VF610_ADC, HDMI audio and PCI_MSI support * tag 'imx-defconfig-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v6_v7_defconfig: enable PCI_MSI ARM: imx_v6_v7_defconfig: Select HDMI audio support ARM: imx_v6_v7_defconfig: Select VF610_ADC ARM: imx_v6_v7_defconfig: Remove CONFIG_SOC_LS1021A Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'imx-dt-4.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt The i.MX device tree updates for 4.5: - New boards support: imx51-ts4800, imx6q-novena, CompuLab imx7d SoM/SBC, vf610m4-cosmic - Add ADC device support for imx6ul and imx7d - Remove config space from PCIe controller ranges property for i.MX6 - Add Vivante GPU nodes for i.MX6 - Add DCU, LCD, and SATA devices for LS1021A - A series to update Ventana gw5xxx boards getting HDMI and LVDS to work simultaneously and devices like PWM and SPI added - Quite a few random cleanups and minor updates * tag 'imx-dt-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (50 commits) ARM: dts: imx7d: sbc-imx7: add basic board support ARM: dts: imx7d: cl-som-imx7: add basic module support ARM: dts: TS-4800: add touchscreen support ARM: dts: ts-4800: Add LCD support ARM: dts: imx6q: add Novena board devicetree: bindings: Add vendor prefix for Kosagi ARM: dts: TS-4800: use weim IP to map the FPGA ARM: dts: TS-4800: drop uart rts/cts pin reservations ARM: dts: imx6: add Vivante GPU nodes ARM: dts: imx28: add alternate auart4 pinmux ARM: dts: ls1021a: add sata node to dts ARM: dts: TS-4800: add basic device tree of: documentation: add bindings documentation for TS-4800 of: add vendor prefix for Technologic Systems ARM: dts: imx7d-sdb: add ADC support ARM: dts: imx7d.dtsi: add ADC support ARM: dts: vf-colibri: add CAN support ARM: mxs: dt: cfa10057: fix backlight PWM ARM: dts: imx6qdl: move GIC to right location in DT ARM: dts: imx6qdl: add IPU aliases ... Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'imx-soc-4.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc The i.MX SoC updates for 4.5: - Select HAVE_IMX_SRC for i.MX7 to avoid a randconfig build error - Enable cpufreq support on i.MX7D - A couple of random cleanup on iomux-imx31 and mach-imx6ul * tag 'imx-soc-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx: select SRC for i.MX7 ARM: mach-imx: iomux-imx31: fix spelling mistake in error message ARM: imx: enable cpufreq device on i.mx7d mach-imx/mach-imx6ul.c: proper constness with __initconst Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22ARM: sa1100/simpad: Be sure to clamp return valueLinus Walleij
As we want gpio_chip .get() calls to be able to return negative error codes and propagate to drivers, we need to go over all drivers and make sure their return values are clamped to [0,1]. We do this by using the ret = !!(val) design pattern. Cc: arm@kernel.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22ARM: scoop: Be sure to clamp return valueLinus Walleij
As we want gpio_chip .get() calls to be able to return negative error codes and propagate to drivers, we need to go over all drivers and make sure their return values are clamped to [0,1]. We do this by using the ret = !!(val) design pattern. Cc: arm@kernel.org Cc: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22ARM: multi_v7_defconfig: enable rk808 clkout moduleHeiko Stübner
The rk808 supplies two clock outputs with one going back into the soc as 32kHz supply, supplying some core soc clocks with it. The system can boot without it being present, but it is needed for example as source clock for the thermal driver. Signed-off-by: Heiko Stuebner <heiko.stuebner@collabora.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22ARM: multi_v7_defconfig: enable rockchip crypto moduleHeiko Stübner
This enables the newly added hardware crypto module found for example on the rk3288. Signed-off-by: Heiko Stuebner <heiko.stuebner@collabora.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22ARM: multi_v7_defconfig: enable Rockchip io-domain driverHeiko Stübner
The io-domain driver is necessary to notify the soc about voltages changes happening on supplying regulators. Probably the most important user right now is the mmc tuning code, where the soc needs to get notified when the voltage is dropped to the 1.8V point. As this option is necessary to sucessfully tune UHS cards etc, it should get built in. Signed-off-by: Heiko Stuebner <heiko.stuebner@collabora.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'omap-for-v4.5/dt-pt2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Second set of omap device tree changes for v4.5 merge window. This series updates the EDMA bindings based on the various fixes to split EDMA into separate independent devices. It also adds support for more devices on the CompuLab cm-t335 and LogicPD Torpedo boards, and enables the new bindings for qspi for am437x and dra7. There are also few dra7 regulator fixes, and change of gpoi-key,wakeup to wakeup-source. These depend on commit ae0add740cd0 ("dmaengine: edma: DT: Change reserved slot array from 16bit to 32bit type") already merged into mainline. * tag 'omap-for-v4.5/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: LogicPD Torpedo: Add Touchscreen Support ARM: dts: DRA7-EVM: Add regulator-allow-bypass property for ldo9 ARM: dts: DRA72-EVM: Add regulator-allow-bypass property for ldo1 and ldo2 ARM: dts: AM4372: add entry for qspi mmap region ARM: dts: DRA7: add entry for qspi mmap region ARM: OMAP2+: LogicPD Torpedo: Revert Duplicative Entries ARM: OMAP2+: LogicPD Torpedo + Wireless: Add Bluetooth ARM: OMAP2+: LogicPD Torpedo: Add LCD Type 15 Support ARM: dts: cm-t335: add support for bluetooth ARM: dts: cm-t335: add support for DVI/LCD ARM: dts: cm-t335: add support for I2C GPIO expander ARM: dts: cm-t335: add support for SBC-T335 ARM: dts: cm-t335: add support for USB0 ARM: dts: omap: replace legacy *,wakeup property with wakeup-source ARM: dts: am335x: replace gpio-key,wakeup with wakeup-source property ARM: DTS: am437x: Use the new DT bindings for the eDMA3 ARM: DTS: am33xx: Use the new DT bindings for the eDMA3 dmaengine: edma: DT: Change reserved slot array from 16bit to 32bit type dmaengine: edma: DT: Change memcpy channel array from 16bit to 32bit type Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'omap-for-v4.5/soc-initcall' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc SoC changes for omaps for v4.5 merge window. The main change here is to change the omap initcall levels a bit to initialize things later to allow early device drivers at core_initcall level. This makes things easier for us as most clocks can be made into regular device drivers except for a few early clocks needed to initialize system timers. I wanted to have these changes sit in Linux next for a few weeks before sending out a pull request, and so far now issues have showed up. The other changes in this series are timer changes for making use of the new PWM driver, and timer changes to support more high security SoCs. Also few minor improvments for module autoidle settings for ti81xx spinbox and dra7 debug on uart4 in hwmod code. The rest is pretty much just removal of platform data for SoCs that are all device tree only nowadays. * tag 'omap-for-v4.5/soc-initcall' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Remove device creation for omap-pcm-audio ARM: OMAP1: Remove device creation for omap-pcm-audio ARM: OMAP2+: Change core_initcall levels to postcore_initcall ARM: DRA7: hwmod: Enable DEBUG_LL for UART4 ARM: OMAP: RX-51: fix a typo in log writing ARM: omap4: hwmod: Remove elm address space from hwmod data ARM: OMAP2+: timer: Remove secure timer for DRA7xx HS devices ARM: OMAP: dmtimer: check for fixed timers during config ARM: OMAP2+: Remove omap_mmu_dev_attr structure ARM: OMAP4: hwmod data: Remove legacy IOMMU attr and addrs ARM: OMAP3: hwmod data: Remove legacy IOMMU data ARM: OMAP2+: Remove legacy device instantiation of IOMMUs ARM: OMAP2+: Add hwmod spinbox support for dm816x ARM: OMAP: add DT support for ti,dm816-timer ARM: OMAP: dmtimer: Add clock source from DT Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'omap-for-v4.4/fixes-rc6' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes Few fixes for omaps to allow am437x only builds to boot properly with CPU_IDLE and ARM TWD timer. This is probably a common configuration setup for people making products with these SoCs so let's make sure it works. Also a wakeirq fix for duovero parlor making my life a bit easier as that allows me to run basic PM regression tests on it. It would be nice to have these in v4.4, but if it gets too late for that because of the holidays, it is not super critical if these get merged for v4.5. * tag 'omap-for-v4.4/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: Fix UART wakeirq for omap4 duovero parlor ARM: OMAP2+: AM43xx: select ARM TWD timer ARM: OMAP2+: am43xx: enable GENERIC_CLOCKEVENTS_BROADCAST Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'socfpga_dts_for_v4.5_part_2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt SoCFPGA DTS update for v4.5, part 2 - clean up mcvevk dts file, replace space with tab - Disable SDMMC node in base socfpga.dtsi file * tag 'socfpga_dts_for_v4.5_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: ARM: socfpga: dts: Enable MMC support at correct place in the DT ARM: socfpga: Repair incorrectly applied MCV patch Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge branch 'treewide/cleanup' into next/socOlof Johansson
Merge in cleanup to avoid internal conflicts with newly added code. * treewide/cleanup: ARM: use "depends on" for SoC configs instead of "if" after prompt ARM/clocksource: use automatic DT probing for ux500 PRCMU ARM: use const and __initconst for smp_operations ARM: hisi: do not export smp_operations structures Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'v4.5-rockchip-dts64-2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt64 New node for the broadcast-timer of the rk3368, a non-critical fix for a regulator voltage and a typo fix. * tag 'v4.5-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: Add the broadcast-timer for RK3368 SoC arm64: dts: rockchip: Fix typo in rk3368 sdmmc card detect pin name arm64: dts: rockchip: correct voltage range for rk3368-evb-act8846 board Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'v4.5-rockchip-dts32-2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Another new soc - the rk3228 quad-core cortex-a7, a new rk3036 board, support for the efuses on Rockchip socs and some improvements for rk3288 regulators. * tag 'v4.5-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: add the kylin board for rk3036 ARM: dts: rockchip: add the sdio/sdmmc node for rk3036 ARM: dts: rockchip: fix the pinctrl bias settings for rk3036 ARM: dts: rockchip: add eFuse node for rk3188 SoCs ARM: dts: rockchip: add eFuse node for rk3066a SoCs ARM: dts: rockchip: add eFuse config of rk3288 SoC ARM: dts: rockchip: add rk3228-evb board ARM: dts: rockchip: add core rk3228 dtsi clk: rockchip: Add the clock ids of rk3288 eFuses ARM: dts: rockchip: Fix typo in rk3288 sdmmc card detect pin name ARM: dts: rockchip: fix voltage ranges for rk3288-evb-act8846 board ARM: dts: rockchip: move the public part to rk3288-evb common ARM: dts: rockchip: add 2 regulators for rk3288-evb-act8846 ARM: dts: rockchip: correct the name of REG8 for rk3288-evb-act8846 clk: rockchip: add dt-binding header for rk3228 clk: rockchip: add id for mipidsi sclk on rk3288 Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'v4.5-rockchip-soc-1' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc SMP special case for the rk3036 and addition of the rk3228 quad-core Cortex-A7 cpu. * tag 'v4.5-rockchip-soc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: rockchip: enable support for RK3228 SoCs ARM: rockchip: use const and __initconst for rk3036 smp_operations ARM: rockchip: add support smp for rk3036 Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'lpc18xx_dts_for_4.5' of https://github.com/manabian/linux-lpc ↵Olof Johansson
into next/dt Device Tree additions for LPC18xx platform NXP LPC18xx EEPROM support plus board updates for CIAA board and EA4357 Dev kit. * tag 'lpc18xx_dts_for_4.5' of https://github.com/manabian/linux-lpc: ARM: dts: lpc4337-ciaa: add i2c0 and devices ARM: dts: lpc4337-ciaa: enable SCT-PWM ARM: dts: lpc4357-ea4357: add mma7455 i2c accelerometer ARM: dts: lpc4357: enable EEPROM memory ARM: dts: lpc18xx: add EEPROM memory node Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'lpc18xx_defconfig_for_4.5' of ↵Olof Johansson
https://github.com/manabian/linux-lpc into next/defconfig Defconfig additions for LPC18xx platform Add LPC18xx EEPROM driver and MMA7455 IIO driver for the accelerometer found on EA4357 Dev kit. * tag 'lpc18xx_defconfig_for_4.5' of https://github.com/manabian/linux-lpc: ARM: configs: lpc18xx: enable EEPROM NVMEM driver ARM: configs: lpc18xx: enable mma7455 IIO driver Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'v4.4-next-kconfig' of https://github.com/mbgg/linux-mediatek into ↵Olof Johansson
next/config64 Enable mediatek clocksource driver by default as otherwise the system does not boot. * tag 'v4.4-next-kconfig' of https://github.com/mbgg/linux-mediatek: arm64: mediatek: enable MTK_TIMER Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'v4.4-next-dts' of https://github.com/mbgg/linux-mediatek into next/dtOlof Johansson
Add regulators to the scpsys binding. Move the include of the reset contoller to include/dt-bindings/reset. Add basic support for mt2701 SoC and evaluation board. * tag 'v4.4-next-dts' of https://github.com/mbgg/linux-mediatek: dt-bindings: soc: Add supplies for Mediatek SCPSYS unit ARM: mediatek: DT: Move reset controller constants into common location ARM: dts: mediatek: add MT2701 basic support Document: DT: Add bindings for mediatek MT2701 SoC Platform Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'v4.4-next-arm64' of https://github.com/mbgg/linux-mediatek into ↵Olof Johansson
next/dt64 Update psci support to the arm,psci-1.0 to mt8173 Add display PWM driver to mt8173 Add mediatek general porpose timer to mt8173 * tag 'v4.4-next-arm64' of https://github.com/mbgg/linux-mediatek: arm64: dts: mediatek: mt8173 PSCI-1.0 support arm64: dts: mt8173: add MT8173 display PWM driver support node arm64: dts: mt8173: add timer node Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'mvebu-dt-4.5-3' of git://git.infradead.org/linux-mvebu into next/dtOlof Johansson
mvebu dt for 4.5 (part 3) Add dts for the following boards: - Zyxel NSA325 - PogoPlug series 4 Add GPU support for Dove Update boolean property to wakeup source for isil * tag 'mvebu-dt-4.5-3' of git://git.infradead.org/linux-mvebu: ARM: dts: armada: replace isil, irq2-can-wakeup-machine with wakeup-source property ARM: dts: enable GPU for SolidRun's Cubox ARM: dts: dove: add DT GPU support ARM: mvebu: kirkwood: add PogoPlug series 4 device tree ARM: mvebu: add kirkwood compatibles for cloudengine boards ARM: dts: kirkwood: Add DTS for Zyxel NSA325 Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'renesas-gic-cleanup-for-v4.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup Renesas ARM Based SoC GIC Cleanup for v4.5 On several Renesas ARM SoCs, the GIC is described in DT as being a Cortex A9 GIC, while it's actually a PL390. This is not only stated in the documentation, but has been verified by reading the GICD_IIDR register. To correct this: 1. Update the DT compatible value to match reality, 2. Update the board staging drivers to match the above. * tag 'renesas-gic-cleanup-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: staging: board: armadillo800eva: Use "arm,pl390" staging: board: kzm9d: Use "arm,pl390" ARM: shmobile: r8a7778 dtsi: Use "arm,pl390" for GIC ARM: shmobile: emev2 dtsi: Use "arm,pl390" for GIC ARM: shmobile: r8a7740 dtsi: Use "arm,pl390" for GIC ARM: shmobile: r7s72100 dtsi: Use "arm,pl390" for GIC Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'renesas-dt3-for-v4.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Third Round of Renesas ARM Based SoC DT Updates for v4.5 * Use SoC-specific usb-dmac and IPMMU compatibility strings * Add internal delay for i2c IPs * Add missing serial devices to r8a7793 * Enable DMA for r8a7793 serial devices * Add serial port config to chosen/stdout-path * Tidyup #sound-dai-cells settings for r8a7798/bockw * Remove deprecated #gpio-range-cells from r8a7793 * Add EtherAVB support to r8a7791 * Add MSIOF support to sh73a0 * tag 'renesas-dt3-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (25 commits) ARM: shmobile: r8a779x: use SoC-specific usb-dmac compatibility strings ARM: shmobile: r8a7794: IPMMU compat string SoC part number update ARM: shmobile: r8a7793: IPMMU compat string SoC part number update ARM: shmobile: r8a7791: IPMMU compat string SoC part number update ARM: shmobile: r8a7790: IPMMU compat string SoC part number update ARM: shmobile: r8a7794: dtsi: add internal delay for i2c IPs ARM: shmobile: r8a7791: dtsi: add internal delay for i2c IPs ARM: shmobile: r8a7790: dtsi: add internal delay for i2c IPs ARM: shmobile: r8a7793: Describe DMA for the serial ports ARM: shmobile: r8a7793: Add missing serial devices to DT ARM: shmobile: lager dts: Add serial port config to chosen/stdout-path ARM: shmobile: porter dts: Add serial port config to chosen/stdout-path ARM: shmobile: silk dts: Add serial port config to chosen/stdout-path ARM: shmobile: gose dts: Add serial port config to chosen/stdout-path ARM: shmobile: bockw dts: Update console parameters ARM: shmobile: ape6evm dts: Add serial port config to chosen/stdout-path ARM: shmobile: alt dts: Add serial port config to chosen/stdout-path ARM: shmobile: koelsch dts: Add serial port config to chosen/stdout-path ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings ARM: shmobile: bockw dts: Override #sound-dai-cells to zero ... Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'renesas-arm64-dt3-for-v4.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt64 Third Round of Renesas ARM64 Based SoC DT Updates for v4.5 * Enable SATA * Add salvator-x part number to DT bindings documentation * Enable all four A57 cores instead of just one * Enhanced audio support: - Use CS2000 as AUDIO_CLK_B - Set ak4613 In/Out pin as single-end * tag 'renesas-arm64-dt3-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: arm64: renesas: r8a7795: fix SATA clock assignment arm64: dts: salvator-x: Enable SATA controller arm64: dts: r8a7795: Add SATA controller node arm64: renesas: r8a7795: add internal delay for i2c IPs arm64: renesas: salvator-x: Add board part number to DT bindings arm64: dts: r8a7795: Add pmu device nodes arm64: dts: r8a7795: Add Cortex-A57 CPU cores arm64: dts: r8a7795: Add PSCI node arm64: renesas: salvator-x: use CS2000 as AUDIO_CLK_B arm64: renesas: salvator-x: set ak4613 In/Out pin as single-end Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'renesas-arm64-defconfig3-for-v4.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/config64 Third Round of Renesas ARM64 Based SoC Defconfig Updates for v4.5 * Enable CS2000 and Renesas R-Car SATA driver * tag 'renesas-arm64-defconfig3-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: arm64: defconfig: add CS2000 support arm64: defconfig: Add Renesas R-Car SATA driver for R-Car Gen3 SoCs Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'qcom-arm64-for-4.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt64 Qualcomm ARM64 Updates for v4.5 * Add fixed rate oscillators to dts * Fixup PMIC alias and properties * Change 8916-MTP compatible to be compliant with new scheme * Fix 8x16 UART pinctrl configuration * Add SMEM, RPM/SMD, and PM8916 support on MSM8916 * tag 'qcom-arm64-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: arm64: dts: Add PM8916 support on MSM8916 arm64: dts: qcom: Add RPM/SMD support on MSM8916 arm64: dts: qcom: Add MSM8916 SMEM nodes arm64: dts: set the default i2c pin drive strength to 16mA arm64: dts: fix the i2c aliasing to match to schematics. arm64: dts: qcom: msm8916: Add fixed rate on-board oscillators arm64: dts: qcom: Alias pm8916 on msm8916 devices arm64: dts: qcom: Make msm8916-mtp compatible string compliant arm64: dts: qcom: 8x16: UART1 and UART2 use DMA for RX and TX arm64: dts: qcom: 8x16: UART1 add CTS_N, RTS_N pin configurations Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'qcom-defconfig-for-4.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/defconfig Qualcomm ARM Based defconfig Updates for v4.5 * Enable newly supported devices on Qualcomm platforms * Enable HAVE_ARM_ARCH_TIMER * tag 'qcom-defconfig-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: ARM: defconfig: qcom: Enable SSBI drivers ARM: defconfig: Update qcom_defconfig ARM: qcom_defconfig: Enable HAVE_ARM_ARCH_TIMER Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'qcom-dt-for-4.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt Qualcomm ARM Based Device Tree Updates for v4.5 * Add support for Sony Xperia Z * Updates for Sony Honami board * Updates for APQ8064 generic platform * Updates for MSM8974 generic platform * Add fixed rate oscillators for MSM8960 and APQ8064 * Add documentation for SMSM and SMP2P * Fixup PMIC compat strings * Add support for SMEM, RPM/SMD on APQ8084 * Fixup compat on IFC5640 * tag 'qcom-dt-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: (24 commits) arm: dts: Add support for PMA8084 on APQ8084 arm: dts: Add RPM/SMD support on APQ8084 arm: dts: Add APQ8084 SMEM nodes ARM: dts: qcom: apq8064-ifc6410 Use hardware flow control for GSBI6 arm: dts: qcom: apq8064: Add fixed rate on-board oscillators ARM: dts: qcom: msm8974: Add i2c8 node ARM: dts: qcom: msm8974: Disable wled and move it to honami arm: dts: qcom: Add generic PMIC gpio/MPP compat strings arm: dts: qcom: Add aliases for PMICs arm: dts: qcom: Update ifc6540 compat for qcom boot format arm: dts: qcom: Add board clocks ARM: dts: qcom: apq8064: Introduce Sony Xperia Z dts ARM: dts: qcom: apq8064: Introduce gsbi5 and gsbi5 serial node ARM: dts: qcom: apq8064: Declare all pm8921 regulators ARM: dts: qcom: apq8064: Add hwmutex and SMEM nodes dt-binding: soc: qcom: Introduce qcom, smp2p binding documentation dt-binding: soc: qcom: Add Qualcomm SMSM device tree documentation devicetree: Add hardware rng entry to qcom-apq8064.dtsi ARM: dts: qcom: msm8974-honami: Specify charging parameters ARM: dts: qcom: msm8974-honami: Add uSD slot nodes ... Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge commit 'fe5fa8fbd4d47f40a45fa29ee1abdb10cb061ec2' into clk-nextMichael Turquette
2015-12-22Merge tag 'tegra-for-4.5-defconfig' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/config64 ARM: tegra: Default configuration updates for v4.5-rc1 This set of patches enable various drivers and features required by 64-bit Tegra SoCs (Tegra132 and Tegra210). * tag 'tegra-for-4.5-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: arm64: defconfig: Enable printk timestamps arm64: defconfig: Enable squashfs support arm64: defconfig: Enable sdhci-tegra driver arm64: defconfig: Enable serial-tegra driver arm64: defconfig: Enable tegra-apbdma driver arm64: defconfig: Do not disable Tegra AHB driver arm64: defconfig: Enable Tegra210 support Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'imx-fixes-4.4-3' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes The i.MX fixes for 4.4, 3rd round: - Fix Ethernet PHY mode on i.MX6 Ventana boards, which can result in a non-functional Ethernet when Marvell phy driver rather than generic phy driver is selected. - Fix an assigned-clock configuration bug on imx6qdl-sabreauto board which was introduced by commit ed339363de1b ("ARM: dts: imx6qdl-sabreauto: Allow HDMI and LVDS to work simultaneously"). * tag 'imx-fixes-4.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: imx6: Fix Ethernet PHY mode on Ventana boards ARM: dts: imx: Fix the assigned-clock mismatch issue on imx6q/dl
2015-12-22Merge tag 'renesas-defconfig-for-v4.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig Renesas ARM Based SoC Defconfig Updates for v4.5 * multi_v7_defconfig and shmobile_defconfig: - Enable frame buffer console for armadillo800eva - Enable missing Renesas ARM support based on DTSes - Drop useless CONFIG_USB_RCAR_PHY=y * shmobile_defconfig only: - Enable CONFIG_PRINTK_TIME * tag 'renesas-defconfig-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: multi_v7_defconfig: Enable frame buffer console for armadillo800eva ARM: multi_v7_defconfig: Enable missing Renesas ARM support based on DTSes ARM: multi_v7_defconfig: Drop useless CONFIG_USB_RCAR_PHY=y ARM: shmobile: defconfig: Enable frame buffer console for armadillo800eva ARM: shmobile: defconfig: Enable missing support based on DTSes ARM: shmobile: defconfig: Drop useless CONFIG_USB_RCAR_PHY=y ARM: shmobile: defconfig: Enable CONFIG_PRINTK_TIME Signed-off-by: Olof Johansson <olof@lixom.net> Conflicts: arch/arm/configs/multi_v7_defconfig
2015-12-22Merge tag 'at91-defconfig' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/defconfig First defconfig pull-request for 4.5: - a single patch to add watchdog drivers to sama5_defconfig * tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: at91/defconfig: enable watchdog drivers in sama5_defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'at91-dt' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt First batch of DT changes for 4.5: - addition of nodes for sama5d2 & sama5d4 - some fixes for i2c hold time, compatible stings - addition of a new patform by DENX: the MA5D4 SoM and EVK * tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: at91/dt: sama5d2 Xplained: pmic needs a specific sda hold time ARM: at91/dt: sama5d4: update i2c compatible string ARM: at91/dt: sama5d4 master clock can run at 200MHz now ARM: at91/dt: sama5d2: add watchdog node ARM: at91/dt: sama5d4: Add support for DENX MA5D4 SoM and EVK ARM: at91/dt: sama5d4: Add pinmux for 8-bit MMC0 bus ARM: at91/dt: sama5d4: Fix mmc0 pinmux comments Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'davinci-for-v4.5/fixes' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/fixes-non-critical This pull request includes a fix for improper usage of WARN() and a fix for unmet 'select' dependencies. * tag 'davinci-for-v4.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: fix a problematic usage of WARN() ARM: davinci: only select WT cache if cache is enabled Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22ARM: multi_v7_defconfig: Enable generic SoC internal OMAP regulatorsNishanth Menon
ABB and PBIAS are internal LDO control regulators that are needed for maintaining proper functionality of OMAP architecture SoCs. Enable the same. PBIAS is already enabled, so just enable ABB regulator as well. Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22ARM: multi_v7_defconfig: Enable AM437x PMIC TPS65218Nishanth Menon
Enable PMIC for AM437x platforms such as AM437x-sk similar to commit a186cf10da84 ("ARM: omap2plus_defconfig: enable TPS65218 configs"). This allows multi_v7_defconfig to boot up on AM437x-sk platform. Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'sunxi-dt-for-4.5' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt Allwinner DT changes for 4.5 Allwinner device-tree related patches for the 4.5 merge window. * Support for the H3 * Addition of the RSB to the relevant devices (sun8i, sun9i) * Addition of the Video Engine clocks for the older SoCs (sun4i, sun7i) * Addition of the DRAM gates for the older SoCs (sun4i, sun7i) * Addition of the audio codec to a bunch of boards * New board: ICNova SWAC * tag 'sunxi-dt-for-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (40 commits) ARM: dts: sun7i: Olimex A20-SOM-EVB: Enable mmc3 (baseboard SD socket) ARM: dts: sun7i: Olimex A20-SOM-EVB: Add LRADC keys ARM: dts: sun9i: cubieboard4: Enable Reduced Serial Bus controller ARM: dts: sun9i: cubieboard4: Enable consumer IR receiver ARM: dts: sun9i: cubieboard4: Enable LEDs ARM: dts: sun7i: Add VE (Video Engine) module clock node ARM: dts: sun4i: Add VE (Video Engine) module clock node ARM: dts: sun8i: Add Orange Pi Plus support ARM: dts: sunxi: Add Allwinner H3 DTSI ARM: dts: sun7i: Add DRAM gates ARM: dts: sun4i: Add DRAM gates ARM: dts: sun9i: Add NMI controller device node ARM: dts: sun9i: optimus: Enable Reduced Serial Bus controller ARM: dts: sun9i: Add Reduced Serial Bus controller device node to A80 dtsi ARM: dts: sun9i: optimus: Enable consumer IR receiver ARM: dts: sun9i: Add consumer IR receiver device node and pinmux settings ARM: dts: sun9i: optimus: Enable LED3 ARM: dts: sun9i: Add A80 R_PIO pin controller device node ARM: dts: sun9i: Add TODO comments for the main and low power clocks ARM: dts: sun9i: Add A80 PRCM clocks and reset control nodes ... Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'zynq-soc-for-4.5' of https://github.com/Xilinx/linux-xlnx into ↵Olof Johansson
next/soc arm: Xilinx Zynq patches for v4.5 - Select reset controller by default for Zynq * tag 'zynq-soc-for-4.5' of https://github.com/Xilinx/linux-xlnx: ARM: zynq: Select ARCH_HAS_RESET_CONTROLLER Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'zynqmp-dt-for-4.5' of https://github.com/Xilinx/linux-xlnx into ↵Olof Johansson
next/dt64 arm: Xilinx ZynqMP dt patches for v4.5 - Label GPIO controller as interrupt controller * tag 'zynqmp-dt-for-4.5' of https://github.com/Xilinx/linux-xlnx: ARM64: zynqmp: DT: Add interrupt-controller property to GPIO Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'zynq-dt-for-4.5' of https://github.com/Xilinx/linux-xlnx into next/dtOlof Johansson
arm: Xilinx Zynq dt patches for v4.5 - Various small DT changes, GPIO, slcr, cpu label * tag 'zynq-dt-for-4.5' of https://github.com/Xilinx/linux-xlnx: ARM: dt: zynq: Add labels to cpu nodes to allow overriding OPPs. ARM: dts: zynq: describe SLCR as simple-mfd rather than simple-bus ARM: dts: zynq: replace gpio-key,wakeup with wakeup-source property ARM: zynq: DT: Add interrupt-controller property to GPIO Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22arm64: dts: hikey: add label properties to UARTsRob Herring
Add label properties to provide a way to identify UARTs based on their board or connector name. This follows naming convention in 96boards CE spec. Ports without external connections are not labelled. Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22arm64: dts: apq8016-sbc: add label properties for UART, I2C, and SPIRob Herring
Add label properties to provide a way to identify UART, I2C and SPI ports based on their connector names. This follows naming convention in 96boards CE spec. Ports without external connections are not labelled. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Cc: Andy Gross <agross@codeaurora.org> Acked-by: Kevin Hilman <khilman@linaro.org> Tested-by: Kevin Hilman <khilman@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22arm64: dts: apq8016-sbc: enable UART0 on LS connectorRob Herring
The LS UART0 is not used by anything else and should be enabled for expansion boards. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Cc: Andy Gross <agross@codeaurora.org> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22arm64: dts: juno: Add idle-states to device treeJon Medhurst (Tixy)
This patch adds idle-states bindings data collected through a set of benchmarking experiments (latency and energy consumption) on Juno boards. Latencies data represents the worst case scenarios as required by the DT idle-states bindings. Signed-off-by: Jon Medhurst <tixy@linaro.org> Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22ARM: bcm2835: Add a compat string for bcm2836 machine probeEric Anholt
Supporting the 2836 requires using the new interrupt controller, which we have support for. Signed-off-by: Eric Anholt <eric@anholt.net>
2015-12-22arm64: dts: Added syscon-reboot node for FSL's LS2080A SoCJ. German Rivera
Added sys-reboot node to the FSL's LS2080A SoC DT to leverage the ARM-generic reboot mechanism for this SoC. This mechanism is enabled through CONFIG_POWER_RESET_SYSCON. Signed-off-by: J. German Rivera <German.Rivera@freescale.com> Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22arm64: dts: add LS1043a-RDB board supportShaohui Xie
Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> Signed-off-by: Mingkai Hu <Mingkai.Hu@freescale.com> Signed-off-by: Wenbin Song <Wenbin.Song@freescale.com> Signed-off-by: Hou Zhiqiang <B48286@freescale.com> Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22arm64: dts: add Freescale LS1043a SoC supportMingkai Hu
LS1043a is an SoC with 4 ARMv8 A53 cores and most other IP blocks are similar to LS1021a which also complies to Freescale Chassis 2.1 spec. Created LS1043a SoC DTSI file to be included by board level DTS files. Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Hou Zhiqiang <B48286@freescale.com> Signed-off-by: Mingkai Hu <Mingkai.Hu@freescale.com> Signed-off-by: Wenbin Song <Wenbin.Song@freescale.com> Signed-off-by: Olof Johansson <olof@lixom.net>