Commit Graph

54784 Commits

Author SHA1 Message Date
Thierry Reding
1874619a7d ARM: dma-mapping: Set proper DMA ops in arm_iommu_detach_device()
Instead of setting the DMA ops pointer to NULL, set the correct,
non-IOMMU ops depending on the device's coherency setting.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2018-07-16 18:06:36 +10:00
Greg Kroah-Hartman
83cf9cd6d5 Merge 4.18-rc5 into char-misc-next
We want the char-misc fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-07-16 09:04:54 +02:00
Linus Torvalds
41b55d23ee Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:

 - A fix for OMAP5 and DRA7 to make the branch predictor hardening
   settings take proper effect on secondary cores

 - Disable USB OTG on am3517 since current driver isn't working

 - Fix thermal sensor register settings on Armada 38x

 - Fix suspend/resume IRQs on pxa3xx

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: dts: am3517.dtsi:  Disable reference to OMAP3 OTG controller
  ARM: DRA7/OMAP5: Enable ACTLR[0] (Enable invalidates of BTB) for secondary cores
  ARM: pxa: irq: fix handling of ICMR registers in suspend/resume
  ARM: dts: armada-38x: use the new thermal binding
2018-07-15 09:49:21 -07:00
Olof Johansson
f54440e41b Merge tag 'gemini-dts-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt
Gemini DTS updates for v4.19:
- Add Vitesse switch chips
- Add a new DT for a reference design

* tag 'gemini-dts-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: Add devicetree for Storlink/Storm SL93512R
  ARM: dts: Add Vitesse G5e switch to the Gemini SQ201
  ARM: dts: Add WAN ethernet port to the SQ201

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 22:47:22 -07:00
Linus Walleij
41043ec45b ARM: dts: Add devicetree for Storlink/Storm SL93512R
The Storlink Gemini324 EV-Board also known as Storm
Semiconductor SL93512R_BRD is ground zero for the Gemini
devices. We add a device tree so we can support it, it
turns out to be pretty trivial.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-07-15 01:09:26 +02:00
Linus Walleij
fa35007f62 ARM: dts: Add Vitesse G5e switch to the Gemini SQ201
This adds the Vitesse G5e ethernet switch to the Square
One Itian SQ201 router device tree.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-07-15 01:09:19 +02:00
Linus Walleij
423fbae3d0 ARM: dts: Add WAN ethernet port to the SQ201
This sets up the ethernet interface and PHY for the
WAN ethernet port which uses a Marvell PHY.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-07-15 01:09:13 +02:00
Olof Johansson
13e66ceea1 Merge tag 'omap-for-v4.18/fixes-rc4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Two omap fixes for v4.18-rc cycle

Turns out the recent patches for ARM branch predictor hardening are
not working on omap5 and dra7 as planned because the secondary CPU
is parked to the bootrom code. We can't configure it in the bootloader.
So we must enable invalidates of BTB for omap5 and dra7 secondary
core in the kernel.

And there's a fix for reserved register access for am3517. The
usb otg module on am3517 is not the same as for other omap3.

* tag 'omap-for-v4.18/fixes-rc4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am3517.dtsi:  Disable reference to OMAP3 OTG controller
  ARM: DRA7/OMAP5: Enable ACTLR[0] (Enable invalidates of BTB) for secondary cores

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 15:14:02 -07:00
Olof Johansson
d4f72a70fe Merge tag 'mvebu-fixes-4.18-1' of git://git.infradead.org/linux-mvebu into fixes
mvebu fixes for 4.18 (part 1)

Use the new thermal binding on Armada 38x allowing to use a driver fix
which is already part of the kernel.

* tag 'mvebu-fixes-4.18-1' of git://git.infradead.org/linux-mvebu:
  ARM: dts: armada-38x: use the new thermal binding

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 15:12:24 -07:00
Olof Johansson
4dbd2b429a Merge tag 'pxa-fixes-4.18' of https://github.com/rjarzmik/linux into fixes
This is the fixes set for v4.18 cycle.

