Commit Graph

50434 Commits

Author SHA1 Message Date
Olof Johansson
2cb6115deb Merge tag 'imx-dt-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
The i.MX device tree updates for 4.13:
 - New board support: Gateworks Ventana GW5600, Technexion Pico i.MX7D
   Board.
 - A series from Alexandre Belloni to correct the vendor prefix for
   rv4162 compatible.
 - A patch-set from Andrey Smirnov ot enable PCIe support for i.MX7 and
   imx7d-sdb board.
 - Increase the SGTL5000 LRCLK pad strength to fix a random audio
   channel swapping seen on imx6qdl-wandboard and imx6qdl-colibri
   boards.
 - Clean up non-existing property 'enable-active-low' from fixed
   regulator device nodes.
 - Correct GPIO polarity for Ethernet PHY and PCI reset lines, even
   though device drivers do not use the polarity for now.
 - Add Wifi and Bluetooth support for imx7d-sdb board.
 - Adopt the i.MX6Q/DL DT to the new and more flexible GPC binding.
 - Update zii-rdu2 device tree source to use #include "..." for local
   inclusion.
 - A series from Philipp Zabel and Steve Longerbeam to enable video
   capture support for imx6qdl platforms.
 - A number of small random updates on various board support.

* tag 'imx-dt-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (47 commits)
  ARM: dts: imx6q-cm-fx6: add sdio wifi/bt nodes
  ARM: dts: ls1021a: update the clockgen node
  ARM: dts: imx6-sabreauto: add the ADV7180 video decoder
  ARM: dts: imx6-sabreauto: add pinctrl for gpt input capture
  ARM: dts: imx6-sabreauto: add reset-gpios property for max7310_b
  ARM: dts: imx6-sabreauto: create i2cmux for i2c3
  ARM: dts: imx6-sabresd: add OV5642 and OV5640 camera sensors
  ARM: dts: imx6-sabrelite: add OV5642 and OV5640 camera sensors
  ARM: dts: imx6qdl-sabrelite: remove erratum ERR006687 workaround
  ARM: dts: imx6qdl: add capture-subsystem device
  ARM: dts: imx6qdl: Add video multiplexers, mipi_csi, and their connections
  ARM: dts: imx6qdl: Add compatible, clocks, irqs to MIPI CSI-2 node
  ARM: dts: imx6qdl: add multiplexer controls
  ARM: dts: imx6: Fix PCI GPIO reset polarity
  ARM: dts: imx7d-sdb: Add Bluetooth support
  ARM: dts: imx7d-sdb: Add Wifi support
  ARM: dts: imx7d-sdb: Adjust the regulator nodes
  ARM: dts: imx: Fix Ethernet PHY reset polarity
  ARM: dts: imx7: Fix typo in watchdog pin name
  ARM: dts: vf610-zii: Add switch eeprom-length properties
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 23:06:36 -07:00
Olof Johansson
67a87a94f9 Merge tag 'imx-soc-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc
The i.MX SoC updates for 4.13:
 - Select GPCv2 for i.MX7 SoCs to get imx-gpcv2 irqchip driver built
   for i.MX7 platforms by default.
 - A couple of patches from Leonard to add IMX6ULL cpu check and get
   suspend/resume work on IMX6ULL.

* tag 'imx-soc-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx6ull: Make suspend/resume work like on 6ul
  ARM: imx: Add MXC_CPU_IMX6ULL and cpu_is_imx6ull
  ARM: imx: Select GPCv2 for i.MX7

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 23:06:06 -07:00
Olof Johansson
ae1d266305 Merge tag 'mvebu-dt-4.13-1' of git://git.infradead.org/linux-mvebu into next/dt
mvebu dt for 4.13 (part 1)

- Add Linksys WRT3200ACM (Rango) support
- Add PWM properties for gpio on Aramda XP and 38x
- A couple of minor updates for the 98dx3236 and 98dx4251

* tag 'mvebu-dt-4.13-1' of git://git.infradead.org/linux-mvebu:
  ARM: dts: turris-omnia: Add generic compatible string for I2C EEPROM
  ARM: dts: mvebu: add support for Linksys WRT3200ACM (Rango)
  ARM: dts: armada-385-linksys: fixup button node names
  ARM: dts: armada-385-linksys: group pins in pinctrl
  ARM: dts: armada-385-linksys: partition layout is board specific
  ARM: dts: armada-385-linksys: use binary unit prefixes
  ARM: dts: armada-385-linksys: drop legacy DSA bindings
  ARM: dts: armada-385-linksys: usb3 label cleanup
  ARM: dts: armada-385-linksys: bm pools by label order
  ARM: dts: armada-385-linksys: drop redundant properties in dependants
  ARM: dts: armada-385-linksys: flatten dependants
  ARM: dts: armada-385-linksys: label nodes
  ARM: dts: armada-385-linksys: flatten dtsi
  ARM: dts: mvebu: disable the rtc on 98dx3236 SoC
  ARM: dts: mvebu: add missing interrupt to 98dx4251 switch
  ARM: dts: armada-xp: Use pwm-fan rather than gpio-fan
  ARM: dts: mvebu: Add PWM properties for armada-38x
  ARM: dts: mvebu: Add PWM properties to .dtsi files

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 22:58:00 -07:00
Olof Johansson
de9761ad4e Merge tag 'mvebu-defconfig-4.13-1' of git://git.infradead.org/linux-mvebu into next/defconfig
mvebu defconfig for 4.13

