Commit 9b7141d0 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Drop legacy board file for n900 



Let's drop the last two remaining omap3 legacy boot board files.
Let's only use the device tree based booting known to work for
these two boards.

We still have two omap3 boards booting in legacy mode in addition
to device tree based booting. All the other ten or so omap2+ SoCs
have been booting using device tree mode only for years now. This
has allowed us to get rid of quite a bit of arch/arm/mach-omap2
related platform init code in favor of dts and driver changes.

Pretty much the only remaining known users for omap3 legacy boot
board files are Kevin's and Russell's boot test systems, and N900
kernel tree maintained by Pali and Ivaylo. And all of them are
also supporting the device tree based booting. The legacy booting
mode has been kept around mostly to verify against regressions.

As there is still a slim chance of possible other uses of the
mainline kernel for these boards, let's just drop the board
files for v4.8, and let's not touch the related platform init
code until around v4.9 time if no issues are found. This makes
it trivial for us to add back the board files with a simple revert.

Acked-By: default avatarSebastian Reichel <sre@kernel.org>
Acked-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: default avatarPali Rohár <pali.rohar@gmail.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e15d11ea

arch/arm/mach-omap2/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -218,12 +218,6 @@ config MACH_NOKIA_N8X0 
	select MACH_NOKIA_N810

	select MACH_NOKIA_N810_WIMAX



config MACH_NOKIA_RX51

	bool "Nokia N900 (RX-51) phone"

	depends on ARCH_OMAP3

	default y

	select OMAP_PACKAGE_CBB



config OMAP3_SDRC_AC_TIMING

	bool "Enable SDRC AC timing register changes"

	depends on ARCH_OMAP3

arch/arm/mach-omap2/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -230,9 +230,6 @@ obj-$(CONFIG_SOC_OMAP2420) += msdi.o 
obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o pdata-quirks.o

obj-$(CONFIG_MACH_OMAP_LDP)		+= board-ldp.o

obj-$(CONFIG_MACH_NOKIA_N8X0)		+= board-n8x0.o

obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51.o sdram-nokia.o

obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-peripherals.o

obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-video.o



# Platform specific device init code

arch/arm/mach-omap2/board-rx51-peripherals.c

deleted100644 → 0
+0 −1312

File deleted.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap2/board-rx51-video.c

deleted100644 → 0
+0 −67
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/mach-omap2/board-rx51-video.c

 *

 * 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.

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/gpio.h>

#include <linux/spi/spi.h>

#include <linux/mm.h>

#include <asm/mach-types.h>

#include <linux/platform_data/omapdss.h>

#include <video/omap-panel-data.h>



#include <linux/platform_data/spi-omap2-mcspi.h>



#include "soc.h"

#include "board-rx51.h"

#include "display.h"



#include "mux.h"



#define RX51_LCD_RESET_GPIO	90



#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)



static struct connector_atv_platform_data rx51_tv_pdata = {

	.name = "tv",

	.source = "venc.0",

	.invert_polarity = false,

};



static struct platform_device rx51_tv_connector_device = {

	.name                   = "connector-analog-tv",

	.id                     = 0,

	.dev.platform_data      = &rx51_tv_pdata,

};



static struct omap_dss_board_info rx51_dss_board_info = {

	.default_display_name = "lcd",

};



static int __init rx51_video_init(void)

{

	if (!machine_is_nokia_rx51())

		return 0;



	if (omap_mux_init_gpio(RX51_LCD_RESET_GPIO, OMAP_PIN_OUTPUT)) {

		pr_err("%s cannot configure MUX for LCD RESET\n", __func__);

		return 0;

	}



	omap_display_init(&rx51_dss_board_info);



	platform_device_register(&rx51_tv_connector_device);



	return 0;

}



omap_subsys_initcall(rx51_video_init);

#endif /* defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE) */

arch/arm/mach-omap2/board-rx51.c

