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

Commit 024a6b95 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'davinci-for-linus' of... 

Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci

* 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (48 commits)
  Revert "rtc: omap: let device wakeup capability be configured from chip init logic"
  DM365: Added more PINMUX configurations for AEMIF
  DM365: Make CLKOUTx available
  DM365: Added PINMUX definitions for GPIO30..32
  Davinci: iotable based ioremap() interception
  Davinci: pinmux - use ioremap()
  Davinci: aintc/cpintc - use ioremap()
  Davinci: psc - use ioremap()
  Davinci: timer - use ioremap()
  Davinci: jtag_id - use ioremap()
  Davinci: da8xx: rtc - use ioremap
  Davinci: gpio - use ioremap()
  davinci: edma: fix coding style issue related to breaking lines
  davinci: edma: use BIT() wherever possible
  davinci: edma: fix coding style issue related to usage of braces
  davinci: edma: use a more intuitive name for edma_info
  Davinci: serial - conditional reset via pwremu
  Davinci: serial - use ioremap()
  Davinci: serial - remove unnecessary define
  Davinci: watchdog reset separation across socs
  ...

Fix up trivial conflict in arch/arm/Kconfig due to removal of "select
GENERIC_TIME"
parents 349e1fba 5e682ef8

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -760,7 +760,6 @@ config ARCH_NOMADIK 


config ARCH_DAVINCI

	bool "TI DaVinci"

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select ARCH_REQUIRE_GPIOLIB

	select ZONE_DMA

arch/arm/mach-davinci/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config CP_INTC 
	bool



config ARCH_DAVINCI_DMx

	select CPU_ARM926T

	bool



menu "TI DaVinci Implementations"
@@ -41,6 +42,7 @@ config ARCH_DAVINCI_DA850 
	select ARCH_HAS_CPUFREQ



config ARCH_DAVINCI_DA8XX

	select CPU_ARM926T

	bool



config ARCH_DAVINCI_DM365

arch/arm/mach-davinci/board-da830-evm.c

+28 −24
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ 
#define DA830_EVM_PHY_MASK		0x0

#define DA830_EVM_MDIO_FREQUENCY	2200000	/* PHY bus frequency */



#define DA830_EMIF25_ASYNC_DATA_CE3_BASE	0x62000000

#define DA830_EMIF25_CONTROL_BASE		0x68000000



/*

 * USB1 VBUS is controlled by GPIO1[15], over-current is reported on GPIO2[4].

 */