This is a fix for suspending all pxa3xx platforms, where high
number interrupts are not reenabled.

* tag 'pxa-fixes-4.18' of https://github.com/rjarzmik/linux:
  ARM: pxa: irq: fix handling of ICMR registers in suspend/resume

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 15:11:41 -07:00
Olof Johansson
64cc2c4eb5 Merge tag 'v4.18-rockchip-dts32fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
Fix for a new warning from dtc in graph node unit addresses.

* tag 'v4.18-rockchip-dts32fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: fix graph node unit address error from dtc

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 15:09:54 -07:00
Olof Johansson
ce8403d455 Merge tag 'tegra-for-4.19-firmware' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc
firmware: tegra: Changes for v4.19-rc1

This contains a single fix for the Trusted Foundations firmware
implementation, used on some Tegra20 and Tegra30 platforms.

* tag 'tegra-for-4.19-firmware' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: trusted_foundations: do not use naked function

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:45:51 -07:00
Olof Johansson
edc07c0012 Merge tag 'omap-for-v4.19/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
SoC updates for omaps for v4.19 merge window

These changes are mostly PM related changes for am335x and
am437x to support RTC only suspend mode. Some of the clock
and driver related chances are still pending so it's not
yet fully functional.

Also included is a change for PM debug sysfs entry to use
DEFINE_SHOW_ATTRIBUTE.

* tag 'omap-for-v4.19/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: sleep33/43xx: Add RTC-Mode support
  ARM: OMAP2+: sleep33/43xx: Make sleep actions configurable
  ARM: OMAP2+: reuse DEFINE_SHOW_ATTRIBUTE() macro
  ARM: hwmod: RTC: Don't assume lock/unlock will be called with irq enabled

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:45:14 -07:00
Olof Johansson
5306c6ad0e Merge tag 'omap-for-v4.19/omap1-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
SoC updates for omap1 for v4.19 merge window

Mostly a series by Janusz Krzysztofik to clean up the
GPIO and input handling for ams-delta. Because of the
platform data changes, we decided that it's best to
merge the related input changes also via the arm-soc
tree so Dmitry Torokhov has acked the input changes.

Also included is a change to constify gpio_leds from
Arvind Yadav.

* tag 'omap-for-v4.19/omap1-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP1: ams-delta: move late devices back to init_machine
  Input: ams_delta_serio: Get FIQ buffer from platform_data
  Input: ams_delta_serio: use IRQ resource
  ARM: OMAP1: Get rid of <mach/ams-delta-fiq.h>
  ARM: OMAP1: ams-delta FIQ: Keep serio input GPIOs requested
  ARM: OMAP1: ams-delta FIQ: don't use static GPIO numbers
  ARM: OMAP1: ams-delta: Hog "keybrd_dataout" GPIO pin
  Input: ams_delta_serio: Replace power GPIO with regulator
  Input: ams_delta_serio: use private structure
  Input: ams_delta_serio: convert to platform driver
  ARM: OMAP1: ams-delta: drop GPIO lookup table for serio device
  ARM: OMAP1: ams-delta: assign LED GPIO numbers from descriptors
  ARM: OMAP1: ams-delta: refactor late_init()
  ARM: OMAP1: constify gpio_led

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:44:34 -07:00
Linus Walleij
ba62dc1126 ARM: dts: nomadik: Cut FSMC timings
After the work done by Thomas Petazzoni, the NAND chip timings
can be read out from the chip instead of open coded in the
device tree, so let's just remove the timing information.

Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:38:45 -07:00
Olof Johansson
6783a9e0b4 Merge tag 'stm32-defconfig-for-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/defconfig
STM32 defconfig updates for v4.19, round 1

Highlights:
----------

In multi_v7_defconfig, add support of:

-STM32 RTC
-STM32 DMA, DMAMUX and MDMA
-STM32 DCMI media

