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 gpmc

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: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

+33 -61
+33 -16
arch/arm/boot/dts/omap4.dtsi
··· 145 145 reg = <0x40304000 0xa000>; /* 40k */ 146 146 }; 147 147 148 - gpmc: gpmc@50000000 { 149 - compatible = "ti,omap4430-gpmc"; 150 - reg = <0x50000000 0x1000>; 151 - #address-cells = <2>; 152 - #size-cells = <1>; 153 - interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; 154 - dmas = <&sdma 4>; 155 - dma-names = "rxtx"; 156 - gpmc,num-cs = <8>; 157 - gpmc,num-waitpins = <4>; 158 - ti,hwmods = "gpmc"; 148 + target-module@50000000 { 149 + compatible = "ti,sysc-omap2", "ti,sysc"; 150 + reg = <0x50000000 4>, 151 + <0x50000010 4>, 152 + <0x50000014 4>; 153 + reg-names = "rev", "sysc", "syss"; 154 + ti,sysc-sidle = <SYSC_IDLE_FORCE>, 155 + <SYSC_IDLE_NO>, 156 + <SYSC_IDLE_SMART>; 157 + ti,syss-mask = <1>; 159 158 ti,no-idle-on-init; 160 - clocks = <&l3_div_ck>; 159 + clocks = <&l3_2_clkctrl OMAP4_GPMC_CLKCTRL 0>; 161 160 clock-names = "fck"; 162 - interrupt-controller; 163 - #interrupt-cells = <2>; 164 - gpio-controller; 165 - #gpio-cells = <2>; 161 + #address-cells = <1>; 162 + #size-cells = <1>; 163 + ranges = <0x50000000 0x50000000 0x00001000>, /* regs */ 164 + <0x00000000 0x00000000 0x40000000>; /* data */ 165 + 166 + gpmc: gpmc@50000000 { 167 + compatible = "ti,omap4430-gpmc"; 168 + reg = <0x50000000 0x1000>; 169 + #address-cells = <2>; 170 + #size-cells = <1>; 171 + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; 172 + dmas = <&sdma 4>; 173 + dma-names = "rxtx"; 174 + gpmc,num-cs = <8>; 175 + gpmc,num-waitpins = <4>; 176 + clocks = <&l3_div_ck>; 177 + clock-names = "fck"; 178 + interrupt-controller; 179 + #interrupt-cells = <2>; 180 + gpio-controller; 181 + #gpio-cells = <2>; 182 + }; 166 183 }; 167 184 168 185 target-module@52000000 {
-45
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
··· 354 354 }; 355 355 356 356 /* 357 - * 'gpmc' class 358 - * general purpose memory controller 359 - */ 360 - 361 - static struct omap_hwmod_class_sysconfig omap44xx_gpmc_sysc = { 362 - .rev_offs = 0x0000, 363 - .sysc_offs = 0x0010, 364 - .syss_offs = 0x0014, 365 - .sysc_flags = (SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE | 366 - SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS), 367 - .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), 368 - .sysc_fields = &omap_hwmod_sysc_type1, 369 - }; 370 - 371 - static struct omap_hwmod_class omap44xx_gpmc_hwmod_class = { 372 - .name = "gpmc", 373 - .sysc = &omap44xx_gpmc_sysc, 374 - }; 375 - 376 - /* gpmc */ 377 - static struct omap_hwmod omap44xx_gpmc_hwmod = { 378 - .name = "gpmc", 379 - .class = &omap44xx_gpmc_hwmod_class, 380 - .clkdm_name = "l3_2_clkdm", 381 - /* Skip reset for CONFIG_OMAP_GPMC_DEBUG for bootloader timings */ 382 - .flags = DEBUG_OMAP_GPMC_HWMOD_FLAGS, 383 - .prcm = { 384 - .omap4 = { 385 - .clkctrl_offs = OMAP4_CM_L3_2_GPMC_CLKCTRL_OFFSET, 386 - .context_offs = OMAP4_RM_L3_2_GPMC_CONTEXT_OFFSET, 387 - .modulemode = MODULEMODE_HWCTRL, 388 - }, 389 - }, 390 - }; 391 - 392 - /* 393 357 * 'iss' class 394 358 * external images sensor pixel data processor 395 359 */ ··· 751 787 .user = OCP_USER_MPU | OCP_USER_SDMA, 752 788 }; 753 789 754 - /* l3_main_2 -> gpmc */ 755 - static struct omap_hwmod_ocp_if omap44xx_l3_main_2__gpmc = { 756 - .master = &omap44xx_l3_main_2_hwmod, 757 - .slave = &omap44xx_gpmc_hwmod, 758 - .clk = "l3_div_ck", 759 - .user = OCP_USER_MPU | OCP_USER_SDMA, 760 - }; 761 - 762 790 /* l3_main_2 -> iss */ 763 791 static struct omap_hwmod_ocp_if omap44xx_l3_main_2__iss = { 764 792 .master = &omap44xx_l3_main_2_hwmod, ··· 856 900 &omap44xx_l4_wkup__ctrl_module_wkup, 857 901 &omap44xx_l4_wkup__ctrl_module_pad_wkup, 858 902 &omap44xx_l3_instr__debugss, 859 - &omap44xx_l3_main_2__gpmc, 860 903 &omap44xx_l3_main_2__iss, 861 904 &omap44xx_l3_main_2__ocmc_ram, 862 905 &omap44xx_mpu_private__prcm_mpu,