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

ARM: OMAP2+: Drop legacy platform data for omap4 iva

We can now probe devices with ti-sysc interconnect driver and dts
data. Let's drop the related platform data and custom ti,hwmods
dts property.

Cc: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

+26 -74
+26 -5
arch/arm/boot/dts/omap4.dtsi
··· 107 107 ti,hwmods = "mpu"; 108 108 sram = <&ocmcram>; 109 109 }; 110 - 111 - iva { 112 - compatible = "ti,ivahd"; 113 - ti,hwmods = "iva"; 114 - }; 115 110 }; 116 111 117 112 /* ··· 644 649 dma-names = "audio_tx"; 645 650 }; 646 651 }; 652 + }; 653 + }; 654 + 655 + iva_hd_target: target-module@5a000000 { 656 + compatible = "ti,sysc-omap4", "ti,sysc"; 657 + reg = <0x5a05a400 0x4>, 658 + <0x5a05a410 0x4>; 659 + reg-names = "rev", "sysc"; 660 + ti,sysc-midle = <SYSC_IDLE_FORCE>, 661 + <SYSC_IDLE_NO>, 662 + <SYSC_IDLE_SMART>; 663 + ti,sysc-sidle = <SYSC_IDLE_FORCE>, 664 + <SYSC_IDLE_NO>, 665 + <SYSC_IDLE_SMART>; 666 + power-domains = <&prm_ivahd>; 667 + resets = <&prm_ivahd 2>; 668 + reset-names = "rstctrl"; 669 + clocks = <&ivahd_clkctrl OMAP4_IVA_CLKCTRL 0>; 670 + clock-names = "fck"; 671 + #address-cells = <1>; 672 + #size-cells = <1>; 673 + ranges = <0x5a000000 0x5a000000 0x1000000>, 674 + <0x5b000000 0x5b000000 0x1000000>; 675 + 676 + iva { 677 + compatible = "ti,ivahd"; 647 678 }; 648 679 }; 649 680 };
-69
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
··· 441 441 }; 442 442 443 443 /* 444 - * 'iva' class 445 - * multi-standard video encoder/decoder hardware accelerator 446 - */ 447 - 448 - static struct omap_hwmod_class omap44xx_iva_hwmod_class = { 449 - .name = "iva", 450 - }; 451 - 452 - /* iva */ 453 - static struct omap_hwmod_rst_info omap44xx_iva_resets[] = { 454 - { .name = "seq0", .rst_shift = 0 }, 455 - { .name = "seq1", .rst_shift = 1 }, 456 - { .name = "logic", .rst_shift = 2 }, 457 - }; 458 - 459 - static struct omap_hwmod omap44xx_iva_hwmod = { 460 - .name = "iva", 461 - .class = &omap44xx_iva_hwmod_class, 462 - .clkdm_name = "ivahd_clkdm", 463 - .rst_lines = omap44xx_iva_resets, 464 - .rst_lines_cnt = ARRAY_SIZE(omap44xx_iva_resets), 465 - .main_clk = "dpll_iva_m5x2_ck", 466 - .prcm = { 467 - .omap4 = { 468 - .clkctrl_offs = OMAP4_CM_IVAHD_IVAHD_CLKCTRL_OFFSET, 469 - .rstctrl_offs = OMAP4_RM_IVAHD_RSTCTRL_OFFSET, 470 - .context_offs = OMAP4_RM_IVAHD_IVAHD_CONTEXT_OFFSET, 471 - .modulemode = MODULEMODE_HWCTRL, 472 - }, 473 - }, 474 - }; 475 - 476 - /* 477 444 * 'mpu' class 478 445 * mpu sub-system 479 446 */ ··· 611 644 .user = OCP_USER_MPU, 612 645 }; 613 646 614 - /* iva -> l3_instr */ 615 - static struct omap_hwmod_ocp_if omap44xx_iva__l3_instr = { 616 - .master = &omap44xx_iva_hwmod, 617 - .slave = &omap44xx_l3_instr_hwmod, 618 - .clk = "l3_div_ck", 619 - .user = OCP_USER_MPU | OCP_USER_SDMA, 620 - }; 621 - 622 647 /* l3_main_3 -> l3_instr */ 623 648 static struct omap_hwmod_ocp_if omap44xx_l3_main_3__l3_instr = { 624 649 .master = &omap44xx_l3_main_3_hwmod, ··· 662 703 /* iss -> l3_main_2 */ 663 704 static struct omap_hwmod_ocp_if omap44xx_iss__l3_main_2 = { 664 705 .master = &omap44xx_iss_hwmod, 665 - .slave = &omap44xx_l3_main_2_hwmod, 666 - .clk = "l3_div_ck", 667 - .user = OCP_USER_MPU | OCP_USER_SDMA, 668 - }; 669 - 670 - /* iva -> l3_main_2 */ 671 - static struct omap_hwmod_ocp_if omap44xx_iva__l3_main_2 = { 672 - .master = &omap44xx_iva_hwmod, 673 706 .slave = &omap44xx_l3_main_2_hwmod, 674 707 .clk = "l3_div_ck", 675 708 .user = OCP_USER_MPU | OCP_USER_SDMA, ··· 803 852 .user = OCP_USER_MPU | OCP_USER_SDMA, 804 853 }; 805 854 806 - /* iva -> sl2if */ 807 - static struct omap_hwmod_ocp_if __maybe_unused omap44xx_iva__sl2if = { 808 - .master = &omap44xx_iva_hwmod, 809 - .slave = &omap44xx_sl2if_hwmod, 810 - .clk = "dpll_iva_m5x2_ck", 811 - .user = OCP_USER_IVA, 812 - }; 813 - 814 - /* l3_main_2 -> iva */ 815 - static struct omap_hwmod_ocp_if omap44xx_l3_main_2__iva = { 816 - .master = &omap44xx_l3_main_2_hwmod, 817 - .slave = &omap44xx_iva_hwmod, 818 - .clk = "l3_div_ck", 819 - .user = OCP_USER_MPU, 820 - }; 821 - 822 855 /* l3_main_2 -> ocmc_ram */ 823 856 static struct omap_hwmod_ocp_if omap44xx_l3_main_2__ocmc_ram = { 824 857 .master = &omap44xx_l3_main_2_hwmod, ··· 878 943 static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { 879 944 &omap44xx_l3_main_1__dmm, 880 945 &omap44xx_mpu__dmm, 881 - &omap44xx_iva__l3_instr, 882 946 &omap44xx_l3_main_3__l3_instr, 883 947 &omap44xx_ocp_wp_noc__l3_instr, 884 948 &omap44xx_l3_main_2__l3_main_1, ··· 885 951 &omap44xx_mpu__l3_main_1, 886 952 &omap44xx_debugss__l3_main_2, 887 953 &omap44xx_iss__l3_main_2, 888 - &omap44xx_iva__l3_main_2, 889 954 &omap44xx_l3_main_1__l3_main_2, 890 955 &omap44xx_l4_cfg__l3_main_2, 891 956 &omap44xx_l3_main_1__l3_main_3, ··· 902 969 &omap44xx_l3_instr__debugss, 903 970 &omap44xx_l3_main_2__gpmc, 904 971 &omap44xx_l3_main_2__iss, 905 - /* &omap44xx_iva__sl2if, */ 906 - &omap44xx_l3_main_2__iva, 907 972 &omap44xx_l3_main_2__ocmc_ram, 908 973 &omap44xx_mpu_private__prcm_mpu, 909 974 &omap44xx_l4_wkup__cm_core_aon,