Skip to content

Commit

Permalink
Merge tag 'v4.19' into master
Browse files Browse the repository at this point in the history
This is the 4.19 merge.

smc:
- Remove PL35x driver (new version will be used)

nand:
- Remove Arasan raw NAND driver (new version will be used)
- Remove PL35x driver (so many merge issues)

sound:
- Replace Codec to Component as was done
  (sha1: 7c8d905)

remoteproc:
- Use mainline version only - revert all Xilinx changes

dmaengine:
- Adopt new registration as was done by
  (sha1: 7c00be60db5380bf0f7a5371370ea63c4259ae76)

configs:
- Sync with new Kconfig structure (microblaze is not synced)

arm:
- Adopt mainline Spectre fixes for Cortex-A9
  (Checked with Marc Zyngier)

usb:
- Several changes in DWC3 driver

clock:
- Fixes about new divider_recalc_rate() prototype
  - xlnx_vcu_clk.c, clk-xlnx-clock-wizard.c

fpga-zynqmp:
- Use fpga_mgr_create() based on
 "fpga: manager: change api, don't use drvdata"
 (sha1: 7085e2a)

media:
- s/drm_mode_connector_attach_encoder/drm_connector_attach_encoder/g
 Based on "drm: drop _mode_ from drm_mode_connector_attach_encoder"
 (sha1: cde4c44)
- s/drm_mode_connector_update_edid_property/drm_connector_update_edid_property/g
 Based on "drm: drop _mode_ from update_edit_property()"
 (sha1: c555f02)

can:
- Using mainline version

reset-zynqnp:
- Add missing of.h header

Signed-off-by: Michal Simek <[email protected]>
  • Loading branch information
Michal Simek committed Jan 9, 2019
2 parents acbe29b + 84df952 commit 26a8a4d

Sorry, this diff is taking too long to generate.

It may be too large to display on GitHub.

0 comments on commit 26a8a4d

Please sign in to comment.