ARM: OMAP2+: Drop legacy platform data for dra7 gpmc (11fdf598) · Commits · 戴 / test

arch/arm/boot/dts/dra7.dtsi

+33 −15

Original line number	Diff line number	Diff line
		@@ -724,9 +724,26 @@

		/* OCP2SCP1 */
		/* IRQ for DWC3_3 and DWC3_4 need IRQ crossbar */

		target-module@50000000 {
		compatible = "ti,sysc-omap2", "ti,sysc";
		reg = <0x50000000 4>,
		<0x50000010 4>,
		<0x50000014 4>;
		reg-names = "rev", "sysc", "syss";
		ti,sysc-sidle = <SYSC_IDLE_FORCE>,
		<SYSC_IDLE_NO>,
		<SYSC_IDLE_SMART>;
		ti,syss-mask = <1>;
		clocks = <&l3main1_clkctrl DRA7_L3MAIN1_GPMC_CLKCTRL 0>;
		clock-names = "fck";
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0x50000000 0x50000000 0x00001000>, /* regs */
		<0x00000000 0x00000000 0x40000000>; /* data */

		gpmc: gpmc@50000000 {
		compatible = "ti,am3352-gpmc";
		ti,hwmods = "gpmc";
		reg = <0x50000000 0x37c>; /* device IO registers */
		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
		dmas = <&edma_xbar 4 0>;
		@@ -741,6 +758,7 @@
		#gpio-cells = <2>;
		status = "disabled";
		};
		};

		target-module@56000000 {
		compatible = "ti,sysc-omap4", "ti,sysc";

arch/arm/mach-omap2/omap_hwmod_7xx_data.c

+0 −49

Original line number	Diff line number	Diff line
		@@ -242,46 +242,6 @@ static struct omap_hwmod dra7xx_ctrl_module_wkup_hwmod = {
		},
		};

		/*
		* 'gpmc' class
		*
		*/

		static struct omap_hwmod_class_sysconfig dra7xx_gpmc_sysc = {
		.rev_offs = 0x0000,
		.sysc_offs = 0x0010,
		.syss_offs = 0x0014,
		.sysc_flags = (SYSC_HAS_AUTOIDLE \| SYSC_HAS_SIDLEMODE \|
		SYSC_HAS_SOFTRESET \| SYSS_HAS_RESET_STATUS),
		.idlemodes = (SIDLE_FORCE \| SIDLE_NO \| SIDLE_SMART),
		.sysc_fields = &omap_hwmod_sysc_type1,
		};

		static struct omap_hwmod_class dra7xx_gpmc_hwmod_class = {
		.name = "gpmc",
		.sysc = &dra7xx_gpmc_sysc,
		};

		/* gpmc */

		static struct omap_hwmod dra7xx_gpmc_hwmod = {
		.name = "gpmc",
		.class = &dra7xx_gpmc_hwmod_class,
		.clkdm_name = "l3main1_clkdm",
		/* Skip reset for CONFIG_OMAP_GPMC_DEBUG for bootloader timings */
		.flags = DEBUG_OMAP_GPMC_HWMOD_FLAGS,
		.main_clk = "l3_iclk_div",
		.prcm = {
		.omap4 = {
		.clkctrl_offs = DRA7XX_CM_L3MAIN1_GPMC_CLKCTRL_OFFSET,
		.context_offs = DRA7XX_RM_L3MAIN1_GPMC_CONTEXT_OFFSET,
		.modulemode = MODULEMODE_HWCTRL,
		},
		},
		};



		/*
		* 'mpu' class
		*
		@@ -611,14 +571,6 @@ static struct omap_hwmod_ocp_if dra7xx_l4_wkup__ctrl_module_wkup = {
		.user = OCP_USER_MPU \| OCP_USER_SDMA,
		};

		/* l3_main_1 -> gpmc */
		static struct omap_hwmod_ocp_if dra7xx_l3_main_1__gpmc = {
		.master = &dra7xx_l3_main_1_hwmod,
		.slave = &dra7xx_gpmc_hwmod,
		.clk = "l3_iclk_div",
		.user = OCP_USER_MPU \| OCP_USER_SDMA,
		};

		/* l4_cfg -> mpu */
		static struct omap_hwmod_ocp_if dra7xx_l4_cfg__mpu = {
		.master = &dra7xx_l4_cfg_hwmod,
		@@ -722,7 +674,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
		&dra7xx_l4_per2__atl,
		&dra7xx_l3_main_1__bb2d,
		&dra7xx_l4_wkup__ctrl_module_wkup,
		&dra7xx_l3_main_1__gpmc,
		&dra7xx_l4_cfg__mpu,
		&dra7xx_l3_main_1__pciess1,
		&dra7xx_l4_cfg__pciess1,

Admin message