Enable the SENSORS_PWM_FAN in mvebu_v7_defconfig support by gpio
driver since the previous release

* tag 'mvebu-defconfig-4.13-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Enable SENSORS_PWM_FAN in defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 22:56:48 -07:00
Olof Johansson
c9487f0387 Merge tag 'at91-ab-4.13-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt
DT for 4.13

 - Switch to the new NAND binding
 - A few non urgent fixes

* tag 'at91-ab-4.13-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: dts: at91: sama5d2_xplained: remove wrong memory node
  ARM: dts: at91: sama5d2_xplained: add pwm controller
  ARM: dts: at91: Add the NOR flash available on sama5d3 dev kits
  ARM: dts: at91: Switch to the new NAND bindings
  ARM: dts: at91: Declare EBI/NAND controllers
  dt-bindings: mtd: atmel-nand: Document the nfc-io bindings
  ARM: dts: at91-sama5d4: use IRQ_TYPE_* to specify irq flags
  dts: gpio_atmel: adapt binding doc to reality
  ARM: dts: at91: sama5d2: add m_can nodes
  ARM: dts: at91: Add generic compatible string for I2C EEPROM

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 22:54:10 -07:00
Olof Johansson
5a55029f46 Merge tag 'at91-ab-4.13-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/soc
SoC for 4.13:

 - New suspend/resume mode for sama5d2
 - Initial support for armv7m based SoCs

* tag 'at91-ab-4.13-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: at91: remove atmel_nand_data
  ARM: at91: fix at91_suspend_entering_slow_clock link error
  ARM: at91: debug: add samv7x support
  ARM: at91: add armv7m SoC detection
  ARM: at91: handle CONFIG_PM for armv7m configurations
  ARM: at91: Add armv7m support
  ARM: at91: Document armv7m compatibles
  ARM: at91: Documentation: add armv7m families
  ARM: at91: pm: fallback to slowclock when backup mode fails
  ARM: at91: pm: allow selecting standby and suspend modes
  ARM: at91: pm: Add sama5d2 backup mode

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 22:53:20 -07:00
Olof Johansson
516835714a Merge tag 'renesas-soc-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Renesas ARM Based SoC Updates for v4.13

* Use GENPD_FLAG_ALWAYS_ON in pm-rmobile

* tag 'renesas-soc-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: pm-rmobile: Use GENPD_FLAG_ALWAYS_ON

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 22:52:14 -07:00
Olof Johansson
878e917315 Merge tag 'renesas-dt2-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Second Round of Renesas ARM Based SoC DT Updates for v4.13

Cleanup:
* Correct PCI bus dtc warnings for r8a779x SoCs

Enhancements:
* Add support for iWave G20D-Q7 board based on RZ/G1M SoC
* Add support for GR-Peach board based on r7s72100 SoC
* Add composite video and HDMI input to gose board

* tag 'renesas-dt2-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: dts: r8a779x: Fix PCI bus dtc warnings
  ARM: dts: iwg20d-q7: Add support for iWave G20D-Q7 board based on RZ/G1M
  ARM: dts: iwg20m: Add iWave RZG1M Qseven SOM
  ARM: dts: gose: add composite video input
  ARM: dts: r7s72100: Add support for GR-Peach
  ARM: dts: gose: add HDMI input

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 22:49:57 -07:00
Olof Johansson
3414b86354 Merge tag 'at91-ab-4.13-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/defconfig
defconfig for 4.13:

 - Switch sama5 to be tickless in idle and enable hrtimer
 - Add MCAN

* tag 'at91-ab-4.13-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: configs: at91: add MCAN driver to sama5_defconfig
  ARM: configs: at91: enable HIGH_RES_TIMERS
  ARM: configs: at91: make system tickless when idle

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 22:38:37 -07:00
Olof Johansson
6a5ba7267f Merge tag 'qcom-soc-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/soc
Qualcomm ARM Based SoC Updates for v4.13

* Add debug UART addresses for IPQ4019

* tag 'qcom-soc-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  ARM: debug: qcom: add UART addresses to Kconfig help for IPQ4019

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 22:38:05 -07:00
Olof Johansson
bf671ec65a Merge tag 'qcom-dts-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt
Qualcomm Device Tree Changes for v4.13

* Fix IPQ4019 i2c0 node
* Add GSBI7 on IPQ8064
* Add misc APQ8060 devices
* Fixup USB related devices on APQ8064 and MSM8974

* tag 'qcom-dts-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  ARM: dts: add core I2C devices to the APQ8060 Dragonboard
  ARM: dts: add GSBI8 defines to the MSM8660 family
  ARM: dts: Qualcomm APQ8060 DragonBoard ALS sensor
  ARM: dts: add XOADC and IIO HWMON to MSM8660/APQ8060
  ARM: dts: qcom: ipq4019: fix i2c_0 node
  ARM: dts: qcom: add gsbi7 serial to ipq8064 SoC device tree
  ARM: dts: qcom-apq8064: Collapse usb support into one node
  ARM: dts: qcom-msm8974: Add HS usb node and OTG detection mechanisms
  ARM: dts: qcom: add charger otg regulator
  ARM: dts: qcom: Remove s4/5vs1,2 from RPM pm8941 control

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 22:37:31 -07:00
Olof Johansson
afa0e3fe34 Merge tag 'qcom-defconfig-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/defconfig
Qualcomm ARM Based defconfig Updates for v4.13

