ARM: OMAP2+: Drop legacy platform data for am3 debugss (e990ebae) · Commits · 戴 / test

arch/arm/boot/dts/am33xx.dtsi

+14 −5

Original line number	Diff line number	Diff line
		@@ -144,12 +144,21 @@
		};
		};

		pmu@4b000000 {
		target-module@4b000000 {
		compatible = "ti,sysc-omap4-simple", "ti,sysc";
		clocks = <&l3_aon_clkctrl AM3_L3_AON_DEBUGSS_CLKCTRL 0>;
		clock-names = "fck";
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0x0 0x4b000000 0x1000000>;

		pmu@0 {
		compatible = "arm,cortex-a8-pmu";
		interrupts = <3>;
		reg = <0x4b000000 0x1000000>;
		reg = <0 0x1000000>;
		ti,hwmods = "debugss";
		};
		};

		/*
		* The soc node represents the soc top level view. It is used for IPs

+0 −37

Original line number	Diff line number	Diff line
		@@ -129,34 +129,6 @@ static struct omap_hwmod am33xx_ocpwp_hwmod = {
		};
		#endif

		/*
		* 'debugss' class
		* debug sub system
		*/
		static struct omap_hwmod_opt_clk debugss_opt_clks[] = {
		{ .role = "dbg_sysclk", .clk = "dbg_sysclk_ck" },
		{ .role = "dbg_clka", .clk = "dbg_clka_ck" },
		};

		static struct omap_hwmod_class am33xx_debugss_hwmod_class = {
		.name = "debugss",
		};

		static struct omap_hwmod am33xx_debugss_hwmod = {
		.name = "debugss",
		.class = &am33xx_debugss_hwmod_class,
		.clkdm_name = "l3_aon_clkdm",
		.main_clk = "trace_clk_div_ck",
		.prcm = {
		.omap4 = {
		.clkctrl_offs = AM33XX_CM_WKUP_DEBUGSS_CLKCTRL_OFFSET,
		.modulemode = MODULEMODE_SWCTRL,
		},
		},
		.opt_clks = debugss_opt_clks,
		.opt_clks_cnt = ARRAY_SIZE(debugss_opt_clks),
		};

		/*
		* Interfaces
		*/
		@@ -177,14 +149,6 @@ static struct omap_hwmod_ocp_if am33xx_l3_main__l4_hs = {
		.user = OCP_USER_MPU \| OCP_USER_SDMA,
		};

		/* l3_main -> debugss */
		static struct omap_hwmod_ocp_if am33xx_l3_main__debugss = {
		.master = &am33xx_l3_main_hwmod,
		.slave = &am33xx_debugss_hwmod,
		.clk = "dpll_core_m4_ck",
		.user = OCP_USER_MPU,
		};

		/* l4 wkup -> smartreflex0 */
		static struct omap_hwmod_ocp_if am33xx_l4_wkup__smartreflex0 = {
		.master = &am33xx_l4_wkup_hwmod,
		@@ -211,7 +175,6 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {
		&am33xx_l3_main__l3_s,
		&am33xx_l3_main__l3_instr,
		&am33xx_l3_s__l3_main,
		&am33xx_l3_main__debugss,
		&am33xx_l4_wkup__smartreflex0,
		&am33xx_l4_wkup__smartreflex1,
		&am33xx_l3_main__ocmc,