deleted100644 → 0
+0 −141
Original line number Diff line number Diff line 
/*

 * Board support file for Nokia N900 (aka RX-51).

 *

 * Copyright (C) 2007, 2008 Nokia

 * Copyright (C) 2012 Ivaylo Dimitrov <freemangordon@abv.bg>

 * Copyright (C) 2013 Pali Rohár <pali.rohar@gmail.com>

 *

 * 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.

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/err.h>

#include <linux/clk.h>

#include <linux/io.h>

#include <linux/gpio.h>

#include <linux/leds.h>

#include <linux/usb/phy.h>

#include <linux/usb/musb.h>

#include <linux/platform_data/spi-omap2-mcspi.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>



#include <linux/omap-dma.h>



#include "common.h"

#include "mux.h"

#include "gpmc.h"

#include "pm.h"

#include "soc.h"

#include "sdram-nokia.h"

#include "omap-secure.h"



#define RX51_GPIO_SLEEP_IND 162



static struct gpio_led gpio_leds[] = {

	{

		.name	= "sleep_ind",

		.gpio	= RX51_GPIO_SLEEP_IND,

	},

};



static struct gpio_led_platform_data gpio_led_info = {

	.leds		= gpio_leds,

	.num_leds	= ARRAY_SIZE(gpio_leds),

};



static struct platform_device leds_gpio = {

	.name	= "leds-gpio",

	.id	= -1,

	.dev	= {

		.platform_data	= &gpio_led_info,

	},

};



/*

 * cpuidle C-states definition for rx51.

 *

 * The 'exit_latency' field is the sum of sleep

 * and wake-up latencies.



    ---------------------------------------------

   | state |  exit_latency  |  target_residency  |

    ---------------------------------------------

   |  C1   |    110 + 162   |            5       |

   |  C2   |    106 + 180   |          309       |

   |  C3   |    107 + 410   |        46057       |

   |  C4   |    121 + 3374  |        46057       |

   |  C5   |    855 + 1146  |        46057       |

   |  C6   |   7580 + 4134  |       484329       |

   |  C7   |   7505 + 15274 |       484329       |

    ---------------------------------------------



*/



extern void __init rx51_peripherals_init(void);



#ifdef CONFIG_OMAP_MUX

static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

#endif



static struct omap_musb_board_data musb_board_data = {

	.interface_type		= MUSB_INTERFACE_ULPI,

	.mode			= MUSB_OTG,

	.power			= 0,

};



static void __init rx51_init(void)

{

	struct omap_sdrc_params *sdrc_params;



	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap_serial_init();



	sdrc_params = nokia_get_sdram_timings();

	omap_sdrc_init(sdrc_params, sdrc_params);



	usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb");

	usb_musb_init(&musb_board_data);

	rx51_peripherals_init();



	if (omap_type() == OMAP2_DEVICE_TYPE_SEC) {

#ifdef CONFIG_ARM_ERRATA_430973

		pr_info("RX-51: Enabling ARM errata 430973 workaround\n");

		/* set IBE to 1 */

		rx51_secure_update_aux_cr(BIT(6), 0);

#endif

	}



	/* Ensure SDRC pins are mux'd for self-refresh */

	omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);

	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);



	platform_device_register(&leds_gpio);

}



static void __init rx51_reserve(void)

{

	omap_reserve();

}



MACHINE_START(NOKIA_RX51, "Nokia RX-51 board")

	/* Maintainer: Lauri Leukkunen <lauri.leukkunen@nokia.com> */

	.atag_offset	= 0x100,

	.reserve	= rx51_reserve,

	.map_io		= omap3_map_io,

	.init_early	= omap3430_init_early,

	.init_irq	= omap3_init_irq,

	.init_machine	= rx51_init,

	.init_late	= omap3430_init_late,

	.init_time	= omap_init_time,

	.restart	= omap3xxx_restart,

MACHINE_END

CRA Git | Maintained and supported by SUSTech CRA and CCSE