[2/2] ARM: OMAP2+: Drop legacy platform data for am4 qspi
diff mbox series

Message ID 20191210215831.6199-2-tony@atomide.com
State New
Headers show
Series
  • [1/2] ARM: dts: Configure interconnect target module for am4 qspi
Related show

Commit Message

Tony Lindgren Dec. 10, 2019, 9:58 p.m. UTC
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: Jean Pihet <jean.pihet@newoldbits.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/boot/dts/am4372.dtsi              |  1 -
 arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 34 ----------------------
 2 files changed, 35 deletions(-)

Comments

Jean Pihet Dec. 11, 2019, 7:17 p.m. UTC | #1
Tony,

On Tue, Dec 10, 2019 at 10:58 PM Tony Lindgren <tony@atomide.com> wrote:
>
> 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.

Tested OK on AM4376 QSPI. The correct fck is found and the hwmod
warning is gone.
Acked-by: Jean Pihet <jean.pihet@newoldbits.com>

Thanks!
Jean

>
> Cc: Jean Pihet <jean.pihet@newoldbits.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
>  arch/arm/boot/dts/am4372.dtsi              |  1 -
>  arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 34 ----------------------
>  2 files changed, 35 deletions(-)
>
> diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
> --- a/arch/arm/boot/dts/am4372.dtsi
> +++ b/arch/arm/boot/dts/am4372.dtsi
> @@ -307,7 +307,6 @@ gpmc: gpmc@50000000 {
>
>                 target-module@47900000 {
>                         compatible = "ti,sysc-omap4", "ti,sysc";
> -                       ti,hwmods = "qspi";
>                         reg = <0x47900000 0x4>,
>                               <0x47900010 0x4>;
>                         reg-names = "rev", "sysc";
> diff --git a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
> --- a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
> @@ -315,32 +315,6 @@ static struct omap_hwmod am43xx_usb_otg_ss1_hwmod = {
>         },
>  };
>
> -static struct omap_hwmod_class_sysconfig am43xx_qspi_sysc = {
> -       .rev_offs       = 0,
> -       .sysc_offs      = 0x0010,
> -       .sysc_flags     = SYSC_HAS_SIDLEMODE,
> -       .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
> -                               SIDLE_SMART_WKUP),
> -       .sysc_fields    = &omap_hwmod_sysc_type2,
> -};
> -
> -static struct omap_hwmod_class am43xx_qspi_hwmod_class = {
> -       .name   = "qspi",
> -       .sysc   = &am43xx_qspi_sysc,
> -};
> -
> -static struct omap_hwmod am43xx_qspi_hwmod = {
> -       .name           = "qspi",
> -       .class          = &am43xx_qspi_hwmod_class,
> -       .clkdm_name     = "l3s_clkdm",
> -       .main_clk       = "l3s_gclk",
> -       .prcm = {
> -               .omap4 = {
> -                       .clkctrl_offs = AM43XX_CM_PER_QSPI_CLKCTRL_OFFSET,
> -                       .modulemode   = MODULEMODE_SWCTRL,
> -               },
> -       },
> -};
>
>  /*
>   * 'adc/tsc' class
> @@ -681,13 +655,6 @@ static struct omap_hwmod_ocp_if am43xx_l3_s__usbotgss1 = {
>         .user           = OCP_USER_MPU | OCP_USER_SDMA,
>  };
>
> -static struct omap_hwmod_ocp_if am43xx_l3_s__qspi = {
> -       .master         = &am33xx_l3_s_hwmod,
> -       .slave          = &am43xx_qspi_hwmod,
> -       .clk            = "l3s_gclk",
> -       .user           = OCP_USER_MPU | OCP_USER_SDMA,
> -};
> -
>  static struct omap_hwmod_ocp_if am43xx_dss__l3_main = {
>         .master         = &am43xx_dss_core_hwmod,
>         .slave          = &am33xx_l3_main_hwmod,
> @@ -783,7 +750,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {
>         &am43xx_l4_wkup__smartreflex1,
>         &am43xx_l4_wkup__timer1,
>         &am43xx_l4_wkup__adc_tsc,
> -       &am43xx_l3_s__qspi,
>         &am33xx_l4_per__dcan0,
>         &am33xx_l4_per__dcan1,
>         &am33xx_l4_ls__timer2,
> --
> 2.24.0

Patch
diff mbox series

diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -307,7 +307,6 @@  gpmc: gpmc@50000000 {
 
 		target-module@47900000 {
 			compatible = "ti,sysc-omap4", "ti,sysc";
-			ti,hwmods = "qspi";
 			reg = <0x47900000 0x4>,
 			      <0x47900010 0x4>;
 			reg-names = "rev", "sysc";
diff --git a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
--- a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
@@ -315,32 +315,6 @@  static struct omap_hwmod am43xx_usb_otg_ss1_hwmod = {
 	},
 };
 
-static struct omap_hwmod_class_sysconfig am43xx_qspi_sysc = {
-	.rev_offs	= 0,
-	.sysc_offs      = 0x0010,
-	.sysc_flags     = SYSC_HAS_SIDLEMODE,
-	.idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
-				SIDLE_SMART_WKUP),
-	.sysc_fields    = &omap_hwmod_sysc_type2,
-};
-
-static struct omap_hwmod_class am43xx_qspi_hwmod_class = {
-	.name   = "qspi",
-	.sysc   = &am43xx_qspi_sysc,
-};
-
-static struct omap_hwmod am43xx_qspi_hwmod = {
-	.name           = "qspi",
-	.class          = &am43xx_qspi_hwmod_class,
-	.clkdm_name     = "l3s_clkdm",
-	.main_clk       = "l3s_gclk",
-	.prcm = {
-		.omap4 = {
-			.clkctrl_offs = AM43XX_CM_PER_QSPI_CLKCTRL_OFFSET,
-			.modulemode   = MODULEMODE_SWCTRL,
-		},
-	},
-};
 
 /*
  * 'adc/tsc' class
@@ -681,13 +655,6 @@  static struct omap_hwmod_ocp_if am43xx_l3_s__usbotgss1 = {
 	.user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-static struct omap_hwmod_ocp_if am43xx_l3_s__qspi = {
-	.master         = &am33xx_l3_s_hwmod,
-	.slave          = &am43xx_qspi_hwmod,
-	.clk            = "l3s_gclk",
-	.user           = OCP_USER_MPU | OCP_USER_SDMA,
-};
-
 static struct omap_hwmod_ocp_if am43xx_dss__l3_main = {
 	.master		= &am43xx_dss_core_hwmod,
 	.slave		= &am33xx_l3_main_hwmod,
@@ -783,7 +750,6 @@  static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {
 	&am43xx_l4_wkup__smartreflex1,
 	&am43xx_l4_wkup__timer1,
 	&am43xx_l4_wkup__adc_tsc,
-	&am43xx_l3_s__qspi,
 	&am33xx_l4_per__dcan0,
 	&am33xx_l4_per__dcan1,
 	&am33xx_l4_ls__timer2,