Commit Graph

377533 Commits

Author SHA1 Message Date
Jon Medhurst
5af2ca472c Merge branch 'tracking-armlt-clcd' into lsk-3.10-vexpress 2013-07-17 12:01:43 +01:00
Jon Medhurst
1d7123299d Merge branch 'tracking-armlt-hdlcd' into lsk-3.10-vexpress 2013-07-17 12:01:42 +01:00
Jon Medhurst
042c5cb741 Merge branch 'tracking-armlt-ve-updates' into lsk-3.10-vexpress 2013-07-17 12:01:37 +01:00
Jon Medhurst
7a6cc8ab22 Merge branch 'tracking-armlt-rtsm' into lsk-3.10-vexpress 2013-07-17 12:01:37 +01:00
Jon Medhurst
50f1a7c407 Merge branch 'tracking-armlt-config' into lsk-3.10-vexpress 2013-07-17 12:01:36 +01:00
Ryan Harkin
c0ac923b5e ARM: vexpress: configure CLCD driver device tree support for A9 CoreTile
Configuration for the amba-clcd PL111 driver is added to the A9 CoreTile's DTS
file.

Configuration of the motherboard CLCD driver is disabled in the DTSI files to
prevent duplicate CLCD drivers being registered.

A generic set of CLCD panel descriptions has been split into its own DTSI file.
Currently, only XVGA and VGA monitors are described.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:31 +01:00
Will Deacon
50ad0eb192 amba-clcd: separate ioremap framebuffer from DMA implementation
The amba-clcd device can be configured to use either DMA or, when this
feature is not available, an ioremapped frambuffer in static ram.

In the case of the latter, we must take care not to pass ioremapped
addresses to dma_common_mmap, since this expects only addresses from
dma_mmap_coherent, which reside in the kernel linear mapping.

This patch reworks the fb initialisation code so that either DMA or IO
implementations of the mmap/remove functions are chosen as appropriate.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2013-07-01 11:04:31 +01:00
Catalin Marinas
8df3102afa amba-clcd: Only use dma_alloc_writecombine() if the arch supports it
This patch hides the dma_(alloc|free)_writecombine() calls behind macros
to allow the amba-clcd.c to be used on architectures that do not provide
this DMA API. With this patch, the *_writecombine() API is only used on
ARM (AArch32).

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2013-07-01 11:04:31 +01:00
Jon Medhurst
95c8041c50 amba-clcd: Remove check for 'reg' value in clcdfb_probe
This check was attempting to ensure only one clcd device in the
device-tree was probed, however the check fails in the valid case where
the device is a child of another device and the 'reg' value is a offset
from the start of that other device, not an absolute address. This
occurs on vexpress with the motherboard clcd being a child of iofga.

For now, we will just have to rely on there only being one display
device specified in device-tree.

Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:30 +01:00
Jon Medhurst
778a02466d amba-clcd: Add Device Tree support to amba-clcd driver
Add support to parse the display configuration from device tree.

If the board does not provide platform specific functions in the struct
clcd_board contained with the amba device info, then defaults are provided
by the driver.

The device tree configuration can either ask for a DMA setup or provide a
framebuffer address to be remapped into the driver.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
2013-07-01 11:04:30 +01:00
Jon Medhurst
83bce1182d ARM HDLCD: Fix clock initialisation sequence
This reworks HDLCD initialisation to mirror how CLCD does this, in
particular to prepare the clock immediately after it has been got which
ensures that we don't try and enable clocks before they were prepared,
e.g. in the former clk_enable after register_framebuffer().

The reason this issue wasn't noticed before is that we have been
setting CONFIG_FRAMEBUFFER_CONSOLE and this caused
register_framebuffer() to trigger the creation of a console which calls
hdlcd_set_par(), which in turn was preparing and enabling the clock.

Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:26 +01:00
Jon Medhurst
0e2f185700 ARM: vexpress: Update TC2 device tree for HDLCD hack
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:26 +01:00
Jon Medhurst
6b614fae0e ARM: vexpress: Add support for HDLCD
This is a temporary solution to get everything running.

Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:26 +01:00
Jon Medhurst
e9a113ad8f ARM HDLCD: Fix compilation on Linux 3.9
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:26 +01:00
Jon Medhurst
ac1b17efc7 ARM HDLCD: Changes to get HDLCD working with 've-updates'
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:26 +01:00
Jon Medhurst
e361c22545 ARM HDLCD: Enable HDLCD_NO_VIRTUAL_SCREEN on Android
This is a hack which prevents annoying screen flicker in the Android UI.

Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:25 +01:00
Chris Redpath
9f14266f6f ARM HDLCD: Add developer option to remove double-height framebuffers
This option can be used with Android to push the graphics subsystem into a
different composition strategy which is more effective when used on hardware
where the framebuffer memory is not cacheable.

