Commit 62a295bd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'davinci-for-v4.17/soc' of... 

Merge tag 'davinci-for-v4.17/soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

Pull "Miscellaneous DaVinci SoC support improvements for v4.17" from Sekhar Nori:

* rationalization of con_id names for phy clocks to make DT conversion easy

* A patch to move away from syscon as platform device. This is needed for
  common clock framework conversion as well as helps get rid of
  syscon_regmap_lookup_by_pdevname() by removing the last known user.

* convert mach-davinci to use reset support available in watchdog driver

* a non-critical warning fix. It has been around since beginning so not sending
  as a standalone fix for -rc cycle.

* moving mach-davinci clock init to .init_time() for legacy boot. This is
  again in preparation for CCF conversion.

* tag 'davinci-for-v4.17/soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: move davinci_clk_init() to init_time
  ARM: davinci: board-da830-evm: fix unused const variable warning
  ARM: davinci: remove watchdog reset
  ARM: da8xx: use platform data for CFGCHIP syscon regmap
  phy: da8xx-usb: rename clock con_ids
parents 7bffa14c 96c08173

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

+15 −20
Original line number Diff line number Diff line
@@ -239,20 +239,6 @@ static inline void da830_evm_init_mmc(void) 
	}

}



/*

 * UI board NAND/NOR flashes only use 8-bit data bus.

 */

static const short da830_evm_emif25_pins[] = {

	DA830_EMA_D_0, DA830_EMA_D_1, DA830_EMA_D_2, DA830_EMA_D_3,

	DA830_EMA_D_4, DA830_EMA_D_5, DA830_EMA_D_6, DA830_EMA_D_7,

	DA830_EMA_A_0, DA830_EMA_A_1, DA830_EMA_A_2, DA830_EMA_A_3,

	DA830_EMA_A_4, DA830_EMA_A_5, DA830_EMA_A_6, DA830_EMA_A_7,

	DA830_EMA_A_8, DA830_EMA_A_9, DA830_EMA_A_10, DA830_EMA_A_11,

	DA830_EMA_A_12, DA830_EMA_BA_0, DA830_EMA_BA_1, DA830_NEMA_WE,

	DA830_NEMA_CS_2, DA830_NEMA_CS_3, DA830_NEMA_OE, DA830_EMA_WAIT_0,

	-1

};



#define HAS_MMC		IS_ENABLED(CONFIG_MMC_DAVINCI)



#ifdef CONFIG_DA830_UI_NAND
@@ -357,6 +343,20 @@ static struct platform_device da830_evm_nand_device = { 
	.resource	= da830_evm_nand_resources,

};



/*

 * UI board NAND/NOR flashes only use 8-bit data bus.

 */

static const short da830_evm_emif25_pins[] = {

	DA830_EMA_D_0, DA830_EMA_D_1, DA830_EMA_D_2, DA830_EMA_D_3,

	DA830_EMA_D_4, DA830_EMA_D_5, DA830_EMA_D_6, DA830_EMA_D_7,

	DA830_EMA_A_0, DA830_EMA_A_1, DA830_EMA_A_2, DA830_EMA_A_3,

	DA830_EMA_A_4, DA830_EMA_A_5, DA830_EMA_A_6, DA830_EMA_A_7,

	DA830_EMA_A_8, DA830_EMA_A_9, DA830_EMA_A_10, DA830_EMA_A_11,

	DA830_EMA_A_12, DA830_EMA_BA_0, DA830_EMA_BA_1, DA830_NEMA_WE,

	DA830_NEMA_CS_2, DA830_NEMA_CS_3, DA830_NEMA_OE, DA830_EMA_WAIT_0,

	-1

};



static inline void da830_evm_init_nand(int mux_mode)

{

	int ret;
@@ -551,10 +551,6 @@ static __init void da830_evm_init(void) 
	struct davinci_soc_info *soc_info = &davinci_soc_info;

	int ret;



	ret = da8xx_register_cfgchip();

	if (ret)

		pr_warn("%s: CFGCHIP registration failed: %d\n", __func__, ret);



	ret = da830_register_gpio();

	if (ret)

		pr_warn("%s: GPIO init failed: %d\n", __func__, ret);
@@ -638,9 +634,8 @@ MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137/AM17x EVM") 
	.atag_offset	= 0x100,

	.map_io		= da830_evm_map_io,

	.init_irq	= cp_intc_init,

	.init_time	= davinci_timer_init,

	.init_time	= da830_init_time,

	.init_machine	= da830_evm_init,

	.init_late	= davinci_init_late,

	.dma_zone_size	= SZ_128M,

	.restart	= da8xx_restart,

MACHINE_END

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

+1 −6
Original line number Diff line number Diff line
@@ -1334,10 +1334,6 @@ static __init void da850_evm_init(void) 
{

	int ret;



	ret = da8xx_register_cfgchip();

	if (ret)

		pr_warn("%s: CFGCHIP registration failed: %d\n", __func__, ret);



	ret = da850_register_gpio();

	if (ret)

		pr_warn("%s: GPIO init failed: %d\n", __func__, ret);
@@ -1481,10 +1477,9 @@ MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM") 
	.atag_offset	= 0x100,

	.map_io		= da850_evm_map_io,

	.init_irq	= cp_intc_init,

	.init_time	= davinci_timer_init,

	.init_time	= da850_init_time,

	.init_machine	= da850_evm_init,

	.init_late	= davinci_init_late,

	.dma_zone_size	= SZ_128M,

	.restart	= da8xx_restart,

	.reserve	= da8xx_rproc_reserve_cma,

MACHINE_END

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

+1 −2
Original line number Diff line number Diff line
@@ -427,9 +427,8 @@ MACHINE_START(DAVINCI_DM355_EVM, "DaVinci DM355 EVM") 
	.atag_offset  = 0x100,

	.map_io	      = dm355_evm_map_io,

	.init_irq     = davinci_irq_init,

	.init_time	= davinci_timer_init,

	.init_time	= dm355_init_time,

	.init_machine = dm355_evm_init,

	.init_late	= davinci_init_late,

	.dma_zone_size	= SZ_128M,

	.restart	= davinci_restart,

MACHINE_END

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

+1 −2
Original line number Diff line number Diff line
@@ -271,9 +271,8 @@ MACHINE_START(DM355_LEOPARD, "DaVinci DM355 leopard") 
	.atag_offset  = 0x100,

	.map_io	      = dm355_leopard_map_io,

	.init_irq     = davinci_irq_init,

	.init_time	= davinci_timer_init,

	.init_time	= dm355_init_time,

	.init_machine = dm355_leopard_init,

	.init_late	= davinci_init_late,

	.dma_zone_size	= SZ_128M,

	.restart	= davinci_restart,

MACHINE_END

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

+1 −2
Original line number Diff line number Diff line
@@ -774,10 +774,9 @@ MACHINE_START(DAVINCI_DM365_EVM, "DaVinci DM365 EVM") 
	.atag_offset	= 0x100,

	.map_io		= dm365_evm_map_io,

	.init_irq	= davinci_irq_init,

	.init_time	= davinci_timer_init,

	.init_time	= dm365_init_time,

	.init_machine	= dm365_evm_init,

	.init_late	= davinci_init_late,

	.dma_zone_size	= SZ_128M,

	.restart	= davinci_restart,

MACHINE_END