Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arm: mach-shmobile: Don't set MERAM ICB numbers in platform data

The marker and cache ICBs are now allocated automatically, there's no
need to specify them manually anymore.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

-16
-8
arch/arm/mach-shmobile/board-ap4evb.c
··· 581 581 }; 582 582 static struct sh_mobile_meram_cfg lcd_meram_cfg = { 583 583 .icb[0] = { 584 - .marker_icb = 28, 585 - .cache_icb = 24, 586 584 .meram_size = 0x40, 587 585 }, 588 586 .icb[1] = { 589 - .marker_icb = 29, 590 - .cache_icb = 25, 591 587 .meram_size = 0x40, 592 588 }, 593 589 }; ··· 858 862 859 863 static struct sh_mobile_meram_cfg hdmi_meram_cfg = { 860 864 .icb[0] = { 861 - .marker_icb = 30, 862 - .cache_icb = 26, 863 865 .meram_size = 0x100, 864 866 }, 865 867 .icb[1] = { 866 - .marker_icb = 31, 867 - .cache_icb = 27, 868 868 .meram_size = 0x100, 869 869 }, 870 870 };
-8
arch/arm/mach-shmobile/board-mackerel.c
··· 371 371 372 372 static struct sh_mobile_meram_cfg lcd_meram_cfg = { 373 373 .icb[0] = { 374 - .marker_icb = 28, 375 - .cache_icb = 24, 376 374 .meram_size = 0x40, 377 375 }, 378 376 .icb[1] = { 379 - .marker_icb = 29, 380 - .cache_icb = 25, 381 377 .meram_size = 0x40, 382 378 }, 383 379 }; ··· 457 461 458 462 static struct sh_mobile_meram_cfg hdmi_meram_cfg = { 459 463 .icb[0] = { 460 - .marker_icb = 30, 461 - .cache_icb = 26, 462 464 .meram_size = 0x100, 463 465 }, 464 466 .icb[1] = { 465 - .marker_icb = 31, 466 - .cache_icb = 27, 467 467 .meram_size = 0x100, 468 468 }, 469 469 };