Some OMAP2+ legacy hwmod data cleanup
Subsystems (5)
cover Some OMAP2+ legacy hwmod data cleanup
Hi Tony,
The following series cleans up some legacy dev_attr data associated with OMAP DMTimer, I2C, McBSP, McSPI and GPIO modules and removes roughly ~500 lines. Patches are based on v4.16-rc1. I have build tested for both omap2plus and omap1 defconfigs, and booted on a few OMAP4+ boards that I have on my desk.
Here is the patch summary:
1. First two patches fixes header inclusion in omap-dmaengine.h and hsmmc-omap.h as I am getting build errors on subsequent patches when I removed some of the platform_data header files.
2. Patches 3 through 7 remove the .dev_attr data for the above modules from various hwmod data files and some macros from McSPI & McBSP platform data header files
3. Patch 8 moves the plat-omap/include/plat/i2c.h into mach-omap1 folder as there is no common i2c code in plat-omap folder anymore.
4. Last patch is a minor cleanup of gpio headers from couple of files.
Some important notes/comments:
- The DMTimer patch cleanup will conflict with Keerthy's current dmtimer-> clocksource series, but ideally he wouldn't need to convert the plat/dmtimer.h into a clocksource header with the removal of the plat/dmtimer.h inclusion from the hwmod data files.
- I found some gaps w.r.t DMTimers on DM814x/DM816x platforms, and haven't fixed them. Both seems to have DMTimer1 through 8, but only DMTimers 1, 2 and 3 are defined in dm814x.dtsi, while dm816x.dtsi is missing DMTimer8. DMTimer3 hwmod is not in the dm814x hwmod list, while DMTimer8 is left out altogther. The timer capabilities are also different between the hwmod data files (lists always-on) which is missing from corresponding dts files. Not sure which one is correct.
This leaves the hsmmc-omap and omap-dma pieces still using the .dev_attr. The former is only used by one OMAP3 board, so can be cleaned up if we limit the init code just for that one board.
regards
Suman
Suman Anna (9):
dmaengine: omap-dma: include header for bool type
mmc: hsmmc_omap: include types.h and provide header inclusion guard
ARM: OMAP2+: Cleanup omap_gpio_dev_attr usage
ARM: OMAP2+: Cleanup omap_i2c_dev_attr usage
ARM: OMAP2+: Cleanup omap_timer_capability_dev_attr usage
ARM: OMAP2+: Cleanup omap2_spi_dev_attr and other legacy data
ARM: OMAP2+: Cleanup omap_mcbsp_dev_attr and other legacy data
ARM: OMAP: Move plat/i2c.h into mach-omap1 folder
ARM: OMAP2+: Remove unused gpio header file references
arch/arm/mach-omap1/common.h | 3 +-
arch/arm/mach-omap1/i2c.c | 2 -
.../{plat-omap/include/plat => mach-omap1}/i2c.h | 9 +-
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-omap2/hsmmc.c | 2 -
arch/arm/mach-omap2/i2c.h | 15 +--
arch/arm/mach-omap2/msdi.c | 1 -
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 11 --
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 18 ----
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 60 -----------
.../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 3 -
.../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 23 ----
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 4 -
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 116 ---------------------
arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 8 --
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 75 -------------
arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 54 ----------
arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 53 ----------
arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 29 ------
arch/arm/mach-omap2/omap_hwmod_common_data.h | 1 -
arch/arm/plat-omap/include/plat/dmtimer.h | 4 -
include/linux/omap-dmaengine.h | 2 +
include/linux/platform_data/asoc-ti-mcbsp.h | 12 ---
include/linux/platform_data/gpio-omap.h | 5 -
include/linux/platform_data/hsmmc-omap.h | 8 ++
include/linux/platform_data/spi-omap2-mcspi.h | 8 --
26 files changed, 16 insertions(+), 512 deletions(-)
rename arch/arm/{plat-omap/include/plat => mach-omap1}/i2c.h (90%)Signature · 1 line
2.15.1
PATCH 1/9 dmaengine: omap-dma: include header for bool type
The omap-dmaengine.h header file uses a bool type, so include the linux types.h header file so that it is self-contained. The lack of this header caused some build errors while cleaning up some header files from various omap_hwmod data files.
--- include/linux/omap-dmaengine.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/omap-dmaengine.h +2 -0
@@ -8,6 +8,8 @@#ifndef __LINUX_OMAP_DMAENGINE_H#define __LINUX_OMAP_DMAENGINE_H +#include <linux/types.h> +struct dma_chan ;#if defined(CONFIG_DMA_OMAP ) || (defined(CONFIG_DMA_OMAP_MODULE ) && defined(MODULE ))
Signature · 1 line
2.15.1
Tony Lindgren
maintainerPATCH 1/9 dmaengine: omap-dma: include header for bool type
Quoted 4 lines · Suman Anna
The
omap-dmaengine.hheader file uses a bool type, so include the linuxtypes.hheader file so that it is self-contained. The lack of this header caused some build errors while cleaning up some header files from variousomap_hwmoddata files.
Let's rather include types.h directly. Here's a patch that replaces your first two patches.
Regards,
Tony
8< --------------------
Quoted 1 line
From tony Mon Sep 17 00:00:00 2001
From: Tony Lindgren <[email protected]>
Date: Wed, 14 Feb 2018 09:35:20 -0800
Subject: [PATCH] ARM: OMAP2+: Include types.h directly for hwmod data
This is needed in preparation for dropping some unused headers that indirectly include types.h.
--- arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 ++ arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 2 ++ arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 2 ++ 3 files changed, 6 insertions(+)
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +2 -0
@@ -9,6 +9,8 @@* published by the Free Software Foundation. */ +#include <linux/types.h> +#include <linux/platform_data/gpio-omap.h> #include <linux/omap-dma.h> #include <plat/dmtimer.h>
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +2 -0
@@ -14,6 +14,8 @@* GNU General Public License for more details. */ +#include <linux/types.h> +#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/hsmmc-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h>
arch/arm/mach-omap2/omap_hwmod_81xx_data.c +2 -0
@@ -15,6 +15,8 @@* */ +#include <linux/types.h> +#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/hsmmc-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h>
Signature · 1 line
2.16.1
PATCH 1/9 dmaengine: omap-dma: include header for bool type
Quoted 8 lines · Tony Lindgren
Quoted 4 lines · Suman Anna
The
omap-dmaengine.hheader file uses a bool type, so include the linuxtypes.hheader file so that it is self-contained. The lack of this header caused some build errors while cleaning up some header files from variousomap_hwmoddata files.Let's rather include
types.hdirectly. Here's a patch that replaces your first two patches.
Yeah, I am ok with this as well. I went with the other approach primarily because whoever includes those header files will need a similar fixing or rely on others bringing in the types.h.
Quoted 11 lines
Regards,
Tony
8< --------------------
From tony Mon Sep 17 00:00:00 2001
From: Tony Lindgren <[email protected]>
Date: Wed, 14 Feb 2018 09:35:20 -0800
Subject: [PATCH] ARM: OMAP2+: Includetypes.hdirectly for hwmod data
Quoted 4 lines
This is needed in preparation for dropping some unused headers that indirectly include
types.h.Signed-off-by Tony Lindgren <[email protected]>
regards
Suman
Quoted 43 lines
--- arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 ++ arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 2 ++ arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 2 ++ 3 files changed, 6 insertions(+)arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +2
-0@@ -9,6 +9,8 @@* published by the Free Software Foundation. */ +#include <linux/types.h> +#include <linux/platform_data/gpio-omap.h> #include <linux/omap-dma.h> #include <plat/dmtimer.h> arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +2
-0@@ -14,6 +14,8 @@* GNU General Public License for more details. */ +#include <linux/types.h> +#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/hsmmc-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h> arch/arm/mach-omap2/omap_hwmod_81xx_data.c +2
-0@@ -15,6 +15,8 @@* */ +#include <linux/types.h> +#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/hsmmc-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h>
PATCH 2/9 mmc: hsmmc_omap: include types.h and provide header inclusion guard
In reply to Suman AnnaThe hsmmc-omap platform data header file uses some u8/u16/u32 types, so include the linux types.h header file so that it is self-contained. The lack of this header caused some build errors while cleaning up some other header files from various omap_hwmod data files.
While at this, also add the missing header inclusion guard.
---
Hi Ulf,
This patch is part of a hwmod cleanup series, and is needed before I can do the cleanup in those files. So prefer to have this patch go through Tony as part of the series.
regards
Suman
include/linux/platform_data/hsmmc-omap.h | 8 ++++++++ 1 file changed, 8 insertions(+)
include/linux/platform_data/hsmmc-omap.h +8 -0
@@ -24,6 +24,12 @@* Operation Issue" in _OMAP3530/3525/3515/3503 Silicon Errata_ * Revision F (October 2010) (SPRZ278F). */ + +#ifndef __LINUX_PLATFORM_DATA_OMAP_HSMMC_H__ +#define __LINUX_PLATFORM_DATA_OMAP_HSMMC_H__ + +#include <linux/types.h> +#define OMAP_HSMMC_SUPPORTS_DUAL_VOLT BIT(0)#define OMAP_HSMMC_BROKEN_MULTIBLOCK_READ BIT(1)#define OMAP_HSMMC_SWAKEUP_MISSING BIT(2)
@@ -79,3 +85,5 @@ struct omap_hsmmc_platform_data {const char *name; u32 ocr_mask; }; + +#endif
Signature · 1 line
2.15.1
Tony Lindgren
maintainerPATCH 2/9 mmc: hsmmc_omap: include types.h and provide header inclusion guard
Quoted 7 lines · Suman Anna
The hsmmc-omap platform data header file uses some u8/u16/u32 types, so include the linux
types.hheader file so that it is self-contained. The lack of this header caused some build errors while cleaning up some other header files from variousomap_hwmoddata files.While at this, also add the missing header inclusion guard.
Quoted 8 lines
Cc Ulf Hansson <[email protected]>Signed-off-by Suman Anna <[email protected]>---
Hi Ulf,This patch is part of a hwmod cleanup series, and is needed before I can do the cleanup in those files. So prefer to have this patch go through Tony as part of the series.
No need for this, I'll post a patch that includes types.h directly in the calling code.
Regards,
Tony
PATCH 3/9 ARM: OMAP2+: Cleanup omap_gpio_dev_attr usage
In reply to Suman AnnaThe omap_gpio_dev_attr data was used to supply instance-specific data for legacy non-DT devices. The GPIO legacy device support has been cleaned up in commit 14944934f8ac ("ARM: OMAP2+: Remove legacy gpio code") a while ago and this data is therefore no longer needed. So, cleanup the structure and all the associated data in various hwmod data files.
--- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 1 - arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 11 ----------- arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 1 - arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 9 --------- arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 -- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 13 ------------- arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 4 ---- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 13 ------------- arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 15 --------------- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 15 --------------- arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 8 -------- arch/arm/mach-omap2/omap_hwmod_common_data.h | 1 - include/linux/platform_data/gpio-omap.h | 5 ----- 13 files changed, 98 deletions(-)
arch/arm/mach-omap2/omap_hwmod_2430_data.c +0 -1
@@ -134,7 +134,6 @@ static struct omap_hwmod omap2430_gpio5_hwmod = { }, }, .class = &omap2xxx_gpio_hwmod_class, - .dev_attr = &omap2xxx_gpio_dev_attr, };/* dma attributes */
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +0 -11
@@ -9,7 +9,6 @@* published by the Free Software Foundation. */ -#include <linux/platform_data/gpio-omap.h> #include <linux/omap-dma.h> #include <plat/dmtimer.h> #include <linux/platform_data/spi-omap2-mcspi.h>
@@ -568,12 +567,6 @@ struct omap_hwmod omap2xxx_dss_venc_hwmod = { .flags = HWMOD_NO_IDLEST, }; -/* gpio dev_attr */ -struct omap_gpio_dev_attr omap2xxx_gpio_dev_attr = { - .bank_width =32 , - .dbck_flag = false, -}; -/* gpio1 */ struct omap_hwmod omap2xxx_gpio1_hwmod = { .name ="gpio1" ,
@@ -587,7 +580,6 @@ struct omap_hwmod omap2xxx_gpio1_hwmod = { }, }, .class = &omap2xxx_gpio_hwmod_class, - .dev_attr = &omap2xxx_gpio_dev_attr, };/* gpio2 */
@@ -603,7 +595,6 @@ struct omap_hwmod omap2xxx_gpio2_hwmod = { }, }, .class = &omap2xxx_gpio_hwmod_class, - .dev_attr = &omap2xxx_gpio_dev_attr, };/* gpio3 */
@@ -619,7 +610,6 @@ struct omap_hwmod omap2xxx_gpio3_hwmod = { }, }, .class = &omap2xxx_gpio_hwmod_class, - .dev_attr = &omap2xxx_gpio_dev_attr, };/* gpio4 */
@@ -635,7 +625,6 @@ struct omap_hwmod omap2xxx_gpio4_hwmod = { }, }, .class = &omap2xxx_gpio_hwmod_class, - .dev_attr = &omap2xxx_gpio_dev_attr, };/* mcspi1 */
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h +0 -1
@@ -139,7 +139,6 @@ extern struct omap_hwmod_class am33xx_epwmss_hwmod_class;extern struct omap_hwmod_class am33xx_ehrpwm_hwmod_class;extern struct omap_hwmod_class am33xx_spi_hwmod_class; -extern struct omap_gpio_dev_attr gpio_dev_attr;extern struct omap2_mcspi_dev_attr mcspi_attrib;void omap_hwmod_am33xx_reg (void );
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +0 -9
@@ -14,7 +14,6 @@* GNU General Public License for more details. */ -#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/hsmmc-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include "omap_hwmod.h"
@@ -537,11 +536,6 @@ struct omap_hwmod_class am33xx_gpio_hwmod_class = { .rev = 2, }; -struct omap_gpio_dev_attr gpio_dev_attr = { - .bank_width =32 , - .dbck_flag = true, -}; -/* gpio1 */ static struct omap_hwmod_opt_clk gpio1_opt_clks[] = { { .role ="dbclk" , .clk ="gpio1_dbclk" },
@@ -560,7 +554,6 @@ struct omap_hwmod am33xx_gpio1_hwmod = { }, .opt_clks = gpio1_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio1_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio2 */
@@ -581,7 +574,6 @@ struct omap_hwmod am33xx_gpio2_hwmod = { }, .opt_clks = gpio2_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio2_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio3 */
@@ -602,7 +594,6 @@ struct omap_hwmod am33xx_gpio3_hwmod = { }, .opt_clks = gpio3_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio3_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpmc */
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +0 -2
@@ -17,7 +17,6 @@#include <linux/i2c-omap.h> #include "omap_hwmod.h" -#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include "omap_hwmod_common_data.h"
@@ -252,7 +251,6 @@ static struct omap_hwmod am33xx_gpio0_hwmod = { }, .opt_clks = gpio0_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio0_opt_clks), - .dev_attr = &gpio_dev_attr, };/* lcdc */
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +0 -13
@@ -17,7 +17,6 @@#include <linux/i2c-omap.h> #include <linux/power/smartreflex.h> -#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/hsmmc-omap.h> #include <linux/omap-dma.h>
@@ -769,12 +768,6 @@ static struct omap_hwmod_class omap3xxx_gpio_hwmod_class = { .rev = 1, }; -/* gpio_dev_attr */ -static struct omap_gpio_dev_attr gpio_dev_attr = { - .bank_width =32 , - .dbck_flag = true, -}; -/* gpio1 */ static struct omap_hwmod_opt_clk gpio1_opt_clks[] = { { .role ="dbclk" , .clk ="gpio1_dbck" , },
@@ -794,7 +787,6 @@ static struct omap_hwmod omap3xxx_gpio1_hwmod = { }, }, .class = &omap3xxx_gpio_hwmod_class, - .dev_attr = &gpio_dev_attr, };/* gpio2 */
@@ -816,7 +808,6 @@ static struct omap_hwmod omap3xxx_gpio2_hwmod = { }, }, .class = &omap3xxx_gpio_hwmod_class, - .dev_attr = &gpio_dev_attr, };/* gpio3 */
@@ -838,7 +829,6 @@ static struct omap_hwmod omap3xxx_gpio3_hwmod = { }, }, .class = &omap3xxx_gpio_hwmod_class, - .dev_attr = &gpio_dev_attr, };/* gpio4 */
@@ -860,7 +850,6 @@ static struct omap_hwmod omap3xxx_gpio4_hwmod = { }, }, .class = &omap3xxx_gpio_hwmod_class, - .dev_attr = &gpio_dev_attr, };/* gpio5 */
@@ -883,7 +872,6 @@ static struct omap_hwmod omap3xxx_gpio5_hwmod = { }, }, .class = &omap3xxx_gpio_hwmod_class, - .dev_attr = &gpio_dev_attr, };/* gpio6 */
@@ -906,7 +894,6 @@ static struct omap_hwmod omap3xxx_gpio6_hwmod = { }, }, .class = &omap3xxx_gpio_hwmod_class, - .dev_attr = &gpio_dev_attr, };/* dma attributes */
arch/arm/mach-omap2/omap_hwmod_43xx_data.c +0 -4
@@ -14,7 +14,6 @@* GNU General Public License for more details. */ -#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include "omap_hwmod.h" #include "omap_hwmod_33xx_43xx_common_data.h"
@@ -107,7 +106,6 @@ static struct omap_hwmod am43xx_gpio0_hwmod = { }, .opt_clks = gpio0_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio0_opt_clks), - .dev_attr = &gpio_dev_attr, };static struct omap_hwmod_class_sysconfig am43xx_synctimer_sysc = {
@@ -288,7 +286,6 @@ static struct omap_hwmod am43xx_gpio4_hwmod = { }, .opt_clks = gpio4_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio4_opt_clks), - .dev_attr = &gpio_dev_attr, };static struct omap_hwmod_opt_clk gpio5_opt_clks[] = {
@@ -309,7 +306,6 @@ static struct omap_hwmod am43xx_gpio5_hwmod = { }, .opt_clks = gpio5_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio5_opt_clks), - .dev_attr = &gpio_dev_attr, };static struct omap_hwmod_class am43xx_ocp2scp_hwmod_class = {
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -13
@@ -21,7 +21,6 @@*/ #include <linux/io.h> -#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/hsmmc-omap.h> #include <linux/power/smartreflex.h> #include <linux/i2c-omap.h>
@@ -1083,12 +1082,6 @@ static struct omap_hwmod_class omap44xx_gpio_hwmod_class = { .rev = 2, }; -/* gpio dev_attr */ -static struct omap_gpio_dev_attr gpio_dev_attr = { - .bank_width =32 , - .dbck_flag = true, -}; -/* gpio1 */ static struct omap_hwmod_opt_clk gpio1_opt_clks[] = { { .role ="dbclk" , .clk ="gpio1_dbclk" },
@@ -1108,7 +1101,6 @@ static struct omap_hwmod omap44xx_gpio1_hwmod = { }, .opt_clks = gpio1_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio1_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio2 */
@@ -1131,7 +1123,6 @@ static struct omap_hwmod omap44xx_gpio2_hwmod = { }, .opt_clks = gpio2_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio2_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio3 */
@@ -1154,7 +1145,6 @@ static struct omap_hwmod omap44xx_gpio3_hwmod = { }, .opt_clks = gpio3_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio3_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio4 */
@@ -1177,7 +1167,6 @@ static struct omap_hwmod omap44xx_gpio4_hwmod = { }, .opt_clks = gpio4_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio4_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio5 */
@@ -1200,7 +1189,6 @@ static struct omap_hwmod omap44xx_gpio5_hwmod = { }, .opt_clks = gpio5_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio5_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio6 */
@@ -1223,7 +1211,6 @@ static struct omap_hwmod omap44xx_gpio6_hwmod = { }, .opt_clks = gpio6_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio6_opt_clks), - .dev_attr = &gpio_dev_attr, };/*
arch/arm/mach-omap2/omap_hwmod_54xx_data.c +0 -15
@@ -18,7 +18,6 @@*/ #include <linux/io.h> -#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/hsmmc-omap.h> #include <linux/power/smartreflex.h> #include <linux/i2c-omap.h>
@@ -627,12 +626,6 @@ static struct omap_hwmod_class omap54xx_gpio_hwmod_class = { .rev = 2, }; -/* gpio dev_attr */ -static struct omap_gpio_dev_attr gpio_dev_attr = { - .bank_width =32 , - .dbck_flag = true, -}; -/* gpio1 */ static struct omap_hwmod_opt_clk gpio1_opt_clks[] = { { .role ="dbclk" , .clk ="gpio1_dbclk" },
@@ -652,7 +645,6 @@ static struct omap_hwmod omap54xx_gpio1_hwmod = { }, .opt_clks = gpio1_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio1_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio2 */
@@ -675,7 +667,6 @@ static struct omap_hwmod omap54xx_gpio2_hwmod = { }, .opt_clks = gpio2_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio2_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio3 */
@@ -698,7 +689,6 @@ static struct omap_hwmod omap54xx_gpio3_hwmod = { }, .opt_clks = gpio3_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio3_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio4 */
@@ -721,7 +711,6 @@ static struct omap_hwmod omap54xx_gpio4_hwmod = { }, .opt_clks = gpio4_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio4_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio5 */
@@ -744,7 +733,6 @@ static struct omap_hwmod omap54xx_gpio5_hwmod = { }, .opt_clks = gpio5_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio5_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio6 */
@@ -767,7 +755,6 @@ static struct omap_hwmod omap54xx_gpio6_hwmod = { }, .opt_clks = gpio6_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio6_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio7 */
@@ -790,7 +777,6 @@ static struct omap_hwmod omap54xx_gpio7_hwmod = { }, .opt_clks = gpio7_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio7_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio8 */
@@ -813,7 +799,6 @@ static struct omap_hwmod omap54xx_gpio8_hwmod = { }, .opt_clks = gpio8_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio8_opt_clks), - .dev_attr = &gpio_dev_attr, };/*
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0 -15
@@ -18,7 +18,6 @@*/ #include <linux/io.h> -#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/hsmmc-omap.h> #include <linux/power/smartreflex.h> #include <linux/i2c-omap.h>
@@ -818,12 +817,6 @@ static struct omap_hwmod_class dra7xx_gpio_hwmod_class = { .rev = 2, }; -/* gpio dev_attr */ -static struct omap_gpio_dev_attr gpio_dev_attr = { - .bank_width =32 , - .dbck_flag = true, -}; -/* gpio1 */ static struct omap_hwmod_opt_clk gpio1_opt_clks[] = { { .role ="dbclk" , .clk ="gpio1_dbclk" },
@@ -844,7 +837,6 @@ static struct omap_hwmod dra7xx_gpio1_hwmod = { }, .opt_clks = gpio1_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio1_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio2 */
@@ -867,7 +859,6 @@ static struct omap_hwmod dra7xx_gpio2_hwmod = { }, .opt_clks = gpio2_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio2_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio3 */
@@ -890,7 +881,6 @@ static struct omap_hwmod dra7xx_gpio3_hwmod = { }, .opt_clks = gpio3_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio3_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio4 */
@@ -913,7 +903,6 @@ static struct omap_hwmod dra7xx_gpio4_hwmod = { }, .opt_clks = gpio4_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio4_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio5 */
@@ -936,7 +925,6 @@ static struct omap_hwmod dra7xx_gpio5_hwmod = { }, .opt_clks = gpio5_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio5_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio6 */
@@ -959,7 +947,6 @@ static struct omap_hwmod dra7xx_gpio6_hwmod = { }, .opt_clks = gpio6_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio6_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio7 */
@@ -982,7 +969,6 @@ static struct omap_hwmod dra7xx_gpio7_hwmod = { }, .opt_clks = gpio7_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio7_opt_clks), - .dev_attr = &gpio_dev_attr, };/* gpio8 */
@@ -1005,7 +991,6 @@ static struct omap_hwmod dra7xx_gpio8_hwmod = { }, .opt_clks = gpio8_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio8_opt_clks), - .dev_attr = &gpio_dev_attr, };/*
arch/arm/mach-omap2/omap_hwmod_81xx_data.c +0 -8
@@ -15,7 +15,6 @@* */ -#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/hsmmc-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <plat/dmtimer.h>
@@ -488,11 +487,6 @@ static struct omap_hwmod_class dm81xx_gpio_hwmod_class = { .rev = 2, }; -static struct omap_gpio_dev_attr gpio_dev_attr = { - .bank_width =32 , - .dbck_flag = true, -}; -static struct omap_hwmod_opt_clk gpio1_opt_clks[] = { { .role ="dbclk" , .clk ="sysclk18_ck" }, };
@@ -510,7 +504,6 @@ static struct omap_hwmod dm81xx_gpio1_hwmod = { }, .opt_clks = gpio1_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio1_opt_clks), - .dev_attr = &gpio_dev_attr, };static struct omap_hwmod_ocp_if dm81xx_l4_ls__gpio1 = {
@@ -537,7 +530,6 @@ static struct omap_hwmod dm81xx_gpio2_hwmod = { }, .opt_clks = gpio2_opt_clks, .opt_clks_cnt = ARRAY_SIZE(gpio2_opt_clks), - .dev_attr = &gpio_dev_attr, };static struct omap_hwmod_ocp_if dm81xx_l4_ls__gpio2 = {
arch/arm/mach-omap2/omap_hwmod_common_data.h +0 -1
@@ -19,7 +19,6 @@#include "display.h" /* Common IP block data across OMAP2xxx */ -extern struct omap_gpio_dev_attr omap2xxx_gpio_dev_attr;extern struct omap_hwmod omap2xxx_l3_main_hwmod;extern struct omap_hwmod omap2xxx_l4_core_hwmod;extern struct omap_hwmod omap2xxx_l4_wkup_hwmod;
include/linux/platform_data/gpio-omap.h +0 -5
@@ -157,11 +157,6 @@#define OMAP_MPUIO (nr) (OMAP_MAX_GPIO_LINES + (nr))#define OMAP_GPIO_IS_MPUIO (nr) ((nr) >= OMAP_MAX_GPIO_LINES) -struct omap_gpio_dev_attr { -int bank_width;/* GPIO bank width */ -bool dbck_flag;/* dbck required or not - True for OMAP3&4 */ -}; -struct omap_gpio_reg_offs {u16 revision;u16 direction;
Signature · 1 line
2.15.1
PATCH 4/9 ARM: OMAP2+: Cleanup omap_i2c_dev_attr usage
In reply to Suman AnnaThe omap_i2c_dev_attr data was used to supply instance-specific data for legacy non-DT devices. The I2C legacy device support has been cleaned up in commit 65fa3e719f36 ("ARM: OMAP2+: Remove legacy i2c.c platform init code") and this data is therefore no longer needed. So, cleanup the structure and all the associated data in various hwmod data files.
The i2c-omap.h header is still needed because of the need for various OMAP_I2C_IP_VERSION_x macros.
--- arch/arm/mach-omap2/i2c.h | 13 ------------- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 9 --------- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 8 -------- .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 7 ------- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 20 -------------------- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 8 -------- arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 10 ---------- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 10 ---------- 8 files changed, 85 deletions(-)
arch/arm/mach-omap2/i2c.h +0 -13
@@ -24,19 +24,6 @@#ifndef __MACH_OMAP2_I2C_H#define __MACH_OMAP2_I2C_H -/** -* i2c_dev_attr - OMAP I2C controller device attributes for omap_hwmod -* @fifo_depth: total controller FIFO size (in bytes) -* @flags: differences in hardware support capability -* -* @fifo_depth represents what exists on the hardware, not what is -* actually configured at runtime by the device driver. -*/ -struct omap_i2c_dev_attr { -u8 fifo_depth; -u32 flags; -}; -int omap_i2c_reset (struct omap_hwmod *oh);#endif /* __MACH_OMAP2_I2C_H */
arch/arm/mach-omap2/omap_hwmod_2420_data.c +0 -9
@@ -97,13 +97,6 @@ static struct omap_hwmod_class i2c_class = { .reset = &omap_i2c_reset, }; -static struct omap_i2c_dev_attr i2c_dev_attr = { - .flags =OMAP_I2C_FLAG_NO_FIFO | -OMAP_I2C_FLAG_SIMPLE_CLOCK | -OMAP_I2C_FLAG_16BIT_DATA_REG | -OMAP_I2C_FLAG_BUS_SHIFT_2 , -}; -/* I2C1 */ static struct omap_hwmod omap2420_i2c1_hwmod = { .name ="i2c1" ,
@@ -116,7 +109,6 @@ static struct omap_hwmod omap2420_i2c1_hwmod = { }, }, .class = &i2c_class, - .dev_attr = &i2c_dev_attr,/* * From mach-omap2/pm24xx.c: "Putting MPU into the WFI state * while a transfer is active seems to cause the I2C block to
@@ -137,7 +129,6 @@ static struct omap_hwmod omap2420_i2c2_hwmod = { }, }, .class = &i2c_class, - .dev_attr = &i2c_dev_attr, .flags = HWMOD_16BIT_REG, };
arch/arm/mach-omap2/omap_hwmod_2430_data.c +0 -8
@@ -75,12 +75,6 @@ static struct omap_hwmod_class i2c_class = { .reset = &omap_i2c_reset, }; -static struct omap_i2c_dev_attr i2c_dev_attr = { - .fifo_depth =8 ,/* bytes */ - .flags =OMAP_I2C_FLAG_BUS_SHIFT_2 | -OMAP_I2C_FLAG_FORCE_19200_INT_CLK , -}; -/* I2C1 */ static struct omap_hwmod omap2430_i2c1_hwmod = { .name ="i2c1" ,
@@ -102,7 +96,6 @@ static struct omap_hwmod omap2430_i2c1_hwmod = { }, }, .class = &i2c_class, - .dev_attr = &i2c_dev_attr, };/* I2C2 */
@@ -118,7 +111,6 @@ static struct omap_hwmod omap2430_i2c2_hwmod = { }, }, .class = &i2c_class, - .dev_attr = &i2c_dev_attr, };/* gpio5 */
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +0 -7
@@ -645,10 +645,6 @@ static struct omap_hwmod_class i2c_class = { .reset = &omap_i2c_reset, }; -static struct omap_i2c_dev_attr i2c_dev_attr = { - .flags =OMAP_I2C_FLAG_BUS_SHIFT_NONE , -}; -/* i2c1 */ struct omap_hwmod am33xx_i2c1_hwmod = { .name ="i2c1" ,
@@ -661,7 +657,6 @@ struct omap_hwmod am33xx_i2c1_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &i2c_dev_attr, };/* i2c1 */
@@ -676,7 +671,6 @@ struct omap_hwmod am33xx_i2c2_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &i2c_dev_attr, };/* i2c3 */
@@ -691,7 +685,6 @@ struct omap_hwmod am33xx_i2c3_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &i2c_dev_attr, };/*
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +0 -20
@@ -682,11 +682,6 @@ static struct omap_hwmod omap3xxx_dss_venc_hwmod = { };/* I2C1 */ -static struct omap_i2c_dev_attr i2c1_dev_attr = { - .fifo_depth =8 ,/* bytes */ - .flags =OMAP_I2C_FLAG_BUS_SHIFT_2 , -}; -static struct omap_hwmod omap3xxx_i2c1_hwmod = { .name ="i2c1" , .flags =HWMOD_16BIT_REG |HWMOD_SET_DEFAULT_CLOCKACT ,
@@ -699,15 +694,9 @@ static struct omap_hwmod omap3xxx_i2c1_hwmod = { }, }, .class = &i2c_class, - .dev_attr = &i2c1_dev_attr, };/* I2C2 */ -static struct omap_i2c_dev_attr i2c2_dev_attr = { - .fifo_depth =8 ,/* bytes */ - .flags =OMAP_I2C_FLAG_BUS_SHIFT_2 , -}; -static struct omap_hwmod omap3xxx_i2c2_hwmod = { .name ="i2c2" , .flags =HWMOD_16BIT_REG |HWMOD_SET_DEFAULT_CLOCKACT ,
@@ -720,17 +709,9 @@ static struct omap_hwmod omap3xxx_i2c2_hwmod = { }, }, .class = &i2c_class, - .dev_attr = &i2c2_dev_attr, };/* I2C3 */ -static struct omap_i2c_dev_attr i2c3_dev_attr = { - .fifo_depth =64 ,/* bytes */ - .flags =OMAP_I2C_FLAG_BUS_SHIFT_2 , -}; - - -static struct omap_hwmod omap3xxx_i2c3_hwmod = { .name ="i2c3" , .flags =HWMOD_16BIT_REG |HWMOD_SET_DEFAULT_CLOCKACT ,
@@ -743,7 +724,6 @@ static struct omap_hwmod omap3xxx_i2c3_hwmod = { }, }, .class = &i2c_class, - .dev_attr = &i2c3_dev_attr, };/*
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -8
@@ -1381,10 +1381,6 @@ static struct omap_hwmod_class omap44xx_i2c_hwmod_class = { .reset = &omap_i2c_reset, }; -static struct omap_i2c_dev_attr i2c_dev_attr = { - .flags =OMAP_I2C_FLAG_BUS_SHIFT_NONE , -}; -/* i2c1 */ static struct omap_hwmod omap44xx_i2c1_hwmod = { .name ="i2c1" ,
@@ -1399,7 +1395,6 @@ static struct omap_hwmod omap44xx_i2c1_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &i2c_dev_attr, };/* i2c2 */
@@ -1416,7 +1411,6 @@ static struct omap_hwmod omap44xx_i2c2_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &i2c_dev_attr, };/* i2c3 */
@@ -1433,7 +1427,6 @@ static struct omap_hwmod omap44xx_i2c3_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &i2c_dev_attr, };/* i2c4 */
@@ -1450,7 +1443,6 @@ static struct omap_hwmod omap44xx_i2c4_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &i2c_dev_attr, };/*
arch/arm/mach-omap2/omap_hwmod_54xx_data.c +0 -10
@@ -824,11 +824,6 @@ static struct omap_hwmod_class omap54xx_i2c_hwmod_class = { .rev = OMAP_I2C_IP_VERSION_2, }; -/* i2c dev_attr */ -static struct omap_i2c_dev_attr i2c_dev_attr = { - .flags =OMAP_I2C_FLAG_BUS_SHIFT_NONE , -}; -/* i2c1 */ static struct omap_hwmod omap54xx_i2c1_hwmod = { .name ="i2c1" ,
@@ -843,7 +838,6 @@ static struct omap_hwmod omap54xx_i2c1_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &i2c_dev_attr, };/* i2c2 */
@@ -860,7 +854,6 @@ static struct omap_hwmod omap54xx_i2c2_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &i2c_dev_attr, };/* i2c3 */
@@ -877,7 +870,6 @@ static struct omap_hwmod omap54xx_i2c3_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &i2c_dev_attr, };/* i2c4 */
@@ -894,7 +886,6 @@ static struct omap_hwmod omap54xx_i2c4_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &i2c_dev_attr, };/* i2c5 */
@@ -911,7 +902,6 @@ static struct omap_hwmod omap54xx_i2c5_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &i2c_dev_attr, };/*
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0 -10
@@ -1090,11 +1090,6 @@ static struct omap_hwmod_class dra7xx_i2c_hwmod_class = { .rev = OMAP_I2C_IP_VERSION_2, }; -/* i2c dev_attr */ -static struct omap_i2c_dev_attr i2c_dev_attr = { - .flags =OMAP_I2C_FLAG_BUS_SHIFT_NONE , -}; -/* i2c1 */ static struct omap_hwmod dra7xx_i2c1_hwmod = { .name ="i2c1" ,
@@ -1109,7 +1104,6 @@ static struct omap_hwmod dra7xx_i2c1_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &i2c_dev_attr, };/* i2c2 */
@@ -1126,7 +1120,6 @@ static struct omap_hwmod dra7xx_i2c2_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &i2c_dev_attr, };/* i2c3 */
@@ -1143,7 +1136,6 @@ static struct omap_hwmod dra7xx_i2c3_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &i2c_dev_attr, };/* i2c4 */
@@ -1160,7 +1152,6 @@ static struct omap_hwmod dra7xx_i2c4_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &i2c_dev_attr, };/* i2c5 */
@@ -1177,7 +1168,6 @@ static struct omap_hwmod dra7xx_i2c5_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &i2c_dev_attr, };/*
Signature · 1 line
2.15.1
PATCH 5/9 ARM: OMAP2+: Cleanup omap_timer_capability_dev_attr usage
In reply to Suman AnnaThe omap_timer_capability_dev_attr data was used to supply instance specific capabilities (like always-on, PWM functionality or ability to interrupt DSP cores) for legacy non-DT devices. These capabilities are now provided through device-tree properties. The legacy device support has been cleaned up in commit 8d39ff3d1696 ("ARM: OMAP2+:
Remove unused legacy code for timer") and this data is therefore no longer needed. So, cleanup the structure and all the associated data in various hwmod data files.
While at this, remove the stale header in hwmod data files that already do not have any timer capability data.
--- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 1 - arch/arm/mach-omap2/omap_hwmod_2430_data.c | 1 - arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 37 ---------------------- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 36 --------------------- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 29 ----------------- arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 1 - arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 1 - arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 14 -------- arch/arm/plat-omap/include/plat/dmtimer.h | 4 --- 9 files changed, 124 deletions(-)
arch/arm/mach-omap2/omap_hwmod_2420_data.c +0 -1
@@ -16,7 +16,6 @@#include <linux/i2c-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/omap-dma.h> -#include <plat/dmtimer.h> #include "omap_hwmod.h" #include "l3_2xxx.h"
arch/arm/mach-omap2/omap_hwmod_2430_data.c +0 -1
@@ -18,7 +18,6 @@#include <linux/platform_data/hsmmc-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/omap-dma.h> -#include <plat/dmtimer.h> #include "omap_hwmod.h" #include "l3_2xxx.h"
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +0 -37
@@ -10,7 +10,6 @@*/ #include <linux/omap-dma.h> -#include <plat/dmtimer.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include "omap_hwmod.h"
@@ -219,23 +218,7 @@ struct omap_hwmod omap2xxx_iva_hwmod = { .class = &iva_hwmod_class, }; -/* always-on timers dev attribute */ -static struct omap_timer_capability_dev_attr capability_alwon_dev_attr = { - .timer_capability =OMAP_TIMER_ALWON , -}; - -/* pwm timers dev attribute */ -static struct omap_timer_capability_dev_attr capability_pwm_dev_attr = { - .timer_capability =OMAP_TIMER_HAS_PWM , -}; - -/* timers with DSP interrupt dev attribute */ -static struct omap_timer_capability_dev_attr capability_dsp_dev_attr = { - .timer_capability =OMAP_TIMER_HAS_DSP_IRQ , -}; -/* timer1 */ -struct omap_hwmod omap2xxx_timer1_hwmod = { .name ="timer1" , .main_clk ="gpt1_fck" ,
@@ -246,13 +229,11 @@ struct omap_hwmod omap2xxx_timer1_hwmod = { .idlest_idle_bit = OMAP24XX_ST_GPT1_SHIFT, }, }, - .dev_attr = &capability_alwon_dev_attr, .class = &omap2xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };/* timer2 */ -struct omap_hwmod omap2xxx_timer2_hwmod = { .name ="timer2" , .main_clk = "gpt2_fck",
@@ -268,7 +249,6 @@ struct omap_hwmod omap2xxx_timer2_hwmod = { };/* timer3 */ -struct omap_hwmod omap2xxx_timer3_hwmod = { .name ="timer3" , .main_clk ="gpt3_fck" ,
@@ -284,7 +264,6 @@ struct omap_hwmod omap2xxx_timer3_hwmod = { };/* timer4 */ -struct omap_hwmod omap2xxx_timer4_hwmod = { .name ="timer4" , .main_clk ="gpt4_fck" ,
@@ -300,7 +279,6 @@ struct omap_hwmod omap2xxx_timer4_hwmod = { };/* timer5 */ -struct omap_hwmod omap2xxx_timer5_hwmod = { .name ="timer5" , .main_clk ="gpt5_fck" ,
@@ -311,13 +289,11 @@ struct omap_hwmod omap2xxx_timer5_hwmod = { .idlest_idle_bit = OMAP24XX_ST_GPT5_SHIFT, }, }, - .dev_attr = &capability_dsp_dev_attr, .class = &omap2xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };/* timer6 */ -struct omap_hwmod omap2xxx_timer6_hwmod = { .name ="timer6" , .main_clk = "gpt6_fck",
@@ -328,13 +304,11 @@ struct omap_hwmod omap2xxx_timer6_hwmod = { .idlest_idle_bit = OMAP24XX_ST_GPT6_SHIFT, }, }, - .dev_attr = &capability_dsp_dev_attr, .class = &omap2xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };/* timer7 */ -struct omap_hwmod omap2xxx_timer7_hwmod = { .name ="timer7" , .main_clk = "gpt7_fck",
@@ -345,13 +319,11 @@ struct omap_hwmod omap2xxx_timer7_hwmod = { .idlest_idle_bit = OMAP24XX_ST_GPT7_SHIFT, }, }, - .dev_attr = &capability_dsp_dev_attr, .class = &omap2xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };/* timer8 */ -struct omap_hwmod omap2xxx_timer8_hwmod = { .name ="timer8" , .main_clk = "gpt8_fck",
@@ -362,13 +334,11 @@ struct omap_hwmod omap2xxx_timer8_hwmod = { .idlest_idle_bit = OMAP24XX_ST_GPT8_SHIFT, }, }, - .dev_attr = &capability_dsp_dev_attr, .class = &omap2xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };/* timer9 */ -struct omap_hwmod omap2xxx_timer9_hwmod = { .name ="timer9" , .main_clk = "gpt9_fck",
@@ -379,13 +349,11 @@ struct omap_hwmod omap2xxx_timer9_hwmod = { .idlest_idle_bit = OMAP24XX_ST_GPT9_SHIFT, }, }, - .dev_attr = &capability_pwm_dev_attr, .class = &omap2xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };/* timer10 */ -struct omap_hwmod omap2xxx_timer10_hwmod = { .name ="timer10" , .main_clk = "gpt10_fck",
@@ -396,13 +364,11 @@ struct omap_hwmod omap2xxx_timer10_hwmod = { .idlest_idle_bit = OMAP24XX_ST_GPT10_SHIFT, }, }, - .dev_attr = &capability_pwm_dev_attr, .class = &omap2xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };/* timer11 */ -struct omap_hwmod omap2xxx_timer11_hwmod = { .name ="timer11" , .main_clk = "gpt11_fck",
@@ -413,13 +379,11 @@ struct omap_hwmod omap2xxx_timer11_hwmod = { .idlest_idle_bit = OMAP24XX_ST_GPT11_SHIFT, }, }, - .dev_attr = &capability_pwm_dev_attr, .class = &omap2xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };/* timer12 */ -struct omap_hwmod omap2xxx_timer12_hwmod = { .name ="timer12" , .main_clk = "gpt12_fck",
@@ -430,7 +394,6 @@ struct omap_hwmod omap2xxx_timer12_hwmod = { .idlest_idle_bit = OMAP24XX_ST_GPT12_SHIFT, }, }, - .dev_attr = &capability_pwm_dev_attr, .class = &omap2xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +0 -36
@@ -24,7 +24,6 @@#include "l4_3xxx.h" #include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/spi-omap2-mcspi.h> -#include <plat/dmtimer.h> #include "soc.h" #include "omap_hwmod.h"
@@ -154,31 +153,6 @@ static struct omap_hwmod_class omap3xxx_timer_hwmod_class = { .sysc = &omap3xxx_timer_sysc, }; -/* secure timers dev attribute */ -static struct omap_timer_capability_dev_attr capability_secure_dev_attr = { - .timer_capability =OMAP_TIMER_ALWON |OMAP_TIMER_SECURE , -}; - -/* always-on timers dev attribute */ -static struct omap_timer_capability_dev_attr capability_alwon_dev_attr = { - .timer_capability =OMAP_TIMER_ALWON , -}; - -/* pwm timers dev attribute */ -static struct omap_timer_capability_dev_attr capability_pwm_dev_attr = { - .timer_capability =OMAP_TIMER_HAS_PWM , -}; - -/* timers with DSP interrupt dev attribute */ -static struct omap_timer_capability_dev_attr capability_dsp_dev_attr = { - .timer_capability =OMAP_TIMER_HAS_DSP_IRQ , -}; - -/* pwm timers with DSP interrupt dev attribute */ -static struct omap_timer_capability_dev_attr capability_dsp_pwm_dev_attr = { - .timer_capability =OMAP_TIMER_HAS_DSP_IRQ |OMAP_TIMER_HAS_PWM , -}; -/* timer1 */ static struct omap_hwmod omap3xxx_timer1_hwmod = { .name ="timer1" ,
@@ -190,7 +164,6 @@ static struct omap_hwmod omap3xxx_timer1_hwmod = { .idlest_idle_bit = OMAP3430_ST_GPT1_SHIFT, }, }, - .dev_attr = &capability_alwon_dev_attr, .class = &omap3xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };
@@ -251,7 +224,6 @@ static struct omap_hwmod omap3xxx_timer5_hwmod = { .idlest_idle_bit = OMAP3430_ST_GPT5_SHIFT, }, }, - .dev_attr = &capability_dsp_dev_attr, .class = &omap3xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };
@@ -267,7 +239,6 @@ static struct omap_hwmod omap3xxx_timer6_hwmod = { .idlest_idle_bit = OMAP3430_ST_GPT6_SHIFT, }, }, - .dev_attr = &capability_dsp_dev_attr, .class = &omap3xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };
@@ -283,7 +254,6 @@ static struct omap_hwmod omap3xxx_timer7_hwmod = { .idlest_idle_bit = OMAP3430_ST_GPT7_SHIFT, }, }, - .dev_attr = &capability_dsp_dev_attr, .class = &omap3xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };
@@ -299,7 +269,6 @@ static struct omap_hwmod omap3xxx_timer8_hwmod = { .idlest_idle_bit = OMAP3430_ST_GPT8_SHIFT, }, }, - .dev_attr = &capability_dsp_pwm_dev_attr, .class = &omap3xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };
@@ -315,7 +284,6 @@ static struct omap_hwmod omap3xxx_timer9_hwmod = { .idlest_idle_bit = OMAP3430_ST_GPT9_SHIFT, }, }, - .dev_attr = &capability_pwm_dev_attr, .class = &omap3xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };
@@ -331,7 +299,6 @@ static struct omap_hwmod omap3xxx_timer10_hwmod = { .idlest_idle_bit = OMAP3430_ST_GPT10_SHIFT, }, }, - .dev_attr = &capability_pwm_dev_attr, .class = &omap3xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };
@@ -347,13 +314,11 @@ static struct omap_hwmod omap3xxx_timer11_hwmod = { .idlest_idle_bit = OMAP3430_ST_GPT11_SHIFT, }, }, - .dev_attr = &capability_pwm_dev_attr, .class = &omap3xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };/* timer12 */ -static struct omap_hwmod omap3xxx_timer12_hwmod = { .name ="timer12" , .main_clk = "gpt12_fck",
@@ -364,7 +329,6 @@ static struct omap_hwmod omap3xxx_timer12_hwmod = { .idlest_idle_bit = OMAP3430_ST_GPT12_SHIFT, }, }, - .dev_attr = &capability_secure_dev_attr, .class = &omap3xxx_timer_hwmod_class, .flags = HWMOD_SET_DEFAULT_CLOCKACT, };
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -29
@@ -29,7 +29,6 @@#include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/asoc-ti-mcbsp.h> -#include <plat/dmtimer.h> #include "omap_hwmod.h" #include "omap_hwmod_common_data.h"
@@ -2526,26 +2525,6 @@ static struct omap_hwmod_class omap44xx_timer_hwmod_class = { .sysc = &omap44xx_timer_sysc, }; -/* always-on timers dev attribute */ -static struct omap_timer_capability_dev_attr capability_alwon_dev_attr = { - .timer_capability =OMAP_TIMER_ALWON , -}; - -/* pwm timers dev attribute */ -static struct omap_timer_capability_dev_attr capability_pwm_dev_attr = { - .timer_capability =OMAP_TIMER_HAS_PWM , -}; - -/* timers with DSP interrupt dev attribute */ -static struct omap_timer_capability_dev_attr capability_dsp_dev_attr = { - .timer_capability =OMAP_TIMER_HAS_DSP_IRQ , -}; - -/* pwm timers with DSP interrupt dev attribute */ -static struct omap_timer_capability_dev_attr capability_dsp_pwm_dev_attr = { - .timer_capability =OMAP_TIMER_HAS_DSP_IRQ |OMAP_TIMER_HAS_PWM , -}; -/* timer1 */ static struct omap_hwmod omap44xx_timer1_hwmod = { .name ="timer1" ,
@@ -2560,7 +2539,6 @@ static struct omap_hwmod omap44xx_timer1_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &capability_alwon_dev_attr, };/* timer2 */
@@ -2622,7 +2600,6 @@ static struct omap_hwmod omap44xx_timer5_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &capability_dsp_dev_attr, };/* timer6 */
@@ -2638,7 +2615,6 @@ static struct omap_hwmod omap44xx_timer6_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &capability_dsp_dev_attr, };/* timer7 */
@@ -2654,7 +2630,6 @@ static struct omap_hwmod omap44xx_timer7_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &capability_dsp_dev_attr, };/* timer8 */
@@ -2670,7 +2645,6 @@ static struct omap_hwmod omap44xx_timer8_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &capability_dsp_pwm_dev_attr, };/* timer9 */
@@ -2686,7 +2660,6 @@ static struct omap_hwmod omap44xx_timer9_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &capability_pwm_dev_attr, };/* timer10 */
@@ -2703,7 +2676,6 @@ static struct omap_hwmod omap44xx_timer10_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &capability_pwm_dev_attr, };/* timer11 */
@@ -2719,7 +2691,6 @@ static struct omap_hwmod omap44xx_timer11_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &capability_pwm_dev_attr, };/*
arch/arm/mach-omap2/omap_hwmod_54xx_data.c +0 -1
@@ -25,7 +25,6 @@#include <linux/omap-dma.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/asoc-ti-mcbsp.h> -#include <plat/dmtimer.h> #include "omap_hwmod.h" #include "omap_hwmod_common_data.h"
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0 -1
@@ -25,7 +25,6 @@#include <linux/omap-dma.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/asoc-ti-mcbsp.h> -#include <plat/dmtimer.h> #include "omap_hwmod.h" #include "omap_hwmod_common_data.h"
arch/arm/mach-omap2/omap_hwmod_81xx_data.c +0 -14
@@ -17,7 +17,6 @@#include <linux/platform_data/hsmmc-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h> -#include <plat/dmtimer.h> #include "omap_hwmod_common_data.h" #include "cm81xx.h"
@@ -646,15 +645,10 @@ static struct omap_hwmod_class dm816x_timer_hwmod_class = { .sysc = &dm816x_timer_sysc, }; -static struct omap_timer_capability_dev_attr capability_alwon_dev_attr = { - .timer_capability =OMAP_TIMER_ALWON , -}; -static struct omap_hwmod dm814x_timer1_hwmod = { .name ="timer1" , .clkdm_name ="alwon_l3s_clkdm" , .main_clk ="timer1_fck" , - .dev_attr = &capability_alwon_dev_attr, .class = &dm816x_timer_hwmod_class, .flags =HWMOD_NO_IDLEST , };
@@ -676,7 +670,6 @@ static struct omap_hwmod dm816x_timer1_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &capability_alwon_dev_attr, .class = &dm816x_timer_hwmod_class, };
@@ -691,7 +684,6 @@ static struct omap_hwmod dm814x_timer2_hwmod = { .name = "timer2", .clkdm_name = "alwon_l3s_clkdm", .main_clk = "timer2_fck", - .dev_attr = &capability_alwon_dev_attr, .class = &dm816x_timer_hwmod_class, .flags = HWMOD_NO_IDLEST, };
@@ -713,7 +705,6 @@ static struct omap_hwmod dm816x_timer2_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &capability_alwon_dev_attr, .class = &dm816x_timer_hwmod_class, };
@@ -734,7 +725,6 @@ static struct omap_hwmod dm816x_timer3_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &capability_alwon_dev_attr, .class = &dm816x_timer_hwmod_class, };
@@ -755,7 +745,6 @@ static struct omap_hwmod dm816x_timer4_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &capability_alwon_dev_attr, .class = &dm816x_timer_hwmod_class, };
@@ -776,7 +765,6 @@ static struct omap_hwmod dm816x_timer5_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &capability_alwon_dev_attr, .class = &dm816x_timer_hwmod_class, };
@@ -797,7 +785,6 @@ static struct omap_hwmod dm816x_timer6_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &capability_alwon_dev_attr, .class = &dm816x_timer_hwmod_class, };
@@ -818,7 +805,6 @@ static struct omap_hwmod dm816x_timer7_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &capability_alwon_dev_attr, .class = &dm816x_timer_hwmod_class, };
arch/arm/plat-omap/include/plat/dmtimer.h +0 -4
@@ -75,10 +75,6 @@*/ #define OMAP_TIMER_ERRATA_I103_I767 0x80000000 -struct omap_timer_capability_dev_attr { -u32 timer_capability; -}; -struct timer_regs {u32 tidr;u32 tier;
Signature · 1 line
2.15.1
PATCH 6/9 ARM: OMAP2+: Cleanup omap2_spi_dev_attr and other legacy data
In reply to Suman AnnaThe omap2_spi_dev_attr data was used to supply instance-specific data for legacy non-DT devices. The SPI legacy device support including the usage of the hwmod class revision data has been dropped in commit 6f3ab009a178 ("ARM: OMAP2+: Remove unused legacy code for device init") and this data is therefore no longer needed. So, cleanup the structure and all the associated data in various hwmod data files.
--- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 1 - arch/arm/mach-omap2/omap_hwmod_2430_data.c | 6 ----- arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 12 ---------- .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 2 -- .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 7 ------ arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 -- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 26 ---------------------- arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 4 ---- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 22 ------------------ arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 26 ---------------------- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 26 ---------------------- arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 7 ------ include/linux/platform_data/spi-omap2-mcspi.h | 8 ------- 13 files changed, 149 deletions(-)
arch/arm/mach-omap2/omap_hwmod_2420_data.c +0 -1
@@ -14,7 +14,6 @@*/ #include <linux/i2c-omap.h> -#include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/omap-dma.h> #include "omap_hwmod.h"
arch/arm/mach-omap2/omap_hwmod_2430_data.c +0 -6
@@ -16,7 +16,6 @@#include <linux/i2c-omap.h> #include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/hsmmc-omap.h> -#include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/omap-dma.h> #include "omap_hwmod.h"
@@ -157,10 +156,6 @@ static struct omap_hwmod omap2430_mailbox_hwmod = { };/* mcspi3 */ -static struct omap2_mcspi_dev_attr omap_mcspi3_dev_attr = { - .num_chipselect =2 , -}; -static struct omap_hwmod omap2430_mcspi3_hwmod = { .name ="mcspi3" , .main_clk ="mcspi3_fck" ,
@@ -172,7 +167,6 @@ static struct omap_hwmod omap2430_mcspi3_hwmod = { }, }, .class = &omap2xxx_mcspi_class, - .dev_attr = &omap_mcspi3_dev_attr, };/* usbhsotg */
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +0 -12
@@ -10,7 +10,6 @@*/ #include <linux/omap-dma.h> -#include <linux/platform_data/spi-omap2-mcspi.h> #include "omap_hwmod.h" #include "omap_hwmod_common_data.h"
@@ -157,7 +156,6 @@ static struct omap_hwmod_class_sysconfig omap2xxx_mcspi_sysc = {struct omap_hwmod_class omap2xxx_mcspi_class = { .name ="mcspi" , .sysc = &omap2xxx_mcspi_sysc, - .rev =OMAP2_MCSPI_REV , };/*
@@ -591,10 +589,6 @@ struct omap_hwmod omap2xxx_gpio4_hwmod = { };/* mcspi1 */ -static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = { - .num_chipselect =4 , -}; -struct omap_hwmod omap2xxx_mcspi1_hwmod = { .name ="mcspi1" , .main_clk ="mcspi1_fck" ,
@@ -606,14 +600,9 @@ struct omap_hwmod omap2xxx_mcspi1_hwmod = { }, }, .class = &omap2xxx_mcspi_class, - .dev_attr = &omap_mcspi1_dev_attr, };/* mcspi2 */ -static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = { - .num_chipselect =2 , -}; -struct omap_hwmod omap2xxx_mcspi2_hwmod = { .name ="mcspi2" , .main_clk ="mcspi2_fck" ,
@@ -625,7 +614,6 @@ struct omap_hwmod omap2xxx_mcspi2_hwmod = { }, }, .class = &omap2xxx_mcspi_class, - .dev_attr = &omap_mcspi2_dev_attr, };static struct omap_hwmod_class omap2xxx_counter_hwmod_class = {
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h +0 -2
@@ -139,8 +139,6 @@ extern struct omap_hwmod_class am33xx_epwmss_hwmod_class;extern struct omap_hwmod_class am33xx_ehrpwm_hwmod_class;extern struct omap_hwmod_class am33xx_spi_hwmod_class; -extern struct omap2_mcspi_dev_attr mcspi_attrib; -void omap_hwmod_am33xx_reg (void );void omap_hwmod_am43xx_reg (void );
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +0 -7
@@ -15,7 +15,6 @@*/ #include <linux/platform_data/hsmmc-omap.h> -#include <linux/platform_data/spi-omap2-mcspi.h> #include "omap_hwmod.h" #include "i2c.h" #include "wd_timer.h"
@@ -877,13 +876,9 @@ static struct omap_hwmod_class_sysconfig am33xx_mcspi_sysc = {struct omap_hwmod_class am33xx_spi_hwmod_class = { .name ="mcspi" , .sysc = &am33xx_mcspi_sysc, - .rev =OMAP4_MCSPI_REV , };/* spi0 */ -struct omap2_mcspi_dev_attr mcspi_attrib = { - .num_chipselect =2 , -};struct omap_hwmod am33xx_spi0_hwmod = { .name ="spi0" , .class = &am33xx_spi_hwmod_class,
@@ -894,7 +889,6 @@ struct omap_hwmod am33xx_spi0_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &mcspi_attrib, };/* spi1 */
@@ -908,7 +902,6 @@ struct omap_hwmod am33xx_spi1_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &mcspi_attrib, };/*
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +0 -2
@@ -17,8 +17,6 @@#include <linux/i2c-omap.h> #include "omap_hwmod.h" -#include <linux/platform_data/spi-omap2-mcspi.h> -#include "omap_hwmod_common_data.h" #include "control.h"
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +0 -26
@@ -23,7 +23,6 @@#include "l3_3xxx.h" #include "l4_3xxx.h" #include <linux/platform_data/asoc-ti-mcbsp.h> -#include <linux/platform_data/spi-omap2-mcspi.h> #include "soc.h" #include "omap_hwmod.h"
@@ -1189,14 +1188,9 @@ static struct omap_hwmod_class_sysconfig omap34xx_mcspi_sysc = {static struct omap_hwmod_class omap34xx_mcspi_class = { .name ="mcspi" , .sysc = &omap34xx_mcspi_sysc, - .rev =OMAP3_MCSPI_REV , };/* mcspi1 */ -static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = { - .num_chipselect =4 , -}; -static struct omap_hwmod omap34xx_mcspi1 = { .name ="mcspi1" , .main_clk ="mcspi1_fck" ,
@@ -1208,14 +1202,9 @@ static struct omap_hwmod omap34xx_mcspi1 = { }, }, .class = &omap34xx_mcspi_class, - .dev_attr = &omap_mcspi1_dev_attr, };/* mcspi2 */ -static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = { - .num_chipselect =2 , -}; -static struct omap_hwmod omap34xx_mcspi2 = { .name ="mcspi2" , .main_clk ="mcspi2_fck" ,
@@ -1227,16 +1216,9 @@ static struct omap_hwmod omap34xx_mcspi2 = { }, }, .class = &omap34xx_mcspi_class, - .dev_attr = &omap_mcspi2_dev_attr, };/* mcspi3 */ - - -static struct omap2_mcspi_dev_attr omap_mcspi3_dev_attr = { - .num_chipselect =2 , -}; -static struct omap_hwmod omap34xx_mcspi3 = { .name ="mcspi3" , .main_clk ="mcspi3_fck" ,
@@ -1248,16 +1230,9 @@ static struct omap_hwmod omap34xx_mcspi3 = { }, }, .class = &omap34xx_mcspi_class, - .dev_attr = &omap_mcspi3_dev_attr, };/* mcspi4 */ - - -static struct omap2_mcspi_dev_attr omap_mcspi4_dev_attr = { - .num_chipselect =1 , -}; -static struct omap_hwmod omap34xx_mcspi4 = { .name ="mcspi4" , .main_clk ="mcspi4_fck" ,
@@ -1269,7 +1244,6 @@ static struct omap_hwmod omap34xx_mcspi4 = { }, }, .class = &omap34xx_mcspi_class, - .dev_attr = &omap_mcspi4_dev_attr, };/* usbhsotg */
arch/arm/mach-omap2/omap_hwmod_43xx_data.c +0 -4
@@ -14,7 +14,6 @@* GNU General Public License for more details. */ -#include <linux/platform_data/spi-omap2-mcspi.h> #include "omap_hwmod.h" #include "omap_hwmod_33xx_43xx_common_data.h" #include "prcm43xx.h"
@@ -237,7 +236,6 @@ static struct omap_hwmod am43xx_spi2_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &mcspi_attrib, }; static struct omap_hwmod am43xx_spi3_hwmod = {
@@ -251,7 +249,6 @@ static struct omap_hwmod am43xx_spi3_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &mcspi_attrib, }; static struct omap_hwmod am43xx_spi4_hwmod = {
@@ -265,7 +262,6 @@ static struct omap_hwmod am43xx_spi4_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &mcspi_attrib, }; static struct omap_hwmod_opt_clk gpio4_opt_clks[] = {
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -22
@@ -27,7 +27,6 @@#include <linux/omap-dma.h> -#include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/asoc-ti-mcbsp.h> #include "omap_hwmod.h"
@@ -1838,14 +1837,9 @@ static struct omap_hwmod_class_sysconfig omap44xx_mcspi_sysc = {static struct omap_hwmod_class omap44xx_mcspi_hwmod_class = { .name ="mcspi" , .sysc = &omap44xx_mcspi_sysc, - .rev =OMAP4_MCSPI_REV , };/* mcspi1 */ -static struct omap2_mcspi_dev_attr mcspi1_dev_attr = { - .num_chipselect =4 , -}; -static struct omap_hwmod omap44xx_mcspi1_hwmod = { .name ="mcspi1" , .class = &omap44xx_mcspi_hwmod_class,
@@ -1858,14 +1852,9 @@ static struct omap_hwmod omap44xx_mcspi1_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &mcspi1_dev_attr, };/* mcspi2 */ -static struct omap2_mcspi_dev_attr mcspi2_dev_attr = { - .num_chipselect =2 , -}; -static struct omap_hwmod omap44xx_mcspi2_hwmod = { .name ="mcspi2" , .class = &omap44xx_mcspi_hwmod_class,
@@ -1878,14 +1867,9 @@ static struct omap_hwmod omap44xx_mcspi2_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &mcspi2_dev_attr, };/* mcspi3 */ -static struct omap2_mcspi_dev_attr mcspi3_dev_attr = { - .num_chipselect =2 , -}; -static struct omap_hwmod omap44xx_mcspi3_hwmod = { .name ="mcspi3" , .class = &omap44xx_mcspi_hwmod_class,
@@ -1898,14 +1882,9 @@ static struct omap_hwmod omap44xx_mcspi3_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &mcspi3_dev_attr, };/* mcspi4 */ -static struct omap2_mcspi_dev_attr mcspi4_dev_attr = { - .num_chipselect =1 , -}; -static struct omap_hwmod omap44xx_mcspi4_hwmod = { .name ="mcspi4" , .class = &omap44xx_mcspi_hwmod_class,
@@ -1918,7 +1897,6 @@ static struct omap_hwmod omap44xx_mcspi4_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &mcspi4_dev_attr, };/*
arch/arm/mach-omap2/omap_hwmod_54xx_data.c +0 -26
@@ -23,7 +23,6 @@#include <linux/i2c-omap.h> #include <linux/omap-dma.h> -#include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/asoc-ti-mcbsp.h> #include "omap_hwmod.h"
@@ -1123,15 +1122,9 @@ static struct omap_hwmod_class_sysconfig omap54xx_mcspi_sysc = {static struct omap_hwmod_class omap54xx_mcspi_hwmod_class = { .name ="mcspi" , .sysc = &omap54xx_mcspi_sysc, - .rev =OMAP4_MCSPI_REV , };/* mcspi1 */ -/* mcspi1 dev_attr */ -static struct omap2_mcspi_dev_attr mcspi1_dev_attr = { - .num_chipselect =4 , -}; -static struct omap_hwmod omap54xx_mcspi1_hwmod = { .name ="mcspi1" , .class = &omap54xx_mcspi_hwmod_class,
@@ -1144,15 +1137,9 @@ static struct omap_hwmod omap54xx_mcspi1_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &mcspi1_dev_attr, };/* mcspi2 */ -/* mcspi2 dev_attr */ -static struct omap2_mcspi_dev_attr mcspi2_dev_attr = { - .num_chipselect =2 , -}; -static struct omap_hwmod omap54xx_mcspi2_hwmod = { .name ="mcspi2" , .class = &omap54xx_mcspi_hwmod_class,
@@ -1165,15 +1152,9 @@ static struct omap_hwmod omap54xx_mcspi2_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &mcspi2_dev_attr, };/* mcspi3 */ -/* mcspi3 dev_attr */ -static struct omap2_mcspi_dev_attr mcspi3_dev_attr = { - .num_chipselect =2 , -}; -static struct omap_hwmod omap54xx_mcspi3_hwmod = { .name ="mcspi3" , .class = &omap54xx_mcspi_hwmod_class,
@@ -1186,15 +1167,9 @@ static struct omap_hwmod omap54xx_mcspi3_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &mcspi3_dev_attr, };/* mcspi4 */ -/* mcspi4 dev_attr */ -static struct omap2_mcspi_dev_attr mcspi4_dev_attr = { - .num_chipselect =1 , -}; -static struct omap_hwmod omap54xx_mcspi4_hwmod = { .name ="mcspi4" , .class = &omap54xx_mcspi_hwmod_class,
@@ -1207,7 +1182,6 @@ static struct omap_hwmod omap54xx_mcspi4_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &mcspi4_dev_attr, };/*
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0 -26
@@ -23,7 +23,6 @@#include <linux/i2c-omap.h> #include <linux/omap-dma.h> -#include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/asoc-ti-mcbsp.h> #include "omap_hwmod.h"
@@ -1375,15 +1374,9 @@ static struct omap_hwmod_class_sysconfig dra7xx_mcspi_sysc = {static struct omap_hwmod_class dra7xx_mcspi_hwmod_class = { .name ="mcspi" , .sysc = &dra7xx_mcspi_sysc, - .rev =OMAP4_MCSPI_REV , };/* mcspi1 */ -/* mcspi1 dev_attr */ -static struct omap2_mcspi_dev_attr mcspi1_dev_attr = { - .num_chipselect =4 , -}; -static struct omap_hwmod dra7xx_mcspi1_hwmod = { .name ="mcspi1" , .class = &dra7xx_mcspi_hwmod_class,
@@ -1396,15 +1389,9 @@ static struct omap_hwmod dra7xx_mcspi1_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &mcspi1_dev_attr, };/* mcspi2 */ -/* mcspi2 dev_attr */ -static struct omap2_mcspi_dev_attr mcspi2_dev_attr = { - .num_chipselect =2 , -}; -static struct omap_hwmod dra7xx_mcspi2_hwmod = { .name ="mcspi2" , .class = &dra7xx_mcspi_hwmod_class,
@@ -1417,15 +1404,9 @@ static struct omap_hwmod dra7xx_mcspi2_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &mcspi2_dev_attr, };/* mcspi3 */ -/* mcspi3 dev_attr */ -static struct omap2_mcspi_dev_attr mcspi3_dev_attr = { - .num_chipselect =2 , -}; -static struct omap_hwmod dra7xx_mcspi3_hwmod = { .name ="mcspi3" , .class = &dra7xx_mcspi_hwmod_class,
@@ -1438,15 +1419,9 @@ static struct omap_hwmod dra7xx_mcspi3_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &mcspi3_dev_attr, };/* mcspi4 */ -/* mcspi4 dev_attr */ -static struct omap2_mcspi_dev_attr mcspi4_dev_attr = { - .num_chipselect =1 , -}; -static struct omap_hwmod dra7xx_mcspi4_hwmod = { .name ="mcspi4" , .class = &dra7xx_mcspi_hwmod_class,
@@ -1459,7 +1434,6 @@ static struct omap_hwmod dra7xx_mcspi4_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .dev_attr = &mcspi4_dev_attr, };/*
arch/arm/mach-omap2/omap_hwmod_81xx_data.c +0 -7
@@ -16,7 +16,6 @@*/ #include <linux/platform_data/hsmmc-omap.h> -#include <linux/platform_data/spi-omap2-mcspi.h> #include "omap_hwmod_common_data.h" #include "cm81xx.h"
@@ -1116,11 +1115,6 @@ static struct omap_hwmod_class_sysconfig dm816x_mcspi_sysc = {static struct omap_hwmod_class dm816x_mcspi_class = { .name ="mcspi" , .sysc = &dm816x_mcspi_sysc, - .rev =OMAP3_MCSPI_REV , -}; - -static struct omap2_mcspi_dev_attr dm816x_mcspi1_dev_attr = { - .num_chipselect =4 , };static struct omap_hwmod dm81xx_mcspi1_hwmod = {
@@ -1134,7 +1128,6 @@ static struct omap_hwmod dm81xx_mcspi1_hwmod = { }, }, .class = &dm816x_mcspi_class, - .dev_attr = &dm816x_mcspi1_dev_attr, };static struct omap_hwmod_ocp_if dm81xx_l4_ls__mcspi1 = {
include/linux/platform_data/spi-omap2-mcspi.h +0 -8
@@ -2,10 +2,6 @@#ifndef _OMAP2_MCSPI_H#define _OMAP2_MCSPI_H -#define OMAP2_MCSPI_REV 0 -#define OMAP3_MCSPI_REV 1 -#define OMAP4_MCSPI_REV 2 -#define OMAP4_MCSPI_REG_OFFSET 0x100#define MCSPI_PINDIR_D0_IN_D1_OUT 0
@@ -17,10 +13,6 @@ struct omap2_mcspi_platform_config { unsigned int pin_dir:1; }; -struct omap2_mcspi_dev_attr { -unsigned short num_chipselect; -}; -struct omap2_mcspi_device_config {unsigned turbo_mode:1 ;
Signature · 1 line
2.15.1
PATCH 7/9 ARM: OMAP2+: Cleanup omap_mcbsp_dev_attr and other legacy data
In reply to Suman AnnaThe omap_mcbsp_dev_attr data was used to supply instance-specific data for legacy non-DT devices. The legacy McBSP device support including the usage of the hwmod class revision data has been dropped in commit 48f6693790aa ("ARM: OMAP2+: Remove unused legacy code for McBSP") and this data is therefore no longer needed. So, cleanup the structure and all the associated data in various hwmod data files.
--- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 -- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 21 --------------------- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 --- arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 2 -- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 1 - include/linux/platform_data/asoc-ti-mcbsp.h | 12 ------------ 6 files changed, 41 deletions(-)
arch/arm/mach-omap2/omap_hwmod_2430_data.c +0 -2
@@ -14,7 +14,6 @@*/ #include <linux/i2c-omap.h> -#include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/hsmmc-omap.h> #include <linux/omap-dma.h>
@@ -223,7 +222,6 @@ static struct omap_hwmod_class_sysconfig omap2430_mcbsp_sysc = {static struct omap_hwmod_class omap2430_mcbsp_hwmod_class = { .name ="mcbsp" , .sysc = &omap2430_mcbsp_sysc, - .rev =MCBSP_CONFIG_TYPE2 , };static struct omap_hwmod_opt_clk mcbsp_opt_clks[] = {
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +0 -21
@@ -22,7 +22,6 @@#include <linux/omap-dma.h> #include "l3_3xxx.h" #include "l4_3xxx.h" -#include <linux/platform_data/asoc-ti-mcbsp.h> #include "soc.h" #include "omap_hwmod.h"
@@ -896,7 +895,6 @@ static struct omap_hwmod_class_sysconfig omap3xxx_mcbsp_sysc = {static struct omap_hwmod_class omap3xxx_mcbsp_hwmod_class = { .name ="mcbsp" , .sysc = &omap3xxx_mcbsp_sysc, - .rev =MCBSP_CONFIG_TYPE3 , };/* McBSP functional clock mapping */
@@ -911,7 +909,6 @@ static struct omap_hwmod_opt_clk mcbsp234_opt_clks[] = { };/* mcbsp1 */ -static struct omap_hwmod omap3xxx_mcbsp1_hwmod = { .name ="mcbsp1" , .class = &omap3xxx_mcbsp_hwmod_class,
@@ -928,11 +925,6 @@ static struct omap_hwmod omap3xxx_mcbsp1_hwmod = { };/* mcbsp2 */ - -static struct omap_mcbsp_dev_attr omap34xx_mcbsp2_dev_attr = { - .sidetone ="mcbsp2_sidetone" , -}; -static struct omap_hwmod omap3xxx_mcbsp2_hwmod = { .name ="mcbsp2" , .class = &omap3xxx_mcbsp_hwmod_class,
@@ -946,15 +938,9 @@ static struct omap_hwmod omap3xxx_mcbsp2_hwmod = { }, .opt_clks = mcbsp234_opt_clks, .opt_clks_cnt = ARRAY_SIZE(mcbsp234_opt_clks), - .dev_attr = &omap34xx_mcbsp2_dev_attr, };/* mcbsp3 */ - -static struct omap_mcbsp_dev_attr omap34xx_mcbsp3_dev_attr = { - .sidetone ="mcbsp3_sidetone" , -}; -static struct omap_hwmod omap3xxx_mcbsp3_hwmod = { .name ="mcbsp3" , .class = &omap3xxx_mcbsp_hwmod_class,
@@ -968,12 +954,9 @@ static struct omap_hwmod omap3xxx_mcbsp3_hwmod = { }, .opt_clks = mcbsp234_opt_clks, .opt_clks_cnt = ARRAY_SIZE(mcbsp234_opt_clks), - .dev_attr = &omap34xx_mcbsp3_dev_attr, };/* mcbsp4 */ - -static struct omap_hwmod omap3xxx_mcbsp4_hwmod = { .name ="mcbsp4" , .class = &omap3xxx_mcbsp_hwmod_class,
@@ -990,8 +973,6 @@ static struct omap_hwmod omap3xxx_mcbsp4_hwmod = { };/* mcbsp5 */ - -static struct omap_hwmod omap3xxx_mcbsp5_hwmod = { .name ="mcbsp5" , .class = &omap3xxx_mcbsp_hwmod_class,
@@ -1020,7 +1001,6 @@ static struct omap_hwmod_class omap3xxx_mcbsp_sidetone_hwmod_class = { };/* mcbsp2_sidetone */ -static struct omap_hwmod omap3xxx_mcbsp2_sidetone_hwmod = { .name ="mcbsp2_sidetone" , .class = &omap3xxx_mcbsp_sidetone_hwmod_class,
@@ -1029,7 +1009,6 @@ static struct omap_hwmod omap3xxx_mcbsp2_sidetone_hwmod = { };/* mcbsp3_sidetone */ -static struct omap_hwmod omap3xxx_mcbsp3_sidetone_hwmod = { .name ="mcbsp3_sidetone" , .class = &omap3xxx_mcbsp_sidetone_hwmod_class,
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -3
@@ -27,8 +27,6 @@#include <linux/omap-dma.h> -#include <linux/platform_data/asoc-ti-mcbsp.h> -#include "omap_hwmod.h" #include "omap_hwmod_common_data.h" #include "cm1_44xx.h"
@@ -1679,7 +1677,6 @@ static struct omap_hwmod_class_sysconfig omap44xx_mcbsp_sysc = {static struct omap_hwmod_class omap44xx_mcbsp_hwmod_class = { .name ="mcbsp" , .sysc = &omap44xx_mcbsp_sysc, - .rev =MCBSP_CONFIG_TYPE4 , };/* mcbsp1 */
arch/arm/mach-omap2/omap_hwmod_54xx_data.c +0 -2
@@ -23,7 +23,6 @@#include <linux/i2c-omap.h> #include <linux/omap-dma.h> -#include <linux/platform_data/asoc-ti-mcbsp.h> #include "omap_hwmod.h" #include "omap_hwmod_common_data.h"
@@ -985,7 +984,6 @@ static struct omap_hwmod_class_sysconfig omap54xx_mcbsp_sysc = {static struct omap_hwmod_class omap54xx_mcbsp_hwmod_class = { .name ="mcbsp" , .sysc = &omap54xx_mcbsp_sysc, - .rev =MCBSP_CONFIG_TYPE4 , };/* mcbsp1 */
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0 -1
@@ -23,7 +23,6 @@#include <linux/i2c-omap.h> #include <linux/omap-dma.h> -#include <linux/platform_data/asoc-ti-mcbsp.h> #include "omap_hwmod.h" #include "omap_hwmod_common_data.h"
include/linux/platform_data/asoc-ti-mcbsp.h +0 -12
@@ -25,10 +25,6 @@#include <linux/spinlock.h> #include <linux/clk.h> -#define MCBSP_CONFIG_TYPE2 0x2 -#define MCBSP_CONFIG_TYPE3 0x3 -#define MCBSP_CONFIG_TYPE4 0x4 -/* Platform specific configuration */ struct omap_mcbsp_ops {void (*request)(unsigned int );
@@ -47,14 +43,6 @@ struct omap_mcbsp_platform_data { int (*force_ick_on)(struct clk *clk, bool force_on); }; -/** -* omap_mcbsp_dev_attr - OMAP McBSP device attributes for omap_hwmod -* @sidetone: name of the sidetone device -*/ -struct omap_mcbsp_dev_attr { -const char *sidetone; -}; -void omap3_mcbsp_init_pdata_callback (struct omap_mcbsp_platform_data *pdata);#endif
Signature · 1 line
2.15.1
PATCH 8/9 ARM: OMAP: Move plat/i2c.h into mach-omap1 folder
In reply to Suman AnnaThe current contents of plat/i2c.h are only relevant for OMAP1 platforms, as all the equivalent functions for OMAP2 has been dropped in commit 65fa3e719f36 ("ARM: OMAP2+: Remove legacy i2c.c platform init code"), and which has also moved the left-over code from plat-omap into mach-omap1. The hwmod is a concept only applicable for OMAP2 platforms, and the omap_i2c_reset() is already declared in mach-omap2/i2c.h. So, move the current plat/i2c.h header file into the mach-omap1 folder, and adjust the header usage accordingly.
---
arch/arm/mach-omap1/common.h | 3 +--
arch/arm/mach-omap1/i2c.c | 2 --
arch/arm/{plat-omap/include/plat => mach-omap1}/i2c.h | 9 +++------
arch/arm/mach-omap2/i2c.h | 4 ++--
4 files changed, 6 insertions(+), 12 deletions(-)
rename arch/arm/{plat-omap/include/plat => mach-omap1}/i2c.h (90%)arch/arm/mach-omap1/common.h +1 -2
@@ -32,11 +32,10 @@#include <asm/exception.h> -#include <plat/i2c.h> -#include <mach/irqs.h> #include "soc.h" +#include "i2c.h" #if defined(CONFIG_ARCH_OMAP730 ) || defined(CONFIG_ARCH_OMAP850 )void omap7xx_map_io (void );
arch/arm/mach-omap1/i2c.c +0 -2
@@ -24,8 +24,6 @@#include <mach/mux.h> #include "soc.h" -#include <plat/i2c.h> -#define OMAP_I2C_SIZE 0x3f#define OMAP1_I2C_BASE 0xfffb3800
arch/arm/mach-omap1/i2c.h renamed from arch/arm/plat-omap/include/plat/i2c.h +3 -6
@@ -19,8 +19,8 @@* */ -#ifndef __PLAT_OMAP_I2C_H -#define __PLAT_OMAP_I2C_H +#ifndef __ARCH_ARM_MACH_OMAP1_I2C_H +#define __ARCH_ARM_MACH_OMAP1_I2C_Hstruct i2c_board_info ;struct omap_i2c_bus_platform_data ;
@@ -47,7 +47,4 @@ static inline int omap_register_i2c_bus_cmdline(void) }#endif -struct omap_hwmod ; -int omap_i2c_reset (struct omap_hwmod *oh); - -#endif /* __PLAT_OMAP_I2C_H */ +#endif /* __ARCH_ARM_MACH_OMAP1_I2C_H */
arch/arm/mach-omap2/i2c.h +2 -2
@@ -19,11 +19,11 @@* */ -#include <plat/i2c.h> -#ifndef __MACH_OMAP2_I2C_H#define __MACH_OMAP2_I2C_H +struct omap_hwmod ; +int omap_i2c_reset (struct omap_hwmod *oh);#endif /* __MACH_OMAP2_I2C_H */
Signature · 1 line
2.15.1
PATCH 9/9 ARM: OMAP2+: Remove unused gpio header file references
In reply to Suman AnnaDrop stale references to the generic and OMAP gpio header files from couple of files which no longer invoke any gpio functions.
--- arch/arm/mach-omap2/devices.c | 2 +- arch/arm/mach-omap2/hsmmc.c | 2 -- arch/arm/mach-omap2/msdi.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-)
arch/arm/mach-omap2/devices.c +1 -1
@@ -8,7 +8,7 @@* the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ -#include <linux/gpio.h> +#include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
arch/arm/mach-omap2/hsmmc.c +0 -2
@@ -13,9 +13,7 @@#include <linux/slab.h> #include <linux/string.h> #include <linux/delay.h> -#include <linux/gpio.h> #include <linux/mmc/host.h> -#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/hsmmc-omap.h> #include "soc.h"
arch/arm/mach-omap2/msdi.c +0 -1
@@ -23,7 +23,6 @@#include <linux/kernel.h> #include <linux/err.h> -#include <linux/platform_data/gpio-omap.h> #include "prm.h" #include "common.h"
Signature · 1 line
2.15.1
Tony Lindgren
maintainercover Some OMAP2+ legacy hwmod data cleanup
In reply to Suman AnnaQuoted 7 lines · Suman Anna
Hi Tony,
The following series cleans up some legacy
dev_attrdata associated with OMAP DMTimer, I2C, McBSP, McSPI and GPIO modules and removes roughly ~500 lines. Patches are based on v4.16-rc1. I have build tested for both omap2plus and omap1 defconfigs, and booted on a few OMAP4+ boards that I have on my desk.
Hey that's great :)
Quoted 11 lines
Here is the patch summary:
1. First two patches fixes header inclusion inomap-dmaengine.handhsmmc-omap.has I am getting build errors on subsequent patches when I removed some of theplatform_dataheader files.
2. Patches 3 through 7 remove the .dev_attr data for the above modules from various hwmod data files and some macros from McSPI & McBSP platform data header files
3. Patch 8 moves theplat-omap/include/plat/i2c.hinto mach-omap1 folder as there is no common i2c code in plat-omap folder anymore.
4. Last patch is a minor cleanup of gpio headers from couple of files.
Quoted 5 lines
Some important notes/comments:
- The DMTimer patch cleanup will conflict with Keerthy's current dmtimer-> clocksource series, but ideally he wouldn't need to convert theplat/dmtimer.hinto a clocksource header with the removal of theplat/dmtimer.hinclusion from the hwmod data files.
OK. It seems that we should do the clean up first if it just means leaving out unused header files.
Quoted 7 lines
- I found some gaps w.r.t DMTimers on DM814x/DM816x platforms, and haven't fixed them. Both seems to have DMTimer1 through 8, but only DMTimers 1, 2 and 3 are defined in
dm814x.dtsi, whiledm816x.dtsiis missing DMTimer8. DMTimer3 hwmod is not in the dm814x hwmod list, while DMTimer8 is left out altogther. The timer capabilities are also different between the hwmod data files (lists always-on) which is missing from corresponding dts files. Not sure which one is correct.
OK we should fix them. The capabilities can be seen by looking at the hardware and clockdomains. The always-on timers are of sysc type 1 (ti,sysc-omap2-timer) and in a always on power domain. The others are of sysc type 2 (ti,sysc-omap4-timer). We should get warnings for those from ti,sysc driver eventually if they don't match :)
Quoted 3 lines
This leaves the hsmmc-omap and omap-dma pieces still using the .dev_attr. The former is only used by one OMAP3 board, so can be cleaned up if we limit the init code just for that one board.
I think Nikolaus had patches coming for removing the last user of mmc pdata?
I think all we need to do is have pandora_wl1251_init_card initialized in the MMC driver based on a compatible value..
Regards,
Tony
cover Some OMAP2+ legacy hwmod data cleanup
Hi,
Quoted 48 lines
Am 13.02.2018 um 16:46 schrieb Tony Lindgren <[email protected]>:
Quoted 7 lines · Suman Anna
Hi Tony,
The following series cleans up some legacy
dev_attrdata associated with OMAP DMTimer, I2C, McBSP, McSPI and GPIO modules and removes roughly ~500 lines. Patches are based on v4.16-rc1. I have build tested for both omap2plus and omap1 defconfigs, and booted on a few OMAP4+ boards that I have on my desk.Hey that's great :)
Quoted 11 lines
Here is the patch summary:
1. First two patches fixes header inclusion inomap-dmaengine.handhsmmc-omap.has I am getting build errors on subsequent patches when I removed some of theplatform_dataheader files.
2. Patches 3 through 7 remove the .dev_attr data for the above modules from various hwmod data files and some macros from McSPI & McBSP platform data header files
3. Patch 8 moves theplat-omap/include/plat/i2c.hinto mach-omap1 folder as there is no common i2c code in plat-omap folder anymore.
4. Last patch is a minor cleanup of gpio headers from couple of files.Quoted 5 lines
Some important notes/comments:
- The DMTimer patch cleanup will conflict with Keerthy's current dmtimer-> clocksource series, but ideally he wouldn't need to convert theplat/dmtimer.hinto a clocksource header with the removal of theplat/dmtimer.hinclusion from the hwmod data files.OK. It seems that we should do the clean up first if it just means leaving out unused header files.
Quoted 7 lines
- I found some gaps w.r.t DMTimers on DM814x/DM816x platforms, and haven't fixed them. Both seems to have DMTimer1 through 8, but only DMTimers 1, 2 and 3 are defined in
dm814x.dtsi, whiledm816x.dtsiis missing DMTimer8. DMTimer3 hwmod is not in the dm814x hwmod list, while DMTimer8 is left out altogther. The timer capabilities are also different between the hwmod data files (lists always-on) which is missing from corresponding dts files. Not sure which one is correct.OK we should fix them. The capabilities can be seen by looking at the hardware and clockdomains. The always-on timers are of sysc type 1 (ti,sysc-omap2-timer) and in a always on power domain. The others are of sysc type 2 (ti,sysc-omap4-timer). We should get warnings for those from ti,sysc driver eventually if they don't match :)
Quoted 6 lines
Quoted 3 lines
This leaves the hsmmc-omap and omap-dma pieces still using the .dev_attr. The former is only used by one OMAP3 board, so can be cleaned up if we limit the init code just for that one board.
I think Nikolaus had patches coming for removing the last user of mmc pdata?
Well, the idea was to convert the wl1251 driver to DT (like e.g. wl183x) and get rid of the pdata. But I didn't find any time to work on this, especially since the driver itself is broken for a while (I think up to 4.11 the wl1251 was found and working, after that it wasn't working and after 4.14 or so it wasn't even found any more). Probably some simple things, but as usual time consuming to dig into.
Quoted 3 lines
I think all we need to do is have
pandora_wl1251_init_cardinitialized in the MMC driver based on a compatible value..
Yes, looks so.
BR and thanks,
Nikolaus