* tag 'stm32-defconfig-for-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: multi_v7_defconfig: enable STM32 DCMI media support
  ARM: multi_v7_defconfig: enable STM32 DMAv2, DMAMUX and MDMA
  ARM: multi_v7_defconfig: enable STM32 RTC

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:38:11 -07:00
Olof Johansson
e74f133134 Merge tag 'samsung-defconfig-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig
Samsung defconfig changes for v4.19

Enable options needed for booting full system on S5Pv210-based Samsung
Galaxy S mobile phones.

* tag 'samsung-defconfig-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: s5pv210_defconfig: Enable options needed to boot typical Linux distro
  ARM: s5pv210_defconfig: Enable drivers for Samsung Aries based phones
  ARM: s5pv210_defconfig: Run make savedefconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:30:19 -07:00
Olof Johansson
3bd1027b49 Merge tag 'davinci-for-v4.19/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig
DaVinci defconfig updates for v4.19
-----------------------------------

* Enable support for PWM backight and bluetooth
* Remove some vestiges of mach-davinci private clock implementation.

* tag 'davinci-for-v4.19/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci_all_defconfig: Enable Bluetooth
  ARM: davinci_all_defconfig: remove CONFIG_DAVINCI_RESET_CLOCKS
  ARM: davinci_all_defconfig: set CONFIG_BACKLIGHT_PWM=m

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:29:51 -07:00
Olof Johansson
5ef28dcc16 Merge tag 'stm32-dt-for-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/dt
STM32 DT updates for v4.19, round 1

Highlights:
----------

-MCU platforms update:
 -Update RTC syscfg bindings on stm32f746 and stm32f429
 -Update IWDG node with LSI clock name on stm32f429

-MPU STM32MP157 platform update:
 -Add HASH support
 -Add m_can support and enable it on EV1 board
 -Add RTC suppoort and enable it on ED1 board
 -Add USB OTG HS support and enable it on EV1 board
 -Enable USB Host EHCI on EV1 board
 -Add DFSDM support
 -Add SPI support
 -Add ETH support and enable it on EV1 board
 -Add IWDG support and enable it on ED1 board
 -Fix useless GPIO aliases and reorder nodes

* tag 'stm32-dt-for-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32: (22 commits)
  ARM: dts: stm32: update iwdg with lsi clock name for stm32f429
  ARM: dts: stm32: add iwdg2 support for stm32mp157c-ed1
  ARM: dts: stm32: add iwdg2 support for stm32mp157c
  ARM: dts: stm32: Reorder nodes in stm32mp157c-ed1
  ARM: dts: stm32: remove gpio aliases for stm32mp157c
  ARM: dts: stm32: add support of ethernet on stm32mp157c-ev1
  ARM: dts: stm32: Add ethernet dwmac on stm32mp1
  ARM: dts: stm32: Add syscfg on stm32mp1
  ARM: dts: stm32: add SPI1 support on stm32mp157c-ev1
  ARM: dts: stm32: add SPI support on stm32mp157c
  ARM: dts: stm32: Add DFSDM support to stm32mp157c
  ARM: dts: stm32: Add ADC support to stm32mp157c
  ARM: dts: stm32: enable USB OTG HS on stm32mp157c-ev1
  ARM: dts: stm32: add USB OTG HS support for stm32mp157c SoC
  ARM: dts: stm32: enable USB Host (USBH) EHCI controller on stm32mp157c-ev1
  ARM: dts: stm32: enable RTC on stm32mp157c-ed1
  ARM: dts: stm32: add RTC support to stm32mp157c
  ARM: dts: stm32: m_can activation on stm32mp157c-ev1
  ARM: dts: stm32: m_can support to stm32mp157c
  ARM: dts: stm32: Add HASH support on stm32mp157c
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:27:22 -07:00
Olof Johansson
efcd3bab9b Merge tag 'mvebu-dt-4.19-1' of git://git.infradead.org/linux-mvebu into next/dt
mvebu dt for 4.19 (part 1)

 - Add a new Armada 388 based board: helios4
 - Enable SPI flash by default on SolidRun Armada 38x Microsom