* Enable IPQ4019 clock and pinctrl

* tag 'qcom-defconfig-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  ARM: qcom_defconfig: Enable IPQ4019 clock and pinctrl

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 22:29:29 -07:00
Olof Johansson
f8a26083ec Merge tag 'davinci-for-v4.13/defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig
Enable mtdtests and USB NCM gadget in DaVinci kernel
(as modules).

* tag 'davinci-for-v4.13/defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci_all_defconfig: enable USB CDC NCM gadget
  ARM: davinci_all_defconfig: enable mtdtests

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 21:03:10 -07:00
Olof Johansson
f7b22111c7 Merge tag 'davinci-for-v4.13/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
A patch to fix warnings resulting from DT conversion
of VPIF driver.

* tag 'davinci-for-v4.13/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: fix const warnings

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 21:02:46 -07:00
Olof Johansson
5088774b8f Merge tag 'tegra-for-4.13-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt
ARM: tegra: Device tree changes for v4.13-rc1

This removes support for the Whistler board, which only a handful of
people ever had access to and which doesn't provide any features over
other Tegra20 devices that we support.

Also this cleans up some PCI related device tree content in preparation
for a future DTC release that has additional checks for the PCI bus.

* tag 'tegra-for-4.13-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: dts: tegra: fix PCI bus dtc warnings
  ARM: tegra: remove Whistler support

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 21:01:58 -07:00
Olof Johansson
da82480d45 Merge tag 'pxa-for-4.13' of https://github.com/rjarzmik/linux into next/soc
This is the pxa changes for v4.13 cycle.

This cycle is a minor fixes one, with :
 - Coccinelle found improvements
 - magician getting touchscreen driver support.

* tag 'pxa-for-4.13' of https://github.com/rjarzmik/linux:
  ARM: pxa: Delete an error message for a failed memory allocation in pxa3xx_u2d_probe()
  ARM: pxa: Improve a size determination in pxa3xx_u2d_probe()
  ARM: pxa: Delete an error message for a failed memory allocation in pxa_pm_init()
  ARM: pxa: magician: Add support for ADS7846 touchscreen

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:48:34 -07:00
Olof Johansson
2b1ee3061f Merge tag 'omap-for-v4.13/soc-v4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
SoC changes for omap variants for v4.13 merge window:

- PM clean-up in preparation of adding am335x/am437x PM support

- Fixes for issues found by Coccinelle

- Legacy code removal now that everything boots in device
  tree only mode

- Interconnect changes in preparation of moving clkctrl clocks
  to be managed by clkctrl clock driver

- Interconnect changes to add omap4 crypto acceclerator
  support

* tag 'omap-for-v4.13/soc-v4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (27 commits)
  ARM: OMAP4: hwmod_data: add SHAM crypto accelerator
  ARM: OMAP4: hwmod data: add des
  ARM: OMAP4: hwmod data: add aes2
  ARM: OMAP4: hwmod data: add aes1
  ARM: OMAP2+: Remove unused legacy code for n8x0
  ARM: OMAP2+: Remove unused legacy code for watchdog
  ARM: OMAP2+: Remove unused legacy code for interconnects
  ARM: OMAP2+: Remove unused legacy code for PRM
  ARM: OMAP2+: Remove unused legacy code for io.c
  ARM: OMAP2+: Remove unused legacy code for McBSP
  ARM: OMAP2+: SmartReflex: Delete an error message for a failed memory allocation in two functions
  ARM: OMAP2+: Use kcalloc() in sr_set_nvalues()
  ARM: OMAP2+: Improve a size determination in sr_dev_init()
  ARM: OMAP2+: Delete an error message for a failed memory allocation in two functions
  ARM: OMAP2+: Remove unused legacy code for device init
  ARM: OMAP2+: Remove unused legacy code for PMU
  ARM: OMAP2+: Remove unused legacy code for opp
  ARM: OMAP2+: hwmod: populate clkctrl clocks for hwmods if available
  ARM: OMAP4: cminst: add support for clkdm_xlate_address
  ARM: omap2+: clockdomain: add clkdm_xlate_address
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:46:30 -07:00
Olof Johansson
0d817768c0 Merge tag 'omap-for-v4.13/dt-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Second set of device tree changes for omaps for v4.13 merge
window:

- Updates for droid 4 proximity sensor, WLAN and battery

- Configure clocks for remoteproc devices for omap5 and dra7

- Configure omap4 crypto accelerators

