Make omap24xx booting device tree based for v3.14 merge window
Subsystems (6)
Tony Lindgren
maintainercover Make omap24xx booting device tree based for v3.14 merge window
Hi all,
Here are some early patches for the v3.14 merge window to make omap2 booting device tree based before we make omap3 device tree only. Otherwise we cannot remove the shared platform data between omap2 and 3 for things like some hwmod entries.
I've added minimal support for 2430sdp to boot it to serial console with ethernet working, and kept n8x0 support using the legacy init for the drivers. Then the old H4 I have not updated as I'm not using it.
Hopefully if there are still people using n8x0 they can pick up the work from here on removing the rest of the legacy platform data init as we're planning to drop those things completely over next few merge cycles.
Note that these patches are against mainline commit 10d0c9705 as there are few device tree related fixes to stuff the resources. These also depend on the recently posted fixes series "[PATCH 0/8] Various omap device tree usability fixes for v3.13 merge window"
Cheers,
Tony
Tony Lindgren (11):
ARM: dts: Add basic device tree support for omap2430 sdp
ARM: dts: Add basic Nokia N8X0 support
ARM: OMAP2+: Add support for board specific auxdata quirks
ARM: OMAP2+: Add device tree compatible revision checks for n8x0
ARM: OMAP2+: Make n8x0 behave better with device tree based booting
ARM: OMAP2+: Add quirks support for n8x0
ARM: OMAP2+: Remove legacy booting support for n8x0
ARM: OMAP2+: Remove board file for H4
ARM: OMAP2+: Remove legacy board file for 2430sdp
ARM: OMAP2+: Remove legacy mux code for omap2
ARM: OMAP2+: Remove legacy hwmod entries for omap2
arch/arm/boot/dts/Makefile | 4 + arch/arm/boot/dts/omap2420-n800.dts | 8 + arch/arm/boot/dts/omap2420-n810-wimax.dts | 8 + arch/arm/boot/dts/omap2420-n810.dts | 8 + arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 34 + arch/arm/boot/dts/omap2430-sdp.dts | 49 ++ arch/arm/mach-omap2/Kconfig | 13 - arch/arm/mach-omap2/Makefile | 4 - arch/arm/mach-omap2/board-2430sdp.c | 273 ------- arch/arm/mach-omap2/board-h4.c | 365 ---------- arch/arm/mach-omap2/board-n8x0.c | 190 ++--- arch/arm/mach-omap2/common-board-devices.h | 1 + arch/arm/mach-omap2/msdi.c | 69 -- arch/arm/mach-omap2/mux.h | 2 - arch/arm/mach-omap2/mux2420.c | 690 ------------------ arch/arm/mach-omap2/mux2420.h | 282 -------- arch/arm/mach-omap2/mux2430.c | 793 --------------------- arch/arm/mach-omap2/mux2430.h | 370 ---------- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 137 ---- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 266 ------- .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 155 ---- arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 68 -- arch/arm/mach-omap2/omap_hwmod_common_data.h | 5 - arch/arm/mach-omap2/pdata-quirks.c | 46 +- 24 files changed, 200 insertions(+), 3640 deletions(-) create mode 100644 arch/arm/boot/dts/omap2420-n800.dts create mode 100644 arch/arm/boot/dts/omap2420-n810-wimax.dts create mode 100644 arch/arm/boot/dts/omap2420-n810.dts create mode 100644 arch/arm/boot/dts/omap2420-n8x0-common.dtsi create mode 100644 arch/arm/boot/dts/omap2430-sdp.dts delete mode 100644 arch/arm/mach-omap2/board-2430sdp.c delete mode 100644 arch/arm/mach-omap2/board-h4.c delete mode 100644 arch/arm/mach-omap2/mux2420.c delete mode 100644 arch/arm/mach-omap2/mux2420.h delete mode 100644 arch/arm/mach-omap2/mux2430.c delete mode 100644 arch/arm/mach-omap2/mux2430.h
Signature · 1 line
1.8.1.1
Tony Lindgren
maintainerPATCH 1/11 ARM: dts: Add basic device tree support for omap2430 sdp
I doubt that there are many people using 2430 sdp, but as that's been historically an important acid test platform for omap2+ related changes, let's add minimal device tree support for it.
If anybody is using it beyond minimal boot testing, patches for more complete device tree support are welcome.
--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/omap2430-sdp.dts | 49 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 arch/arm/boot/dts/omap2430-sdp.dts
arch/arm/boot/dts/Makefile +1 -0
@@ -173,6 +173,7 @@ dtb-$(CONFIG_ARCH_NSPIRE) += nspire-cx.dtb \ nspire-tp.dtb \ nspire-clp.dtb dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ + omap2430-sdp.dtb \ omap3430-sdp.dtb \ omap3-beagle.dtb \ omap3-devkit8000.dtb \
arch/arm/boot/dts/omap2430-sdp.dts new file +49 -0
49 lines not on this page · raw message
Signature · 1 line
1.8.1.1
Tony Lindgren
maintainerPATCH 2/11 ARM: dts: Add basic Nokia N8X0 support
In reply to Tony LindgrenAdd minimal device tree support for n8x0 boards so we can make omap2 device tree only. Note that we still need to initialize various platform data quirks to keep things working until n8x0 drivers support device tree.
Here's a rough todo list for the people using n8x0:
1. Update menelaus for device tree and set up
regulators at least for the MMC driver
2. Remove the MMC regulator platform data callback by using the Menlaus regulators directly in the driver passed from the .dts file
3. Update GPMC connected devices for onenand and
tusb6010 for device tree
We're planning to remove all legacy platform data for mach-omap2 over next few merge cycles, so if people are still using n8x0, please fix the issues above.
--- arch/arm/boot/dts/Makefile | 3 +++ arch/arm/boot/dts/omap2420-n800.dts | 8 +++++++ arch/arm/boot/dts/omap2420-n810-wimax.dts | 8 +++++++ arch/arm/boot/dts/omap2420-n810.dts | 8 +++++++ arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 34 +++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+) create mode 100644 arch/arm/boot/dts/omap2420-n800.dts create mode 100644 arch/arm/boot/dts/omap2420-n810-wimax.dts create mode 100644 arch/arm/boot/dts/omap2420-n810.dts create mode 100644 arch/arm/boot/dts/omap2420-n8x0-common.dtsi
arch/arm/boot/dts/Makefile +3 -0
@@ -174,6 +174,9 @@ dtb-$(CONFIG_ARCH_NSPIRE) += nspire-cx.dtb \ nspire-clp.dtb dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ omap2430-sdp.dtb \ + omap2420-n800.dtb \ + omap2420-n810.dtb \ + omap2420-n810-wimax.dtb \ omap3430-sdp.dtb \ omap3-beagle.dtb \ omap3-devkit8000.dtb \
arch/arm/boot/dts/omap2420-n800.dts new file +8 -0
@@ -0,0 +1,8 @@ +/dts-v1/; + +#include "omap2420-n8x0-common.dtsi" + +/ { + model = "Nokia N800"; + compatible = "nokia,n800", "nokia,n8x0", "ti,omap2420", "ti,omap2"; +};
arch/arm/boot/dts/omap2420-n810-wimax.dts new file +8 -0
@@ -0,0 +1,8 @@ +/dts-v1/; + +#include "omap2420-n8x0-common.dtsi" + +/ { + model = "Nokia N810 WiMax"; + compatible = "nokia,n810-wimax", "nokia,n8x0", "ti,omap2420", "ti,omap2"; +};
arch/arm/boot/dts/omap2420-n810.dts new file +8 -0
@@ -0,0 +1,8 @@ +/dts-v1/; + +#include "omap2420-n8x0-common.dtsi" + +/ { + model = "Nokia N810"; + compatible = "nokia,n810", "nokia,n8x0", "ti,omap2420", "ti,omap2"; +};
arch/arm/boot/dts/omap2420-n8x0-common.dtsi new file +34 -0
@@ -0,0 +1,34 @@ +#include "omap2420.dtsi" + +/ { + memory { + device_type = "memory"; + reg = <0x80000000 0x8000000>; /* 128 MB */ + }; + + ocp { + i2c at 0 { + compatible = "i2c-cbus-gpio"; + gpios = <&gpio3 2 0 /* gpio66 clk */ + &gpio3 1 0 /* gpio65 dat */ + &gpio3 0 0 /* gpio64 sel */ + >; + #address-cells = <1>; + #size-cells = <0>; + retu_mfd: retu at 1 { + compatible = "retu-mfd"; + interrupt-parent = <&gpio4>; + interrupts = <12 IRQ_TYPE_EDGE_RISING>; + reg = <0x1>; + }; + }; + }; +}; + +&i2c1 { + clock-frequency = <400000>; +}; + +&i2c2 { + clock-frequency = <400000>; +};
Signature · 1 line
1.8.1.1
Tony Lindgren
maintainerPATCH 3/11 ARM: OMAP2+: Add support for board specific auxdata quirks
In reply to Tony LindgrenLooks like some boards need to fill in the auxdata before we call of_platform_populate(). Let's add support for auxdata quirks like we already have for pdata quirks for legacy drivers.
--- arch/arm/mach-omap2/pdata-quirks.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-)
arch/arm/mach-omap2/pdata-quirks.c +25 -7
@@ -125,7 +125,18 @@ void omap_pcs_legacy_init(int irq, void (*rearm)(void)) pcs_pdata.rearm = rearm; } +/* +* Few boards still need auxdata populated before we populate +* the dev entries in of_platform_populate(). +*/ +static struct pdata_init auxdata_quirks[]__initdata = { + {/* sentinel */ }, +}; + struct of_dev_auxdata omap_auxdata_lookup[] __initdata = { +#ifdef CONFIG_MACH_NOKIA_N8X0 + OF_DEV_AUXDATA("ti,omap2420-mmc", 0x4809c000, "mmci-omap.0", NULL), +#endif #ifdef CONFIG_ARCH_OMAP3 OF_DEV_AUXDATA ("ti,omap3-padconf" ,0x48002030 ,"48002030.pinmux" , &pcs_pdata), OF_DEV_AUXDATA("ti,omap3-padconf", 0x48002a00, "48002a00.pinmux", &pcs_pdata),
@@ -137,6 +148,10 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = { { /* sentinel */ }, }; +/* +* Few boards still need to initialize some legacy devices with +* platform data until the drivers support device tree. +*/ static struct pdata_init pdata_quirks[] __initdata = {#ifdef CONFIG_ARCH_OMAP3 { "nokia,omap3-n9", hsmmc2_internal_input_clk, },
@@ -155,14 +170,8 @@ static struct pdata_init pdata_quirks[] __initdata = { { /* sentinel */ }, }; -void __init pdata_quirks_init (struct of_device_id *omap_dt_match_table) +static void pdata_quirks_check (struct pdata_init *quirks) { -struct pdata_init *quirks = pdata_quirks; - -omap_sdrc_init (NULL ,NULL ); -of_platform_populate (NULL , omap_dt_match_table, - omap_auxdata_lookup,NULL ); -while (quirks->compatible) {if (of_machine_is_compatible (quirks->compatible)) {if (quirks->fn)
@@ -172,3 +181,12 @@ void __init pdata_quirks_init(struct of_device_id *omap_dt_match_table) quirks++; } } + +void __init pdata_quirks_init (struct of_device_id *omap_dt_match_table) +{ +omap_sdrc_init (NULL ,NULL ); +pdata_quirks_check (auxdata_quirks); +of_platform_populate (NULL , omap_dt_match_table, + omap_auxdata_lookup,NULL ); +pdata_quirks_check (pdata_quirks); +}
Signature · 1 line
1.8.1.1
Tony Lindgren
maintainerPATCH 4/11 ARM: OMAP2+: Add device tree compatible revision checks for n8x0
In reply to Tony LindgrenThis allows us to initialize the legacy devices when booted with device tree.
--- arch/arm/mach-omap2/board-n8x0.c | 51 +++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 9 deletions(-)
arch/arm/mach-omap2/board-n8x0.c +42 -9
@@ -42,6 +42,38 @@#define TUSB6010_GPIO_ENABLE 0#define TUSB6010_DMACHAN 0x3f +#define NOKIA_N810_WIMAX (1 << 2) +#define NOKIA_N810 (1 << 1) +#define NOKIA_N800 (1 << 0) + +static u32 board_caps; + +#define board_is_n800 () (board_caps & NOKIA_N800) +#define board_is_n810 () (board_caps & NOKIA_N810) +#define board_is_n810_wimax () (board_caps & NOKIA_N810_WIMAX) + +static void board_check_revision (void ) +{ +if (of_have_populated_dt ()) { +if (of_machine_is_compatible ("nokia,n800" )) + board_caps =NOKIA_N800 ; +else if (of_machine_is_compatible ("nokia,n810" )) + board_caps =NOKIA_N810 ; +else if (of_machine_is_compatible ("nokia,n810-wimax" )) + board_caps =NOKIA_N810_WIMAX ; + }else { +if (machine_is_nokia_n800 ()) + board_caps =NOKIA_N800 ; +else if (machine_is_nokia_n810 ()) + board_caps =NOKIA_N810 ; +else if (machine_is_nokia_n810_wimax ()) + board_caps =NOKIA_N810_WIMAX ; + } + +if (!board_caps) +pr_err ("Unknown board\n" ); +} +#if defined(CONFIG_I2C_CBUS_GPIO ) || defined(CONFIG_I2C_CBUS_GPIO_MODULE )static struct i2c_cbus_platform_data n8x0_cbus_data = { .clk_gpio = 66,
@@ -342,7 +374,7 @@ static void n810_set_power_emmc(struct device *dev,static int n8x0_mmc_set_power (struct device *dev,int slot,int power_on,int vdd) { -if (machine_is_nokia_n800 () || slot ==0 ) +if (board_is_n800 () || slot ==0 )return n8x0_mmc_set_power_menelaus (dev, slot, power_on, vdd);n810_set_power_emmc (dev, power_on);
@@ -388,7 +420,7 @@ static void n8x0_mmc_callback(void *data, u8 card_mask) {int bit, *openp, index; -if (machine_is_nokia_n800 ()) { +if (board_is_n800 ()) { bit =1 <<1 ; openp = &slot2_cover_open; index =1 ;
@@ -421,7 +453,7 @@ static int n8x0_mmc_late_init(struct device *dev)if (r <0 )return r; -if (machine_is_nokia_n800 ()) +if (board_is_n800 ()) vs2sel =0 ;else vs2sel =2 ;
@@ -444,7 +476,7 @@ static int n8x0_mmc_late_init(struct device *dev)if (r <0 )return r; -if (machine_is_nokia_n800 ()) { +if (board_is_n800 ()) { bit =1 <<1 ; openp = &slot2_cover_open; }else {
@@ -471,7 +503,7 @@ static void n8x0_mmc_shutdown(struct device *dev) {int vs2sel; -if (machine_is_nokia_n800 ()) +if (board_is_n800 ()) vs2sel =0 ;else vs2sel =2 ;
@@ -486,7 +518,7 @@ static void n8x0_mmc_cleanup(struct device *dev)gpio_free (N8X0_SLOT_SWITCH_GPIO ); -if (machine_is_nokia_n810 ()) { +if (board_is_n810 ()) {gpio_free (N810_EMMC_VSD_GPIO );gpio_free (N810_EMMC_VIO_GPIO ); }
@@ -537,7 +569,7 @@ static void __init n8x0_mmc_init(void) {int err; -if (machine_is_nokia_n810 ()) { +if (board_is_n810 ()) { mmc1_data.slots[0 ].name ="external" ;/*
@@ -555,7 +587,7 @@ static void __init n8x0_mmc_init(void)if (err)return ; -if (machine_is_nokia_n810 ()) { +if (board_is_n810 ()) { err =gpio_request_array (n810_emmc_gpios,ARRAY_SIZE (n810_emmc_gpios));if (err) {
@@ -700,6 +732,7 @@ static inline void board_serial_init(void)static void __init n8x0_init_machine (void ) { +board_check_revision ();omap2420_mux_init (board_mux,OMAP_PACKAGE_ZAC );/* FIXME: add n810 spi devices */ spi_register_board_info(n800_spi_board_info,
@@ -707,7 +740,7 @@ static void __init n8x0_init_machine(void)omap_register_i2c_bus (1 ,400 , n8x0_i2c_board_info_1,ARRAY_SIZE (n8x0_i2c_board_info_1));omap_register_i2c_bus (2 ,400 ,NULL ,0 ); -if (machine_is_nokia_n810 ()) +if (board_is_n810 ())i2c_register_board_info (2 , n810_i2c_board_info_2,ARRAY_SIZE (n810_i2c_board_info_2));board_serial_init ();
Signature · 1 line
1.8.1.1
Tony Lindgren
maintainerPATCH 5/11 ARM: OMAP2+: Make n8x0 behave better with device tree based booting
In reply to Tony LindgrenInitialize some devices using a late_initcall and test for the device tree based booting for some devices.
This way we can keep things working for legacy platform devices when booted with device tree.
--- arch/arm/mach-omap2/board-n8x0.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-)
arch/arm/mach-omap2/board-n8x0.c +22 -8
@@ -32,7 +32,7 @@#include "common.h" #include "mmc.h" - +#include "soc.h" #include "mux.h" #include "gpmc-onenand.h"
@@ -597,7 +597,8 @@ static void __init n8x0_mmc_init(void) } mmc_data[0 ] = &mmc1_data; -omap242x_init_mmc (mmc_data); +if (!of_have_populated_dt ()) +omap242x_init_mmc (mmc_data); }#else
@@ -730,6 +731,21 @@ static inline void board_serial_init(void)#endif +static int __init n8x0_late_initcall (void ) +{ +if (!board_caps) +return -ENODEV ; + +gpmc_onenand_init (board_onenand_data); +n8x0_mmc_init (); +n8x0_usb_init (); +if (!of_have_populated_dt ()) +n8x0_cbus_init (); + +return 0 ; +} +omap_late_initcall (n8x0_late_initcall); +static void __init n8x0_init_machine (void ) {board_check_revision ();
@@ -743,12 +759,10 @@ static void __init n8x0_init_machine(void)if (board_is_n810 ())i2c_register_board_info (2 , n810_i2c_board_info_2,ARRAY_SIZE (n810_i2c_board_info_2)); -board_serial_init (); -omap_sdrc_init (NULL ,NULL ); -gpmc_onenand_init (board_onenand_data); -n8x0_mmc_init (); -n8x0_usb_init (); -n8x0_cbus_init (); +if (!of_have_populated_dt ()) { +board_serial_init (); +omap_sdrc_init (NULL ,NULL ); + } }MACHINE_START (NOKIA_N800 ,"Nokia N800" )
Signature · 1 line
1.8.1.1
Tony Lindgren
maintainerPATCH 6/11 ARM: OMAP2+: Add quirks support for n8x0
In reply to Tony LindgrenThis allows us to keep things working when booted with device tree. Note that we still need to initialize most things with platform data as the drivers are lacking support for device tree.
--- arch/arm/mach-omap2/board-n8x0.c | 21 ++++++++++++++++++++- arch/arm/mach-omap2/common-board-devices.h | 1 + arch/arm/mach-omap2/pdata-quirks.c | 14 ++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-)
arch/arm/mach-omap2/board-n8x0.c +20 -1
@@ -529,7 +529,7 @@ static void n8x0_mmc_cleanup(struct device *dev)* MMC controller2 is not in use. */ static struct omap_mmc_platform_data mmc1_data = { - .nr_slots =2 , + .nr_slots =0 , .switch_slot = n8x0_mmc_switch_slot, .init = n8x0_mmc_late_init, .cleanup = n8x0_mmc_cleanup,
@@ -596,6 +596,7 @@ static void __init n8x0_mmc_init(void) } } + mmc1_data.nr_slots =2 ; mmc_data[0 ] = &mmc1_data;if (!of_have_populated_dt ())omap242x_init_mmc (mmc_data);
@@ -746,6 +747,24 @@ static int __init n8x0_late_initcall(void) }omap_late_initcall (n8x0_late_initcall); +/* +* Legacy init pdata init for n8x0. Note that we want to follow the +* I2C bus numbering starting at 0 for device tree like other omaps. +*/ +void *__init n8x0_legacy_init (void ) +{ +board_check_revision (); +spi_register_board_info (n800_spi_board_info, +ARRAY_SIZE (n800_spi_board_info)); +i2c_register_board_info (0 , n8x0_i2c_board_info_1, +ARRAY_SIZE (n8x0_i2c_board_info_1)); +if (board_is_n810 ()) +i2c_register_board_info (1 , n810_i2c_board_info_2, +ARRAY_SIZE (n810_i2c_board_info_2)); + +return &mmc1_data; +} +static void __init n8x0_init_machine (void ) {board_check_revision ();
arch/arm/mach-omap2/common-board-devices.h +1 -0
@@ -10,5 +10,6 @@ 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 );#endif /* __OMAP_COMMON_BOARD_DEVICES__ */
arch/arm/mach-omap2/pdata-quirks.c +14 -0
@@ -26,6 +26,8 @@ struct pdata_init {void (*fn)(void ); }; +struct of_dev_auxdata omap_auxdata_lookup[]; +/* * Create alias for USB host PHY clock. * Remove this when clock phandle can be provided via DT
@@ -68,6 +70,13 @@ static inline void legacy_init_wl12xx(unsigned ref_clock, }#endif +#ifdef CONFIG_SOC_OMAP2420 +static void __init omap2420_n8x0_legacy_init (void ) +{ + omap_auxdata_lookup[0 ].platform_data =n8x0_legacy_init (); +} +#endif +#ifdef CONFIG_ARCH_OMAP3 static void __init hsmmc2_internal_input_clk (void ) {
@@ -130,6 +139,11 @@ void omap_pcs_legacy_init(int irq, void (*rearm)(void))* the dev entries in of_platform_populate(). */ static struct pdata_init auxdata_quirks[] __initdata = { +#ifdef CONFIG_SOC_OMAP2420 + { "nokia,n800", omap2420_n8x0_legacy_init, }, + { "nokia,n810", omap2420_n8x0_legacy_init, }, + { "nokia,n810-wimax", omap2420_n8x0_legacy_init, }, +#endif { /* sentinel */ }, };
Signature · 1 line
1.8.1.1
Tony Lindgren
maintainerPATCH 7/11 ARM: OMAP2+: Remove legacy booting support for n8x0
In reply to Tony LindgrenNow we can boot n8x with the appended device tree with:
$ ARCH=arm CROSS_COMPILE=/usr/bin/arm-linux-gnueabi- make omap2420-n800.dtb $ cat arch/arm/boot/zImage arch/arm/boot/dts/omap2420-n800.dtb > /tmp/zImage
Note that you need at least the following enabled:
CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y CONFIG_PINCTRL=yCONFIG_PINCTRL_SINGLE=y
--- arch/arm/mach-omap2/board-n8x0.c | 158 --------------------------------------- arch/arm/mach-omap2/msdi.c | 69 ----------------- 2 files changed, 227 deletions(-)
arch/arm/mach-omap2/board-n8x0.c +0 -158
@@ -21,7 +21,6 @@#include <linux/i2c.h> #include <linux/spi/spi.h> #include <linux/usb/musb.h> -#include <linux/platform_data/i2c-cbus-gpio.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/mtd-onenand-omap2.h> #include <linux/mfd/menelaus.h>
@@ -33,7 +32,6 @@#include "common.h" #include "mmc.h" #include "soc.h" -#include "mux.h" #include "gpmc-onenand.h" #define TUSB6010_ASYNC_CS 1
@@ -61,58 +59,12 @@ static void board_check_revision(void) board_caps =NOKIA_N810 ; else if (of_machine_is_compatible("nokia,n810-wimax")) board_caps =NOKIA_N810_WIMAX ; - }else { -if (machine_is_nokia_n800 ()) - board_caps =NOKIA_N800 ; -else if (machine_is_nokia_n810 ()) - board_caps =NOKIA_N810 ; -else if (machine_is_nokia_n810_wimax ()) - board_caps =NOKIA_N810_WIMAX ; }if (!board_caps)pr_err ("Unknown board\n" ); } -#if defined(CONFIG_I2C_CBUS_GPIO ) || defined(CONFIG_I2C_CBUS_GPIO_MODULE ) -static struct i2c_cbus_platform_data n8x0_cbus_data = { - .clk_gpio =66 , - .dat_gpio =65 , - .sel_gpio =64 , -}; - -static struct platform_device n8x0_cbus_device = { - .name ="i2c-cbus-gpio" , - .id =3 , - .dev = { - .platform_data = &n8x0_cbus_data, - }, -}; - -static struct i2c_board_info n8x0_i2c_board_info_3[]__initdata = { - { -I2C_BOARD_INFO ("retu-mfd" ,0x01 ), - }, -}; - -static void __init n8x0_cbus_init (void ) -{ -const int retu_irq_gpio =108 ; - -if (gpio_request_one (retu_irq_gpio,GPIOF_IN ,"Retu IRQ" )) -return ; -irq_set_irq_type (gpio_to_irq (retu_irq_gpio),IRQ_TYPE_EDGE_RISING ); - n8x0_i2c_board_info_3[0 ].irq =gpio_to_irq (retu_irq_gpio); -i2c_register_board_info (3 , n8x0_i2c_board_info_3, -ARRAY_SIZE (n8x0_i2c_board_info_3)); -platform_device_register (&n8x0_cbus_device); -} -#else /* CONFIG_I2C_CBUS_GPIO */ -static void __init n8x0_cbus_init (void ) -{ -} -#endif /* CONFIG_I2C_CBUS_GPIO */ -#if defined(CONFIG_USB_MUSB_TUSB6010 ) || defined(CONFIG_USB_MUSB_TUSB6010_MODULE )/* * Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and
@@ -598,8 +550,6 @@ static void __init n8x0_mmc_init(void) mmc1_data.nr_slots =2 ; mmc_data[0] = &mmc1_data; -if (!of_have_populated_dt ()) - omap242x_init_mmc(mmc_data); }#else
@@ -684,54 +634,6 @@ static struct i2c_board_info n810_i2c_board_info_2[] __initdata = { }, }; -#ifdef CONFIG_OMAP_MUX -static struct omap_board_mux board_mux[]__initdata = { -/* I2S codec port pins for McBSP block */ -OMAP2420_MUX (EAC_AC_SCLK ,OMAP_MUX_MODE1 |OMAP_PIN_INPUT ), -OMAP2420_MUX (EAC_AC_FS ,OMAP_MUX_MODE1 |OMAP_PIN_INPUT ), -OMAP2420_MUX (EAC_AC_DIN ,OMAP_MUX_MODE1 |OMAP_PIN_INPUT ), -OMAP2420_MUX (EAC_AC_DOUT ,OMAP_MUX_MODE1 |OMAP_PIN_OUTPUT ), - { .reg_offset =OMAP_MUX_TERMINATOR }, -}; - -static struct omap_device_pad serial2_pads[]__initdata = { - { - .name ="uart3_rx_irrx.uart3_rx_irrx" , - .flags =OMAP_DEVICE_PAD_REMUX |OMAP_DEVICE_PAD_WAKEUP , - .enable =OMAP_MUX_MODE0 , - .idle =OMAP_MUX_MODE3 /* Mux as GPIO for idle */ - }, -}; - -static inline void board_serial_init (void ) -{ -struct omap_board_data bdata; - - bdata.flags =0 ; - bdata.pads =NULL ; - bdata.pads_cnt =0 ; - - bdata.id =0 ; -omap_serial_init_port (&bdata,NULL ); - - bdata.id =1 ; -omap_serial_init_port (&bdata,NULL ); - - bdata.id =2 ; - bdata.pads = serial2_pads; - bdata.pads_cnt =ARRAY_SIZE (serial2_pads); -omap_serial_init_port (&bdata,NULL ); -} - -#else - -static inline void board_serial_init (void ) -{ -omap_serial_init (); -} - -#endif -static int __init n8x0_late_initcall (void ) {if (!board_caps)
@@ -740,8 +642,6 @@ static int __init n8x0_late_initcall(void)gpmc_onenand_init (board_onenand_data);n8x0_mmc_init ();n8x0_usb_init (); -if (!of_have_populated_dt ()) -n8x0_cbus_init ();return 0 ; }
@@ -764,61 +664,3 @@ void * __init n8x0_legacy_init(void)return &mmc1_data; } - -static void __init n8x0_init_machine (void ) -{ -board_check_revision (); -omap2420_mux_init (board_mux,OMAP_PACKAGE_ZAC ); -/* FIXME: add n810 spi devices */ -spi_register_board_info (n800_spi_board_info, -ARRAY_SIZE (n800_spi_board_info)); -omap_register_i2c_bus (1 ,400 , n8x0_i2c_board_info_1, -ARRAY_SIZE (n8x0_i2c_board_info_1)); -omap_register_i2c_bus (2 ,400 ,NULL ,0 ); -if (board_is_n810 ()) -i2c_register_board_info (2 , n810_i2c_board_info_2, -ARRAY_SIZE (n810_i2c_board_info_2)); -if (!of_have_populated_dt ()) { -board_serial_init (); -omap_sdrc_init (NULL ,NULL ); - } -} - -MACHINE_START (NOKIA_N800 ,"Nokia N800" ) - .atag_offset = 0x100, - .reserve = omap_reserve, - .map_io = omap242x_map_io, - .init_early = omap2420_init_early, - .init_irq = omap2_init_irq, - .handle_irq = omap2_intc_handle_irq, - .init_machine = n8x0_init_machine, - .init_late = omap2420_init_late, - .init_time = omap2_sync32k_timer_init, - .restart = omap2xxx_restart, -MACHINE_END - -MACHINE_START (NOKIA_N810 ,"Nokia N810" ) - .atag_offset =0x100 , - .reserve = omap_reserve, - .map_io = omap242x_map_io, - .init_early = omap2420_init_early, - .init_irq = omap2_init_irq, - .handle_irq = omap2_intc_handle_irq, - .init_machine = n8x0_init_machine, - .init_late = omap2420_init_late, - .init_time = omap2_sync32k_timer_init, - .restart = omap2xxx_restart, -MACHINE_END - -MACHINE_START (NOKIA_N810_WIMAX ,"Nokia N810 WiMAX" ) - .atag_offset =0x100 , - .reserve = omap_reserve, - .map_io = omap242x_map_io, - .init_early = omap2420_init_early, - .init_irq = omap2_init_irq, - .handle_irq = omap2_intc_handle_irq, - .init_machine = n8x0_init_machine, - .init_late = omap2420_init_late, - .init_time = omap2_sync32k_timer_init, - .restart = omap2xxx_restart, -MACHINE_END
arch/arm/mach-omap2/msdi.c +0 -69
72 lines not on this page · raw message
Signature · 1 line
1.8.1.1
Tony Lindgren
maintainerPATCH 8/11 ARM: OMAP2+: Remove board file for H4
In reply to Tony LindgrenThe old 2420 based H4 is probably not used at all as 2420 was Nokia specific SoC. I have one, but I'm not using it because of it's large size, and I doubt anybody else is using it either.
We do have minimal omap2420-h4.dts in place, so if anybody wants more support on H4, patches are welcome.
So let's just remove it as that helps us making mach-omap2 to be device tree only.
--- arch/arm/mach-omap2/Kconfig | 7 - arch/arm/mach-omap2/Makefile | 1 - arch/arm/mach-omap2/board-h4.c | 365 ----------------------------------------- 3 files changed, 373 deletions(-) delete mode 100644 arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/Kconfig +0 -7
@@ -192,13 +192,6 @@ config MACH_OMAP2_TUSB6010 depends on ARCH_OMAP2 && SOC_OMAP2420 default y if MACH_NOKIA_N8X0 -config MACH_OMAP_H4 - bool "OMAP 2420 H4 board" - depends on SOC_OMAP2420 - default y - select OMAP_DEBUG_DEVICES - select OMAP_PACKAGE_ZAF - config MACH_OMAP_2430SDP bool "OMAP 2430 SDP board" depends on SOC_OMAP2430
arch/arm/mach-omap2/Makefile +0 -1
@@ -237,7 +237,6 @@ obj-$(CONFIG_SOC_OMAP2420) += msdi.o # Specific board support obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o pdata-quirks.o -obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o obj-$(CONFIG_MACH_DEVKIT8000) += board-devkit8000.o
arch/arm/mach-omap2/board-h4.c deleted +0 -365
365 lines not on this page · raw message
Signature · 1 line
1.8.1.1
Tony Lindgren
maintainerPATCH 9/11 ARM: OMAP2+: Remove legacy board file for 2430sdp
In reply to Tony LindgrenWe can now boot with device tree and appended DTB with basic devices working. If people are still using this board, patches are welcome to add more complete support.
--- arch/arm/mach-omap2/Kconfig | 6 - arch/arm/mach-omap2/Makefile | 1 - arch/arm/mach-omap2/board-2430sdp.c | 273 ------------------------------------ 3 files changed, 280 deletions(-) delete mode 100644 arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/Kconfig +0 -6
@@ -192,12 +192,6 @@ config MACH_OMAP2_TUSB6010 depends on ARCH_OMAP2 && SOC_OMAP2420 default y if MACH_NOKIA_N8X0 -config MACH_OMAP_2430SDP - bool "OMAP 2430 SDP board" - depends on SOC_OMAP2430 - default y - select OMAP_PACKAGE_ZAC - config MACH_OMAP3_BEAGLE bool "OMAP3 BEAGLE board" depends on ARCH_OMAP3
arch/arm/mach-omap2/Makefile +0 -1
@@ -237,7 +237,6 @@ obj-$(CONFIG_SOC_OMAP2420) += msdi.o # Specific board support obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o pdata-quirks.o -obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o obj-$(CONFIG_MACH_DEVKIT8000) += board-devkit8000.o obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o
arch/arm/mach-omap2/board-2430sdp.c deleted +0 -273
273 lines not on this page · raw message
Signature · 1 line
1.8.1.1
Tony Lindgren
maintainerPATCH 10/11 ARM: OMAP2+: Remove legacy mux code for omap2
In reply to Tony LindgrenThis is no longer needed as pins can be muxed using pinctrl-single.
--- arch/arm/mach-omap2/Makefile | 2 - arch/arm/mach-omap2/mux.h | 2 - arch/arm/mach-omap2/mux2420.c | 690 ------------------------------------ arch/arm/mach-omap2/mux2420.h | 282 --------------- arch/arm/mach-omap2/mux2430.c | 793 ------------------------------------------ arch/arm/mach-omap2/mux2430.h | 370 -------------------- 6 files changed, 2139 deletions(-) delete mode 100644 arch/arm/mach-omap2/mux2420.c delete mode 100644 arch/arm/mach-omap2/mux2420.h delete mode 100644 arch/arm/mach-omap2/mux2430.c delete mode 100644 arch/arm/mach-omap2/mux2430.h
arch/arm/mach-omap2/Makefile +0 -2
@@ -66,8 +66,6 @@ obj-$(CONFIG_SOC_OMAP5) += omap4-restart.o obj-$(CONFIG_SOC_DRA7XX) += omap4-restart.o # Pin multiplexing -obj-$(CONFIG_SOC_OMAP2420) += mux2420.o -obj-$(CONFIG_SOC_OMAP2430) += mux2430.o obj-$(CONFIG_ARCH_OMAP3) += mux34xx.o # SMS/SDRC
arch/arm/mach-omap2/mux.h +0 -2
@@ -7,8 +7,6 @@* published by the Free Software Foundation. */ -#include "mux2420.h" -#include "mux2430.h" #include "mux34xx.h" #define OMAP_MUX_TERMINATOR 0xffff
arch/arm/mach-omap2/mux2420.c deleted +0 -690
690 lines not on this page · raw message
arch/arm/mach-omap2/mux2420.h deleted +0 -282
282 lines not on this page · raw message
arch/arm/mach-omap2/mux2430.c deleted +0 -793
793 lines not on this page · raw message
arch/arm/mach-omap2/mux2430.h deleted +0 -370
370 lines not on this page · raw message
Signature · 1 line
1.8.1.1
Tony Lindgren
maintainerPATCH 11/11 ARM: OMAP2+: Remove legacy hwmod entries for omap2
In reply to Tony LindgrenThese now come from device tree except for DSS and DMA that still uses hwmod to initialize. That will get fixed when we DSS gets device tree bindings and we move completely to the dmaengine API.
--- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 137 ----------- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 266 --------------------- .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 155 ------------ arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 68 ------ arch/arm/mach-omap2/omap_hwmod_common_data.h | 5 - 5 files changed, 631 deletions(-)
arch/arm/mach-omap2/omap_hwmod_2420_data.c +0 -137
@@ -108,8 +108,6 @@ static struct omap_i2c_dev_attr i2c_dev_attr = {/* I2C1 */ static struct omap_hwmod omap2420_i2c1_hwmod = { .name ="i2c1" , - .mpu_irqs = omap2_i2c1_mpu_irqs, - .sdma_reqs = omap2_i2c1_sdma_reqs, .main_clk ="i2c1_fck" , .prcm = { .omap2 = {
@@ -133,8 +131,6 @@ static struct omap_hwmod omap2420_i2c1_hwmod = {/* I2C2 */ static struct omap_hwmod omap2420_i2c2_hwmod = { .name ="i2c2" , - .mpu_irqs = omap2_i2c2_mpu_irqs, - .sdma_reqs = omap2_i2c2_sdma_reqs, .main_clk ="i2c2_fck" , .prcm = { .omap2 = {
@@ -179,16 +175,9 @@ static struct omap_mbox_pdata omap2420_mailbox_attrs = { .info = omap2420_mailbox_info, }; -static struct omap_hwmod_irq_info omap2420_mailbox_irqs[] = { - { .name ="dsp" , .irq =26 +OMAP_INTC_START , }, - { .name ="iva" , .irq =34 +OMAP_INTC_START , }, - { .irq =-1 }, -}; -static struct omap_hwmod omap2420_mailbox_hwmod = { .name ="mailbox" , .class = &omap2xxx_mailbox_hwmod_class, - .mpu_irqs = omap2420_mailbox_irqs, .main_clk ="mailboxes_ick" , .prcm = { .omap2 = {
@@ -217,17 +206,9 @@ static struct omap_hwmod_opt_clk mcbsp_opt_clks[] = { };/* mcbsp1 */ -static struct omap_hwmod_irq_info omap2420_mcbsp1_irqs[] = { - { .name ="tx" , .irq =59 +OMAP_INTC_START , }, - { .name ="rx" , .irq =60 +OMAP_INTC_START , }, - { .irq =-1 }, -}; -static struct omap_hwmod omap2420_mcbsp1_hwmod = { .name ="mcbsp1" , .class = &omap2420_mcbsp_hwmod_class, - .mpu_irqs = omap2420_mcbsp1_irqs, - .sdma_reqs = omap2_mcbsp1_sdma_reqs, .main_clk ="mcbsp1_fck" , .prcm = { .omap2 = {
@@ -243,17 +224,9 @@ static struct omap_hwmod omap2420_mcbsp1_hwmod = { };/* mcbsp2 */ -static struct omap_hwmod_irq_info omap2420_mcbsp2_irqs[] = { - { .name ="tx" , .irq =62 +OMAP_INTC_START , }, - { .name ="rx" , .irq =63 +OMAP_INTC_START , }, - { .irq =-1 }, -}; -static struct omap_hwmod omap2420_mcbsp2_hwmod = { .name ="mcbsp2" , .class = &omap2420_mcbsp_hwmod_class, - .mpu_irqs = omap2420_mcbsp2_irqs, - .sdma_reqs = omap2_mcbsp2_sdma_reqs, .main_clk ="mcbsp2_fck" , .prcm = { .omap2 = {
@@ -283,22 +256,9 @@ static struct omap_hwmod_class omap2420_msdi_hwmod_class = { };/* msdi1 */ -static struct omap_hwmod_irq_info omap2420_msdi1_irqs[] = { - { .irq =83 +OMAP_INTC_START , }, - { .irq =-1 }, -}; - -static struct omap_hwmod_dma_info omap2420_msdi1_sdma_reqs[] = { - { .name ="tx" , .dma_req =61 },/* OMAP24XX_DMA_MMC1_TX */ - { .name ="rx" , .dma_req =62 },/* OMAP24XX_DMA_MMC1_RX */ - { .dma_req =-1 } -}; -static struct omap_hwmod omap2420_msdi1_hwmod = { .name ="msdi1" , .class = &omap2420_msdi_hwmod_class, - .mpu_irqs = omap2420_msdi1_irqs, - .sdma_reqs = omap2420_msdi1_sdma_reqs, .main_clk ="mmc_fck" , .prcm = { .omap2 = {
@@ -315,7 +275,6 @@ static struct omap_hwmod omap2420_msdi1_hwmod = {/* HDQ1W/1-wire */ static struct omap_hwmod omap2420_hdq1w_hwmod = { .name ="hdq1w" , - .mpu_irqs = omap2_hdq1w_mpu_irqs, .main_clk ="hdq_fck" , .prcm = { .omap2 = {
@@ -338,7 +297,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__i2c1 = { .master = &omap2xxx_l4_core_hwmod, .slave = &omap2420_i2c1_hwmod, .clk = "i2c1_ick", - .addr = omap2_i2c1_addr_space, .user = OCP_USER_MPU | OCP_USER_SDMA, };
@@ -347,7 +305,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__i2c2 = { .master = &omap2xxx_l4_core_hwmod, .slave = &omap2420_i2c2_hwmod, .clk = "i2c2_ick", - .addr = omap2_i2c2_addr_space, .user = OCP_USER_MPU | OCP_USER_SDMA, };
@@ -367,111 +324,51 @@ static struct omap_hwmod_ocp_if omap2420_l3__dsp = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -static struct omap_hwmod_addr_space omap2420_timer1_addrs[] = { - { - .pa_start =0x48028000 , - .pa_end =0x48028000 +SZ_1K -1 , - .flags =ADDR_TYPE_RT - }, - { } -}; -/* l4_wkup -> timer1 */ static struct omap_hwmod_ocp_if omap2420_l4_wkup__timer1 = { .master = &omap2xxx_l4_wkup_hwmod, .slave = &omap2xxx_timer1_hwmod, .clk ="gpt1_ick" , - .addr = omap2420_timer1_addrs, .user =OCP_USER_MPU |OCP_USER_SDMA , };/* l4_wkup -> wd_timer2 */ -static struct omap_hwmod_addr_space omap2420_wd_timer2_addrs[] = { - { - .pa_start =0x48022000 , - .pa_end =0x4802207f , - .flags =ADDR_TYPE_RT - }, - { } -}; -static struct omap_hwmod_ocp_if omap2420_l4_wkup__wd_timer2 = { .master = &omap2xxx_l4_wkup_hwmod, .slave = &omap2xxx_wd_timer2_hwmod, .clk ="mpu_wdt_ick" , - .addr = omap2420_wd_timer2_addrs, .user =OCP_USER_MPU |OCP_USER_SDMA , };/* l4_wkup -> gpio1 */ -static struct omap_hwmod_addr_space omap2420_gpio1_addr_space[] = { - { - .pa_start =0x48018000 , - .pa_end =0x480181ff , - .flags =ADDR_TYPE_RT - }, - { } -}; -static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio1 = { .master = &omap2xxx_l4_wkup_hwmod, .slave = &omap2xxx_gpio1_hwmod, .clk ="gpios_ick" , - .addr = omap2420_gpio1_addr_space, .user =OCP_USER_MPU |OCP_USER_SDMA , };/* l4_wkup -> gpio2 */ -static struct omap_hwmod_addr_space omap2420_gpio2_addr_space[] = { - { - .pa_start =0x4801a000 , - .pa_end =0x4801a1ff , - .flags =ADDR_TYPE_RT - }, - { } -}; -static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio2 = { .master = &omap2xxx_l4_wkup_hwmod, .slave = &omap2xxx_gpio2_hwmod, .clk ="gpios_ick" , - .addr = omap2420_gpio2_addr_space, .user =OCP_USER_MPU |OCP_USER_SDMA , };/* l4_wkup -> gpio3 */ -static struct omap_hwmod_addr_space omap2420_gpio3_addr_space[] = { - { - .pa_start =0x4801c000 , - .pa_end =0x4801c1ff , - .flags =ADDR_TYPE_RT - }, - { } -}; -static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio3 = { .master = &omap2xxx_l4_wkup_hwmod, .slave = &omap2xxx_gpio3_hwmod, .clk ="gpios_ick" , - .addr = omap2420_gpio3_addr_space, .user =OCP_USER_MPU |OCP_USER_SDMA , };/* l4_wkup -> gpio4 */ -static struct omap_hwmod_addr_space omap2420_gpio4_addr_space[] = { - { - .pa_start =0x4801e000 , - .pa_end =0x4801e1ff , - .flags =ADDR_TYPE_RT - }, - { } -}; -static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio4 = { .master = &omap2xxx_l4_wkup_hwmod, .slave = &omap2xxx_gpio4_hwmod, .clk ="gpios_ick" , - .addr = omap2420_gpio4_addr_space, .user =OCP_USER_MPU |OCP_USER_SDMA , };
@@ -496,7 +393,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dma_system = {static struct omap_hwmod_ocp_if omap2420_l4_core__mailbox = { .master = &omap2xxx_l4_core_hwmod, .slave = &omap2420_mailbox_hwmod, - .addr = omap2_mailbox_addrs, .user =OCP_USER_MPU |OCP_USER_SDMA , };
@@ -505,7 +401,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcbsp1 = { .master = &omap2xxx_l4_core_hwmod, .slave = &omap2420_mcbsp1_hwmod, .clk = "mcbsp1_ick", - .addr = omap2_mcbsp1_addrs, .user = OCP_USER_MPU | OCP_USER_SDMA, };
@@ -514,25 +409,14 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcbsp2 = { .master = &omap2xxx_l4_core_hwmod, .slave = &omap2420_mcbsp2_hwmod, .clk = "mcbsp2_ick", - .addr = omap2xxx_mcbsp2_addrs, .user = OCP_USER_MPU | OCP_USER_SDMA, }; -static struct omap_hwmod_addr_space omap2420_msdi1_addrs[] = { - { - .pa_start =0x4809c000 , - .pa_end =0x4809c000 +SZ_128 -1 , - .flags =ADDR_TYPE_RT , - }, - { } -}; -/* l4_core -> msdi1 */ static struct omap_hwmod_ocp_if omap2420_l4_core__msdi1 = { .master = &omap2xxx_l4_core_hwmod, .slave = &omap2420_msdi1_hwmod, .clk ="mmc_ick" , - .addr = omap2420_msdi1_addrs, .user =OCP_USER_MPU |OCP_USER_SDMA , };
@@ -541,36 +425,16 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__hdq1w = { .master = &omap2xxx_l4_core_hwmod, .slave = &omap2420_hdq1w_hwmod, .clk = "hdq_ick", - .addr = omap2_hdq1w_addr_space, .user = OCP_USER_MPU | OCP_USER_SDMA, .flags = OMAP_FIREWALL_L4 | OCPIF_SWSUP_IDLE, };/* l4_wkup -> 32ksync_counter */ -static struct omap_hwmod_addr_space omap2420_counter_32k_addrs[] = { - { - .pa_start =0x48004000 , - .pa_end =0x4800401f , - .flags =ADDR_TYPE_RT - }, - { } -}; - -static struct omap_hwmod_addr_space omap2420_gpmc_addrs[] = { - { - .pa_start =0x6800a000 , - .pa_end =0x6800afff , - .flags =ADDR_TYPE_RT - }, - { } -}; -static struct omap_hwmod_ocp_if omap2420_l4_wkup__counter_32k = { .master = &omap2xxx_l4_wkup_hwmod, .slave = &omap2xxx_counter_32k_hwmod, .clk ="sync_32k_ick" , - .addr = omap2420_counter_32k_addrs, .user =OCP_USER_MPU |OCP_USER_SDMA , };
@@ -578,7 +442,6 @@ static struct omap_hwmod_ocp_if omap2420_l3__gpmc = { .master = &omap2xxx_l3_main_hwmod, .slave = &omap2xxx_gpmc_hwmod, .clk = "core_l3_ck", - .addr = omap2420_gpmc_addrs, .user = OCP_USER_MPU | OCP_USER_SDMA, };
arch/arm/mach-omap2/omap_hwmod_2430_data.c +0 -266
551 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c +0 -155
274 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +0 -68
241 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_common_data.h +0 -5
@@ -18,9 +18,6 @@#include "common.h" #include "display.h" -/* Common address space across OMAP2xxx */ -extern struct omap_hwmod_addr_space omap2xxx_mcbsp2_addrs[]; -/* 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[];
@@ -41,8 +38,6 @@ 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_hwmod_irq_info omap2xxx_timer12_mpu_irqs[]; -extern struct omap_hwmod_dma_info omap2xxx_dss_sdma_chs[];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;
Signature · 1 line
1.8.1.1
Aaro Koskinen
maintainercover Make omap24xx booting device tree based for v3.14 merge window
In reply to Tony LindgrenHi,
Quoted 10 lines · Tony Lindgren
Here are some early patches for the v3.14 merge window to make omap2 booting device tree based before we make omap3 device tree only. Otherwise we cannot remove the shared platform data between omap2 and 3 for things like some hwmod entries.
I've added minimal support for 2430sdp to boot it to serial console with ethernet working, and kept n8x0 support using the legacy init for the drivers. Then the old H4 I have not updated as I'm not using it.
Quoted 4 lines
Hopefully if there are still people using n8x0 they can pick up the work from here on removing the rest of the legacy platform data init as we're planning to drop those things completely over next few merge cycles.
Thanks for the effort, I'll try to continue this work. You can add my Tested-by for N8x0 bits.
Quoted 5 lines
Note that these patches are against mainline commit
10d0c9705as there are few device tree related fixes to stuff the resources. These also depend on the recently posted fixes series "[PATCH 0/8] Various omap device tree usability fixes for v3.13 merge window"
I noticed one bug. If you disable MACH_NOKIA_N8X0 from .config, there is a compilation failure:
arch/arm/mach-omap2/built-in.o: In function `omap2420_n8x0_legacy_init':/home/aaro/git/linux/arch/arm/mach-omap2/pdata-quirks.c:76: undefined reference to `n8x0_legacy_init'
A.
Tony Lindgren
maintainercover Make omap24xx booting device tree based for v3.14 merge window
Quoted 27 lines · Aaro Koskinen
Hi,
Quoted 10 lines · Tony Lindgren
Here are some early patches for the v3.14 merge window to make omap2 booting device tree based before we make omap3 device tree only. Otherwise we cannot remove the shared platform data between omap2 and 3 for things like some hwmod entries.
I've added minimal support for 2430sdp to boot it to serial console with ethernet working, and kept n8x0 support using the legacy init for the drivers. Then the old H4 I have not updated as I'm not using it.
Quoted 4 lines
Hopefully if there are still people using n8x0 they can pick up the work from here on removing the rest of the legacy platform data init as we're planning to drop those things completely over next few merge cycles.
Thanks for the effort, I'll try to continue this work. You can add my Tested-by for N8x0 bits.
Quoted 5 lines
Note that these patches are against mainline commit
10d0c9705as there are few device tree related fixes to stuff the resources. These also depend on the recently posted fixes series "[PATCH 0/8] Various omap device tree usability fixes for v3.13 merge window"
Quoted 5 lines
I noticed one bug. If you disable
MACH_NOKIA_N8X0from .config, there is a compilation failure:
arch/arm/mach-omap2/built-in.o: In function `omap2420_n8x0_legacy_init':/home/aaro/git/linux/arch/arm/mach-omap2/pdata-quirks.c:76: undefined reference to `n8x0_legacy_init'
OK thanks for testing, I'll fix that.
Regards,
Tony