* tag 'mvebu-dt-4.19-1' of git://git.infradead.org/linux-mvebu:
  ARM: dts: armada388-clearfog: drop future changes disclaimer
  ARM: dts: armada388-clearfog: enable spi flash
  ARM: dts: armada388-helios4

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:26:17 -07:00
Olof Johansson
1b6d732835 Merge tag 'pxa-dt-4.19' of https://github.com/rjarzmik/linux into next/dt
This device-tree pxa update brings :
 - pxa3xx fixes and updates

* tag 'pxa-dt-4.19' of https://github.com/rjarzmik/linux:
  arm: dts: pxa3xx: Add ssp ports to pxa3xx device tree
  arm: dts: pxa3xx: provide correct clk-names property for nand controller node
  ARM: dts: pxa: add label to lcd controller node

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:24:28 -07:00
Olof Johansson
85b40cf3a8 Merge tag 'samsung-dt-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt
Samsung DTS ARM changes for v4.19

1. Add two new S5Pv210 boards: Samsung Galaxy S and Samsung Galaxy S 4G
   mobile phones.  Both are from family codenamed Aries.  The Samsung
   Galaxy S was released on the market in 2010 with Android operating
   system.  At that time, it was the Samsung's flagship model.
   This brings support for storage (SD card and internal memory), PMIC,
   RTC, fuel-gauge, keys, USB (in peripherial mode) and WiFi.

2. Add missing secondary CPU properties.
3. Cleanup from old files and properties.

* tag 'samsung-dt-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  dt-bindings: samsung: Document bindings for SGH-T959P board
  dt-bindings: samsung: Document bindings for Samsung aries boards
  ARM: dts: s5pv210: Add initial DTS for SGH-T959P phone
  ARM: dts: s5pv210: Add initial DTS for Samsung Galaxy S phone
  ARM: dts: s5pv210: Add initial DTS for Samsung Aries based phones
  ARM: dts: s5pv210: Add missing interrupt-controller property to gph2
  ARM: dts: exynos: remove no longer needed samsung thermal properties
  dt-bindings: arm: Remove obsolete insignal-boards.txt
  ARM: dts: exynos: Add missing CPU clocks to secondary CPUs on Exynos542x
  arm: dts: exynos: Add missing cooling device properties for CPUs

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:22:46 -07:00
Olof Johansson
a4c43ba496 Merge tag 'tegra-for-4.19-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt
ARM: tegra: Device tree changes for v4.19-rc1

This set of changes adds support for the memory client resets on Tegra20
and Tegra30, fixes a couple of issues on Cardhu and Tegra30 Apalis as
well as adds a unit-address to the memory node to avoid warnings from
DTC. To round things of, the NAND flash controller is enabled on the
Tegra20 Colibri.

* tag 'tegra-for-4.19-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: dts: tegra: enable NAND flash on Colibri T20
  ARM: dts: tegra: add Tegra20 NAND flash controller node
  ARM: tegra: Work safely with 256 MB Colibri-T20 modules
  ARM: tegra: Fix unit_address_vs_reg and avoid_unnecessary_addr_size DTC warnings
  ARM: tegra: Fix unit_address_vs_reg DTC warnings for /memory
  ARM: tegra: Remove usage of deprecated skeleton.dtsi
  ARM: tegra: Fix can2 on Tegra30 Apalis
  ARM: tegra: Fix Tegra30 Cardhu PCA954x reset
  ARM: dts: tegra30: Add Memory Client reset to VDE
  ARM: dts: tegra20: Add Memory Client reset to VDE

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:20:50 -07:00
Olof Johansson
8291ca5d2a Merge tag 'omap-for-v4.19/dt-mcan-v2-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
dts changes for mcan for omaps for v4.19 merge window

These changes configure the mcan clock, interconnect target
module and mcan device. These changes depend on the ti-sysc
related driver changes and are based on those.

Notably this is the first new driver that probes with ti-sysc
driver with no legacy hwmod platform data for the interconnect
target module.