@@ -157,7 +154,7 @@ static __init void da830_evm_usb_init(void) 
				   __func__, ret);

	}



	ret = da8xx_pinmux_setup(da830_evm_usb11_pins);

	ret = davinci_cfg_reg_list(da830_evm_usb11_pins);

	if (ret) {

		pr_warning("%s: USB 1.1 PinMux setup failed: %d\n",

			   __func__, ret);
@@ -229,15 +226,22 @@ static const short da830_evm_mmc_sd_pins[] = { 
};



#define DA830_MMCSD_WP_PIN		GPIO_TO_PIN(2, 1)

#define DA830_MMCSD_CD_PIN		GPIO_TO_PIN(2, 2)



static int da830_evm_mmc_get_ro(int index)

{

	return gpio_get_value(DA830_MMCSD_WP_PIN);

}



static int da830_evm_mmc_get_cd(int index)

{

	return !gpio_get_value(DA830_MMCSD_CD_PIN);

}



static struct davinci_mmc_config da830_evm_mmc_config = {

	.get_ro			= da830_evm_mmc_get_ro,

	.wires			= 4,

	.get_cd			= da830_evm_mmc_get_cd,

	.wires			= 8,

	.max_freq		= 50000000,

	.caps			= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,

	.version		= MMC_CTLR_VERSION_2,
@@ -247,7 +251,7 @@ static inline void da830_evm_init_mmc(void) 
{

	int ret;



	ret = da8xx_pinmux_setup(da830_evm_mmc_sd_pins);

	ret = davinci_cfg_reg_list(da830_evm_mmc_sd_pins);

	if (ret) {

		pr_warning("da830_evm_init: mmc/sd mux setup failed: %d\n",

				ret);
@@ -262,6 +266,14 @@ static inline void da830_evm_init_mmc(void) 
	}

	gpio_direction_input(DA830_MMCSD_WP_PIN);



	ret = gpio_request(DA830_MMCSD_CD_PIN, "MMC CD\n");

	if (ret) {

		pr_warning("da830_evm_init: can not open GPIO %d\n",

			   DA830_MMCSD_CD_PIN);

		return;

	}

	gpio_direction_input(DA830_MMCSD_CD_PIN);



	ret = da8xx_register_mmcsd0(&da830_evm_mmc_config);

	if (ret) {

		pr_warning("da830_evm_init: mmc/sd registration failed: %d\n",
@@ -360,13 +372,13 @@ static struct davinci_nand_pdata da830_evm_nand_pdata = { 


static struct resource da830_evm_nand_resources[] = {

	[0] = {		/* First memory resource is NAND I/O window */

		.start	= DA830_EMIF25_ASYNC_DATA_CE3_BASE,

		.end	= DA830_EMIF25_ASYNC_DATA_CE3_BASE + PAGE_SIZE - 1,

		.start	= DA8XX_AEMIF_CS3_BASE,

		.end	= DA8XX_AEMIF_CS3_BASE + PAGE_SIZE - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {		/* Second memory resource is AEMIF control registers */

		.start	= DA830_EMIF25_CONTROL_BASE,

		.end	= DA830_EMIF25_CONTROL_BASE + SZ_32K - 1,

		.start	= DA8XX_AEMIF_CTL_BASE,

		.end	= DA8XX_AEMIF_CTL_BASE + SZ_32K - 1,

		.flags	= IORESOURCE_MEM,

	},

};
@@ -392,7 +404,7 @@ static inline void da830_evm_init_nand(int mux_mode) 
		return;

	}



	ret = da8xx_pinmux_setup(da830_evm_emif25_pins);

	ret = davinci_cfg_reg_list(da830_evm_emif25_pins);

	if (ret)

		pr_warning("da830_evm_init: emif25 mux setup failed: %d\n",

				ret);
@@ -412,7 +424,7 @@ static inline void da830_evm_init_lcdc(int mux_mode) 
{

	int ret;



	ret = da8xx_pinmux_setup(da830_lcdcntl_pins);

	ret = davinci_cfg_reg_list(da830_lcdcntl_pins);

	if (ret)

		pr_warning("da830_evm_init: lcdcntl mux setup failed: %d\n",

				ret);
@@ -492,7 +504,7 @@ static __init void da830_evm_init(void) 
		pr_warning("da830_evm_init: edma registration failed: %d\n",

				ret);



	ret = da8xx_pinmux_setup(da830_i2c0_pins);

	ret = davinci_cfg_reg_list(da830_i2c0_pins);

	if (ret)

		pr_warning("da830_evm_init: i2c0 mux setup failed: %d\n",

				ret);
@@ -508,7 +520,7 @@ static __init void da830_evm_init(void) 
	soc_info->emac_pdata->mdio_max_freq = DA830_EVM_MDIO_FREQUENCY;

	soc_info->emac_pdata->rmii_en = 1;



	ret = da8xx_pinmux_setup(da830_cpgmac_pins);

	ret = davinci_cfg_reg_list(da830_cpgmac_pins);

	if (ret)

		pr_warning("da830_evm_init: cpgmac mux setup failed: %d\n",

				ret);
@@ -527,7 +539,7 @@ static __init void da830_evm_init(void) 
	i2c_register_board_info(1, da830_evm_i2c_devices,

			ARRAY_SIZE(da830_evm_i2c_devices));



	ret = da8xx_pinmux_setup(da830_evm_mcasp1_pins);

	ret = davinci_cfg_reg_list(da830_evm_mcasp1_pins);

	if (ret)

		pr_warning("da830_evm_init: mcasp1 mux setup failed: %d\n",

				ret);
@@ -549,14 +561,6 @@ static int __init da830_evm_console_init(void) 
console_initcall(da830_evm_console_init);

#endif



static __init void da830_evm_irq_init(void)

{

	struct davinci_soc_info *soc_info = &davinci_soc_info;



	cp_intc_init((void __iomem *)DA8XX_CP_INTC_VIRT, DA830_N_CP_INTC_IRQ,

			soc_info->intc_irq_prios);

}



static void __init da830_evm_map_io(void)

{

	da830_init();
@@ -567,7 +571,7 @@ MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137 EVM") 
	.io_pg_offst	= (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,

	.boot_params	= (DA8XX_DDR_BASE + 0x100),

	.map_io		= da830_evm_map_io,

	.init_irq	= da830_evm_irq_init,

	.init_irq	= cp_intc_init,

	.timer		= &davinci_timer,

	.init_machine	= da830_evm_init,

MACHINE_END

arch/arm/mach-davinci/board-da850-evm.c

+10 −18
Original line number Diff line number Diff line
@@ -206,12 +206,12 @@ static __init void da850_evm_setup_nor_nand(void) 
	int ret = 0;



	if (ui_card_detected & !HAS_MMC) {

		ret = da8xx_pinmux_setup(da850_nand_pins);

		ret = davinci_cfg_reg_list(da850_nand_pins);

		if (ret)

			pr_warning("da850_evm_init: nand mux setup failed: "

					"%d\n", ret);



		ret = da8xx_pinmux_setup(da850_nor_pins);

		ret = davinci_cfg_reg_list(da850_nor_pins);

		if (ret)

			pr_warning("da850_evm_init: nor mux setup failed: %d\n",

				ret);
@@ -568,12 +568,12 @@ static int __init da850_evm_config_emac(void) 


	if (rmii_en) {

		val |= BIT(8);

		ret = da8xx_pinmux_setup(da850_rmii_pins);

		ret = davinci_cfg_reg_list(da850_rmii_pins);

		pr_info("EMAC: RMII PHY configured, MII PHY will not be"

							" functional\n");

	} else {

		val &= ~BIT(8);

		ret = da8xx_pinmux_setup(da850_cpgmac_pins);

		ret = davinci_cfg_reg_list(da850_cpgmac_pins);

		pr_info("EMAC: MII PHY configured, RMII PHY will not be"

							" functional\n");

	}
@@ -626,7 +626,7 @@ static __init void da850_evm_init(void) 
		pr_warning("da850_evm_init: edma registration failed: %d\n",

				ret);



	ret = da8xx_pinmux_setup(da850_i2c0_pins);

	ret = davinci_cfg_reg_list(da850_i2c0_pins);

	if (ret)

		pr_warning("da850_evm_init: i2c0 mux setup failed: %d\n",

				ret);
@@ -643,7 +643,7 @@ static __init void da850_evm_init(void) 
				ret);



	if (HAS_MMC) {

		ret = da8xx_pinmux_setup(da850_mmcsd0_pins);

		ret = davinci_cfg_reg_list(da850_mmcsd0_pins);

		if (ret)

			pr_warning("da850_evm_init: mmcsd0 mux setup failed:"

					" %d\n", ret);
@@ -679,20 +679,20 @@ static __init void da850_evm_init(void) 
	__raw_writel(0, IO_ADDRESS(DA8XX_UART1_BASE) + 0x30);

	__raw_writel(0, IO_ADDRESS(DA8XX_UART0_BASE) + 0x30);



	ret = da8xx_pinmux_setup(da850_mcasp_pins);

	ret = davinci_cfg_reg_list(da850_mcasp_pins);

	if (ret)

		pr_warning("da850_evm_init: mcasp mux setup failed: %d\n",

				ret);



	da8xx_register_mcasp(0, &da850_evm_snd_data);



	ret = da8xx_pinmux_setup(da850_lcdcntl_pins);

	ret = davinci_cfg_reg_list(da850_lcdcntl_pins);

	if (ret)

		pr_warning("da850_evm_init: lcdcntl mux setup failed: %d\n",

				ret);



	/* Handle board specific muxing for LCD here */

	ret = da8xx_pinmux_setup(da850_evm_lcdc_pins);

	ret = davinci_cfg_reg_list(da850_evm_lcdc_pins);

	if (ret)

		pr_warning("da850_evm_init: evm specific lcd mux setup "

				"failed: %d\n",	ret);
@@ -736,14 +736,6 @@ static int __init da850_evm_console_init(void) 
console_initcall(da850_evm_console_init);

#endif



static __init void da850_evm_irq_init(void)

{

	struct davinci_soc_info *soc_info = &davinci_soc_info;



	cp_intc_init((void __iomem *)DA8XX_CP_INTC_VIRT, DA850_N_CP_INTC_IRQ,

			soc_info->intc_irq_prios);

}



static void __init da850_evm_map_io(void)

{

	da850_init();
@@ -754,7 +746,7 @@ MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138 EVM") 
	.io_pg_offst	= (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,

	.boot_params	= (DA8XX_DDR_BASE + 0x100),

	.map_io		= da850_evm_map_io,

	.init_irq	= da850_evm_irq_init,

	.init_irq	= cp_intc_init,

	.timer		= &davinci_timer,

	.init_machine	= da850_evm_init,

MACHINE_END

arch/arm/mach-davinci/board-dm355-evm.c

+5 −13
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ 
#include <mach/mmc.h>

#include <mach/usb.h>



#define DAVINCI_ASYNC_EMIF_CONTROL_BASE		0x01e10000

#define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE	0x02000000



/* NOTE:  this is geared for the standard config, with a socketed

 * 2 GByte Micron NAND (MT29F16G08FAA) using 128KB sectors.  If you

 * swap chips, maybe with a different block size, partitioning may
@@ -86,12 +83,12 @@ static struct davinci_nand_pdata davinci_nand_data = { 


static struct resource davinci_nand_resources[] = {

	{

		.start		= DAVINCI_ASYNC_EMIF_DATA_CE0_BASE,

		.end		= DAVINCI_ASYNC_EMIF_DATA_CE0_BASE + SZ_32M - 1,

		.start		= DM355_ASYNC_EMIF_DATA_CE0_BASE,

		.end		= DM355_ASYNC_EMIF_DATA_CE0_BASE + SZ_32M - 1,

		.flags		= IORESOURCE_MEM,

	}, {

		.start		= DAVINCI_ASYNC_EMIF_CONTROL_BASE,

		.end		= DAVINCI_ASYNC_EMIF_CONTROL_BASE + SZ_4K - 1,

		.start		= DM355_ASYNC_EMIF_CONTROL_BASE,

		.end		= DM355_ASYNC_EMIF_CONTROL_BASE + SZ_4K - 1,

		.flags		= IORESOURCE_MEM,

	},

};
@@ -353,17 +350,12 @@ static __init void dm355_evm_init(void) 
	dm355_init_asp1(ASP1_TX_EVT_EN | ASP1_RX_EVT_EN, &dm355_evm_snd_data);

}



static __init void dm355_evm_irq_init(void)

{

	davinci_irq_init();

}



MACHINE_START(DAVINCI_DM355_EVM, "DaVinci DM355 EVM")

	.phys_io      = IO_PHYS,

	.io_pg_offst  = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,

	.boot_params  = (0x80000100),

	.map_io	      = dm355_evm_map_io,

	.init_irq     = dm355_evm_irq_init,

	.init_irq     = davinci_irq_init,

	.timer	      = &davinci_timer,

	.init_machine = dm355_evm_init,

MACHINE_END