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 dra7 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 -64
+33 -15
arch/arm/boot/dts/dra7.dtsi
··· 724 724 725 725 /* OCP2SCP1 */ 726 726 /* IRQ for DWC3_3 and DWC3_4 need IRQ crossbar */ 727 - gpmc: gpmc@50000000 { 728 - compatible = "ti,am3352-gpmc"; 729 - ti,hwmods = "gpmc"; 730 - reg = <0x50000000 0x37c>; /* device IO registers */ 731 - interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; 732 - dmas = <&edma_xbar 4 0>; 733 - dma-names = "rxtx"; 734 - gpmc,num-cs = <8>; 735 - gpmc,num-waitpins = <2>; 736 - #address-cells = <2>; 727 + 728 + target-module@50000000 { 729 + compatible = "ti,sysc-omap2", "ti,sysc"; 730 + reg = <0x50000000 4>, 731 + <0x50000010 4>, 732 + <0x50000014 4>; 733 + reg-names = "rev", "sysc", "syss"; 734 + ti,sysc-sidle = <SYSC_IDLE_FORCE>, 735 + <SYSC_IDLE_NO>, 736 + <SYSC_IDLE_SMART>; 737 + ti,syss-mask = <1>; 738 + clocks = <&l3main1_clkctrl DRA7_L3MAIN1_GPMC_CLKCTRL 0>; 739 + clock-names = "fck"; 740 + #address-cells = <1>; 737 741 #size-cells = <1>; 738 - interrupt-controller; 739 - #interrupt-cells = <2>; 740 - gpio-controller; 741 - #gpio-cells = <2>; 742 - status = "disabled"; 742 + ranges = <0x50000000 0x50000000 0x00001000>, /* regs */ 743 + <0x00000000 0x00000000 0x40000000>; /* data */ 744 + 745 + gpmc: gpmc@50000000 { 746 + compatible = "ti,am3352-gpmc"; 747 + reg = <0x50000000 0x37c>; /* device IO registers */ 748 + interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; 749 + dmas = <&edma_xbar 4 0>; 750 + dma-names = "rxtx"; 751 + gpmc,num-cs = <8>; 752 + gpmc,num-waitpins = <2>; 753 + #address-cells = <2>; 754 + #size-cells = <1>; 755 + interrupt-controller; 756 + #interrupt-cells = <2>; 757 + gpio-controller; 758 + #gpio-cells = <2>; 759 + status = "disabled"; 760 + }; 743 761 }; 744 762 745 763 target-module@56000000 {
-49
arch/arm/mach-omap2/omap_hwmod_7xx_data.c
··· 243 243 }; 244 244 245 245 /* 246 - * 'gpmc' class 247 - * 248 - */ 249 - 250 - static struct omap_hwmod_class_sysconfig dra7xx_gpmc_sysc = { 251 - .rev_offs = 0x0000, 252 - .sysc_offs = 0x0010, 253 - .syss_offs = 0x0014, 254 - .sysc_flags = (SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE | 255 - SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS), 256 - .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), 257 - .sysc_fields = &omap_hwmod_sysc_type1, 258 - }; 259 - 260 - static struct omap_hwmod_class dra7xx_gpmc_hwmod_class = { 261 - .name = "gpmc", 262 - .sysc = &dra7xx_gpmc_sysc, 263 - }; 264 - 265 - /* gpmc */ 266 - 267 - static struct omap_hwmod dra7xx_gpmc_hwmod = { 268 - .name = "gpmc", 269 - .class = &dra7xx_gpmc_hwmod_class, 270 - .clkdm_name = "l3main1_clkdm", 271 - /* Skip reset for CONFIG_OMAP_GPMC_DEBUG for bootloader timings */ 272 - .flags = DEBUG_OMAP_GPMC_HWMOD_FLAGS, 273 - .main_clk = "l3_iclk_div", 274 - .prcm = { 275 - .omap4 = { 276 - .clkctrl_offs = DRA7XX_CM_L3MAIN1_GPMC_CLKCTRL_OFFSET, 277 - .context_offs = DRA7XX_RM_L3MAIN1_GPMC_CONTEXT_OFFSET, 278 - .modulemode = MODULEMODE_HWCTRL, 279 - }, 280 - }, 281 - }; 282 - 283 - 284 - 285 - /* 286 246 * 'mpu' class 287 247 * 288 248 */ ··· 571 611 .user = OCP_USER_MPU | OCP_USER_SDMA, 572 612 }; 573 613 574 - /* l3_main_1 -> gpmc */ 575 - static struct omap_hwmod_ocp_if dra7xx_l3_main_1__gpmc = { 576 - .master = &dra7xx_l3_main_1_hwmod, 577 - .slave = &dra7xx_gpmc_hwmod, 578 - .clk = "l3_iclk_div", 579 - .user = OCP_USER_MPU | OCP_USER_SDMA, 580 - }; 581 - 582 614 /* l4_cfg -> mpu */ 583 615 static struct omap_hwmod_ocp_if dra7xx_l4_cfg__mpu = { 584 616 .master = &dra7xx_l4_cfg_hwmod, ··· 674 722 &dra7xx_l4_per2__atl, 675 723 &dra7xx_l3_main_1__bb2d, 676 724 &dra7xx_l4_wkup__ctrl_module_wkup, 677 - &dra7xx_l3_main_1__gpmc, 678 725 &dra7xx_l4_cfg__mpu, 679 726 &dra7xx_l3_main_1__pciess1, 680 727 &dra7xx_l4_cfg__pciess1,