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

Commit 7c006926 authored by Alistair Buxton's avatar Alistair Buxton
Browse files

OMAP7XX: Rename all the rest of the omap730 references in omap1 core 



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.

This updates all the remaining omap730 references in miscellaneous local
variables, macros and similar.

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

arch/arm/mach-omap1/clock.c

+4 −4
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ struct omap_clk { 
	}



#define CK_310	(1 << 0)

#define CK_730	(1 << 1)

#define CK_7XX	(1 << 1)

#define CK_1510	(1 << 2)

#define CK_16XX	(1 << 3)
@@ -97,7 +97,7 @@ static struct omap_clk omap_clks[] = { 
	CLK(NULL,	"dspxor_ck",	&dspxor_ck,	CK_16XX | CK_1510 | CK_310),

	CLK(NULL,	"dsptim_ck",	&dsptim_ck,	CK_16XX | CK_1510 | CK_310),

	/* CK_GEN3 clocks */

	CLK(NULL,	"tc_ck",	&tc_ck.clk,	CK_16XX | CK_1510 | CK_310 | CK_730),

	CLK(NULL,	"tc_ck",	&tc_ck.clk,	CK_16XX | CK_1510 | CK_310 | CK_7XX),

	CLK(NULL,	"tipb_ck",	&tipb_ck,	CK_1510 | CK_310),

	CLK(NULL,	"l3_ocpi_ck",	&l3_ocpi_ck,	CK_16XX),

	CLK(NULL,	"tc1_ck",	&tc1_ck,	CK_16XX),
@@ -108,7 +108,7 @@ static struct omap_clk omap_clks[] = { 
	CLK(NULL,	"lb_ck",	&lb_ck.clk,	CK_1510 | CK_310),

	CLK(NULL,	"rhea1_ck",	&rhea1_ck,	CK_16XX),

	CLK(NULL,	"rhea2_ck",	&rhea2_ck,	CK_16XX),

	CLK(NULL,	"lcd_ck",	&lcd_ck_16xx,	CK_16XX | CK_730),

	CLK(NULL,	"lcd_ck",	&lcd_ck_16xx,	CK_16XX | CK_7XX),

	CLK(NULL,	"lcd_ck",	&lcd_ck_1510.clk, CK_1510 | CK_310),

	/* ULPD clocks */

	CLK(NULL,	"uart1_ck",	&uart1_1510,	CK_1510 | CK_310),
@@ -784,7 +784,7 @@ int __init omap1_clk_init(void) 
	if (cpu_is_omap1510())

		cpu_mask |= CK_1510;

	if (cpu_is_omap7xx())

		cpu_mask |= CK_730;

		cpu_mask |= CK_7XX;

	if (cpu_is_omap310())

		cpu_mask |= CK_310;

arch/arm/mach-omap1/io.c

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 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 = {

static struct map_desc omap7xx_io_desc[] __initdata = {

	{

		.virtual	= OMAP7XX_DSP_BASE,

		.pfn		= __phys_to_pfn(OMAP7XX_DSP_START),
@@ -106,7 +106,7 @@ void __init omap1_map_common_io(void) 


#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)

	if (cpu_is_omap7xx()) {

		iotable_init(omap730_io_desc, ARRAY_SIZE(omap730_io_desc));

		iotable_init(omap7xx_io_desc, ARRAY_SIZE(omap7xx_io_desc));

	}

#endif

#ifdef CONFIG_ARCH_OMAP15XX

arch/arm/mach-omap1/irq.c

+3 −3
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static void omap_irq_set_cfg(int irq, int fiq, int priority, int trigger) 
}



#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)

static struct omap_irq_bank omap730_irq_banks[] = {

static struct omap_irq_bank omap7xx_irq_banks[] = {

	{ .base_reg = OMAP_IH1_BASE,		.trigger_map = 0xb3f8e22f },

	{ .base_reg = OMAP_IH2_BASE,		.trigger_map = 0xfdb9c1f2 },

	{ .base_reg = OMAP_IH2_BASE + 0x100,	.trigger_map = 0x800040f3 },
@@ -180,8 +180,8 @@ void __init omap_init_irq(void) 


#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)

	if (cpu_is_omap7xx()) {

		irq_banks = omap730_irq_banks;

		irq_bank_count = ARRAY_SIZE(omap730_irq_banks);

		irq_banks = omap7xx_irq_banks;

		irq_bank_count = ARRAY_SIZE(omap7xx_irq_banks);

	}

#endif

#ifdef CONFIG_ARCH_OMAP15XX

arch/arm/mach-omap1/mcbsp.c

+9 −9
Original line number Diff line number Diff line
@@ -80,9 +80,9 @@ static struct omap_mcbsp_ops omap1_mcbsp_ops = { 
};



#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)

static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = {

static struct omap_mcbsp_platform_data omap7xx_mcbsp_pdata[] = {

	{

		.phys_base	= OMAP730_MCBSP1_BASE,

		.phys_base	= OMAP7XX_MCBSP1_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,

		.rx_irq		= INT_7XX_McBSP1RX,
@@ -90,7 +90,7 @@ static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = { 
		.ops		= &omap1_mcbsp_ops,

	},

	{

		.phys_base	= OMAP730_MCBSP2_BASE,

		.phys_base	= OMAP7XX_MCBSP2_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,

		.rx_irq		= INT_7XX_McBSP2RX,
@@ -98,10 +98,10 @@ static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = { 
		.ops		= &omap1_mcbsp_ops,

	},

};

#define OMAP730_MCBSP_PDATA_SZ		ARRAY_SIZE(omap730_mcbsp_pdata)

#define OMAP7XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap7xx_mcbsp_pdata)

#else

#define omap730_mcbsp_pdata		NULL

#define OMAP730_MCBSP_PDATA_SZ		0

#define omap7xx_mcbsp_pdata		NULL

#define OMAP7XX_MCBSP_PDATA_SZ		0

#endif



#ifdef CONFIG_ARCH_OMAP15XX
@@ -173,7 +173,7 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { 
int __init omap1_mcbsp_init(void)

{

	if (cpu_is_omap7xx())

		omap_mcbsp_count = OMAP730_MCBSP_PDATA_SZ;

		omap_mcbsp_count = OMAP7XX_MCBSP_PDATA_SZ;

	if (cpu_is_omap15xx())

		omap_mcbsp_count = OMAP15XX_MCBSP_PDATA_SZ;

	if (cpu_is_omap16xx())
@@ -185,8 +185,8 @@ int __init omap1_mcbsp_init(void) 
		return -ENOMEM;



	if (cpu_is_omap7xx())

		omap_mcbsp_register_board_cfg(omap730_mcbsp_pdata,

						OMAP730_MCBSP_PDATA_SZ);

		omap_mcbsp_register_board_cfg(omap7xx_mcbsp_pdata,

						OMAP7XX_MCBSP_PDATA_SZ);



	if (cpu_is_omap15xx())

		omap_mcbsp_register_board_cfg(omap15xx_mcbsp_pdata,

arch/arm/mach-omap1/mux.c

+21 −21
Original line number Diff line number Diff line
@@ -36,27 +36,27 @@ 
static struct omap_mux_cfg arch_mux_cfg;



#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)

static struct pin_config __initdata_or_module omap730_pins[] = {

MUX_CFG_730("E2_730_KBR0",        12,   21,    0,   20,   1, 0)

MUX_CFG_730("J7_730_KBR1",        12,   25,    0,   24,   1, 0)

MUX_CFG_730("E1_730_KBR2",        12,   29,    0,   28,   1, 0)

MUX_CFG_730("F3_730_KBR3",        13,    1,    0,    0,   1, 0)

MUX_CFG_730("D2_730_KBR4",        13,    5,    0,    4,   1, 0)

MUX_CFG_730("C2_730_KBC0",        13,    9,    0,    8,   1, 0)

MUX_CFG_730("D3_730_KBC1",        13,   13,    0,   12,   1, 0)

MUX_CFG_730("E4_730_KBC2",        13,   17,    0,   16,   1, 0)

MUX_CFG_730("F4_730_KBC3",        13,   21,    0,   20,   1, 0)

MUX_CFG_730("E3_730_KBC4",        13,   25,    0,   24,   1, 0)



MUX_CFG_730("AA17_730_USB_DM",     2,   21,    0,   20,   0, 0)

MUX_CFG_730("W16_730_USB_PU_EN",   2,   25,    0,   24,   0, 0)

MUX_CFG_730("W17_730_USB_VBUSI",   2,   29,    0,   28,   0, 0)

static struct pin_config __initdata_or_module omap7xx_pins[] = {

MUX_CFG_7XX("E2_7XX_KBR0",        12,   21,    0,   20,   1, 0)

MUX_CFG_7XX("J7_7XX_KBR1",        12,   25,    0,   24,   1, 0)

MUX_CFG_7XX("E1_7XX_KBR2",        12,   29,    0,   28,   1, 0)

MUX_CFG_7XX("F3_7XX_KBR3",        13,    1,    0,    0,   1, 0)

MUX_CFG_7XX("D2_7XX_KBR4",        13,    5,    0,    4,   1, 0)

MUX_CFG_7XX("C2_7XX_KBC0",        13,    9,    0,    8,   1, 0)

MUX_CFG_7XX("D3_7XX_KBC1",        13,   13,    0,   12,   1, 0)

MUX_CFG_7XX("E4_7XX_KBC2",        13,   17,    0,   16,   1, 0)

MUX_CFG_7XX("F4_7XX_KBC3",        13,   21,    0,   20,   1, 0)

MUX_CFG_7XX("E3_7XX_KBC4",        13,   25,    0,   24,   1, 0)



MUX_CFG_7XX("AA17_7XX_USB_DM",     2,   21,    0,   20,   0, 0)

MUX_CFG_7XX("W16_7XX_USB_PU_EN",   2,   25,    0,   24,   0, 0)

MUX_CFG_7XX("W17_7XX_USB_VBUSI",   2,   29,    0,   28,   0, 0)

};

#define OMAP730_PINS_SZ		ARRAY_SIZE(omap730_pins)

#define OMAP7XX_PINS_SZ		ARRAY_SIZE(omap7xx_pins)

#else

#define omap730_pins		NULL

#define OMAP730_PINS_SZ		0

#endif	/* CONFIG_ARCH_OMAP730 */

#define omap7xx_pins		NULL

#define OMAP7XX_PINS_SZ		0

#endif	/* CONFIG_ARCH_OMAP730 || CONFIG_ARCH_OMAP850 */



#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX)

static struct pin_config __initdata_or_module omap1xxx_pins[] = {
@@ -431,8 +431,8 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg) 
int __init omap1_mux_init(void)

{

	if (cpu_is_omap7xx()) {

		arch_mux_cfg.pins	= omap730_pins;

		arch_mux_cfg.size	= OMAP730_PINS_SZ;

		arch_mux_cfg.pins	= omap7xx_pins;

		arch_mux_cfg.size	= OMAP7XX_PINS_SZ;

		arch_mux_cfg.cfg_reg	= omap1_cfg_reg;

	}