* tag 'omap-for-v4.13/dt-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: omap4: add SHAM node
  ARM: dts: omap4: add aes2 instance
  ARM: dts: omap4.dtsi: remove aes[12]_fck
  ARM: dts: omap4: Fix aes entry
  ARM: dts: omap4-droid4: Configure CPCAP battery driver
  ARM: dts: dra7xx-clocks: Use DPLL_GPU for GPU clocks
  ARM: dts: dra7xx-clocks: Set IVA DPLL and its output clock rates
  ARM: dts: dra7xx-clocks: Set DSP DPLL and its output clock rates
  ARM: dts: dra7xx-clocks: Source IPU1 functional clock from CORE DPLL
  ARM: dts: omap54xx-clocks: Set IVA DPLL and its output clock rates
  ARM: dts: omap44xx-clocks: Set IVA DPLL and its output clock rates
  ARM: dts: omap4-droid4: Fix WLAN compatible
  ARM: dts: omap4-droid4: Add isl29030 ALS/proximity sensor

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:46:06 -07:00
Olof Johansson
4daea49941 Merge tag 'sunxi-dt-h3-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt
Allwinner H3 changes for 4.13

This tag is about bringing the EMAC support to the H3 boards.

* tag 'sunxi-dt-h3-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: sun8i: h3: Enable EMAC with external PHY on Orange Pi Plus 2E
  arm: sun8i: orangepi-zero: Enable dwmac-sun8i
  ARM: sun8i: bananapi-m2-plus: Enable dwmac-sun8i
  ARM: sun8i: orangepi-plus: Enable dwmac-sun8i
  arm: sun8i: nanopi-neo: Enable dwmac-sun8i
  arm: sun8i: orangepi-pc-plus: Set EMAC activity LEDs to active high
  arm: sun8i: orangepi-2: Enable dwmac-sun8i
  arm: sun8i: orangepi-one: Enable dwmac-sun8i
  arm: sun8i: orangepi-pc: Enable dwmac-sun8i
  arm: sun8i: sunxi-h3-h5: add dwmac-sun8i ethernet driver
  arm: sun8i: sunxi-h3-h5: Add dt node for the syscon control module
  ARM: sunxi: h3-h5: Convert R_CCU raw numbers to macros

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:43:28 -07:00
Olof Johansson
a1858df975 Merge tag 'sunxi-fixes-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes
Allwinner fixes for 4.12

A few fixes around the PRCM support that got in 4.12 with a wrong
compatible, and a missing clock in the binding.

* tag 'sunxi-fixes-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: allwinner: a64: Add PLL_PERIPH0 clock to the R_CCU
  ARM: sunxi: h3-h5: Add PLL_PERIPH0 clock to the R_CCU
  arm64: allwinner: h5: Remove syslink to shared DTSI
  ARM: sunxi: h3/h5: fix the compatible of R_CCU

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:42:21 -07:00
Olof Johansson
bcab84fb9f Merge tag 'sunxi-dt-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt
Allwinner DT changes for 4.13

The usual chunk of patches. The most notable improvements are the power
supplies improvements (battery and AC-IN), crypto support for the sun5i
family, HDMI support for the A10s, plus a lot of new things for the V3S and
the A83T.

* tag 'sunxi-dt-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (47 commits)
  ARM: sun6i: a31s: primo81: Enable battery power supply
  ARM: sun6i: a31s: primo81: Change USB OTG to OTG mode
  ARM: sun8i: a83t: Add dt node for the syscon control module
  ARM: sun8i: a83t: Add device node for R_PIO
  ARM: sun8i: v3s: add device nodes for DE2 display pipeline
  ARM: dts: sunxi: add SoC specific compatibles for the crypto nodes
  ARM: sun5i: add a cryptographic engine node
  ARM: sun8i: a83t: Add device node for PRCM
  ARM: dts: sun8i: h3: Add initial NanoPi M1 Plus support
  ARM: dts: orange-pi-zero: add node for SPI NOR
  ARM: sun7i: a20: cubietruck: Tie AXP209's USB power supply to USB PHY
  ARM: sun6i: a31: hummingbird: Enable AXP221's ACIN power supply
  ARM: sun4i: a10: cubieboard: Enable AXP209's ACIN power supply
  ARM: sun7i: a20: bananapi-m1-plus: Enable AXP209's ACIN power supply
  ARM: sun7i: a20: cubieboard2: Enable AXP209's ACIN power supply
  ARM: sun7i: a20: cubieboard2: Move usb_otg node for alphabetical ordering
  ARM: sun8i: a83t: cubietruck-plus: Enable SPDIF output
  ARM: sun8i: a83t: cubietruck-plus: Add LED device nodes
  ARM: sun8i: a83t: Add device node for SPDIF transmitter
  ARM: sun8i: a83t: Add device node for DMA controller
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:40:35 -07:00
Olof Johansson
ada0cc63dc Merge tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt
Amlogic 32-bit DT changes for v4.13:
- minor reorganization to support different busses
- add/use real clock controller

* tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: dts: meson8: add and use the real clock controller
  ARM: dts: meson: Extend L2 cache controller node for Meson8 and Meson8b
  ARM: dts: meson8b: inherit meson.dtsi from meson8b.dtsi
  ARM: dts: meson: organize devices in their corresponding busses

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:37:56 -07:00
Olof Johansson
6198c74939 Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/soc
Amlogic SoC updates for v4.13
- enable the clock controller for 32-bit Meson8

* tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm: meson: select the clock controller for Meson8

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:36:21 -07:00
Olof Johansson
92042d292d Merge tag 'omap-for-v4.13/omap1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
A series of omap1 changes for issues found by Coccinelle.