* tag 'omap-for-v4.19/dt-mcan-v2-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: dra76x: Add MCAN node
  ARM: dts: Add generic interconnect target module node for MCAN
  ARM: dts: dra762: Add MCAN clock support
  bus: ti-sysc: Add support for software reset
  bus: ti-sysc: Add support for using ti-sysc for MCAN on dra76x
  clk: ti: dra7: Add clkctrl clock data for the mcan clocks
  bus: ti-sysc: Use 2-factor allocator arguments

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:20:03 -07:00
Olof Johansson
260cfb9ff8 Merge tag 'omap-for-v4.19/dt-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
dts changes for omaps for v4.19 merge window

Mostly updates to configure and improve the devices
found on various SoCs and boards:

- several patches to update support for am3517-evm
  to replace bogus fixed regulators with proper
  regulators and configure various devices such
  as wlan, bluetooth and usb1

- add missing cooling devices for omap5 and dra7

- configure dual role for usb ports for am57xx
  and dra7

- PM updates for omap4 devices to allow retention
  idle for minimal configurations

- am335x-sl50 updates for various devices

- update d-can alias names to not use undescore

- configure pandaboard gpio button

- a non-urgent change to fix dcan node address that
  i forgot to send a pull request for earlier

* tag 'omap-for-v4.19/dt-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (25 commits)
  ARM: dts: pandaboard: add gpio user button
  ARM: dts: am3517-evm: Add 'vdd_io_reg' regulator references
  ARM: dts: am3517-evm: Enable USB1 Host
  ARM: dts: am33xx: Fix syntax of alias names
  ARM: dts: am3517-som:  Add builtin Bluetooth
  ARM: dts: am3517-som: Add WL127x Wifi
  ARM: dts: am335x-sl50: enable tsadc on SL50 board
  ARM: dts: am335x-sl50: fix label names for all LEDs
  ARM: dts: am335x-sl50: use audio-graph-card for sound
  ARM: dts: am335x-sl50: add support for DS1339 Real Time Clock
  ARM: dts: am335x-sl50: set dr_mode to otg
  ARM: dts: am335x-sl50: add a node for the LCD controller
  ARM: dts: am335x-sl50: use phy-phandle declarations
  ARM: dts: am335x-sl50: update backlight nodes
  ARM: dts: omap4-droid4: Use software debounce for gpio-keys
  ARM: dts: Configure duovero for to allow core retention during idle
  ARM: dts: Improve omap l4per idling with wlcore edge sensitive interrupt
  ARM: dts: dra76-evm: Add VBUS GPIO to USB1/USB2 extcon
  ARM: dts: dra71-evm: Add VBUS GPIO to USB1/USB2 extcon
  ARM: dts: dra7-evm: Add extcon to USB2 port
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:17:26 -07:00
Olof Johansson
b7b6be6435 Merge tag 'davinci-for-v4.19/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt
DaVinci Device-Tree updates for v4.19
-------------------------------------

* DA850 now uses clocks from device-tree
* DA850 EVM gains LCD (with backlight) and SATA support
* Lego Mindstorms gains bluetooth support
* DSP reset control support on DA850

* tag 'davinci-for-v4.19/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: dts: da850: Add power-domains to CPPI 4.1 node
  ARM: davinci: dts: add a reset control to the dsp node
  ARM: davinci: dts: make psc0 a reset provider
  ARM: dts: da850-lego-ev3: Add Bluetooth nodes
  ARM: dts: da850: Add power-domains to PWM nodes
  ARM: dts: da850: Add clocks
  dt-bindings: timer: new bindings for TI DaVinci timer
  ARM: dts: da850-evm: Enable LCD and backlight
  ARM: dts: da850-evm: Enable SATA port

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:16:58 -07:00
Olof Johansson
f46ad02377 Merge tag 'davinci-for-v4.19/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
DaVinci SoC updates for v4.19
-----------------------------

* mach-davinci updates needed to finally move over to common clock framework
* update to use the aemif driver from drivers/memory rather than the
  private implementation available in mach-davinci

