diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-19 08:18:48 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-19 08:18:48 -0300 |
| commit | 5a53a1db6f05ad25ebf05360a60e44c0773ca36e (patch) | |
| tree | 38f7772d73c4dae6e4203acc37ed705efbfd26dd /linux/arch/sh | |
| parent | f1cac250b990f7cd71c0ed048b57719273b93cea (diff) | |
| download | mediapointer-dvb-s2-5a53a1db6f05ad25ebf05360a60e44c0773ca36e.tar.gz mediapointer-dvb-s2-5a53a1db6f05ad25ebf05360a60e44c0773ca36e.tar.bz2 | |
Backport changes at arch/sh files
From: Mauro Carvalho Chehab <mchehab@redhat.com>
kernel-sync:
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/arch/sh')
| -rw-r--r-- | linux/arch/sh/boards/board-ap325rxa.c | 10 | ||||
| -rw-r--r-- | linux/arch/sh/boards/mach-migor/setup.c | 11 |
2 files changed, 18 insertions, 3 deletions
diff --git a/linux/arch/sh/boards/board-ap325rxa.c b/linux/arch/sh/boards/board-ap325rxa.c index 48ab77ea0..2d080732a 100644 --- a/linux/arch/sh/boards/board-ap325rxa.c +++ b/linux/arch/sh/boards/board-ap325rxa.c @@ -188,7 +188,7 @@ static struct sh_mobile_lcdc_info lcdc_info = { .name = "LB070WV1", .xres = 800, .yres = 480, - .left_margin = 40, + .left_margin = 32, .right_margin = 160, .hsync_len = 8, .upper_margin = 63, @@ -211,7 +211,7 @@ static struct resource lcdc_resources[] = { [0] = { .name = "LCDC", .start = 0xfe940000, /* P4-only space */ - .end = 0xfe941fff, + .end = 0xfe942fff, .flags = IORESOURCE_MEM, }, [1] = { @@ -227,6 +227,9 @@ static struct platform_device lcdc_device = { .dev = { .platform_data = &lcdc_info, }, + .archdata = { + .hwblk_id = HWBLK_LCDC, + }, }; static void camera_power(int val) @@ -401,6 +404,9 @@ static struct platform_device ceu_device = { .dev = { .platform_data = &sh_mobile_ceu_info, }, + .archdata = { + .hwblk_id = HWBLK_CEU, + }, }; struct spi_gpio_platform_data sdcard_cn3_platform_data = { diff --git a/linux/arch/sh/boards/mach-migor/setup.c b/linux/arch/sh/boards/mach-migor/setup.c index f9b2e4df3..6ed1fd323 100644 --- a/linux/arch/sh/boards/mach-migor/setup.c +++ b/linux/arch/sh/boards/mach-migor/setup.c @@ -98,6 +98,9 @@ static struct platform_device sh_keysc_device = { .dev = { .platform_data = &sh_keysc_info, }, + .archdata = { + .hwblk_id = HWBLK_KEYSC, + }, }; static struct mtd_partition migor_nor_flash_partitions[] = @@ -276,7 +279,7 @@ static struct resource migor_lcdc_resources[] = { [0] = { .name = "LCDC", .start = 0xfe940000, /* P4-only space */ - .end = 0xfe941fff, + .end = 0xfe942fff, .flags = IORESOURCE_MEM, }, [1] = { @@ -292,6 +295,9 @@ static struct platform_device migor_lcdc_device = { .dev = { .platform_data = &sh_mobile_lcdc_info, }, + .archdata = { + .hwblk_id = HWBLK_LCDC, + }, }; static struct clk *camera_clk; @@ -379,6 +385,9 @@ static struct platform_device migor_ceu_device = { .dev = { .platform_data = &sh_mobile_ceu_info, }, + .archdata = { + .hwblk_id = HWBLK_CEU, + }, }; struct spi_gpio_platform_data sdcard_cn9_platform_data = { |