Commit df7f2f95 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Drop legacy platform data for am3 and am4 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.

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.

Cc: Roger Quadros <rogerq@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 3856e86f

arch/arm/boot/dts/am335x-nano.dts

+0 −1
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ 


&gpmc {

	compatible = "ti,am3352-gpmc";

	ti,hwmods = "gpmc";

	status = "okay";

	gpmc,num-waitpins = <2>;

	pinctrl-names = "default";

arch/arm/boot/dts/am33xx.dtsi

+32 −16
Original line number Diff line number Diff line
@@ -480,10 +480,25 @@ 
			ti,no-idle;

		};



		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 = <&l3s_clkctrl AM3_L3S_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";

			ti,no-idle-on-init;

				reg = <0x50000000 0x2000>;

				interrupts = <100>;

				dmas = <&edma 52 0>;
@@ -498,6 +513,7 @@ 
				#gpio-cells = <2>;

				status = "disabled";

			};

		};



		sham_target: target-module@53100000 {

			compatible = "ti,sysc-omap3-sham", "ti,sysc";

arch/arm/boot/dts/am4372.dtsi

+33 −16
Original line number Diff line number Diff line
@@ -434,9 +434,25 @@ 
			ranges = <0x0 0x54400000 0x80000>;

		};



		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 = <&l3s_clkctrl AM4_L3S_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";

				dmas = <&edma 52 0>;

				dma-names = "rxtx";

				clocks = <&l3s_gclk>;
@@ -453,6 +469,7 @@ 
				#gpio-cells = <2>;

				status = "disabled";

			};

		};



		target-module@47900000 {

			compatible = "ti,sysc-omap4", "ti,sysc";

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h

+0 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ extern struct omap_hwmod_ocp_if am33xx_mpu__prcm; 
extern struct omap_hwmod_ocp_if am33xx_l3_s__l3_main;

extern struct omap_hwmod_ocp_if am33xx_gfx__l3_main;

extern struct omap_hwmod_ocp_if am33xx_l3_main__gfx;

extern struct omap_hwmod_ocp_if am33xx_l3_s__gpmc;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__timer2;

extern struct omap_hwmod_ocp_if am33xx_l3_main__ocmc;
@@ -41,7 +40,6 @@ extern struct omap_hwmod am33xx_prcm_hwmod; 
extern struct omap_hwmod am33xx_ocmcram_hwmod;

extern struct omap_hwmod am33xx_smartreflex0_hwmod;

extern struct omap_hwmod am33xx_smartreflex1_hwmod;

extern struct omap_hwmod am33xx_gpmc_hwmod;



extern struct omap_hwmod_class am33xx_emif_hwmod_class;

extern struct omap_hwmod_class am33xx_l4_hwmod_class;

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c

+0 −8
Original line number Diff line number Diff line
@@ -74,14 +74,6 @@ struct omap_hwmod_ocp_if am33xx_l3_s__l3_main = { 
	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* l3s cfg -> gpmc */

struct omap_hwmod_ocp_if am33xx_l3_s__gpmc = {

	.master		= &am33xx_l3_s_hwmod,

	.slave		= &am33xx_gpmc_hwmod,

	.clk		= "l3s_gclk",

	.user		= OCP_USER_MPU,

};



/* l3 main -> ocmc */

struct omap_hwmod_ocp_if am33xx_l3_main__ocmc = {

	.master		= &am33xx_l3_main_hwmod,

CRA Git | Maintained and supported by SUSTech CRA and CCSE