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 omap5 usb host

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.

As we're just dropping data, and the early platform data init
is based on the custom ti,hwmods property, we want to drop both
the platform data and ti,hwmods property in a single patch.

Signed-off-by: Tony Lindgren <tony@atomide.com>

-129
-2
arch/arm/boot/dts/omap5-l4.dtsi
··· 268 268 269 269 target-module@62000 { /* 0x4a062000, ap 11 0e.0 */ 270 270 compatible = "ti,sysc-omap2", "ti,sysc"; 271 - ti,hwmods = "usb_tll_hs"; 272 271 reg = <0x62000 0x4>, 273 272 <0x62010 0x4>, 274 273 <0x62014 0x4>; ··· 296 297 297 298 target-module@64000 { /* 0x4a064000, ap 71 1e.0 */ 298 299 compatible = "ti,sysc-omap4", "ti,sysc"; 299 - ti,hwmods = "usb_host_hs"; 300 300 reg = <0x64000 0x4>, 301 301 <0x64010 0x4>; 302 302 reg-names = "rev", "sysc";
-127
arch/arm/mach-omap2/omap_hwmod_54xx_data.c
··· 267 267 }; 268 268 269 269 /* 270 - * 'usb_host_hs' class 271 - * high-speed multi-port usb host controller 272 - */ 273 - 274 - static struct omap_hwmod_class_sysconfig omap54xx_usb_host_hs_sysc = { 275 - .rev_offs = 0x0000, 276 - .sysc_offs = 0x0010, 277 - .sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_RESET_STATUS | 278 - SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET), 279 - .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | 280 - SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO | 281 - MSTANDBY_SMART | MSTANDBY_SMART_WKUP), 282 - .sysc_fields = &omap_hwmod_sysc_type2, 283 - }; 284 - 285 - static struct omap_hwmod_class omap54xx_usb_host_hs_hwmod_class = { 286 - .name = "usb_host_hs", 287 - .sysc = &omap54xx_usb_host_hs_sysc, 288 - }; 289 - 290 - static struct omap_hwmod omap54xx_usb_host_hs_hwmod = { 291 - .name = "usb_host_hs", 292 - .class = &omap54xx_usb_host_hs_hwmod_class, 293 - .clkdm_name = "l3init_clkdm", 294 - /* 295 - * Errata: USBHOST Configured In Smart-Idle Can Lead To a Deadlock 296 - * id: i660 297 - * 298 - * Description: 299 - * In the following configuration : 300 - * - USBHOST module is set to smart-idle mode 301 - * - PRCM asserts idle_req to the USBHOST module ( This typically 302 - * happens when the system is going to a low power mode : all ports 303 - * have been suspended, the master part of the USBHOST module has 304 - * entered the standby state, and SW has cut the functional clocks) 305 - * - an USBHOST interrupt occurs before the module is able to answer 306 - * idle_ack, typically a remote wakeup IRQ. 307 - * Then the USB HOST module will enter a deadlock situation where it 308 - * is no more accessible nor functional. 309 - * 310 - * Workaround: 311 - * Don't use smart idle; use only force idle, hence HWMOD_SWSUP_SIDLE 312 - */ 313 - 314 - /* 315 - * Errata: USB host EHCI may stall when entering smart-standby mode 316 - * Id: i571 317 - * 318 - * Description: 319 - * When the USBHOST module is set to smart-standby mode, and when it is 320 - * ready to enter the standby state (i.e. all ports are suspended and 321 - * all attached devices are in suspend mode), then it can wrongly assert 322 - * the Mstandby signal too early while there are still some residual OCP 323 - * transactions ongoing. If this condition occurs, the internal state 324 - * machine may go to an undefined state and the USB link may be stuck 325 - * upon the next resume. 326 - * 327 - * Workaround: 328 - * Don't use smart standby; use only force standby, 329 - * hence HWMOD_SWSUP_MSTANDBY 330 - */ 331 - 332 - .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY, 333 - .main_clk = "l3init_60m_fclk", 334 - .prcm = { 335 - .omap4 = { 336 - .clkctrl_offs = OMAP54XX_CM_L3INIT_USB_HOST_HS_CLKCTRL_OFFSET, 337 - .context_offs = OMAP54XX_RM_L3INIT_USB_HOST_HS_CONTEXT_OFFSET, 338 - .modulemode = MODULEMODE_SWCTRL, 339 - }, 340 - }, 341 - }; 342 - 343 - /* 344 - * 'usb_tll_hs' class 345 - * usb_tll_hs module is the adapter on the usb_host_hs ports 346 - */ 347 - 348 - static struct omap_hwmod_class_sysconfig omap54xx_usb_tll_hs_sysc = { 349 - .rev_offs = 0x0000, 350 - .sysc_offs = 0x0010, 351 - .syss_offs = 0x0014, 352 - .sysc_flags = (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY | 353 - SYSC_HAS_ENAWAKEUP | SYSC_HAS_SIDLEMODE | 354 - SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS), 355 - .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), 356 - .sysc_fields = &omap_hwmod_sysc_type1, 357 - }; 358 - 359 - static struct omap_hwmod_class omap54xx_usb_tll_hs_hwmod_class = { 360 - .name = "usb_tll_hs", 361 - .sysc = &omap54xx_usb_tll_hs_sysc, 362 - }; 363 - 364 - static struct omap_hwmod omap54xx_usb_tll_hs_hwmod = { 365 - .name = "usb_tll_hs", 366 - .class = &omap54xx_usb_tll_hs_hwmod_class, 367 - .clkdm_name = "l3init_clkdm", 368 - .main_clk = "l4_root_clk_div", 369 - .prcm = { 370 - .omap4 = { 371 - .clkctrl_offs = OMAP54XX_CM_L3INIT_USB_TLL_HS_CLKCTRL_OFFSET, 372 - .context_offs = OMAP54XX_RM_L3INIT_USB_TLL_HS_CONTEXT_OFFSET, 373 - .modulemode = MODULEMODE_HWCTRL, 374 - }, 375 - }, 376 - }; 377 - 378 - /* 379 270 * 'sata' class 380 271 * sata: serial ata interface gen2 compliant ( 1 rx/ 1 tx) 381 272 */ ··· 467 576 .user = OCP_USER_MPU | OCP_USER_SDMA, 468 577 }; 469 578 470 - /* l4_cfg -> usb_host_hs */ 471 - static struct omap_hwmod_ocp_if omap54xx_l4_cfg__usb_host_hs = { 472 - .master = &omap54xx_l4_cfg_hwmod, 473 - .slave = &omap54xx_usb_host_hs_hwmod, 474 - .clk = "l3_iclk_div", 475 - .user = OCP_USER_MPU | OCP_USER_SDMA, 476 - }; 477 - 478 - /* l4_cfg -> usb_tll_hs */ 479 - static struct omap_hwmod_ocp_if omap54xx_l4_cfg__usb_tll_hs = { 480 - .master = &omap54xx_l4_cfg_hwmod, 481 - .slave = &omap54xx_usb_tll_hs_hwmod, 482 - .clk = "l4_root_clk_div", 483 - .user = OCP_USER_MPU | OCP_USER_SDMA, 484 - }; 485 - 486 579 static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = { 487 580 &omap54xx_l3_main_1__dmm, 488 581 &omap54xx_l3_main_3__l3_instr, ··· 487 612 &omap54xx_mpu__emif1, 488 613 &omap54xx_mpu__emif2, 489 614 &omap54xx_l4_cfg__mpu, 490 - &omap54xx_l4_cfg__usb_host_hs, 491 - &omap54xx_l4_cfg__usb_tll_hs, 492 615 &omap54xx_l4_cfg__sata, 493 616 NULL, 494 617 };