Drop some unused omap platform_data
Subsystems (9)
Tony Lindgren
maintainercover Drop some unused omap platform_data
Hi all,
I've rebased the earlier legacy platform data removal patches from few years ago that I've kept stashed in the omap-for-v3.14/omap3-board-removal branch until omap3 became device tree only.
Looks like we still have hwmod data at least for omap4 that is not yet populated in the dts files. I'll fix that up later on.
Meanwhile, if you notice some other unused platform_data related code in mach-omap2, please send patches. I'll be queueing them into omap-for-v4.10/legacy branch.
Regards,
Tony
Javier Martinez Canillas (2):
ARM: OMAP2+: Remove legacy smsc911x and smc91x GPMC support
ARM: OMAP2+: Remove legacy board-flash.c
Tony Lindgren (12):
ARM: OMAP2+: Remove legacy serial.c
ARM: OMAP2+: Remove legacy i2c.c platform init code
ARM: OMAP2+: Remove legacy PM init
ARM: OMAP2+: Remove legacy twl4030 platform init code
ARM: OMAP2+: Remove legacy usb-host.c platform init code
ARM: OMAP2+: Remove legacy muxing for usb-tusb6010.c
ARM: OMAP2+: Remove legacy usb-musb.c platform init code
ARM: OMAP2+: Remove legacy hwmod mux code
ARM: OMAP2+: Remove legacy mux code
ARM: OMAP2+: Remove legacy data from hwmod for omap3
ARM: OMAP2+: Drop legacy ads7846 init
ARM: OMAP2+: Drop legacy sdram timings
arch/arm/mach-omap1/Kconfig | 26 + arch/arm/mach-omap1/i2c.c | 83 + arch/arm/mach-omap2/Makefile | 16 +- arch/arm/mach-omap2/board-flash.c | 242 --- arch/arm/mach-omap2/board-flash.h | 56 - arch/arm/mach-omap2/common-board-devices.c | 102 - arch/arm/mach-omap2/common-board-devices.h | 8 - arch/arm/mach-omap2/common.h | 9 - arch/arm/mach-omap2/devices.c | 1 - arch/arm/mach-omap2/dss-common.c | 37 - arch/arm/mach-omap2/dss-common.h | 13 - arch/arm/mach-omap2/gpmc-smsc911x.c | 100 - arch/arm/mach-omap2/gpmc-smsc911x.h | 35 - arch/arm/mach-omap2/hsmmc.c | 88 - arch/arm/mach-omap2/i2c.c | 97 - arch/arm/mach-omap2/io.c | 1 - arch/arm/mach-omap2/msdi.c | 1 - arch/arm/mach-omap2/mux.c | 1153 ----------- arch/arm/mach-omap2/mux.h | 352 ---- arch/arm/mach-omap2/mux34xx.c | 2061 -------------------- arch/arm/mach-omap2/mux34xx.h | 402 ---- arch/arm/mach-omap2/omap_hwmod.c | 107 +- .../omap_hwmod_2xxx_3xxx_interconnect_data.c | 149 +- .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 201 +- .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 4 - arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 1 - arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 787 +------- arch/arm/mach-omap2/omap_hwmod_common_data.h | 15 - arch/arm/mach-omap2/pdata-quirks.c | 1 - arch/arm/mach-omap2/pm.c | 66 +- arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h | 51 - arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h | 55 - arch/arm/mach-omap2/sdram-nokia.c | 299 --- arch/arm/mach-omap2/sdram-nokia.h | 12 - arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h | 51 - .../mach-omap2/sdram-qimonda-hyb18m512160af-6.h | 54 - arch/arm/mach-omap2/serial.c | 332 ---- arch/arm/mach-omap2/twl-common.c | 81 - arch/arm/mach-omap2/twl-common.h | 42 - arch/arm/mach-omap2/usb-host.c | 496 ----- arch/arm/mach-omap2/usb-musb.c | 106 - arch/arm/mach-omap2/usb-tusb6010.c | 21 - arch/arm/plat-omap/Kconfig | 26 - arch/arm/plat-omap/Makefile | 3 - arch/arm/plat-omap/i2c.c | 116 -- 45 files changed, 160 insertions(+), 7799 deletions(-) delete mode 100644 arch/arm/mach-omap2/board-flash.c delete mode 100644 arch/arm/mach-omap2/board-flash.h delete mode 100644 arch/arm/mach-omap2/common-board-devices.c delete mode 100644 arch/arm/mach-omap2/dss-common.c delete mode 100644 arch/arm/mach-omap2/dss-common.h delete mode 100644 arch/arm/mach-omap2/gpmc-smsc911x.c delete mode 100644 arch/arm/mach-omap2/gpmc-smsc911x.h delete mode 100644 arch/arm/mach-omap2/mux.c delete mode 100644 arch/arm/mach-omap2/mux.h delete mode 100644 arch/arm/mach-omap2/mux34xx.c delete mode 100644 arch/arm/mach-omap2/mux34xx.h delete mode 100644 arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h delete mode 100644 arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h delete mode 100644 arch/arm/mach-omap2/sdram-nokia.c delete mode 100644 arch/arm/mach-omap2/sdram-nokia.h delete mode 100644 arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h delete mode 100644 arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h delete mode 100644 arch/arm/mach-omap2/serial.c delete mode 100644 arch/arm/mach-omap2/twl-common.c delete mode 100644 arch/arm/mach-omap2/twl-common.h delete mode 100644 arch/arm/mach-omap2/usb-host.c delete mode 100644 arch/arm/mach-omap2/usb-musb.c delete mode 100644 arch/arm/plat-omap/i2c.c
Signature · 1 line
2.10.2
Tony Lindgren
maintainerPATCH 1/14 ARM: OMAP2+: Remove legacy serial.c
We can now initialize the UARTs using device tree.
--- arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/serial.c | 332 ------------------------------------------- 2 files changed, 1 insertion(+), 333 deletions(-) delete mode 100644 arch/arm/mach-omap2/serial.c
arch/arm/mach-omap2/Makefile +1 -1
@@ -6,7 +6,7 @@ ccflags-y := -I$(srctree)/$(src)/include \ -I$(srctree)/arch/arm/plat-omap/include # Common support -obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o timer.o pm.o \ +obj-y := id.o io.o control.o mux.o devices.o fb.o timer.o pm.o \ common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \ omap_device.o omap-headsmp.o sram.o drm.o
arch/arm/mach-omap2/serial.c deleted +0 -332
332 lines not on this page · raw message
Signature · 1 line
2.10.2
Tony Lindgren
maintainerPATCH 2/14 ARM: OMAP2+: Remove legacy i2c.c platform init code
In reply to Tony LindgrenWe can now initialize I2C for mach-omap2 using device tree. And we can move the remaining code in plat-omap/i2c.c into mach-omap1/i2c.c.
Note that we cannot remove some of the I2C bus reset functions as they are being used by hwmod code.
--- arch/arm/mach-omap1/i2c.c | 83 +++++++++++++++++++++++++++++++ arch/arm/mach-omap2/i2c.c | 97 ------------------------------------ arch/arm/plat-omap/Makefile | 3 -- arch/arm/plat-omap/i2c.c | 116 -------------------------------------------- 4 files changed, 83 insertions(+), 216 deletions(-) delete mode 100644 arch/arm/plat-omap/i2c.c
arch/arm/mach-omap1/i2c.c +83 -0
@@ -19,6 +19,7 @@* */ +#include <linux/i2c.h> #include <linux/i2c-omap.h> #include <mach/mux.h> #include "soc.h"
@@ -91,6 +92,88 @@ int __init omap_i2c_add_bus(struct omap_i2c_bus_platform_data *pdata,return platform_device_register (pdev); } +#define OMAP_I2C_MAX_CONTROLLERS 4 +static struct omap_i2c_bus_platform_data i2c_pdata[OMAP_I2C_MAX_CONTROLLERS ]; + +#define OMAP_I2C_CMDLINE_SETUP (BIT(31)) + +/** +* omap_i2c_bus_setup - Process command line options for the I2C bus speed +* @str: String of options +* +* This function allow to override the default I2C bus speed for given I2C +* bus with a command line option. +* +* Format: i2c_bus=bus_id,clkrate (in kHz) +* +* Returns 1 on success, 0 otherwise. +*/ +static int __init omap_i2c_bus_setup (char *str) +{ +int ints[3 ]; + +get_options (str,3 , ints); +if (ints[0 ] <2 || ints[1 ] <1 || + ints[1 ] >OMAP_I2C_MAX_CONTROLLERS ) +return 0 ; + i2c_pdata[ints[1 ] -1 ].clkrate = ints[2 ]; + i2c_pdata[ints[1 ] -1 ].clkrate |=OMAP_I2C_CMDLINE_SETUP ; + +return 1 ; +} +__setup ("i2c_bus=" , omap_i2c_bus_setup); + +/* +* Register busses defined in command line but that are not registered with +* omap_register_i2c_bus from board initialization code. +*/ +int __init omap_register_i2c_bus_cmdline (void ) +{ +int i, err =0 ; + +for (i =0 ; i <ARRAY_SIZE (i2c_pdata); i++) +if (i2c_pdata[i].clkrate &OMAP_I2C_CMDLINE_SETUP ) { + i2c_pdata[i].clkrate &= ~OMAP_I2C_CMDLINE_SETUP ; + err =omap_i2c_add_bus (&i2c_pdata[i], i +1 ); +if (err) + goto out; + } + +out: +return err; +} + +/** +* omap_register_i2c_bus - register I2C bus with device descriptors +* @bus_id: bus id counting from number 1 +* @clkrate: clock rate of the bus in kHz +* @info: pointer into I2C device descriptor table or NULL +* @len: number of descriptors in the table +* +* Returns 0 on success or an error code. +*/ +int __init omap_register_i2c_bus (int bus_id,u32 clkrate, +struct i2c_board_info const *info, +unsigned len) +{ +int err; + +BUG_ON (bus_id <1 || bus_id >OMAP_I2C_MAX_CONTROLLERS ); + +if (info) { + err =i2c_register_board_info (bus_id, info, len); +if (err) +return err; + } + +if (!i2c_pdata[bus_id -1 ].clkrate) + i2c_pdata[bus_id -1 ].clkrate = clkrate; + + i2c_pdata[bus_id -1 ].clkrate &= ~OMAP_I2C_CMDLINE_SETUP ; + +return omap_i2c_add_bus (&i2c_pdata[bus_id -1 ], bus_id); +} +static int __init omap_i2c_cmdline (void ) {return omap_register_i2c_bus_cmdline ();
arch/arm/mach-omap2/i2c.c +0 -97
112 lines not on this page · raw message
arch/arm/plat-omap/Makefile +0 -3
@@ -11,6 +11,3 @@ obj-y := sram.o dma.o counter_32k.o obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o -i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o -obj-y += $(i2c-omap-m) $(i2c-omap-y) -
arch/arm/plat-omap/i2c.c deleted +0 -116
116 lines not on this page · raw message
Signature · 1 line
2.10.2
Tony Lindgren
maintainerPATCH 3/14 ARM: OMAP2+: Remove legacy PM init
In reply to Tony LindgrenThis is no longer needed when booted with device tree. And let's replace cpu_is with soc_is for the PM code to avoid confusion, they do the same thing.
Note that omap_pmic_late_init() now just calls omap3_twl_init() and omap4_twl_init() to initialize the voltage layer so we can remove the remaining references to twl-common code and remove it in the following patch.
--- arch/arm/mach-omap2/pm.c | 66 +++++------------------------------------------- 1 file changed, 6 insertions(+), 60 deletions(-)
arch/arm/mach-omap2/pm.c +6 -60
@@ -30,7 +30,6 @@#include "powerdomain.h" #include "clockdomain.h" #include "pm.h" -#include "twl-common.h" #ifdef CONFIG_SUSPEND /*
@@ -72,42 +71,6 @@ void omap_pm_get_oscillator(u32 *tstart, u32 *tshut) }#endif -static int __init _init_omap_device (char *name) -{ -struct omap_hwmod *oh; -struct platform_device *pdev; - - oh =omap_hwmod_lookup (name); -if (WARN (!oh,"%s: could not find omap_hwmod for %s\n" , - __func__, name)) -return -ENODEV ; - - pdev =omap_device_build (oh->name,0 , oh,NULL ,0 ); -if (WARN (IS_ERR (pdev),"%s: could not build omap_device for %s\n" , - __func__, name)) -return -ENODEV ; - -return 0 ; -} - -/* -* Build omap_devices for processors and bus. -*/ -static void __init omap2_init_processor_devices (void ) -{ -_init_omap_device ("mpu" ); -if (omap3_has_iva ()) -_init_omap_device ("iva" ); - -if (cpu_is_omap44xx ()) { -_init_omap_device ("l3_main_1" ); -_init_omap_device ("dsp" ); -_init_omap_device ("iva" ); - }else { -_init_omap_device ("l3_main" ); - } -} -int __init omap_pm_clkdms_setup (struct clockdomain *clkdm,void *unused) {clkdm_allow_idle (clkdm);
@@ -215,7 +178,7 @@ static int omap_pm_enter(suspend_state_t suspend_state)static int omap_pm_begin (suspend_state_t state) {cpu_idle_poll_ctrl (true); -if (cpu_is_omap34xx ()) +if (soc_is_omap34xx ())omap_prcm_irq_prepare ();return 0 ; }
@@ -227,7 +190,7 @@ static void omap_pm_end(void)static void omap_pm_finish (void ) { -if (cpu_is_omap34xx ()) +if (soc_is_omap34xx ())omap_prcm_irq_complete (); }
@@ -252,7 +215,7 @@ void omap_common_suspend_init(void *pm_suspend)static void __init omap3_init_voltages (void ) { -if (!cpu_is_omap34xx ()) +if (!soc_is_omap34xx ())return ;omap2_set_init_voltage ("mpu_iva" ,"dpll1_ck" ,"mpu" );
@@ -261,7 +224,7 @@ static void __init omap3_init_voltages(void)static void __init omap4_init_voltages (void ) { -if (!cpu_is_omap44xx ()) +if (!soc_is_omap44xx ())return ;omap2_set_init_voltage ("mpu" ,"dpll_mpu_ck" ,"mpu" );
@@ -269,18 +232,8 @@ static void __init omap4_init_voltages(void)omap2_set_init_voltage ("iva" ,"dpll_iva_m5x2_ck" ,"iva" ); } -static inline void omap_init_cpufreq (void ) -{ -struct platform_device_info devinfo = { .name ="omap-cpufreq" }; - -if (!of_have_populated_dt ()) -platform_device_register_full (&devinfo); -} -static int __init omap2_common_pm_init (void ) { -if (!of_have_populated_dt ()) -omap2_init_processor_devices ();omap_pm_if_init ();return 0 ;
@@ -289,13 +242,9 @@ omap_postcore_initcall(omap2_common_pm_init);int __init omap2_common_pm_late_init (void ) { -if (of_have_populated_dt ()) { -omap3_twl_init (); -omap4_twl_init (); - } -/* Init the voltage layer */ -omap_pmic_late_init (); +omap3_twl_init (); +omap4_twl_init ();omap_voltage_late_init ();/* Initialize the voltages */
@@ -305,8 +254,5 @@ int __init omap2_common_pm_late_init(void)/* Smartreflex device init */ omap_devinit_smartreflex (); -/* cpufreq dummy device instantiation */ -omap_init_cpufreq (); -return 0 ; }
Signature · 1 line
2.10.2
Tony Lindgren
maintainerPATCH 4/14 ARM: OMAP2+: Remove legacy twl4030 platform init code
In reply to Tony LindgrenThis code is no longer used and can be removed as we are using device tree.
--- arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/common-board-devices.h | 1 - arch/arm/mach-omap2/twl-common.c | 81 ------------------------------ arch/arm/mach-omap2/twl-common.h | 42 ---------------- 4 files changed, 1 insertion(+), 125 deletions(-) delete mode 100644 arch/arm/mach-omap2/twl-common.c delete mode 100644 arch/arm/mach-omap2/twl-common.h
arch/arm/mach-omap2/Makefile +1 -1
@@ -257,4 +257,4 @@ obj-y += $(nand-m) $(nand-y) smsc911x-$(CONFIG_SMSC911X) := gpmc-smsc911x.o obj-y += $(smsc911x-m) $(smsc911x-y) -obj-y += common-board-devices.o twl-common.o dss-common.o +obj-y += common-board-devices.o dss-common.o
arch/arm/mach-omap2/common-board-devices.h +0 -1
@@ -3,7 +3,6 @@#include <sound/tlv320aic3x.h> #include <linux/mfd/menelaus.h> -#include "twl-common.h" #define NAND_BLOCK_SIZE SZ_128K
arch/arm/mach-omap2/twl-common.c deleted +0 -81
81 lines not on this page · raw message
arch/arm/mach-omap2/twl-common.h deleted +0 -42
42 lines not on this page · raw message
Signature · 1 line
2.10.2
Tony Lindgren
maintainerPATCH 5/14 ARM: OMAP2+: Remove legacy usb-host.c platform init code
In reply to Tony LindgrenThis is no longer needed when booted with device tree.
--- arch/arm/mach-omap2/Makefile | 1 - arch/arm/mach-omap2/usb-host.c | 496 ----------------------------------------- 2 files changed, 497 deletions(-) delete mode 100644 arch/arm/mach-omap2/usb-host.c
arch/arm/mach-omap2/Makefile +0 -1
@@ -246,7 +246,6 @@ obj-y += usb-musb.o obj-y += omap_phy_internal.o obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o -obj-y += usb-host.o onenand-$(CONFIG_MTD_ONENAND_OMAP2) := gpmc-onenand.o obj-y += $(onenand-m) $(onenand-y)
arch/arm/mach-omap2/usb-host.c deleted +0 -496
496 lines not on this page · raw message
Signature · 1 line
2.10.2
Tony Lindgren
maintainerPATCH 6/14 ARM: OMAP2+: Remove legacy muxing for usb-tusb6010.c
In reply to Tony LindgrenWe are moving to device tree based booting, and this should be done using pinctrl-single instead.
--- arch/arm/mach-omap2/usb-tusb6010.c | 21 --------------------- 1 file changed, 21 deletions(-)
arch/arm/mach-omap2/usb-tusb6010.c +0 -21
@@ -22,8 +22,6 @@#include "gpmc.h" -#include "mux.h" -static u8 async_cs, sync_cs;static unsigned refclk_psec;
@@ -226,25 +224,6 @@ tusb6010_setup_interface(struct musb_hdrc_platform_data *data, } tusb_device.dev.platform_data = data; -/* REVISIT let the driver know what DMA channels work */ -if (!dmachan) - tusb_device.dev.dma_mask =NULL ; -else { -/* assume OMAP 2420 ES2.0 and later */ -if (dmachan & (1 <<0 )) -omap_mux_init_signal ("sys_ndmareq0" ,0 ); -if (dmachan & (1 <<1 )) -omap_mux_init_signal ("sys_ndmareq1" ,0 ); -if (dmachan & (1 <<2 )) -omap_mux_init_signal ("sys_ndmareq2" ,0 ); -if (dmachan & (1 <<3 )) -omap_mux_init_signal ("sys_ndmareq3" ,0 ); -if (dmachan & (1 <<4 )) -omap_mux_init_signal ("sys_ndmareq4" ,0 ); -if (dmachan & (1 <<5 )) -omap_mux_init_signal ("sys_ndmareq5" ,0 ); - } -/* so far so good ... register the device */ status =platform_device_register (&tusb_device);if (status <0 ) {
Signature · 1 line
2.10.2
Tony Lindgren
maintainerPATCH 7/14 ARM: OMAP2+: Remove legacy usb-musb.c platform init code
In reply to Tony LindgrenThis is no longer needed when booted with device tree.
--- arch/arm/mach-omap2/Makefile | 1 - arch/arm/mach-omap2/usb-musb.c | 106 ----------------------------------------- 2 files changed, 107 deletions(-) delete mode 100644 arch/arm/mach-omap2/usb-musb.c
arch/arm/mach-omap2/Makefile +0 -1
@@ -242,7 +242,6 @@ obj-y += $(omap-flash-y) $(omap-flash-m) omap-hsmmc-$(CONFIG_MMC_OMAP_HS) := hsmmc.o obj-y += $(omap-hsmmc-m) $(omap-hsmmc-y) -obj-y += usb-musb.o obj-y += omap_phy_internal.o obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o
arch/arm/mach-omap2/usb-musb.c deleted +0 -106
106 lines not on this page · raw message
Signature · 1 line
2.10.2
Tony Lindgren
maintainerPATCH 8/14 ARM: OMAP2+: Remove legacy hwmod mux code
In reply to Tony LindgrenThis is no longer needed when booted with device tree.
--- arch/arm/mach-omap2/devices.c | 1 - arch/arm/mach-omap2/omap_hwmod.c | 107 +-------------------------------------- 2 files changed, 1 insertion(+), 107 deletions(-)
arch/arm/mach-omap2/devices.c +0 -1
@@ -30,7 +30,6 @@#include "soc.h" #include "common.h" -#include "mux.h" #include "control.h" #include "display.h"
arch/arm/mach-omap2/omap_hwmod.c +1 -106
169 lines not on this page · raw message
Signature · 1 line
2.10.2
Tony Lindgren
maintainerPATCH 10/14 ARM: OMAP2+: Remove legacy data from hwmod for omap3
In reply to Tony LindgrenThis data is now coming from device tree so we can remove the duplicate data. Let's keep the DSS and DMA related things for now until those have been converted to device tree completely.
While at it, let's also add the trailing commas to data structures so further processing with scripts will be a bit easier.
--- .../omap_hwmod_2xxx_3xxx_interconnect_data.c | 149 +--- .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 201 +----- .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 4 - arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 1 - arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 787 +-------------------- arch/arm/mach-omap2/omap_hwmod_common_data.h | 15 - 6 files changed, 43 insertions(+), 1114 deletions(-)
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c +2 -147
@@ -17,156 +17,11 @@#include "omap_hwmod_common_data.h" -struct omap_hwmod_addr_space omap2430_mmc1_addr_space[] = { - { - .pa_start =0x4809c000 , - .pa_end =0x4809c1ff , - .flags =ADDR_TYPE_RT , - }, - { } -}; - -struct omap_hwmod_addr_space omap2430_mmc2_addr_space[] = { - { - .pa_start =0x480b4000 , - .pa_end =0x480b41ff , - .flags =ADDR_TYPE_RT , - }, - { } -}; - -struct omap_hwmod_addr_space omap2_i2c1_addr_space[] = { - { - .pa_start =0x48070000 , - .pa_end =0x48070000 +SZ_128 -1 , - .flags =ADDR_TYPE_RT , - }, - { } -}; - -struct omap_hwmod_addr_space omap2_i2c2_addr_space[] = { - { - .pa_start =0x48072000 , - .pa_end =0x48072000 +SZ_128 -1 , - .flags =ADDR_TYPE_RT , - }, - { } -}; - -struct omap_hwmod_addr_space omap2_dss_addrs[] = { - { - .pa_start =0x48050000 , - .pa_end =0x48050000 +SZ_1K -1 , - .flags =ADDR_TYPE_RT - }, - { } -}; - -struct omap_hwmod_addr_space omap2_dss_dispc_addrs[] = { - { - .pa_start =0x48050400 , - .pa_end =0x48050400 +SZ_1K -1 , - .flags =ADDR_TYPE_RT - }, - { } -}; - -struct omap_hwmod_addr_space omap2_dss_rfbi_addrs[] = { - { - .pa_start =0x48050800 , - .pa_end =0x48050800 +SZ_1K -1 , - .flags =ADDR_TYPE_RT - }, - { } -}; - -struct omap_hwmod_addr_space omap2_dss_venc_addrs[] = { - { - .pa_start =0x48050C00 , - .pa_end =0x48050C00 +SZ_1K -1 , - .flags =ADDR_TYPE_RT - }, - { } -}; - -struct omap_hwmod_addr_space omap2_timer10_addrs[] = { - { - .pa_start =0x48086000 , - .pa_end =0x48086000 +SZ_1K -1 , - .flags =ADDR_TYPE_RT - }, - { } -}; - -struct omap_hwmod_addr_space omap2_timer11_addrs[] = { - { - .pa_start =0x48088000 , - .pa_end =0x48088000 +SZ_1K -1 , - .flags =ADDR_TYPE_RT - }, - { } -}; - -struct omap_hwmod_addr_space omap2xxx_timer12_addrs[] = { - { - .pa_start =0x4808a000 , - .pa_end =0x4808a000 +SZ_1K -1 , - .flags =ADDR_TYPE_RT - }, - { } -}; - -struct omap_hwmod_addr_space omap2_mcspi1_addr_space[] = { - { - .pa_start =0x48098000 , - .pa_end =0x48098000 +SZ_256 -1 , - .flags =ADDR_TYPE_RT , - }, - { } -}; - -struct omap_hwmod_addr_space omap2_mcspi2_addr_space[] = { - { - .pa_start =0x4809a000 , - .pa_end =0x4809a000 +SZ_256 -1 , - .flags =ADDR_TYPE_RT , - }, - { } -}; - -struct omap_hwmod_addr_space omap2430_mcspi3_addr_space[] = { - { - .pa_start =0x480b8000 , - .pa_end =0x480b8000 +SZ_256 -1 , - .flags =ADDR_TYPE_RT , - }, - { } -}; -struct omap_hwmod_addr_space omap2_dma_system_addrs[] = { { .pa_start =0x48056000 , .pa_end =0x48056000 +SZ_4K -1 , - .flags =ADDR_TYPE_RT - }, - { } -}; - -struct omap_hwmod_addr_space omap2_mcbsp1_addrs[] = { - { - .name ="mpu" , - .pa_start =0x48074000 , - .pa_end =0x480740ff , - .flags =ADDR_TYPE_RT - }, - { } -}; - -struct omap_hwmod_addr_space omap2_hdq1w_addr_space[] = { - { - .pa_start =0x480b2000 , - .pa_end =0x480b2fff , - .flags =ADDR_TYPE_RT , + .flags =ADDR_TYPE_RT , }, - { } + { }, };
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c +6 -195
236 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c +0 -4
@@ -191,7 +191,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__dss = { .master = &omap2xxx_l4_core_hwmod, .slave = &omap2xxx_dss_core_hwmod, .clk = "dss_ick", - .addr = omap2_dss_addrs, .fw = { .omap2 = { .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_CORE_REGION,
@@ -206,7 +205,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__dss_dispc = { .master = &omap2xxx_l4_core_hwmod, .slave = &omap2xxx_dss_dispc_hwmod, .clk = "dss_ick", - .addr = omap2_dss_dispc_addrs, .fw = { .omap2 = { .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_DISPC_REGION,
@@ -221,7 +219,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__dss_rfbi = { .master = &omap2xxx_l4_core_hwmod, .slave = &omap2xxx_dss_rfbi_hwmod, .clk = "dss_ick", - .addr = omap2_dss_rfbi_addrs, .fw = { .omap2 = { .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_CORE_REGION,
@@ -236,7 +233,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__dss_venc = { .master = &omap2xxx_l4_core_hwmod, .slave = &omap2xxx_dss_venc_hwmod, .clk = "dss_ick", - .addr = omap2_dss_venc_addrs, .fw = { .omap2 = { .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_VENC_REGION,
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +0 -1
@@ -569,7 +569,6 @@ struct omap_hwmod omap2xxx_dss_core_hwmod = {struct omap_hwmod omap2xxx_dss_dispc_hwmod = { .name ="dss_dispc" , .class = &omap2_dispc_hwmod_class, - .mpu_irqs = omap2_dispc_irqs, .main_clk ="dss1_fck" , .prcm = { .omap2 = {
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +35 -752
1,975 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_common_data.h +0 -15
@@ -19,22 +19,7 @@#include "display.h" /* Common address space across OMAP2xxx/3xxx */ -extern struct omap_hwmod_addr_space omap2_i2c1_addr_space[]; -extern struct omap_hwmod_addr_space omap2_i2c2_addr_space[]; -extern struct omap_hwmod_addr_space omap2_dss_addrs[]; -extern struct omap_hwmod_addr_space omap2_dss_dispc_addrs[]; -extern struct omap_hwmod_addr_space omap2_dss_rfbi_addrs[]; -extern struct omap_hwmod_addr_space omap2_dss_venc_addrs[]; -extern struct omap_hwmod_addr_space omap2_timer10_addrs[]; -extern struct omap_hwmod_addr_space omap2_timer11_addrs[]; -extern struct omap_hwmod_addr_space omap2430_mmc1_addr_space[]; -extern struct omap_hwmod_addr_space omap2430_mmc2_addr_space[]; -extern struct omap_hwmod_addr_space omap2_mcspi1_addr_space[]; -extern struct omap_hwmod_addr_space omap2_mcspi2_addr_space[]; -extern struct omap_hwmod_addr_space omap2430_mcspi3_addr_space[];extern struct omap_hwmod_addr_space omap2_dma_system_addrs[]; -extern struct omap_hwmod_addr_space omap2_mcbsp1_addrs[]; -extern struct omap_hwmod_addr_space omap2_hdq1w_addr_space[];/* Common IP block data across OMAP2xxx */ extern struct omap_gpio_dev_attr omap2xxx_gpio_dev_attr;
Signature · 1 line
2.10.2
PATCH 10/14 ARM: OMAP2+: Remove legacy data from hwmod for omap3
Quoted 7 lines · Tony Lindgren
This data is now coming from device tree so we can remove the duplicate data. Let's keep the DSS and DMA related things for now until those have been converted to device tree completely.
While at it, let's also add the trailing commas to data structures so further processing with scripts will be a bit easier.
Tony,
I am having some errors with this patch.
Smartreflex on a DM3730 drops a few errors:
[ 1.209747] smartreflex smartreflex.0: invalid resource [ 1.215301] smartreflex smartreflex.0: omap_sr_probe: ioremap fail [ 1.221832] smartreflex smartreflex.1: invalid resource [ 1.227294] smartreflex smartreflex.1: omap_sr_probe: ioremap fail [ 1.233856] sr_init: platform driver register failed for SR
I used Git bisect to narrow it down to this patch, and I confirmed it manually. Sorry it took so long to get feedback on this, but I was on vacation.
I attempted to just add back the smartreflex stuff for the omap36xx, but that didn't work. I am going to assume something is missing or wrong in the device tree, but I could be wrong. If you have any suggestions before I go down a rabbit hole, I am open for ideas.
adam
Quoted 15 lines
Cc Paul Walmsley <[email protected]>Signed-off-by Tony Lindgren <[email protected]>--- .../omap_hwmod_2xxx_3xxx_interconnect_data.c | 149 +--- .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 201 +----- .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 4 - arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 1 - arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 787 +-------------------- arch/arm/mach-omap2/omap_hwmod_common_data.h | 15 - 6 files changed, 43 insertions(+), 1114 deletions(-)
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c line 17
Quoted 1 line
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c +0
-0@@ -17,156 +17,11 @@
[ Stuff Deleted]
Quoted 7 lines
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c +0
-1--2.10.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Tony Lindgren
maintainerPATCH 10/14 ARM: OMAP2+: Remove legacy data from hwmod for omap3
Quoted 20 lines · Adam Ford
Quoted 7 lines · Tony Lindgren
This data is now coming from device tree so we can remove the duplicate data. Let's keep the DSS and DMA related things for now until those have been converted to device tree completely.
While at it, let's also add the trailing commas to data structures so further processing with scripts will be a bit easier.
Tony,
I am having some errors with this patch.
Smartreflex on a DM3730 drops a few errors:
[ 1.209747] smartreflex smartreflex.0: invalid resource [ 1.215301] smartreflex smartreflex.0: omap_sr_probe: ioremap fail [ 1.221832] smartreflex smartreflex.1: invalid resource [ 1.227294] smartreflex smartreflex.1: omap_sr_probe: ioremap fail [ 1.233856] sr_init: platform driver register failed for SR
Quoted 3 lines
I used Git bisect to narrow it down to this patch, and I confirmed it manually. Sorry it took so long to get feedback on this, but I was on vacation.
Oh OK sorry about that.
Quoted 4 lines
I attempted to just add back the smartreflex stuff for the omap36xx, but that didn't work. I am going to assume something is missing or wrong in the device tree, but I could be wrong. If you have any suggestions before I go down a rabbit hole, I am open for ideas.
That's all there is to it :) You must have missed some part of it. Below is a fix that seems to work for me, care to test?
Regards,
Tony
8< -----------------------
Quoted 1 line
From tony Mon Sep 17 00:00:00 2001
From: Tony Lindgren <[email protected]>
Date: Tue, 14 Feb 2017 09:33:25 -0800
Subject: [PATCH] ARM: OMAP3: Fix smartreflex platform data regression
Commit d9d9cec02835 ("ARM: OMAP2+: Remove legacy data from hwmod for omap3") dropped platform data that should no longer be used as we're booting with device tree. It turns out that smartreflex is still using platform data and produces the following errors during probe:
smartreflex smartreflex.0: invalid resource smartreflex smartreflex.0: omap_sr_probe: ioremap fail
smartreflex: probe of smartreflex.0 failed with error -22 smartreflex smartreflex.1: invalid resource smartreflex smartreflex.1: omap_sr_probe: ioremap fail
smartreflex: probe of smartreflex.1 failed with error -22
Let's fix the regression by adding back the smartreflex hwmod data. The long term is to update the smartreflex driver to use device tree based probing.
--- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +21 -0
@@ -1946,6 +1946,7 @@ static struct omap_hwmod_ocp_if omap3xxx_dss__l3 = { };/* l3_core -> usbhsotg interface */ +static struct omap_hwmod_ocp_if omap3xxx_usbhsotg__l3 = { .master = &omap3xxx_usbhsotg_hwmod, .slave = &omap3xxx_l3_main_hwmod,
@@ -2112,11 +2113,20 @@ static struct omap_hwmod_ocp_if omap3_l4_core__i2c3 = { };/* L4 CORE -> SR1 interface */ +static struct omap_hwmod_addr_space omap3_sr1_addr_space[] = { + { + .pa_start =OMAP34XX_SR1_BASE , + .pa_end =OMAP34XX_SR1_BASE +SZ_1K -1 , + .flags =ADDR_TYPE_RT , + }, + { }, +};static struct omap_hwmod_ocp_if omap34xx_l4_core__sr1 = { .master = &omap3xxx_l4_core_hwmod, .slave = &omap34xx_sr1_hwmod, .clk ="sr_l4_ick" , + .addr = omap3_sr1_addr_space, .user =OCP_USER_MPU , };
@@ -2124,15 +2134,25 @@ static struct omap_hwmod_ocp_if omap36xx_l4_core__sr1 = { .master = &omap3xxx_l4_core_hwmod, .slave = &omap36xx_sr1_hwmod, .clk = "sr_l4_ick", + .addr = omap3_sr1_addr_space, .user = OCP_USER_MPU, };/* L4 CORE -> SR1 interface */ +static struct omap_hwmod_addr_space omap3_sr2_addr_space[] = { + { + .pa_start =OMAP34XX_SR2_BASE , + .pa_end =OMAP34XX_SR2_BASE +SZ_1K -1 , + .flags =ADDR_TYPE_RT , + }, + { }, +};static struct omap_hwmod_ocp_if omap34xx_l4_core__sr2 = { .master = &omap3xxx_l4_core_hwmod, .slave = &omap34xx_sr2_hwmod, .clk ="sr_l4_ick" , + .addr = omap3_sr2_addr_space, .user =OCP_USER_MPU , };
@@ -2140,6 +2160,7 @@ static struct omap_hwmod_ocp_if omap36xx_l4_core__sr2 = { .master = &omap3xxx_l4_core_hwmod, .slave = &omap36xx_sr2_hwmod, .clk = "sr_l4_ick", + .addr = omap3_sr2_addr_space, .user = OCP_USER_MPU, };
Signature · 1 line
2.11.1
Tony Lindgren
maintainerPATCH 10/14 ARM: OMAP2+: Remove legacy data from hwmod for omap3
Quoted 38 lines · Tony Lindgren
Quoted 20 lines · Adam Ford
Quoted 7 lines · Tony Lindgren
This data is now coming from device tree so we can remove the duplicate data. Let's keep the DSS and DMA related things for now until those have been converted to device tree completely.
While at it, let's also add the trailing commas to data structures so further processing with scripts will be a bit easier.
Tony,
I am having some errors with this patch.
Smartreflex on a DM3730 drops a few errors:
[ 1.209747] smartreflex smartreflex.0: invalid resource [ 1.215301] smartreflex smartreflex.0: omap_sr_probe: ioremap fail [ 1.221832] smartreflex smartreflex.1: invalid resource [ 1.227294] smartreflex smartreflex.1: omap_sr_probe: ioremap fail [ 1.233856] sr_init: platform driver register failed for SRQuoted 3 lines
I used Git bisect to narrow it down to this patch, and I confirmed it manually. Sorry it took so long to get feedback on this, but I was on vacation.
Oh OK sorry about that.
Quoted 4 lines
I attempted to just add back the smartreflex stuff for the omap36xx, but that didn't work. I am going to assume something is missing or wrong in the device tree, but I could be wrong. If you have any suggestions before I go down a rabbit hole, I am open for ideas.
That's all there is to it :) You must have missed some part of it. Below is a fix that seems to work for me, care to test?
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c static struct omap_hwmod_ocp_if omap3xxx_dss__l3 = { · line 1952
Quoted 7 lines
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +1
-0@@ -1946,6 +1946,7 @@ static struct omap_hwmod_ocp_if omap3xxx_dss__l3 = { };/* l3_core -> usbhsotg interface */ +static struct omap_hwmod_ocp_if omap3xxx_usbhsotg__l3 = { .master = &omap3xxx_usbhsotg_hwmod, .slave = &omap3xxx_l3_main_hwmod,
This extra line should not be there, will remove.
Tony
PATCH 10/14 ARM: OMAP2+: Remove legacy data from hwmod for omap3
In reply to Tony LindgrenQuoted 27 lines · Tony Lindgren
Quoted 20 lines · Adam Ford
Quoted 7 lines · Tony Lindgren
This data is now coming from device tree so we can remove the duplicate data. Let's keep the DSS and DMA related things for now until those have been converted to device tree completely.
While at it, let's also add the trailing commas to data structures so further processing with scripts will be a bit easier.
Tony,
I am having some errors with this patch.
Smartreflex on a DM3730 drops a few errors:
[ 1.209747] smartreflex smartreflex.0: invalid resource [ 1.215301] smartreflex smartreflex.0: omap_sr_probe: ioremap fail [ 1.221832] smartreflex smartreflex.1: invalid resource [ 1.227294] smartreflex smartreflex.1: omap_sr_probe: ioremap fail [ 1.233856] sr_init: platform driver register failed for SRQuoted 3 lines
I used Git bisect to narrow it down to this patch, and I confirmed it manually. Sorry it took so long to get feedback on this, but I was on vacation.
Oh OK sorry about that.
Quoted 7 lines
Quoted 4 lines
I attempted to just add back the smartreflex stuff for the omap36xx, but that didn't work. I am going to assume something is missing or wrong in the device tree, but I could be wrong. If you have any suggestions before I go down a rabbit hole, I am open for ideas.
That's all there is to it :) You must have missed some part of it. Below is a fix that seems to work for me, care to test?
Damn, you're fast! :-)
I tested it and it works just fine now.
Quoted 23 lines
Regards,
Tony
8< -----------------------
From tony Mon Sep 17 00:00:00 2001
From: Tony Lindgren <[email protected]>
Date: Tue, 14 Feb 2017 09:33:25 -0800
Subject: [PATCH] ARM: OMAP3: Fix smartreflex platform data regressionCommit
d9d9cec02835("ARM: OMAP2+: Remove legacy data from hwmod for omap3") dropped platform data that should no longer be used as we're booting with device tree. It turns out that smartreflex is still using platform data and produces the following errors during probe:smartreflex smartreflex.0: invalid resource smartreflex smartreflex.0:
omap_sr_probe: ioremap fail
smartreflex: probe of smartreflex.0 failed with error -22 smartreflex smartreflex.1: invalid resource smartreflex smartreflex.1:omap_sr_probe: ioremap fail
smartreflex: probe of smartreflex.1 failed with error -22
Quoted 4 lines
Let's fix the regression by adding back the smartreflex hwmod data. The long term is to update the smartreflex driver to use device tree based probing.
Quoted 74 lines
Reported-by Adam Ford <[email protected]>Signed-off-by Tony Lindgren <[email protected]>--- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +21
-1@@ -1946,6 +1946,7 @@ static struct omap_hwmod_ocp_if omap3xxx_dss__l3 = { };/* l3_core -> usbhsotg interface */ +static struct omap_hwmod_ocp_if omap3xxx_usbhsotg__l3 = { .master = &omap3xxx_usbhsotg_hwmod, .slave = &omap3xxx_l3_main_hwmod,@@ -2112,11 +2113,20 @@ static struct omap_hwmod_ocp_if omap3_l4_core__i2c3 = { };/* L4 CORE -> SR1 interface */ +static struct omap_hwmod_addr_space omap3_sr1_addr_space[] = { + { + .pa_start =OMAP34XX_SR1_BASE , + .pa_end =OMAP34XX_SR1_BASE +SZ_1K -1 , + .flags =ADDR_TYPE_RT , + }, + { }, +};static struct omap_hwmod_ocp_if omap34xx_l4_core__sr1 = { .master = &omap3xxx_l4_core_hwmod, .slave = &omap34xx_sr1_hwmod, .clk ="sr_l4_ick" , + .addr = omap3_sr1_addr_space, .user =OCP_USER_MPU , };@@ -2124,15 +2134,25 @@ static struct omap_hwmod_ocp_if omap36xx_l4_core__sr1 = { .master = &omap3xxx_l4_core_hwmod, .slave = &omap36xx_sr1_hwmod, .clk = "sr_l4_ick", + .addr = omap3_sr1_addr_space, .user = OCP_USER_MPU, };/* L4 CORE -> SR1 interface */ +static struct omap_hwmod_addr_space omap3_sr2_addr_space[] = { + { + .pa_start =OMAP34XX_SR2_BASE , + .pa_end =OMAP34XX_SR2_BASE +SZ_1K -1 , + .flags =ADDR_TYPE_RT , + }, + { }, +};static struct omap_hwmod_ocp_if omap34xx_l4_core__sr2 = { .master = &omap3xxx_l4_core_hwmod, .slave = &omap34xx_sr2_hwmod, .clk ="sr_l4_ick" , + .addr = omap3_sr2_addr_space, .user =OCP_USER_MPU , };@@ -2140,6 +2160,7 @@ static struct omap_hwmod_ocp_if omap36xx_l4_core__sr2 = { .master = &omap3xxx_l4_core_hwmod, .slave = &omap36xx_sr2_hwmod, .clk = "sr_l4_ick", + .addr = omap3_sr2_addr_space, .user = OCP_USER_MPU, }; --2.11.1
Tony Lindgren
maintainerPATCH 11/14 ARM: OMAP2+: Remove legacy smsc911x and smc91x GPMC support
In reply to Tony LindgrenFrom: Javier Martinez Canillas <[email protected]>
When connecting an ethernet chip to the GPMC, such as smc91x or smsc911x, a GPIO has to be requested to be used as an IRQ and also the IO memory for a GPMC chip-select.
When booting with DT the chip-select allocation is handled in a generic manner in the GPMC driver and the GPIO to IRQ mapping is made by the DT core so this code is not needed anymore now that mach-omap2 related boards are DT-only.
--- arch/arm/mach-omap2/Makefile | 2 - arch/arm/mach-omap2/gpmc-smsc911x.c | 100 ------------------------------------ arch/arm/mach-omap2/gpmc-smsc911x.h | 35 ------------- 3 files changed, 137 deletions(-) delete mode 100644 arch/arm/mach-omap2/gpmc-smsc911x.c delete mode 100644 arch/arm/mach-omap2/gpmc-smsc911x.h
arch/arm/mach-omap2/Makefile +0 -2
@@ -249,7 +249,5 @@ obj-y += $(onenand-m) $(onenand-y) nand-$(CONFIG_MTD_NAND_OMAP2) := gpmc-nand.o obj-y += $(nand-m) $(nand-y) -smsc911x-$(CONFIG_SMSC911X) := gpmc-smsc911x.o -obj-y += $(smsc911x-m) $(smsc911x-y) obj-y += common-board-devices.o dss-common.o
arch/arm/mach-omap2/gpmc-smsc911x.c deleted +0 -100
100 lines not on this page · raw message
arch/arm/mach-omap2/gpmc-smsc911x.h deleted +0 -35
@@ -1,35 +0,0 @@ -/* -* arch/arm/plat-omap/include/plat/gpmc-smsc911x.h -* -* Copyright (C) 2009 Li-Pro.Net -* Stephan Linz <[email protected]> -* -* Modified from arch/arm/plat-omap/include/plat/gpmc-smc91x.h -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_OMAP_GPMC_SMSC911X_H__ - -struct omap_smsc911x_platform_data { -int id; -int cs; -int gpio_irq; -int gpio_reset; -u32 flags; -}; - -#if IS_ENABLED (CONFIG_SMSC911X ) - -extern void gpmc_smsc911x_init (struct omap_smsc911x_platform_data *d); - -#else - -static inline void gpmc_smsc911x_init (struct omap_smsc911x_platform_data *d) -{ -} - -#endif -#endif
Signature · 1 line
2.10.2
Tony Lindgren
maintainerPATCH 12/14 ARM: OMAP2+: Remove legacy board-flash.c
In reply to Tony LindgrenFrom: Javier Martinez Canillas <[email protected]>
Legacy board files in mach-omap2 used the helper functions board_{nor,nand,onenand}_init() to initialize the flash devices attached to the GPMC.
With Device Tree booting the initialization is handled by the GPMC driver gpmc_probe_*_child() functions so this code is not needed anymore now that OMAP2+ is DT-only.
--- arch/arm/mach-omap2/Makefile | 4 - arch/arm/mach-omap2/board-flash.c | 242 -------------------------------------- arch/arm/mach-omap2/board-flash.h | 56 --------- 3 files changed, 302 deletions(-) delete mode 100644 arch/arm/mach-omap2/board-flash.c delete mode 100644 arch/arm/mach-omap2/board-flash.h
arch/arm/mach-omap2/Makefile +0 -4
@@ -232,10 +232,6 @@ obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o # Platform specific device init code -omap-flash-$(CONFIG_MTD_NAND_OMAP2) := board-flash.o -omap-flash-$(CONFIG_MTD_ONENAND_OMAP2) := board-flash.o -obj-y += $(omap-flash-y) $(omap-flash-m) - omap-hsmmc-$(CONFIG_MMC_OMAP_HS) := hsmmc.o obj-y += $(omap-hsmmc-m) $(omap-hsmmc-y)
arch/arm/mach-omap2/board-flash.c deleted +0 -242
242 lines not on this page · raw message
arch/arm/mach-omap2/board-flash.h deleted +0 -56
56 lines not on this page · raw message
Signature · 1 line
2.10.2
Tony Lindgren
maintainerPATCH 13/14 ARM: OMAP2+: Drop legacy ads7846 init
In reply to Tony Lindgren--- arch/arm/mach-omap2/Makefile | 3 - arch/arm/mach-omap2/common-board-devices.c | 102 ----------------------------- arch/arm/mach-omap2/common-board-devices.h | 7 -- arch/arm/mach-omap2/dss-common.c | 36 ---------- arch/arm/mach-omap2/dss-common.h | 13 ---- arch/arm/mach-omap2/pdata-quirks.c | 1 - 6 files changed, 162 deletions(-) delete mode 100644 arch/arm/mach-omap2/common-board-devices.c delete mode 100644 arch/arm/mach-omap2/dss-common.c delete mode 100644 arch/arm/mach-omap2/dss-common.h
arch/arm/mach-omap2/Makefile +0 -3
@@ -244,6 +244,3 @@ obj-y += $(onenand-m) $(onenand-y) nand-$(CONFIG_MTD_NAND_OMAP2) := gpmc-nand.o obj-y += $(nand-m) $(nand-y) - - -obj-y += common-board-devices.o dss-common.o
arch/arm/mach-omap2/common-board-devices.c deleted +0 -102
102 lines not on this page · raw message
arch/arm/mach-omap2/common-board-devices.h +0 -7
@@ -4,13 +4,6 @@#include <sound/tlv320aic3x.h> #include <linux/mfd/menelaus.h> -#define NAND_BLOCK_SIZE SZ_128K - -struct mtd_partition ; -struct ads7846_platform_data ; - -void omap_ads7846_init (int bus_num,int gpio_pendown,int gpio_debounce, -struct ads7846_platform_data *board_pdata);void *n8x0_legacy_init (void );extern struct menelaus_platform_data n8x0_menelaus_platform_data;
arch/arm/mach-omap2/dss-common.c deleted +0 -36
@@ -1,36 +0,0 @@ -/* -* Copyright (C) 2012 Texas Instruments, Inc.. -* Author: Tomi Valkeinen <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* version 2 as published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA -* -*/ - -/* -* NOTE: this is a transitional file to help with DT adaptation. -* This file will be removed when DSS supports DT. -*/ - -#include <linux/kernel.h> -#include <linux/gpio.h> -#include <linux/platform_device.h> - -#include <linux/platform_data/omapdss.h> -#include <video/omap-panel-data.h> - -#include "soc.h" -#include "dss-common.h" -#include "display.h" -
arch/arm/mach-omap2/dss-common.h deleted +0 -13
@@ -1,13 +0,0 @@ -#ifndef __OMAP_DSS_COMMON__ -#define __OMAP_DSS_COMMON__ - -/* -* NOTE: this is a transitional file to help with DT adaptation. -* This file will be removed when DSS supports DT. -*/ - -void __init omap4_panda_display_init_of (void ); -void __init omap_4430sdp_display_init_of (void ); -void __init omap3_igep2_display_init_of (void ); - -#endif
arch/arm/mach-omap2/pdata-quirks.c +0 -1
@@ -31,7 +31,6 @@#include "common.h" #include "common-board-devices.h" -#include "dss-common.h" #include "control.h" #include "omap_device.h" #include "omap-pm.h"
Signature · 1 line
2.10.2
Tony Lindgren
maintainerPATCH 14/14 ARM: OMAP2+: Drop legacy sdram timings
In reply to Tony LindgrenThese are no longer used. If somebody needs to configure memory timings for various idle modes, they should be implemented as a device driver callbacks from the PM code.
--- arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h | 51 ---- arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h | 55 ---- arch/arm/mach-omap2/sdram-nokia.c | 299 --------------------- arch/arm/mach-omap2/sdram-nokia.h | 12 - arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h | 51 ---- .../mach-omap2/sdram-qimonda-hyb18m512160af-6.h | 54 ---- 6 files changed, 522 deletions(-) delete mode 100644 arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h delete mode 100644 arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h delete mode 100644 arch/arm/mach-omap2/sdram-nokia.c delete mode 100644 arch/arm/mach-omap2/sdram-nokia.h delete mode 100644 arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h delete mode 100644 arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h
arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h deleted +0 -51
@@ -1,51 +0,0 @@ -/* -* SDRC register values for the Hynix H8MBX00U0MER-0EM -* -* Copyright (C) 2009 Texas Instruments, Inc. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#ifndef __ARCH_ARM_MACH_OMAP2_SDRAM_HYNIX_H8MBX00U0MER0EM -#define __ARCH_ARM_MACH_OMAP2_SDRAM_HYNIX_H8MBX00U0MER0EM - -#include "sdrc.h" - -/* Hynix H8MBX00U0MER-0EM */ -static struct omap_sdrc_params h8mbx00u0mer0em_sdrc_params[] = { - [0 ] = { - .rate =200000000 , - .actim_ctrla =0xa2e1b4c6 , - .actim_ctrlb =0x0002131c , - .rfr_ctrl =0x0005e601 , - .mr =0x00000032 , - }, - [1 ] = { - .rate =166000000 , - .actim_ctrla =0x629db4c6 , - .actim_ctrlb =0x00012214 , - .rfr_ctrl =0x0004dc01 , - .mr =0x00000032 , - }, - [2 ] = { - .rate =100000000 , - .actim_ctrla =0x51912284 , - .actim_ctrlb =0x0002120e , - .rfr_ctrl =0x0002d101 , - .mr =0x00000022 , - }, - [3 ] = { - .rate =83000000 , - .actim_ctrla =0x31512283 , - .actim_ctrlb =0x0001220a , - .rfr_ctrl =0x00025501 , - .mr =0x00000022 , - }, - [4 ] = { - .rate =0 - }, -}; - -#endif
arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h deleted +0 -55
55 lines not on this page · raw message
arch/arm/mach-omap2/sdram-nokia.c deleted +0 -299
299 lines not on this page · raw message
arch/arm/mach-omap2/sdram-nokia.h deleted +0 -12
@@ -1,12 +0,0 @@ -/* -* SDRC register values for Nokia boards -* -* Copyright (C) 2010 Nokia -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -struct omap_sdrc_params *nokia_get_sdram_timings (void ); -
arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h deleted +0 -51
51 lines not on this page · raw message
arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h deleted +0 -54
54 lines not on this page · raw message
Signature · 1 line
2.10.2