28 Feb, 2010
7 commits
-
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (24 commits)
m68k: Define sigcontext ABI of ColdFire
m68knommu: NPTL support for uClinux
m68k: Add NPTL support
m68k: Eliminate unused variable in page_to_phys()
m68k: Switch to generic siginfo layout
macfb: fix 24-bit visual and stuff
macfb: cleanup
fbdev: add some missing mac modes
mac68k: start CUDA early
valkyriefb: various fixes
fbdev: mac_var_to_mode() fix
mac68k: move macsonic and macmace platform devices
mac68k: move mac_esp platform device
mac68k: replace mac68k SCC code with platform device
pmac-zilog: add platform driver
pmac-zilog: cleanup
mac68k: rework SWIM platform device
mac68k: cleanup
ataflop: Killl warning about unused variable flags
m68k: Use DIV_ROUND_CLOSEST
... -
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (88 commits)
powerpc: Fix lwsync feature fixup vs. modules on 64-bit
powerpc: Convert pmc_owner_lock to raw_spinlock
powerpc: Convert die.lock to raw_spinlock
powerpc: Convert tlbivax_lock to raw_spinlock
powerpc: Convert mpic locks to raw_spinlock
powerpc: Convert pmac_pic_lock to raw_spinlock
powerpc: Convert big_irq_lock to raw_spinlock
powerpc: Convert feature_lock to raw_spinlock
powerpc: Convert i8259_lock to raw_spinlock
powerpc: Convert beat_htab_lock to raw_spinlock
powerpc: Convert confirm_error_lock to raw_spinlock
powerpc: Convert ipic_lock to raw_spinlock
powerpc: Convert native_tlbie_lock to raw_spinlock
powerpc: Convert beatic_irq_mask_lock to raw_spinlock
powerpc: Convert nv_lock to raw_spinlock
powerpc: Convert context_lock to raw_spinlock
powerpc/85xx: Add NOR, LEDs and PIB support for MPC8568E-MDS boards
powerpc/86xx: Enable VME driver on the GE SBC610
powerpc/86xx: Enable VME driver on the GE PPC9A
powerpc/86xx: Add MSI section to GE PPC9A DTS
... -
Lots of changes. Remove volatile keywords. Take the advice in the comments
and change video_slot to slot_addr. Factor out fifteen or so "channel >>
8" shifts into three shifts higher up the call graph. Make
csc_setpalette() atomic, pass the correct color values. Check for
ioremap() failure. Add missing break statement, thus fixing 24 bit console
visual (blue background bug). Remove some uninformative printk() noise.
Add a description for powerbook 140/170 graphics.Signed-off-by: Finn Thain
Signed-off-by: Geert Uytterhoeven -
Cleanup whitespace and code style. Remove unused #includes and prototypes.
Remove obsolete, redundant or misleading comments. Remove dead code and
redundant initialisers.Signed-off-by: Finn Thain
Signed-off-by: Geert Uytterhoeven -
Add the missing mac video modes for the Portrait and 12" RGB displays. The
specs come from the Mac LC III developer note.Signed-off-by: Finn Thain
Signed-off-by: Geert Uytterhoeven -
Valkyriefb and macfb will adopt the same card if they get the chance, so
remove valkyrie support from macfb. Also fix the "valkyriefb: can't do
832x624x8" problem reported by Raylynn Knight some time ago, by adding
vmode 13 support for CONFIG_MAC. Also add vmode 11 since that works too.
Make use of the monitor sense lines on 68k Macs too. Also some cleanups.Signed-off-by: Finn Thain
Signed-off-by: Geert Uytterhoeven -
The valkyriefb driver assumes that this logic holds:
mac_vmode_to_var(X, cmode, &var);
mac_var_to_vmode(&var, &vmode, &cmode);
assert(vmode == X);But it doesn't hold because mac_var_to_vmode() can return a mode with a
slower pixel clock, even when a match is available. So we end up with this
failure:using video mode 11 and color mode 0.
valkyriefb: vmode 12 not valid.
valkyriefb: can't set default video mode
valkyriefb: vmode 12 not valid.Rather than have mac_var_to_mode() return the first reasonable mode it
finds, have it return the mode that is closest to the requested one (or
the mode with the closest longer pixel clock period if there is no exact
match).Signed-off-by: Finn Thain
Signed-off-by: Geert Uytterhoeven
27 Feb, 2010
1 commit
-
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (187 commits)
sh: remove dead LED code for migo-r and ms7724se
sh: ecovec build fix for CONFIG_I2C=n
sh: ecovec r-standby support
sh: ms7724se r-standby support
sh: SH-Mobile R-standby register save/restore
clocksource: Fix up a registration/IRQ race in the sh drivers.
sh: ms7724: modify scan_timing for KEYSC
sh: ms7724: Add sh_sir support
sh: mach-ecovec24: Add sh_sir support
sh: wire up SET/GET_UNALIGN_CTL.
sh: allow alignment fault mode to be configured at kernel boot.
sh: sh7724: Update FSI/SPU2 clock
sh: always enable sh7724 vpu_clk and set to 166MHz on Ecovec
sh: add sh7724 kick callback to clk_div4_table
sh: introduce struct clk_div4_table
sh: clock-cpg div4 set_rate() shift fix
sh: Turn on speculative return for SH7785 and SH7786
sh: Merge legacy and dynamic PMB modes.
sh: Use uncached I/O helpers in PMB setup.
sh: Provide uncached I/O helpers.
...
26 Feb, 2010
2 commits
-
Manual merge of:
drivers/char/hvc_console.c
drivers/char/hvc_console.h -
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (41 commits)
of: remove undefined request_OF_resource & release_OF_resource
of/sparc: Remove sparc-local declaration of allnodes and devtree_lock
of: move definition of of_chosen into common code.
of: remove unused extern reference to devtree_lock
of: put default string compare and #a/s-cell values into common header
of/flattree: Don't assume HAVE_LMB
of: protect linux/of.h with CONFIG_OF
proc_devtree: fix THIS_MODULE without module.h
of: Remove old and misplaced function declarations
of/flattree: Make the kernel accept ePAPR style phandle information
of/flattree: endian-convert members of boot_param_header
of: assume big-endian properties, adding conversions where necessary
of: use __be32 for cell value accessors
of/flattree: use OF_ROOT_NODE_{SIZE,ADDR}_CELLS DEFAULT for fdt parsing
of/flattree: use callback to setup initrd from /chosen
proc_devtree: include linux/of.h
of: make set_node_proc_entry private to proc_devtree.c
of: include linux/proc_fs.h
of/flattree: merge early_init_dt_scan_memory() common code
of: add 'of_' prefix to machine_is_compatible()
...
23 Feb, 2010
1 commit
-
Commit 4410f3910947dcea8672280b3adecd53cec4e85e ("fbdev: add support for
handoff from firmware to hw framebuffers") didn't add fb_destroy
operation to efifb. Fix it and change aperture_size to match size
passed to request_mem_region.Addresses http://bugzilla.kernel.org/show_bug.cgi?id=15151
Signed-off-by: Marcin Slusarz
Reported-by: Alex Zhavnerchik
Tested-by: Alex Zhavnerchik
Acked-by: Peter Jones
Cc: Huang Ying
Cc: Dave Airlie
Cc: "Rafael J. Wysocki"
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
17 Feb, 2010
2 commits
-
The DIU driver should bind against "fsl,mpc5121-diu"
directly. Add this compatible property to the match
table and fix DTS and platform code accordingly.Signed-off-by: Anatolij Gustschin
Signed-off-by: Grant Likely -
Both the store queue API and the PMB remapping take unsigned long for
their pgprot flags, which cuts off the extended protection bits. In the
case of the PMB this isn't really a problem since the cache attribute
bits that we care about are all in the lower 32-bits, but we do it just
to be safe. The store queue remapping on the other hand depends on the
extended prot bits for enabling userspace access to the mappings.Signed-off-by: Paul Mundt
16 Feb, 2010
2 commits
-
Fixed SH-Mobile panning. Previously the address of the frame to be displayed
was updated in the VSync end interrupt. This meant there was a minimum of 1
frame bewteen calling FBIOPAN_DISPLAY ioctl and the pan occuring. This meant
that apps were not able to use the FBIO_WAITFORVSYNC ioctl to wait for the
pan to complete. This patch moves the write to LDSA1R mirror reg into the
pan ioctl. Tested on MS7724 board against 2.6.33-rc7Signed-off-by: Phil Edworthy
Signed-off-by: Paul Mundt -
Added FBIO_WAITFORVSYNC ioctl for SH-Mobile devices.
Tested on MS7724 and MigoR boards against 2.6.33-rc7.Signed-off-by: Phil Edworthy
Signed-off-by: Paul Mundt
09 Feb, 2010
1 commit
-
machine is compatible is an OF-specific call. It should have
the of_ prefix to protect the global namespace.Signed-off-by: Grant Likely
Acked-by: Michal Simek
03 Feb, 2010
2 commits
-
The probe function passes a pointer to a struct fb_info to
platform_set_drvdata(), so don't interpret the return value of
platform_get_drvdata() as a pointer to struct imxfb_info.The original imxfb_info *fbi backlight_power was NULL but in imxfb_suspend
it was 4 resulting in an oops as imxfb_suspend calls
imxfb_disable_controller(fbi) which in turn hasif (fbi->backlight_power)
fbi->backlight_power(0);Signed-off-by: Uwe Kleine-König
Acked-by: Sascha Hauer
Cc:
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Fix the kernel oops when dev_dbg is called with mx3_fbi->txd == NULL
Fix the late initialisation of mx3fb->backlight_level. If not, in the
chain of function started by init_fb_chan(), in __blank() call
sdc_set_brightness(mx3fb, mx3fb->backlight_level) that will shut down the
CONTRAST PWM output.Signed-off-by: Alberto Panizzo
Acked-by: Guennadi Liakhovetski gmx.de>
Cc: Sascha Hauer
Cc:
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
29 Jan, 2010
2 commits
-
In struct device_node, the phandle is named 'linux_phandle' for PowerPC
and MicroBlaze, and 'node' for SPARC. There is no good reason for the
difference, it is just an artifact of the code diverging over a couple
of years. This patch renames both to simply .phandle.Note: the .node also existed in PowerPC/MicroBlaze, but the only user
seems to be arch/powerpc/platforms/powermac/pfunc_core.c. It doesn't
look like the assignment between .linux_phandle and .node is
significantly different enough to warrant the separate code paths
unless ibm,phandle properties actually appear in Apple device trees.I think it is safe to eliminate the old .node property and use
phandle everywhere.Signed-off-by: Grant Likely
Acked-by: David S. Miller
Tested-by: Wolfram Sang
Acked-by: Benjamin Herrenschmidt
17 Jan, 2010
4 commits
-
Fix divide by zero and broken output. Commit 600ce1a0fa ("fix clock
setting for Samsung SoC Framebuffer") introduced a mandatory refresh
parameter to the platform data for the S3C framebuffer but did not
introduce any validation code, causing existing platforms (none of which
have refresh set) to divide by zero whenever the framebuffer is
configured, generating warnings and unusable output.Ben Dooks noted several problems with the patch:
- The platform data supplies the pixclk directly and should already
have taken care of the refresh rate.
- The addition of a window ID parameter doesn't help since only the
root framebuffer can control the pixclk.
- pixclk is specified in picoseconds (rather than Hz) as the patch
assumed.and suggests reverting the commit so do that. Without fixing this no
mainline user of the driver will produce output.[akpm@linux-foundation.org: don't revert the correct bit]
Signed-off-by: Mark Brown
Cc: InKi Dae
Cc: Kyungmin Park
Cc: Krzysztof Helt
Cc: Marek Szyprowski
Cc: Ben Dooks
Cc:
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Fix a regression in hardware acceleration which made the accelerated
framebuffer unusable on some chips. These need extra initialization and
an extra flag which is no longer needed/available on current chips.Signed-off-by: Erik-Jan Post
Signed-off-by: Florian Tobias Schandinat
Cc: Scott Fang
Cc: Joseph Chan
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Reorder viafb_set_par to allow using the updated variables in
viafb_setmode. This fixes a regression that prevented proper runtime mode
changes.Signed-off-by: Erik-Jan Post
Signed-off-by: Florian Tobias Schandinat
Cc: Scott Fang
Cc: Joseph Chan
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Although I'd consider this a hardware bug, as there is hardware out that
for whatever reason does not support hardware cursors on LCD output we
have to care about it in the driver. This fixes a regression (invisible
cursor) introduced by:viafb: cleanup viafb_cursor
Signed-off-by: Florian Tobias Schandinat
Reported-by: Julian Wollrath
Tested-by: Julian Wollrath
Cc: Scott Fang
Cc: Joseph Chan
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
13 Jan, 2010
1 commit
-
* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
OMAP: DSS2: OMAPFB: fix crash when panel driver was not loaded
OMAP: DSS2: Reject scaling settings when they cannot be supported
OMAP: DSS2: Make check-delay-loops consistent
OMAP: DSS2: OMAPFB: fix omapfb_free_fbmem()
video/omap: add __init/__exit macros to drivers/video/omap/lcd_htcherald.c
OMAP: DSS2: Fix compile warning
MAINTAINERS: Combine DSS2 and OMAPFB2 into one entry
MAINTAINERS: change omapfb maintainer
OMAP: OMAPFB: add dummy release function for omapdss
OMAP: OMAPFB: fix clk_get for RFBI
OMAP: DSS2: RFBI: convert to new kfifo API
OMAP: DSS2: Fix crash when panel doesn't define enable_te()
OMAP: DSS2: Collect interrupt statistics
OMAP: DSS2: DSI: print debug DCS cmd in hex
OMAP: DSS2: DSI: fix VC channels in send_short and send_null
12 Jan, 2010
3 commits
-
If the panel's probe had failed, omapfb would still go on, eventually
crashing.A better fix would be to handle each display properly, and leaving just
the failed display out. But that is a bigger change.Signed-off-by: Tomi Valkeinen
-
If the scaling ratio is below 0.5 video output width can't be identical
to the display width. Reject such settings.Signed-off-by: Ville Syrjälä
Acked-by: Tomi Valkeinen -
…/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (26 commits)
OMAP2 clock: dynamically allocate CPUFreq frequency table
OMAP clock/CPUFreq: add clk_exit_cpufreq_table()
OMAP2xxx OPP: clean up comments in OPP data
OMAP2xxx clock: clk2xxx.c doesn't compile if CPUFREQ is enabled
OMAP1 clock: remove __initdata from struct clk_functions to prevent crash
OMAP1 clock: Add missing clocks for OMAP 7xx
OMAP clock: remove incorrect EXPORT_SYMBOL()s
OMAP3 clock: Add capability to change rate of dpll4_m5_ck
OMAP3 clock: McBSP 2, 3, 4 functional clock parent is PER_96M_FCLK, not CORE_96M_FCLK
OMAP3: clock: add clockdomains for UART1 & 2
OMAP2420 IO mapping: move IVA mapping virtual address out of vmalloc space
OMAP2xxx IO mapping: mark DSP mappings as being 2420-only
ARM: OMAP3: PM: Fix the Invalid CM_CLKSTCTRL reg access.
OMAP2: remove duplicated #include
omap3: EVM: Choose OMAP_PACKAGE_CBB
omap3: Fix booting if package is uninitialized
omap3: add missing parentheses
omap3: add missing parentheses
omap2/3: ZOOM: Correcting key mapping for few keys
omap2/3: make serial_in_override() address the right uart port
...
11 Jan, 2010
7 commits
-
Loops checking for certain condition were rather inconsistent.
Signed-off-by: Tomi Valkeinen
Reported-by: Juha Leppanen -
Fixes bug causing VRFB memory area to be released twice.
Signed-off-by: Tomi Valkeinen
Reported-by: Eino-Ville Talvala -
Trivial patch which adds the __init/__exit macros to the module_init/
module_exit functions ofdrivers/video/omap/lcd_htcherald.c
Please have a look at the small patch and either pull it through
your tree, or please ack' it so Jiri can pull it through the trivial
tree.Patch against linux-next-tree, 22. Dez 08:38:18 CET 2009
but also present in linus tree.Signed-off-by: Peter Huewe
Acked-by: Tony Lindgren -
Signed-off-by: Vaibhav Hiremath
Acked-by: Tomi Valkeinen -
This should fix:
WARNING: at drivers/base/core.c:131 device_release+0x68/0x7c()
Device 'omapdss' does not have a release() function, it is broken and
must be fixed.Signed-off-by: Tomi Valkeinen
-
omapfb platform device was still used to get clocks inside rfbi.c
Signed-off-by: Tomi Valkeinen
Tested-by: Sergey Lapin -
Signed-off-by: Tomi Valkeinen
09 Jan, 2010
1 commit
-
Commit 9905a43b made struct backlight_ops const. Omap was
setting check_fb dynamically, which caused the following
compile error:drivers/video/backlight/omap1_bl.c: In function 'omapbl_probe':
drivers/video/backlight/omap1_bl.c:142: error: assignment of read-only variable 'omapbl_ops'Turns out pdata->check_fb is not being used, so just remove
it to fix the compile.Cc: Emese Revfy
Cc: Richard Purdie
Signed-off-by: Tony Lindgren
08 Jan, 2010
4 commits
-
DSI driver didn't check if the panel driver actually implements
enable_te().Signed-off-by: Tomi Valkeinen
-
Collect interrupt statistics, printable via debugfs:
debugfs/omapdss/dispc_irq
debugfs/omapdss/dsi_irqThe counters are reset when printed.
Signed-off-by: Tomi Valkeinen
-
Signed-off-by: Tomi Valkeinen
-
- dsi_vc_send_short() needs to use dest_per for the peripheral id
- dsi_vc_send_null() was always using channel id 0Signed-off-by: Tomi Valkeinen