* tag 'omap-for-v4.13/omap1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP1: Fix a typo in a comment line
  ARM: OMAP1: Delete an error message for a failed memory allocation in omap1_dm_timer_init()
  ARM: OMAP1: DMA: Delete an unnecessary return statement in omap1_show_dma_caps()
  ARM: OMAP1: DMA: Delete an error message for a failed memory allocation in omap1_system_dma_init()
  ARM: OMAP1: DMA: Improve a size determination in omap1_system_dma_init()

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:32:44 -07:00
Olof Johansson
392366c34c Merge tag 'gemini-v4.13-dts-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt
Gemini DTS patches for v4.13, take 2:
- Add DMA controller
- Add PATA controller and SATA bridge

* tag 'gemini-v4.13-dts-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: add Gemini PATA/SATA support
  ARM: dts: Add Gemini DMA controller

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:31:59 -07:00
Olof Johansson
29b5f29894 Merge tag 'arm-soc/for-4.13/defconfig' of http://github.com/Broadcom/stblinux into next/defconfig
This pull request contains Broadcom ARM-based SoCs defconfig updates for 4.13,
please pull the following:

- Stefan updates the bcm2835_defconfig to include serial, Ethernet and USB
  gadget support which is needed for the Raspberry Pi Zero OTG changes

* tag 'arm-soc/for-4.13/defconfig' of http://github.com/Broadcom/stblinux:
  ARM: bcm2835_defconfig: Enable serial & ethernet USB gadget support

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:29:37 -07:00
Olof Johansson
2a65ec81b7 Merge tag 'arm-soc/for-4.13/devicetree' of http://github.com/Broadcom/stblinux into next/dt
This pull request contains Broadcom ARM-based Device Tree changes for 4.13.

Note that Baruch's changes are fixes that are currently included in v4.12-rc2,
but they are also included here in order to keep this tag based off v4.12-rc1.

Please pull the following:

- Rafal adds CPU and thermal zones to the Northstar (BCM5301X) Device Tree and he
  also adds the MDIO controller nodes for later use by USB PHYs

- Eric adds support for the V3D engine and Ethernet switch on the Cygnus
  platforms, he also adds a set of Device Tree sources and include files for the
  Raspberry Pi 3 (BCM2837) to be used with the ARM/Linux kernel,

- Jon adds CPU and thermal zones to the Northstar Plus Device Tree files

- Stefan updates the Raspberry Pi DTS files with thermal trip points and zones,
  adds support for the USB OTG on the Raspberry Pi Zero which includes the
  proper dwc2 configuration, a generic USB PHY and finally the enabling of the
  OTG controller by including the proper DTS include file

- Gerd switches the Raspberry Pi DTS files to use the SDHOST controller (faster
  than the SDHCI)

* tag 'arm-soc/for-4.13/devicetree' of http://github.com/Broadcom/stblinux:
  ARM: dts: bcm2835-rpi-zero: Enable OTG mode
  ARM: dts: bcm283x: Add generic USB PHY
  ARM: dts: bcm283x: Add dtsi for OTG mode
  ARM: dts: Cygnus: Add the ethernet switch and ethernet PHY
  ARM: dts: NSP: Add Thermal Support
  ARM: dts: Cygnus: Add BCM11360's V3D device
  ARM: dts: BCM5301X: Specify MDIO bus in the DT
  ARM: dts: BCM5301X: Add CPU thermal sensor and zone
  ARM: dts: bcm283x: switch from &sdhci to &sdhost
  ARM: dts: bcm283x: Add CPU thermal zone with 1 trip point
  ARM: dts: Add devicetree for the Raspberry Pi 3, for arm32 (v6)

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:15:54 -07:00
Olof Johansson
b9e44ddbe5 Merge tag 'arm-soc/for-4.13/soc' of http://github.com/Broadcom/stblinux into next/soc
This pull request contains Broadcom ARM-based SoCs (non Device Tree) changes:

- Jon updates the Kconfig entry for Northstar Plus to have THERMAL and THERMAL_OF
  selected in order to get the NS/NSP thermal driver dependencies to be satistfied

* tag 'arm-soc/for-4.13/soc' of http://github.com/Broadcom/stblinux:
  ARM: BCM: Enable thermal support for NSP SoCs

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:14:46 -07:00
Olof Johansson
1830893b42 Merge tag 'uniphier-dt-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt
UniPhier ARM SoC DT updates for v4.13

- fix W=1 build warnings
- use SPDX License Identifier
- add generic compatible string for I2C EEPROM

* tag 'uniphier-dt-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  ARM: dts: uniphier: Add generic compatible string for I2C EEPROM
  ARM: dts: uniphier: use SPDX-License-Identifier
  ARM: dts: uniphier: fix simple-bus unit address format error
  ARM: dts: uniphier: Use - instead of @ for DT OPP entries

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:11:08 -07:00
Alexandre TORGUE
d28bcd53fa ARM: stm32: Introduce MACH_STM32F469 flag
This patch introduces the MACH_STM32F469 to make possible to only select
STM32F469 pinctrl driver