For the later item, I have included a branch from David Lechner which
should also get merged through the clk tree. The clk dependencies are
needed for aemif conversion.

* tag 'davinci-for-v4.19/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: (34 commits)
  ARM: davinci: unduplicate aemif support
  ARM: davinci: mityomapl138: use aemif platform driver
  ARM: davinci: dm646x-evm: use aemif platform driver
  ARM: davinci: da830-evm: use aemif platform driver
  ARM: davinci: dm644x-evm: use aemif platform driver
  ARM: davinci: dm365-evm: use the ti-aemif soc driver
  ARM: davinci: da850-evm: use aemif platform driver in legacy mode
  ARM: davinci: omapl138-hawk: add aemif & nand support
  clk: davinci: psc-da830: add a lookup entry for aemif clock
  clk: davinci: psc-dm646x: use two lookup entries for the aemif clock
  clk: davinci: psc-dm644x: use two lookup entries for the aemif clock
  clk: davinci: psc-dm365: use two lookup entries for the aemif clock
  clk: davinci: psc-da850: remove the 'davinci_nand.0" lookup
  ARM: davinci: da8xx-dt: switch to device tree clocks
  ARM: davinci: add device tree support to timer
  ARM: davinci: remove legacy clocks
  ARM: davinci: da8xx: Remove legacy USB and SATA clock init
  ARM: davinci: dm646x: Remove legacy clock init
  ARM: davinci: dm644x: Remove legacy clock init
  ARM: davinci: dm365: Remove legacy clock init
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:16:26 -07:00
Olof Johansson
dd8ba52325 Merge tag 'arm-soc/for-4.19/soc' of https://github.com/Broadcom/stblinux into next/soc
This pull request contains Broadcom ARM-based SoCs platform changes for
4.19, please pull the following:

- Clement re-orders the UART debug entries to be in ascending order and
  he also adds the iProc UART3 debug address since that is a common
  location for iProc based designs.

* tag 'arm-soc/for-4.19/soc' of https://github.com/Broadcom/stblinux:
  ARM: debug: fix BCM2836 order entry
  ARM: debug: Add iProc UART3 debug addresses

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:12:22 -07:00
Olof Johansson
c79306d5c4 Merge tag 'arm-soc/for-4.19/devicetree' of https://github.com/Broadcom/stblinux into next/dt
This pull request contains Broadcom ARM-based SoCs Device Tree changes
for 4.19, please pull the following:

- Clement adds ethernet aliases to the Cygnus DTS include file such that
  a DT aware bootloader such as u-boot can properly insert MAC addresses

- Mohamed adds a Device Tree node for the HWRNG found on Cygnus SoCs

- Vivek migrates all the BCM5301x (Northstar) Device Tree sources to use
  the proper USB 3.0 PHY representation using its parent MDIO bus.
  Vivek also completes the Linksys EA9500 Device Tree by adding support
  for LEDs, internal and external switches.

- Rafal adds the ARM architected timer to the BCM53573 Device Tree
  include file.

- Eric adds the Performance Monitoring Unit to the BCM2837 DTS include
  file since it was absent before

- Boris adds the BCM283x transposer block to the Device Tree

- Stefan adds the Raspberry Pi Compute Module (CM1) Device Tree include
  and sources.

* tag 'arm-soc/for-4.19/devicetree' of https://github.com/Broadcom/stblinux:
  ARM: dts: BCM5301X: Add support for Linksys EA9500
  ARM: dts: BCM53573: Add architected timer
  ARM: dts: BCM5301X: Make USB 3.0 PHY use MDIO PHY driver
  ARM: dts: cygnus: enable iproc-hwrng
  ARM: dts: cygnus: add ethernet0 alias
  ARM: dts: bcm283x: Add Transposer block
  ARM: dts: bcm283x: Add the PMU to the devicetree.
  ARM: dts: add Raspberry Pi Compute Module and IO board

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:10:54 -07:00
Olof Johansson
11d378ce5d Merge tag 'arm-soc/for-4.19/defconfig' of https://github.com/Broadcom/stblinux into next/defconfig
This pull request contains Broadcom ARM-based SoCs defconfig updates
for 4.19, please pull the following:

- Stefan enables the Raspberry Pi voltage sensor driver (HWMON) in both
  multi_v7_defconfig and bcm2835_defconfig

* tag 'arm-soc/for-4.19/defconfig' of https://github.com/Broadcom/stblinux:
  ARM: multi_v7_defconfig: Enable RPi voltage sensor
  ARM: bcm2835_defconfig: Enable RPi voltage sensor

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:07:48 -07:00
Olof Johansson
9fcad3b634 Merge tag 'v4.19-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
SPDX conversion for existing Rockchip devicetree files as well
as conversion of rk3288 to OPPv2 to facilitate the addition of
missing cpu-cooling-device properties.

* tag 'v4.19-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Add missing cooling device properties for CPUs on rk3288
  ARM: dts: rockchip: convert rk3288 to operating-points-v2
  ARM: dts: rockchip: Add missing cooling device properties for CPUs on rk322x
  ARM: dts: rockchip: use SPDX-License-Identifier

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-07-14 14:06:17 -07:00
Russell King
14459ce2bd ARM: tcm: ensure inline stub functions are marked static
Ensure that the stubbed out tcm_init() is marked static, so we don't
end up emitting the stub each time the header is included.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
2018-07-14 16:09:27 +01:00
Linus Torvalds
e6ef760731 Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
 "A couple of small fixes this time around from Steven for an
  interaction between ftrace and kernel read-only protection, and
  Vladimir for nommu"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8780/1: ftrace: Only set kernel memory back to read-only after boot
  ARM: 8775/1: NOMMU: Use instr_sync instead of plain isb in common code
