All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: linux-omap@vger.kernel.org
Cc: Vignesh R <vigneshr@ti.com>, Keerthy <j-keerthy@ti.com>,
	Jyri Sarha <jsarha@ti.com>, "Andrew F . Davis" <afd@ti.com>,
	Tomi Valkeinen <tomi.valkeinen@ti.com>,
	linux-arm-kernel@lists.infradead.org, Suman Anna <s-anna@ti.com>,
	Franklin S Cooper Jr <fcooper@ti.com>,
	Roger Quadros <rogerq@ti.com>
Subject: [PATCH 11/16] ARM: OMAP2+: Drop legacy platform data for am4 adc_tsc
Date: Wed, 11 Dec 2019 09:20:09 -0800	[thread overview]
Message-ID: <20191211172014.35201-12-tony@atomide.com> (raw)
In-Reply-To: <20191211172014.35201-1-tony@atomide.com>

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: Andrew F. Davis <afd@ti.com>
Cc: Keerthy <j-keerthy@ti.com>
Cc: Vignesh R <vigneshr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/boot/dts/am437x-l4.dtsi           |  1 -
 arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 40 ----------------------
 2 files changed, 41 deletions(-)

diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
--- a/arch/arm/boot/dts/am437x-l4.dtsi
+++ b/arch/arm/boot/dts/am437x-l4.dtsi
@@ -225,7 +225,6 @@ i2c0: i2c@0 {
 
 		target-module@d000 {			/* 0x44e0d000, ap 20 38.0 */
 			compatible = "ti,sysc-omap4", "ti,sysc";
-			ti,hwmods = "adc_tsc";
 			reg = <0xd000 0x4>,
 			      <0xd010 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
@@ -185,38 +185,6 @@ static struct omap_hwmod am43xx_usb_otg_ss1_hwmod = {
 	},
 };
 
-
-/*
- * 'adc/tsc' class
- * TouchScreen Controller (Analog-To-Digital Converter)
- */
-static struct omap_hwmod_class_sysconfig am43xx_adc_tsc_sysc = {
-	.rev_offs	= 0x00,
-	.sysc_offs	= 0x10,
-	.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_adc_tsc_hwmod_class = {
-	.name		= "adc_tsc",
-	.sysc		= &am43xx_adc_tsc_sysc,
-};
-
-static struct omap_hwmod am43xx_adc_tsc_hwmod = {
-	.name		= "adc_tsc",
-	.class		= &am43xx_adc_tsc_hwmod_class,
-	.clkdm_name	= "l3s_tsc_clkdm",
-	.main_clk	= "adc_tsc_fck",
-	.prcm		= {
-		.omap4  = {
-			.clkctrl_offs   = AM43XX_CM_WKUP_ADC_TSC_CLKCTRL_OFFSET,
-			.modulemode     = MODULEMODE_SWCTRL,
-		},
-	},
-};
-
 /* dss */
 
 static struct omap_hwmod am43xx_dss_core_hwmod = {
@@ -381,13 +349,6 @@ static struct omap_hwmod_ocp_if am43xx_l4_wkup__control = {
 	.user		= OCP_USER_MPU,
 };
 
-static struct omap_hwmod_ocp_if am43xx_l4_wkup__adc_tsc = {
-	.master         = &am33xx_l4_wkup_hwmod,
-	.slave          = &am43xx_adc_tsc_hwmod,
-	.clk            = "dpll_core_m4_div2_ck",
-	.user           = OCP_USER_MPU,
-};
-
 static struct omap_hwmod_ocp_if am43xx_l4_wkup__timer1 = {
 	.master		= &am33xx_l4_wkup_hwmod,
 	.slave		= &am33xx_timer1_hwmod,
@@ -507,7 +468,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {
 	&am43xx_l4_wkup__smartreflex0,
 	&am43xx_l4_wkup__smartreflex1,
 	&am43xx_l4_wkup__timer1,
-	&am43xx_l4_wkup__adc_tsc,
 	&am33xx_l4_ls__timer2,
 	&am33xx_l3_main__tpcc,
 	&am33xx_l4_ls__elm,
-- 
2.24.1

WARNING: multiple messages have this Message-ID (diff)
From: Tony Lindgren <tony@atomide.com>
To: linux-omap@vger.kernel.org
Cc: Vignesh R <vigneshr@ti.com>, Keerthy <j-keerthy@ti.com>,
	Jyri Sarha <jsarha@ti.com>, "Andrew F . Davis" <afd@ti.com>,
	Tomi Valkeinen <tomi.valkeinen@ti.com>,
	linux-arm-kernel@lists.infradead.org, Suman Anna <s-anna@ti.com>,
	Franklin S Cooper Jr <fcooper@ti.com>,
	Roger Quadros <rogerq@ti.com>
Subject: [PATCH 11/16] ARM: OMAP2+: Drop legacy platform data for am4 adc_tsc
Date: Wed, 11 Dec 2019 09:20:09 -0800	[thread overview]
Message-ID: <20191211172014.35201-12-tony@atomide.com> (raw)
In-Reply-To: <20191211172014.35201-1-tony@atomide.com>

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: Andrew F. Davis <afd@ti.com>
Cc: Keerthy <j-keerthy@ti.com>
Cc: Vignesh R <vigneshr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/boot/dts/am437x-l4.dtsi           |  1 -
 arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 40 ----------------------
 2 files changed, 41 deletions(-)

diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
--- a/arch/arm/boot/dts/am437x-l4.dtsi
+++ b/arch/arm/boot/dts/am437x-l4.dtsi
@@ -225,7 +225,6 @@ i2c0: i2c@0 {
 
 		target-module@d000 {			/* 0x44e0d000, ap 20 38.0 */
 			compatible = "ti,sysc-omap4", "ti,sysc";
-			ti,hwmods = "adc_tsc";
 			reg = <0xd000 0x4>,
 			      <0xd010 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
@@ -185,38 +185,6 @@ static struct omap_hwmod am43xx_usb_otg_ss1_hwmod = {
 	},
 };
 
-
-/*
- * 'adc/tsc' class
- * TouchScreen Controller (Analog-To-Digital Converter)
- */
-static struct omap_hwmod_class_sysconfig am43xx_adc_tsc_sysc = {
-	.rev_offs	= 0x00,
-	.sysc_offs	= 0x10,
-	.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_adc_tsc_hwmod_class = {
-	.name		= "adc_tsc",
-	.sysc		= &am43xx_adc_tsc_sysc,
-};
-
-static struct omap_hwmod am43xx_adc_tsc_hwmod = {
-	.name		= "adc_tsc",
-	.class		= &am43xx_adc_tsc_hwmod_class,
-	.clkdm_name	= "l3s_tsc_clkdm",
-	.main_clk	= "adc_tsc_fck",
-	.prcm		= {
-		.omap4  = {
-			.clkctrl_offs   = AM43XX_CM_WKUP_ADC_TSC_CLKCTRL_OFFSET,
-			.modulemode     = MODULEMODE_SWCTRL,
-		},
-	},
-};
-
 /* dss */
 
 static struct omap_hwmod am43xx_dss_core_hwmod = {
@@ -381,13 +349,6 @@ static struct omap_hwmod_ocp_if am43xx_l4_wkup__control = {
 	.user		= OCP_USER_MPU,
 };
 
-static struct omap_hwmod_ocp_if am43xx_l4_wkup__adc_tsc = {
-	.master         = &am33xx_l4_wkup_hwmod,
-	.slave          = &am43xx_adc_tsc_hwmod,
-	.clk            = "dpll_core_m4_div2_ck",
-	.user           = OCP_USER_MPU,
-};
-
 static struct omap_hwmod_ocp_if am43xx_l4_wkup__timer1 = {
 	.master		= &am33xx_l4_wkup_hwmod,
 	.slave		= &am33xx_timer1_hwmod,
@@ -507,7 +468,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {
 	&am43xx_l4_wkup__smartreflex0,
 	&am43xx_l4_wkup__smartreflex1,
 	&am43xx_l4_wkup__timer1,
-	&am43xx_l4_wkup__adc_tsc,
 	&am33xx_l4_ls__timer2,
 	&am33xx_l3_main__tpcc,
 	&am33xx_l4_ls__elm,
-- 
2.24.1

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2019-12-11 17:20 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-11 17:19 [PATCH 00/16] Drop legacy platform data for various omap devices Tony Lindgren
2019-12-11 17:19 ` Tony Lindgren
2019-12-11 17:19 ` [PATCH 01/16] ARM: OMAP2+: Drop legacy platform data for am3 and am4 epwmss Tony Lindgren
2019-12-11 17:19   ` Tony Lindgren
2019-12-11 17:20 ` [PATCH 02/16] ARM: OMAP2+: Drop legacy platform data for dra7 epwmss Tony Lindgren
2019-12-11 17:20   ` Tony Lindgren
2019-12-11 17:20 ` [PATCH 03/16] ARM: OMAP2+: Drop legacy platform data for am3 and am4 spinlock Tony Lindgren
2019-12-11 17:20   ` Tony Lindgren
2019-12-11 17:20 ` [PATCH 04/16] ARM: OMAP2+: Drop legacy platform data for omap4 spinlock Tony Lindgren
2019-12-11 17:20   ` Tony Lindgren
2019-12-11 17:20 ` [PATCH 05/16] ARM: OMAP2+: Drop legacy platform data for omap5 spinlock Tony Lindgren
2019-12-11 17:20   ` Tony Lindgren
2019-12-11 17:20 ` [PATCH 06/16] ARM: OMAP2+: Drop legacy platform data for dra7 spinlock Tony Lindgren
2019-12-11 17:20   ` Tony Lindgren
2019-12-11 17:20 ` [PATCH 07/16] ARM: OMAP2+: Drop legacy platform data for am3 and am4 spi Tony Lindgren
2019-12-11 17:20   ` Tony Lindgren
2019-12-11 17:20 ` [PATCH 08/16] ARM: OMAP2+: Drop legacy platform data for am3 and am4 dcan Tony Lindgren
2019-12-11 17:20   ` Tony Lindgren
2019-12-11 17:20 ` [PATCH 09/16] ARM: OMAP2+: Drop legacy platform data for dra7 dcan Tony Lindgren
2019-12-11 17:20   ` Tony Lindgren
2019-12-11 17:20 ` [PATCH 10/16] ARM: OMAP2+: Drop legacy platform data for am3 adc_tsc Tony Lindgren
2019-12-11 17:20   ` Tony Lindgren
2019-12-11 17:20 ` Tony Lindgren [this message]
2019-12-11 17:20   ` [PATCH 11/16] ARM: OMAP2+: Drop legacy platform data for am4 adc_tsc Tony Lindgren
2019-12-11 17:20 ` [PATCH 12/16] ARM: OMAP2+: Drop legacy platform data for am3 and am4 rtc Tony Lindgren
2019-12-11 17:20   ` Tony Lindgren
2019-12-13  5:28   ` Keerthy
2019-12-13  5:28     ` Keerthy
2019-12-13 14:59     ` Tony Lindgren
2019-12-13 14:59       ` Tony Lindgren
2019-12-11 17:20 ` [PATCH 13/16] ARM: OMAP2+: Drop legacy platform data for am3 and am4 elm Tony Lindgren
2019-12-11 17:20   ` Tony Lindgren
2019-12-11 17:20 ` [PATCH 14/16] ARM: OMAP2+: Drop legacy platform data for omap4 elm Tony Lindgren
2019-12-11 17:20   ` Tony Lindgren
2019-12-11 17:20 ` [PATCH 15/16] ARM: OMAP2+: Drop legacy platform data for dra7 elm Tony Lindgren
2019-12-11 17:20   ` Tony Lindgren
2019-12-11 17:20 ` [PATCH 16/16] ARM: OMAP2+: Drop legacy platform data for am3 lcdc Tony Lindgren
2019-12-11 17:20   ` Tony Lindgren
2019-12-13  6:10 ` [PATCH 00/16] Drop legacy platform data for various omap devices Keerthy
2019-12-13  6:10   ` Keerthy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191211172014.35201-12-tony@atomide.com \
    --to=tony@atomide.com \
    --cc=afd@ti.com \
    --cc=fcooper@ti.com \
    --cc=j-keerthy@ti.com \
    --cc=jsarha@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=rogerq@ti.com \
    --cc=s-anna@ti.com \
    --cc=tomi.valkeinen@ti.com \
    --cc=vigneshr@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.