By default, all the MACH_STM32Fxxx flags will be set with STM32 defconfig.

Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:10:27 -07:00
Olof Johansson
35a0a5545d Merge tag 'stm32-defconfig-for-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/defconfig
STM32 defconfig updates for v4.13, round 1

Highlights:
----------
 - Enable STMPE1600 IO expander
 - Enable Watchdog support

* tag 'stm32-defconfig-for-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: configs: stm32: STMPE1600 GPIO expander
  ARM: configs: stm32: Add watchdog support in STM32 defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:09:57 -07:00
Olof Johansson
d25b45539b Merge tag 'stm32-dt-for-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/dt
STM32 DT updates for v4.13, round 1

Highlights:
----------
 - Add stm32h743-disco board support
 - Add stm32f746-disco board support
 - Add stm32f769-disco board support
 - Enable LTDC & simple pannel on stm32f429-eval
 - Enable Watchdog on stm32f429-eval
 - Enable DCMI on stm32f429-eval
 - Enable STMPE1600 io expander on stm32f429-eval
 - Enable OV2640 camera on stm32f429-eval
 - Enable CRC on stm32f429-eval & stm32f429-disco

* tag 'stm32-dt-for-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: dts: stm32: Add stm32h743i-disco board
  ARM: dts: stm32: Add usart2 support on stm32h743
  ARM: dts: stm32: Add usart2_pins on stm32h743
  ARM: dts: stm32: enable CRC32 on stm32429i-eval board
  ARM: dts: stm32: enable CRC32 on stm32429-disco board
  ARM: dts: stm32: Add CRC support to stm32f429
  ARM: dts: stm32: Enable OV2640 camera support of STM32F429-EVAL board
  ARM: dts: stm32: Enable STMPE1600 gpio expander of STM32F429-EVAL board
  ARM: dts: stm32: Enable DCMI camera interface on STM32F429-EVAL board
  ARM: dts: stm32: Enable DCMI support on STM32F429 MCU
  ARM: dts: stm32: Add missing reset-cells node in stm32f746
  ARM: dts: stm32: Set gpio controller as interrupt controller on F4 and F7
  ARM: dts: stm32: Add watchdog support for STM32F429 eval board
  ARM: dts: stm32: Add watchdog support for STM32F429 SoC
  ARM: dts: stm32: Enable ltdc & simple panel on stm32f429-Eval board
  ARM: dts: stm32: Add ltdc support on stm32f429 MCU
  ARM: dts: stm32: add stm32f769I & stm32f746 discovery board support

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:06:32 -07:00
Olof Johansson
226fe7c14d Merge tag 'v4.12-next-dts32' of https://github.com/mbgg/linux-mediatek into next/dt
Add device tree nodes for
mt7623:
- clocks
- power domain
- pmic-wrapper
- pinctrl
- i2c
- spi
- nand
- mmc
- usb
- pwm
- ethernet
- crypto engine
- infared remote control
- audio controller
- ADC
- efuse
- thermal driver
- HW random generator

mt2701:
- NOR flash
- JPEG decoder
- i2c
- audio controller

* tag 'v4.12-next-dts32' of https://github.com/mbgg/linux-mediatek: (25 commits)
  arm: dts: mediatek: Add audio driver node for MT2701
  arm: dts: Add Mediatek MT2701 i2c device node
  arm: dts: mt2701: Add node for Mediatek JPEG Decoder
  arm: dts: mt2701: add nor flash node
  ARM: dts: mt2701: Add mtk-cirq node for mt2701
  arm: dts: mt7623: add Sean as one of authors for mt7623.dtsi files
  arm: dts: mt7623: add thermal nodes to the mt7623.dtsi file
  arm: dts: mt7623: add efuse nodes to the mt7623.dtsi file
  arm: dts: mt7623: add auxadc nodes to the mt7623.dtsi file
  arm: dts: mt7623: add rng nodes to the mt7623.dtsi file
  arm: dts: mt7623: add afe nodes to the mt7623.dtsi file
  arm: dts: mt7623: add ir nodes to the mt7623.dtsi file
  arm: dts: mt7623: add crypto engine nodes to the mt7623.dtsi file
  arm: dts: mt7623: add ethernet nodes to the mt7623.dtsi file
  arm: dts: mt7623: add pwm nodes to the mt7623.dtsi file
  arm: dts: mt7623: add usb nodes to the mt7623.dtsi file
  arm: dts: mt7623: add mmc nodes to the mt7623.dtsi file
  arm: dts: mt7623: add nand nodes to the mt7623.dtsi file
  arm: dts: mt7623: add spi nodes to the mt7623.dtsi file
  arm: dts: mt7623: add i2c nodes to the mt7623.dtsi file
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 19:22:03 -07:00
Olof Johansson
3325a5ce0f Merge tag 'renesas-fixes2-for-v4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/fixes-non-critical
Second Round of Renesas ARM Based SoC Fixes for v4.12

* Split LCD mux and gpio on armadillo800eva board

* tag 'renesas-fixes2-for-v4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: dts: armadillo800eva: Split LCD mux and gpio

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 19:19:11 -07:00
Olof Johansson
3a1fc4d204 Merge tag 'keystone_dts_for_4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt
ARM: dts: Keystone K2G ICE EVM support for v4.13