Signed-off-by: Chris Redpath <chris.redpath@arm.com>
2013-07-01 11:04:25 +01:00
Chris Redpath
5705f5f9c6 ARM HDLCD: Review comments from Liviu - extraneous memcpy
Signed-off-by: Chris Redpath <chris.redpath@arm.com>
Reviewed-By: Liviu Dudau <liviu.dudau@arm.com>
2013-07-01 11:04:25 +01:00
Chris Redpath
7195cb1444 ARM HDLCD: Add useful functions to HDLCD driver for system integration
During TC2 integration a bad config option resulted in HDLCD memory reads
not being serviced often enough. This lead to unsightly screen blanking.

These options allow the developer to count the number of underruns and
to control the color used by HDLCD when an underrun prevents accessing
pixel data. The combination of these two options allow easy diagnosis
of HDLCD underrun conditions.

Signed-off-by: Chris Redpath <chris.redpath@arm.com>
2013-07-01 11:04:25 +01:00
Chris Redpath
585617333b ARM HDLCD: Change default byte ordering to match Android assumption
Change color byte location in 32-bit word from argb to abgr to match
the assumption made in Android when 32-bit color displays are used.

Signed-off-by: Chris Redpath <chris.redpath@arm.com>
2013-07-01 11:04:25 +01:00
Dietmar Eggemann
f03c663576 ARM HDLCD: Get it working under Android.
Add a shortcut when set_par is called to only change the yoffset. Android is
doing that instead of calling pan_display to flip the framebuffer.

Signed-off-by: Chris Redpath <chris.redpath@arm.com>
2013-07-01 11:04:24 +01:00
Jon Medhurst
51f1911828 ARM HDLCD: Fixup driver to resemble ARM's latest codebase.
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:24 +01:00
Jon Medhurst
7c7d3b31d5 ARM HDLCD: Add missing clk_{un}prepare calls
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:24 +01:00
Liviu Dudau
caf003fa1d ARM HDLCD: Add support for ARM High Definition LCD.
The ARM HDLCD device is now found in various new Versatile Express coretiles.

Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
2013-07-01 11:04:24 +01:00
Pawel Moll
abe8e2fe9e mfd: vexpress: Make the driver optional for arm and arm64
The driver can be used on either arm or arm64 platforms, but
the latter doesn't have any platform-specific configuration
options, so it must be possible to manually enable the driver.

As the gpiolib is optional for arm64 arch, the gpio/led code
must be compiled conditionally.

Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
2013-07-01 11:04:20 +01:00
Pawel Moll
981794e2f2 power/reset: Make the vexpress driver optional on arm and arm64
The driver can be used on either arm or arm64 platforms, but
the latter doesn't have any platform-specific configuration
options, so it must be possible to manually enable the driver.

Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
2013-07-01 11:04:20 +01:00
Pawel Moll
503552ea01 clk: vexpress: Make the clock drivers directly available for arm64
The new arm64 architecture has no idea of platform or machine, so
it doesn't have to define ARCH_VEXPRESS configuration option at
all. To allow user to select the drivers at all, make it depend
on ARM64 as well.

Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
2013-07-01 11:04:20 +01:00
Pawel Moll
5f97d66c4a clk: vexpress: Use full node name to identify individual clocks
Previously all the clocks were reported as "osc". Now it will be
something like "/dcc/osc@0".

Signed-off-by: Pawel Moll <pawel.moll@arm.com>
2013-07-01 11:04:19 +01:00
Jon Medhurst
c3e43a142a video: Make vexpress DVI driver depend on CONFIG_FB
The driver uses symbols from fbmem.c so if CONFIG_FB is not
selected we get build errors like:

drivers/built-in.o: In function `vexpress_dvi_fb_select':
 :(.text+0x1b6c): undefined reference to `lock_fb_info'
 :(.text+0x1ba0): undefined reference to `registered_fb'

Note, this is only a partial solution because we still have a
problem if CONFIG_FB is selected as a module.

Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:19 +01:00
Pawel Moll
d73a32d90f video: Versatile Express DVI output driver
Versatile Express' DVI video output can be connected to one the three
sources - motherboard's CLCD controller or a video signal generated
by one of the daughterboards.

This driver configures the muxer FPGA so the output displays content
of one of the framebuffers in the system (0 by default, can be changed
by user writing to the "fb" sysfs attribute of the muxfpga device).

It will also set up the display formatter mode and keep it up
to date with mode changes requested by the user (eg. with fbset
tool).

Signed-off-by: Pawel Moll <pawel.moll@arm.com>
2013-07-01 11:04:19 +01:00
Jon Medhurst
d2cab175b7 rtsm: fixup for new CCI driver
We include the compatible string "arm,cci" because the semihosting
bootwrapper searches for this to initialise the CCI before boot.

The boot-wrapper will need updating for the new CCI device-tree
bindings when they are stable, then we can remove this old compatible
string from the RTSM device-trees.

Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:15 +01:00
Nicolas Pitre
e63a47a858 ARM: rtsm_ve-v2p-ca15x?-ca7x?.dts: update dcscb compatible string
... to match the version that was approved during upstream review.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
2013-07-01 11:04:15 +01:00
Nicolas Pitre
76546a4560 ARM: RTSM: add DCSCB address definition to ca15x*-ca7x* .dts files 2013-07-01 11:04:14 +01:00
Jon Medhurst
2791e6ee27 ARM: dts: Update RTSM dtbs for CLCD changes
Signed-off-by: Jon Medhurst <tixy@linaro.org>

Conflicts:
	arch/arm/boot/dts/rtsm_ve-motherboard.dtsi
2013-07-01 11:04:14 +01:00
Jon Medhurst
cec7118232 ARM: dts: Changes to get RTSM working with Linux 3.8
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:14 +01:00
Jon Medhurst
ecc1f5b6c9 ARM: dts: Add RTSM dtb's to Makefile.boot
So they are built by 'make dtbs' and so will appear in Linaro's
Ubuntu kernel package.

Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:14 +01:00
Jon Medhurst
d0d4f95d6f ARM: dts: Add device trees for RTSM
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:14 +01:00
Liviu Dudau
d9f00d1927 ARM: VExpress: PSCI: Compile PSCI code by default
Compile support for PSCI by default and let the command line decide
whether support for SMC calls gets enabled or not.

Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
2013-07-01 11:04:10 +01:00
Jon Medhurst
7c394d27f8 configs: vexpress-tuning: Re-enable CONFIG_THUMB2_KERNEL
Performace and power don't appear to be improved by building for ARM,
in fact, there's a suggestion it uses slightly more power.

Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:10 +01:00
Jon Medhurst
5b3a8f7d38 configs: vexpress-tuning: Re-enable tracing and profiling options
For now, lets play safe and not disable any tracing and profiling
options in case these are expected to be present for benchmarking
purposes.

Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:10 +01:00
Jon Medhurst
5103a93f13 configs: vexpress-tuning: Add fragment for better performance
Use ARM rather than Thumb2 and disable debug and trace features which
aren't essential. (Some trace features are still needed to avoid
breaking Gator).

Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:09 +01:00
Jon Medhurst
d66c588058 configs: vexpress: Enable TC2 power management options
Note, for the sake of a faster boot and better performance, we default
to maximum CPU clock frequency (CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE)
and will rely on user-side scripts on Android and Ubuntu to change this
as appropriate for big.LITTLE power saving. E.g. changing LITTLE cores
to 'ondemand'.

Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:09 +01:00
Jon Medhurst
ff4091af32 configs: vexpress: Extra options needed for TC2
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:09 +01:00
Jon Medhurst
c338b0c753 configs: vexpress: Enable LEDs
To provide access to LEDs enable

  CONFIG_LEDS_CLASS=y
  CONFIG_LEDS_GPIO=y

(LED's are available from user side under under /sys/class/leds)

To use the motherboard LEDs to show CPU activity...

  CONFIG_LEDS_TRIGGERS=y
  CONFIG_LEDS_TRIGGER_HEARTBEAT=y
  CONFIG_LEDS_TRIGGER_CPU=y

Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:09 +01:00
Jon Medhurst
2d98cd5fd0 configs: vexpress: Changes needed for Linux 3.9
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:09 +01:00
Jon Medhurst
b1c39e26a4 configs: vexpress: Changes needed for Linux 3.8
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:08 +01:00
Jon Medhurst
7242eb38ab configs: vexpress: Enable CONFIG_SMC91X
This is the ethernet device RTSM models and we want normal vexpress
kernels also working on RTSM.

Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:08 +01:00
Jon Medhurst
47e07abc26 configs: vexpress: Basic board config fragment
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2013-07-01 11:04:08 +01:00
Linus Torvalds
8bb495e3f0 Linux 3.10 v3.10 2013-06-30 15:13:29 -07:00
Linus Torvalds
f0277dce1b Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull another powerpc fix from Benjamin Herrenschmidt:
 "I mentioned that while we had fixed the kernel crashes, EEH error
  recovery didn't always recover...  It appears that I had a fix for
  that already in powerpc-next (with a stable CC).

  I cherry-picked it today and did a few tests and it seems that things
  now work quite well.  The patch is also pretty simple, so I see no
  reason to wait before merging it."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/eeh: Fix fetching bus for single-dev-PE
2013-06-30 15:08:15 -07:00