Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b51988db authored by Alistair Buxton's avatar Alistair Buxton
Browse files

OMAP7XX: Update core omap1 files to use omap7xx.h 



This patch is part of a series which removes references to omap730 in code
which is shared with omap850, replacing them with references to omap7xx.

Signed-off-by: default avatarAlistair Buxton <a.j.buxton@gmail.com>
Reviewed-by: default avatarZebediah C. McClure <zmc@lurian.net>
parent e6684f71

arch/arm/mach-omap1/board-fsample.c

+6 −6
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ static void __init omap_fsample_map_io(void) 
	/*

	 * Hold GSM Reset until needed

	 */

	omap_writew(omap_readw(OMAP730_DSP_M_CTL) & ~1, OMAP730_DSP_M_CTL);

	omap_writew(omap_readw(OMAP7XX_DSP_M_CTL) & ~1, OMAP7XX_DSP_M_CTL);



	/*

	 * UARTs -> done automagically by 8250 driver
@@ -320,21 +320,21 @@ static void __init omap_fsample_map_io(void) 
	 */



	/* Flash: CS0 timings setup */

	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_0);

	omap_writel(0x00000088, OMAP730_FLASH_ACFG_0);

	omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_0);

	omap_writel(0x00000088, OMAP7XX_FLASH_ACFG_0);



	/*

	 * Ethernet support through the debug board

	 * CS1 timings setup

	 */

	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1);

	omap_writel(0x00000000, OMAP730_FLASH_ACFG_1);

	omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_1);

	omap_writel(0x00000000, OMAP7XX_FLASH_ACFG_1);



	/*

	 * Configure MPU_EXT_NIRQ IO in IO_CONF9 register,

	 * It is used as the Ethernet controller interrupt

	 */

	omap_writel(omap_readl(OMAP730_IO_CONF_9) & 0x1FFFFFFF, OMAP730_IO_CONF_9);

	omap_writel(omap_readl(OMAP7XX_IO_CONF_9) & 0x1FFFFFFF, OMAP7XX_IO_CONF_9);

}



MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample")

arch/arm/mach-omap1/board-perseus2.c

+6 −6
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static void __init omap_perseus2_map_io(void) 
	/*

	 * Hold GSM Reset until needed

	 */

	omap_writew(omap_readw(OMAP730_DSP_M_CTL) & ~1, OMAP730_DSP_M_CTL);

	omap_writew(omap_readw(OMAP7XX_DSP_M_CTL) & ~1, OMAP7XX_DSP_M_CTL);



	/*

	 * UARTs -> done automagically by 8250 driver
@@ -281,21 +281,21 @@ static void __init omap_perseus2_map_io(void) 
	 */



	/* Flash: CS0 timings setup */

	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_0);

	omap_writel(0x00000088, OMAP730_FLASH_ACFG_0);

	omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_0);

	omap_writel(0x00000088, OMAP7XX_FLASH_ACFG_0);



	/*

	 * Ethernet support through the debug board

	 * CS1 timings setup

	 */

	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1);

	omap_writel(0x00000000, OMAP730_FLASH_ACFG_1);

	omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_1);

	omap_writel(0x00000000, OMAP7XX_FLASH_ACFG_1);



	/*

	 * Configure MPU_EXT_NIRQ IO in IO_CONF9 register,

	 * It is used as the Ethernet controller interrupt

	 */

	omap_writel(omap_readl(OMAP730_IO_CONF_9) & 0x1FFFFFFF, OMAP730_IO_CONF_9);

	omap_writel(omap_readl(OMAP7XX_IO_CONF_9) & 0x1FFFFFFF, OMAP7XX_IO_CONF_9);

}



MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")

arch/arm/mach-omap1/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -862,7 +862,7 @@ int __init omap1_clk_init(void) 


#if defined(CONFIG_MACH_OMAP_PERSEUS2) || defined(CONFIG_MACH_OMAP_FSAMPLE)

	/* Select slicer output as OMAP input clock */

	omap_writew(omap_readw(OMAP730_PCC_UPLD_CTRL) & ~0x1, OMAP730_PCC_UPLD_CTRL);

	omap_writew(omap_readw(OMAP7XX_PCC_UPLD_CTRL) & ~0x1, OMAP7XX_PCC_UPLD_CTRL);

#endif



	/* Amstrad Delta wants BCLK high when inactive */

arch/arm/mach-omap1/io.c

+6 −6
Original line number Diff line number Diff line
@@ -39,14 +39,14 @@ static struct map_desc omap_io_desc[] __initdata = { 
#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)

static struct map_desc omap730_io_desc[] __initdata = {

	{

		.virtual	= OMAP730_DSP_BASE,

		.pfn		= __phys_to_pfn(OMAP730_DSP_START),

		.length		= OMAP730_DSP_SIZE,

		.virtual	= OMAP7XX_DSP_BASE,

		.pfn		= __phys_to_pfn(OMAP7XX_DSP_START),

		.length		= OMAP7XX_DSP_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= OMAP730_DSPREG_BASE,

		.pfn		= __phys_to_pfn(OMAP730_DSPREG_START),

		.length		= OMAP730_DSPREG_SIZE,

		.virtual	= OMAP7XX_DSPREG_BASE,

		.pfn		= __phys_to_pfn(OMAP7XX_DSPREG_START),

		.length		= OMAP7XX_DSPREG_SIZE,

		.type		= MT_DEVICE

	}

};

arch/arm/plat-omap/include/mach/hardware.h

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ 
 * ---------------------------------------------------------------------------

 */



#include "omap730.h"

#include "omap7xx.h"

#include "omap1510.h"

#include "omap16xx.h"

#include "omap24xx.h"