* tag 'keystone_dts_for_4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone: Add minimum support for K2G ICE evm
  ARM: keystone: Create new binding for K2G ICE evm
  ARM: dts: k2g-evm: Add unit address to memory node
  ARM: dts: keystone-k2g: Remove skeleton.dtsi

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 19:14:52 -07:00
Masahiro Yamada
4435f5dc5c ARM: prima2: remove redundant select CPU_V7
<linux@armlinux.org.uk>, Barry Song <baohua@kernel.org>,
linux-kernel@vger.kernel.org

ARCH_ATLAS7 resides in "if ARCH_SIRF ... end", and ARCH_SIRF depends
on ARCH_MULTI_V7, which selects CPU_V7.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 19:13:47 -07:00
Olof Johansson
23dbd13d77 Merge tag 'samsung-soc-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc
Samsung mach/soc update for v4.13:
1. Fix possible circular Kconfig dependency on S3C64xx.

* tag 'samsung-soc-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: s3c64xx: Do not select ARM_AMBA from S3C64XX_PL080

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 19:11:30 -07:00
Olof Johansson
c3e81b9dd5 Merge tag 'samsung-dt-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt
Samsung DeviceTree update for v4.13:
1. Add HDMI CEC to Exynos5 SoCs.
2. Minor cleanups and readability improvements.

* tag 'samsung-dt-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Use human-friendly symbols for GIC interrupt properties
  ARM: dts: exynos: Use human-friendly symbols for interrupt flags in board sources
  ARM: dts: exynos: Add HDMI CEC device to Exynos5 SoC family
  ARM: dts: exynos: Remove MFC reserved buffers

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 19:10:31 -07:00
Olof Johansson
c186dbe463 Merge tag 'samsung-defconfig-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig
Samsung defconfig ARM update for v4.13:
1. Enable Exynos PRNG along with user-space crypto API.

* tag 'samsung-defconfig-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: multi_v7_defconfig: Enable Exynos RNG and user-space crypto API
  ARM: exynos_defconfig: Enable Exynos RNG and user-space crypto API

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 19:10:07 -07:00
Olof Johansson
19cfdfd668 Merge tag 'v4.13-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc
Add support for the RV1108 and its debug uart

* tag 'v4.13-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: enable support for RV1108 SoC
  ARM: debug: add low level debug uart for rv1108

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 19:08:43 -07:00
Olof Johansson
63a677bca2 Merge tag 'v4.13-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
A bunch of changes including mali gpu nodes for rk3288 boards
following (and including) the new Mali Midgard binding; a lot of
improvements for the rk3228/rk3229 socs (tsadc, operating points,
usb, clock-rates, pinctrl, watchdog); finalizing the rk1108->rv1108
rename and adc buttons for the rk3288 firefly boards.

* tag 'v4.13-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: enable usb for rk3229 evb board
  ARM: dts: rockchip: add usb nodes on rk322x
  ARM: dts: rockchip: add adc button for Firefly
  ARM: dts: rockchip: enable ARM Mali GPU on rk3288-veyron
  ARM: dts: rockchip: enable ARM Mali GPU on rk3288-firefly
  ARM: dts: rockchip: enable ARM Mali GPU on rk3288-rock2-som
  ARM: dts: rockchip: add ARM Mali GPU node for rk3288
  dt-bindings: gpu: add bindings for the ARM Mali Midgard GPU
  ARM: dts: rockchip: set a sane frequence for tsadc on rk322x
  ARM: dts: rockchip: add operating-points-v2 for cpu on rk322x
  ARM: dts: rockchip: set default rates for core clocks on rk322x
  ARM: dts: rockchip: add second uart2 pinctrl on rk322x
  ARM: dts: rockchip: correct rk322x uart2 pinctrl
  ARM: dts: rockchip: add watchdog device node on rk322x
  clk: rockchip: add clock-ids for more rk3228 clocks
  clk: rockchip: add ids for camera on rk3399
  ARM: dts: rockchip: fix rk322x i2s1 pinctrl error
  ARM: dts: rockchip: rename RK1108-evb to RV1108-evb
  ARM: dts: rockchip: rename core dtsi from RK1108 to RV1108
  ARM: dts: rockchip: Setup usb vbus-supply on rk3288-rock2

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 19:07:25 -07:00
Olof Johansson
f9928af64b Merge tag 'davinci-for-v4.13/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig
Re-sync of davinci_all_defconfig with savedefconfig and enable
CPPI 4.1 DMA for MUSB, some commonly used USB devices, and
Lego Mindstorms EV3 battery driver.

* tag 'davinci-for-v4.13/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci_all_defconfig: Enable CPPI 4.1 USB OTG DMA
  ARM: davinci_all_defconfig: enable USB audio/video device support
  ARM: davinci_all_defconfig: cleanup with savedefconfig
  ARM: davinci_all_defconfig: enable LEGO MINDSTORMS EV3 battery module

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 19:05:52 -07:00
Olof Johansson
23aaaf8d9f Merge tag 'davinci-for-v4.13/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt
Miscellaneous DT support updates for DA850. Includes Lego mindstorms
EV3 battery support, DMA support for MUSB, and non-critical fixes to
GPIO nodes of DA850's GPIO controller and GPIO expander available on
DA850 EVM.