2018-07-13 11:44:12 -07:00
Russell King
b18bea2a45 ARM: net: bpf: improve 64-bit ALU implementation
Improbe the 64-bit ALU implementation from:

  movw    r8, #65532
  movt    r8, #65535
  movw    r9, #65535
  movt    r9, #65535
  ldr     r7, [fp, #-44]
  adds    r7, r7, r8
  str     r7, [fp, #-44]
  ldr     r7, [fp, #-40]
  adc     r7, r7, r9
  str     r7, [fp, #-40]

to:

  movw    r8, #65532
  movt    r8, #65535
  movw    r9, #65535
  movt    r9, #65535
  ldrd    r6, [fp, #-44]
  adds    r6, r6, r8
  adc     r7, r7, r9
  strd    r6, [fp, #-44]

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
2018-07-13 15:26:42 +02:00
Russell King
c5eae69257 ARM: net: bpf: improve 64-bit store implementation
Improve the 64-bit store implementation from:

  ldr     r6, [fp, #-8]
  str     r8, [r6]
  ldr     r6, [fp, #-8]
  mov     r7, #4
  add     r7, r6, r7
  str     r9, [r7]

to:

  ldr     r6, [fp, #-8]
  str     r8, [r6]
  str     r9, [r6, #4]

We leave the store as two separate STR instructions rather than using
STRD as the store may not be aligned, and STR can handle misalignment.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
2018-07-13 15:26:42 +02:00
Russell King
077513b894 ARM: net: bpf: improve 64-bit sign-extended immediate load
Improve the 64-bit sign-extended immediate from:

  mov     r6, #1
  str     r6, [fp, #-52]  ; 0xffffffcc
  mov     r6, #0
  str     r6, [fp, #-48]  ; 0xffffffd0

to:

  mov     r6, #1
  mov     r7, #0
  strd    r6, [fp, #-52]  ; 0xffffffcc

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
2018-07-13 15:26:41 +02:00
Russell King
f9ff5018c1 ARM: net: bpf: improve 64-bit load immediate implementation
Rather than writing each 32-bit half of the 64-bit immediate value
separately when the register is on the stack:

  movw    r6, #45056      ; 0xb000
  movt    r6, #60979      ; 0xee33
  str     r6, [fp, #-44]  ; 0xffffffd4
  mov     r6, #0
  str     r6, [fp, #-40]  ; 0xffffffd8

arrange to use the double-word store when available instead:

  movw    r6, #45056      ; 0xb000
  movt    r6, #60979      ; 0xee33
  mov     r7, #0
  strd    r6, [fp, #-44]  ; 0xffffffd4

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
2018-07-13 15:26:41 +02:00
Hugues Fruchet
1b8a8589a3 ARM: multi_v7_defconfig: enable STM32 DCMI media support
Enables support of STM32 DCMI V4L2 media driver.

Signed-off-by: Hugues Fruchet <hugues.fruchet@st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
2018-07-13 14:54:24 +02:00
Pierre-Yves MORDRET
e270718ec3 ARM: multi_v7_defconfig: enable STM32 DMAv2, DMAMUX and MDMA
This enables drivers for STM32:
 - DMAv2
 - DMMAUX
 - MDMA

Signed-off-by: Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
2018-07-13 14:54:23 +02:00
Amelie Delaunay
a9b8e2fb05 ARM: multi_v7_defconfig: enable STM32 RTC
Enable the STM32 Real Time Clock (RTC) driver, implemented on STM32MP1 SoC.

Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
2018-07-13 14:54:23 +02:00
Ludovic Barre
c2888cc2e2 ARM: dts: stm32: update iwdg with lsi clock name for stm32f429
This patch updates iwdg watchdog to use lsi clock name.

Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
2018-07-13 13:57:05 +02:00
Ludovic Barre
dd2eda3d97 ARM: dts: stm32: add iwdg2 support for stm32mp157c-ed1
This patch activates independent watchdog support for
stm32mp157c board.

Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
2018-07-13 13:57:05 +02:00
Ludovic Barre
5f0f3bac59 ARM: dts: stm32: add iwdg2 support for stm32mp157c
This patch adds independent watchdog support for stm32mp157c.

Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
2018-07-13 13:57:04 +02:00
Alexandre Torgue
e880845e29 ARM: dts: stm32: Reorder nodes in stm32mp157c-ed1
Nodes should be ordered in alphabetic order.

Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
2018-07-13 13:57:04 +02:00
Alexandre Torgue
b86646881b ARM: dts: stm32: remove gpio aliases for stm32mp157c
GPIO aliases are not used by stm32 pinctrl driver.

Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
2018-07-13 13:57:03 +02:00
Christophe Roullier
a7419ff8b7 ARM: dts: stm32: add support of ethernet on stm32mp157c-ev1
MAC is connected to a PHY in RGMII mode.

Signed-off-by: Christophe Roullier <christophe.roullier@st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
2018-07-13 13:57:03 +02:00
Christophe Roullier
7c045e8be1 ARM: dts: stm32: Add ethernet dwmac on stm32mp1
Add Ethernet support (Synopsys MAC IP 4.20a) on stm32mp1 SOC.
Enable feature supported by the stmmac driver, such as TSO.

Signed-off-by: Christophe Roullier <christophe.roullier@st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
2018-07-13 13:57:03 +02:00
Christophe Roullier
06944a55fe ARM: dts: stm32: Add syscfg on stm32mp1
System configuration controller is mainly used to manage
the compensation cell and other IOs and system related
settings.

Signed-off-by: Christophe Roullier <christophe.roullier@st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
2018-07-13 13:57:02 +02:00
Amelie Delaunay
7e29ed4a97 ARM: dts: stm32: add SPI1 support on stm32mp157c-ev1
This patch adds SPI1 support on stm32mp157c-ev1 board.
SPI1 is available on GPIO expansion connector but kept disabled
so these pins can be used as GPIOs by default.

Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
2018-07-13 13:57:02 +02:00
Amelie Delaunay
dc3f8c86c1 ARM: dts: stm32: add SPI support on stm32mp157c
This patch adds all SPI instances on stm32mp157c.

Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
2018-07-13 13:57:01 +02:00