Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync up with Linus #29

Merged
merged 87 commits into from
Feb 3, 2015
Merged
Changes from 1 commit
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
4dba418
ARM: dts: sunxi: Fix usb-phy support for sun4i/sun5i
wens Dec 18, 2014
6ba8bbe
ARM: dts: sun6i: ippo-q8h-v5: Fix serial0 alias
jwrdegoede Dec 25, 2014
a5d0b7c
DT: i2c: Add devices handled by the da9063 MFD driver
geertu Dec 9, 2014
cf54772
usb: dwc2: call dwc2_is_controller_alive() under spinlock
Jan 15, 2015
0df8fc3
usb: phy: never defer probe in non-OF case
Jan 16, 2015
8543cf1
Input: synaptics - adjust min/max for Lenovo ThinkPad X1 Carbon 2nd
whot Jan 20, 2015
8cedd66
ARM: dts: sun4i: Add simplefb node with de_fe0-de_be0-lcd0-hdmi pipeline
jwrdegoede Jan 19, 2015
267b677
perf evlist: Remove extraneous 'was' on error message
acmel Jan 19, 2015
75e0b5f
perf scripting perl: Force to use stdbool
WangNan0 Jan 19, 2015
be81908
perf annotate: Handle ins parsing failures
vitkyrka Jan 18, 2015
0fb9f2a
perf annotate: Fix memory leaks in LOCK handling
vitkyrka Jan 18, 2015
de48099
perf symbols: Return the first entry with a given name in find_by_nam…
namhyung Jan 16, 2015
18bd726
perf symbols: Introduce method to iterate symbols ordered by name
acmel Jan 16, 2015
564c62a
perf probe: Do not rely on map__load() filter to find symbols
namhyung Jan 14, 2015
0a3873a
perf symbols: Introduce 'for' method to iterate over the symbols with…
acmel Jan 16, 2015
25dd917
perf probe: Fix probing kretprobes
namhyung Jan 14, 2015
ee8a1a8
nfs: fix dio deadlock when O_DIRECT flag is flipped
Jan 19, 2015
3175e1d
NFSv4.1: Fix an Oops in nfs41_walk_client_list
trondmypd Jan 21, 2015
2ef47eb
NFS: Fix use of nfs_attr_use_mounted_on_fileid()
amschuma-ntap Dec 9, 2014
1d90d6d
Input: i8042 - add noloop quirk for Medion Akoya E7225 (MD98857)
jh23453 Jan 22, 2015
8edba33
i2c: st: Rename clock reference to something that exists
Aug 28, 2014
2541f7f
i2c: slave-eeprom: fix boundary check when using sysfs
Jan 19, 2015
34e81ad
i2c: s3c2410: fix ABBA deadlock by keeping clock prepared
Jan 19, 2015
2b7ded0
staging: nvec: specify a platform-device base id
marvintwentyfour Jan 20, 2015
41c9e95
MAINTAINERS: add Android driver entries
gregkh Jan 18, 2015
3d3fecb
MAINTAINERS: add git url entry for UIO
Jan 11, 2015
26713c8
drivers/Kconfig: remove duplicate entry for soc
poeschel Jan 14, 2015
a7a34d0
storage: Revise/fix quirk for 04E6:000F SCM USB-SCSI converter
M-a-r-k Jan 19, 2015
8a87088
uas: Add no-report-opcodes quirk for Simpletech devices with id 4971:…
jwrdegoede Jan 12, 2015
bf5c413
usb-storage/SCSI: blacklist FUA on JMicron 152d:2566 USB-SATA controller
dionorgua Jan 12, 2015
e5dff0e
USB: Add OTG PET device to TPL
macpaul Jan 23, 2015
117a2cc
ARM: sunxi: dt: Fix aliases
mripard Jan 22, 2015
f48a016
drm/i915: Init PPGTT before context enable
dwmw2 Jan 20, 2015
13f3fbe
drm/i915: fix inconsistent brightness after resume
jmahler Jan 12, 2015
af1a730
drm/i915: Only fence tiled region of object.
bobpaauwe Dec 18, 2014
a35cc9d
drm/i915: Fix and clean BDW PCH identification
rodrigovivi Jan 21, 2015
6b96d70
drm/i915: BDW Fix Halo PCI IDs marked as ULT.
rodrigovivi Jan 20, 2015
c7e3ca5
iommu/tegra: gart: Do not register with bus
thierryreding Jan 23, 2015
3557707
iommu/tegra: gart: Provide default ->map_sg() callback
thierryreding Jan 23, 2015
d5fd120
i2c: Only include slave support if selected
jdelvare Jan 26, 2015
54eb4cd
Merge tag 'fixes-for-v3.19-rc6' of git://git.kernel.org/pub/scm/linux…
gregkh Jan 27, 2015
c6e3324
Merge tag 'sunxi-fixes-for-3.19' of https://git.kernel.org/pub/scm/li…
olofj Jan 27, 2015
063c54d
btrfs: fix raid56 scrub failed in xfstests btrfs/072
Jan 9, 2015
b07ef35
udf: Release preallocation on last writeable close
jankara Jan 28, 2015
14bf61f
quota: Switch ->get_dqblk() and ->set_dqblk() to use bytes as space u…
jankara Oct 9, 2014
c05199e
perf/x86/intel/uncore: Move uncore_box_init() out of driver initializ…
kliang2 Jan 20, 2015
98b008d
perf/rapl: Fix crash in rapl_scale()
Jan 22, 2015
ef454ca
perf/x86/intel: Add model number for Airmont
kliang2 Jan 22, 2015
c3c87e7
perf: Tighten (and fix) the grouping condition
Jan 23, 2015
ae43e9d
rbd: fix rbd_dev_parent_get() when parent_overlap == 0
idryomov Jan 19, 2015
e69b8d4
rbd: drop parent_ref in rbd_dev_unprobe() unconditionally
idryomov Jan 19, 2015
e742f3d
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/lin…
Jan 28, 2015
766a788
dm cache: fix missing ERR_PTR returns and handling
jthornber Jan 28, 2015
2a7eaea
dm thin: don't allow messages to be sent to a pool target in READ_ONL…
jthornber Jan 26, 2015
dcad688
ARM: mvebu: don't set the PL310 in I/O coherency mode when I/O cohere…
tpetazzoni Jan 28, 2015
764e2c7
Merge tag 'mvebu-fixes-3.19-6' of git://git.infradead.org/linux-mvebu…
olofj Jan 28, 2015
974b072
ARM: shmobile: r8a73a4: Instantiate GIC from C board code in legacy b…
Jan 28, 2015
77cf516
ARM: shmobile: r8a7790: Instantiate GIC from C board code in legacy b…
Jan 29, 2015
eab8d65
arm: dma-mapping: Set DMA IOMMU ops in arm_iommu_attach_device()
Jan 23, 2015
3c1e716
arm/arm64: KVM: Use set/way op trapping to track the state of the caches
Dec 19, 2014
363ef89
arm/arm64: KVM: Invalidate data cache on unmap
Dec 19, 2014
0d3e4d4
arm/arm64: KVM: Use kernel mapping to perform invalidation on page fault
Jan 5, 2015
884e00f
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Jan 29, 2015
353a0c6
Merge tag 'nfs-for-3.19-3' of git://git.linux-nfs.org/projects/trondm…
torvalds Jan 29, 2015
1c999c4
Merge tag 'dm-3.19-fixes-3' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Jan 29, 2015
2148f18
drm: fix fb-helper vs MST dangling connector ptrs (v2)
robclark Jan 26, 2015
a78b80f
Merge tag 'drm-intel-fixes-2015-01-29' of git://anongit.freedesktop.o…
airlied Jan 30, 2015
02512b2
Merge tag 'kvm-arm-fixes-3.19-2' of git://git.kernel.org/pub/scm/linu…
bonzini Jan 30, 2015
df04d1d
KVM: x86: check LAPIC presence when building apic_map
rkrcmar Jan 29, 2015
32e2240
i2c: sh_mobile: terminate DMA reads properly
Jan 29, 2015
e262eb9
arc: mm: Fix build failure
groeck Jan 30, 2015
c6591c8
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
torvalds Jan 30, 2015
f3a3404
Merge tag 'iommu-fixes-v3.19-rc6' of git://git.kernel.org/pub/scm/lin…
torvalds Jan 30, 2015
1f59fe7
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
torvalds Jan 30, 2015
92ef9ce
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Jan 30, 2015
bc208e0
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Jan 30, 2015
6155bc1
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/…
torvalds Jan 30, 2015
73dc61c
Merge tag 'usb-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Jan 31, 2015
5921dfe
Merge tag 'staging-3.19-rc7' of git://git.kernel.org/pub/scm/linux/ke…
torvalds Jan 31, 2015
2141fd0
Merge tag 'char-misc-3.19-rc7' of git://git.kernel.org/pub/scm/linux/…
torvalds Jan 31, 2015
788807d
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/…
torvalds Jan 31, 2015
28111dd
Merge tag 'renesas-soc-fixes3-for-v3.19' of git://git.kernel.org/pub/…
olofj Feb 1, 2015
47c1ffb
Input: elantech - add more Fujtisu notebooks to force crc_enabled
Jan 27, 2015
00845eb
sched: don't cause task state changes in nested sleep debugging
torvalds Feb 1, 2015
3441456
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Feb 1, 2015
fba7e99
Merge tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/ke…
torvalds Feb 1, 2015
e36f014
Linux 3.19-rc7
torvalds Feb 2, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ARM: dts: sun4i: Add simplefb node with de_fe0-de_be0-lcd0-hdmi pipeline
Testing has shown that on sun4i the display backend engine does not have
deep enough fifo-s causing flickering / tearing in full-hd mode due to
fifo underruns. This can be avoided by letting the display frontend engine
do the dma from memory, and then letting it feed the data directly into
the backend unmodified, as the frontend does have deep enough fifo-s.

Note since u-boot-v2015.01 has been released using the de_be0-lcd0-hdmi
pipeline on sun4i, we need to keep that one around too (unfortunately).

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
jwrdegoede authored and mripard committed Jan 21, 2015
commit 8cedd6628472aa2d8f2f54dfcc36633e46a59db8
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/sun4i-a10.dtsi
Original file line number Diff line number Diff line change
@@ -39,6 +39,14 @@
<&ahb_gates 44>;
status = "disabled";
};

framebuffer@1 {
compatible = "allwinner,simple-framebuffer", "simple-framebuffer";
allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi";
clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
<&ahb_gates 44>, <&ahb_gates 46>;
status = "disabled";
};
};

cpus {