* tag 'davinci-for-v4.13/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: dts: da850-evm: fix tca6416 for use with GPIO hogs
  ARM: dts: da850: Add interrupt-controller property to gpio node
  ARM: dts: da850: Add CPPI 4.1 DMA to USB OTG controller
  ARM: dts: da850-lego-ev3: Add node for LEGO MINDSTORMS EV3 Battery

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 19:05:14 -07:00
Olof Johansson
7c3b54a550 Merge tag 'davinci-for-v4.13/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
DaVinci SoC support updates enhancing DSP remoteproc
support for DA850 SoC. This lays the foundation for
DT conversion of da8xx remoteproc driver.

* tag 'davinci-for-v4.13/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: da8xx: Add DSP internal RAM memories as IOMEM resources
  ARM: davinci: da8xx: Add names to DSP IOMEM resources
  ARM: davinci: da8xx: Create DSP device only when assigned memory

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 19:04:47 -07:00
Andreas Färber
fdfe7f4f9d ARM: dts: Add Actions Semi S500 and LeMaker Guitar
Add Device Trees for Actions Semiconductor S500 SoC and LeMaker Guitar SoM
and base board.

Signed-off-by: Andreas Färber <afaerber@suse.de>
2017-06-19 03:57:35 +02:00
Olof Johansson
fe6d7199fc Merge tag 'omap-for-v4.13/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Device tree changes for omaps for v4.13 merge window.
This adds support for am335x-boneblue. The rest of
the changes are for enabling features on various
devices with the git shortlog describing the changes.

* tag 'omap-for-v4.13/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  arm: dts: am33xx: Remove redundant interrupt-parent property
  ARM: dts: bonegreen-wireless: add WL1835 Bluetooth device node
  ARM: dts: AM43XX: Remove min and max voltage values for dcdc3
  ARM: dts: Add am335x-boneblue
  ARM: dts: twl4030: Add missing madc reference for bci subnode
  ARM: dts: am43xx-clocks: Add support for CLKOUT2
  ARM: dts: Configure USB host for 37xx-evm
  ARM: dts: omap: Add generic compatible string for I2C EEPROM
  ARM: dts: Enable earlycon stdout path for LogicPD torpedo
  ARM: dts: Enable earlycon stdout path for duovero
  arm: dts: boneblack-wireless: add WL1835 Bluetooth device node
  ARM: dts: am571x-idk: Enable the system mailboxes 5 and 6
  ARM: dts: am572x-idk: Enable the system mailboxes 5 and 6
  ARM: dts: omap4-devkit8000: fix gpmc ranges property
  ARM: dts: omap3: Remove 'enable-active-low' property
  ARM: dts: OMAP5: uevm: add µSD card detect
  ARM: dts: omap4-droid4: Add bluetooth
  ARM: dts: dra7x-evm: Enable dual-role mode for USB1
  ARM: dts: Use - instead of @ for DT OPP entries for TI SoCs
  ARM: dts: am335x-phycore-som: fix rv4162 compatible

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 18:56:35 -07:00
Olof Johansson
51b6e2813c Merge tag 'omap-for-v4.12/fixes-sl50' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Two fixes for am335x-sl50 to fix a boot time error
for claiming SPI pins, and to fix a SDIO card detect
pin for production version of the device.

* tag 'omap-for-v4.12/fixes-sl50' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am335x-sl50: Fix cannot claim requested pins for spi0
  ARM: dts: am335x-sl50: Fix card detect pin for mmc1

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 18:55:12 -07:00
Marc Gonzalez
2d618fee69 ARM: 8679/1: bitops: Align prototypes to generic API
include/asm-generic/bitops/find.h declares:

extern unsigned long
find_first_zero_bit(const unsigned long *addr, unsigned long size);

while arch/arm/include/asm/bitops.h declares:

#define find_first_zero_bit(p,sz)	_find_first_zero_bit_le(p,sz)
extern int _find_first_zero_bit_le(const void * p, unsigned size);

Align the arm prototypes to the generic API, to have gcc report
inadequate arguments, such as pointer to u32.

Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
2017-06-18 22:36:33 +01:00
Abel Vesa
620176f335 ARM: 8678/1: ftrace: Adds support for CONFIG_DYNAMIC_FTRACE_WITH_REGS
The DYNAMIC_FTRACE_WITH_REGS configuration makes it possible for a
ftrace operation to specify if registers need to saved/restored by
the ftrace handler. This is needed by kgraft and possibly other
ftrace-based tools, and the ARM architecture is currently lacking
this feature. It would also be the first step to support the
"Kprobes-on-ftrace" optimization on ARM.

This patch introduces a new ftrace handler that stores the registers
on the stack before calling the next stage. The registers are restored
from the stack before going back to the instrumented function.

A side-effect of this patch is to activate the support for
ftrace_modify_call() as it defines ARCH_SUPPORTS_FTRACE_OPS for the
ARM architecture.

Signed-off-by: Abel Vesa <abelvesa@linux.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
2017-06-18 22:25:16 +01:00
Fabio Estevam
6db5337388 ARM: imx_v6_v7_defconfig: Select CONFIG_IMX7D_ADC
Select CONFIG_IMX7D_ADC so that the i.MX7 ADC driver can be
built by default.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2017-06-18 07:32:01 +08:00