Pull ARM SoC cleanups from Olof Johansson: "A large cleanup branch this release, with a healthy 10k negative line delta. Most of this is removal of legacy (non-DT) support of shmobile platforms. There is also removal of two non-DT platforms on OMAP, and the plat-samsung directory is cleaned out by moving most of the previously shared-location-but-not-actually-shared files from there to the appropriate mach directories instead. There are other sets of changes in here as well: - Rob Herring removed use of set_irq_flags under all platforms and moved to genirq alternatives - a series of timer API conversions to set-state interface - ep93xx, nomadik and ux500 cleanups from Linus Walleij - __init annotation fixes from Nicolas Pitre + a bunch of other changes that all add up to a nice set of cleanups" * tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (108 commits) ARM/fb: ep93xx: switch framebuffer to use modedb only ARM: gemini: Setup timer3 as free running timer ARM: gemini: Use timer1 for clockevent ARM: gemini: Add missing register definitions for gemini timer ARM: ep93xx/timer: Migrate to new 'set-state' interface ARM: nomadik: push accelerometer down to boards ARM: nomadik: move l2x0 setup to device tree ARM: nomadik: selectively enable UART0 on boards ARM: nomadik: move hog code to use DT hogs ARM: shmobile: Fix mismerges ARM: ux500: simplify secondary CPU boot ARM: SAMSUNG: remove keypad-core header in plat-samsung ARM: SAMSUNG: local watchdog-reset header in mach-s3c64xx ARM: SAMSUNG: local onenand-core header in mach-s3c64xx ARM: SAMSUNG: local irq-uart header in mach-s3c64xx ARM: SAMSUNG: local backlight header in mach-s3c64xx ARM: SAMSUNG: local ata-core header in mach-s3c64xx ARM: SAMSUNG: local regs-usb-hsotg-phy header in mach-s3c64xx ARM: SAMSUNG: local spi-core header in mach-s3c24xx ARM: SAMSUNG: local nand-core header in mach-s3c24xx ...
Showing the changes to include/linux/platform_data (1 of 196 files). Show all
Unified · Split
| @@ -2,11 +2,8 @@ · 1 unmodified line | |||
| 2 | #define __VIDEO_EP93XX_H | 2 | #define __VIDEO_EP93XX_H |
| 3 | 3 | ||
| 4 | struct platform_device; | 4 | struct platform_device; |
| 5 | struct fb_videomode; | ||
| 6 | struct fb_info; | 5 | struct fb_info; |
| 7 | 6 | ||
| 8 | #define EP93XXFB_USE_MODEDB 0 | ||
| 9 | |||
| 10 | /* VideoAttributes flags */ | 7 | /* VideoAttributes flags */ |
| 11 | #define EP93XXFB_STATE_MACHINE_ENABLE (1 << 0) | 8 | #define EP93XXFB_STATE_MACHINE_ENABLE (1 << 0) |
| 12 | #define EP93XXFB_PIXEL_CLOCK_ENABLE (1 << 1) | 9 | #define EP93XXFB_PIXEL_CLOCK_ENABLE (1 << 1) |
| @@ -38,12 +35,7 @@ struct fb_info; · 25 unmodified lines | |||
| 38 | EP93XXFB_PIXEL_DATA_ENABLE) | 35 | EP93XXFB_PIXEL_DATA_ENABLE) |
| 39 | 36 | ||
| 40 | struct ep93xxfb_mach_info { | 37 | struct ep93xxfb_mach_info { |
| 41 | unsigned int num_modes; | ||
| 42 | const struct fb_videomode *modes; | ||
| 43 | const struct fb_videomode *default_mode; | ||
| 44 | int bpp; | ||
| 45 | unsigned int flags; | 38 | unsigned int flags; |
| 46 | |||
| 47 | int (*setup)(struct platform_device *pdev); | 39 | int (*setup)(struct platform_device *pdev); |
| 48 | void (*teardown)(struct platform_device *pdev); | 40 | void (*teardown)(struct platform_device *pdev); |
| 49 | void (*blank)(int blank_mode, struct fb_info *info); | 41 | void (*blank)(int blank_mode, struct fb_info *info); |