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

Commit cee7e8bb authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'davinci-for-v3.12/soc' of... 

Merge tag 'davinci-for-v3.12/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

From Sekhar Nori:

DaVinci SoC updates for v3.12
-----------------------------

This set of SoC updates contains changes to the
way UART clock is handled to enabled DT-boot to
obtain UART clock frequency instead of relying
on DT-binding being supplied. Similarly handling
of MDIO clock is fixed to make it easier to support
MDIO in DT-boot. Finally there is patch to remove
now unnecessary setting of wake-up capable flag for
RTC.

* tag 'davinci-for-v3.12/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: davinci: fix clock lookup for mdio device
  ARM: davinci: da8xx: remove hard coding of rtc device wakeup
  ARM: davinci: serial: remove davinci_serial_setup_clk()
  ARM: davinci: serial: get rid of davinci_uart_config
  ARM: davinci: da8xx: remove da8xx_uart_clk_enable
  ARM: davinci: uart: move to devid based clk_get

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 1ee64e48 46c18334

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

+1 −5
Original line number Original line Diff line number Diff line
@@ -185,10 +185,6 @@ static __init void da830_evm_usb_init(void) 
			   __func__, ret);

			   __func__, ret);

}

}





static struct davinci_uart_config da830_evm_uart_config __initdata = {

	.enabled_uarts = 0x7,

};



static const short da830_evm_mcasp1_pins[] = {

static const short da830_evm_mcasp1_pins[] = {

	DA830_AHCLKX1, DA830_ACLKX1, DA830_AFSX1, DA830_AHCLKR1, DA830_AFSR1,

	DA830_AHCLKX1, DA830_ACLKX1, DA830_AFSX1, DA830_AHCLKR1, DA830_AFSR1,

	DA830_AMUTE1, DA830_AXR1_0, DA830_AXR1_1, DA830_AXR1_2, DA830_AXR1_5,

	DA830_AMUTE1, DA830_AXR1_0, DA830_AXR1_1, DA830_AXR1_2, DA830_AXR1_5,
@@ -630,7 +626,7 @@ static __init void da830_evm_init(void) 
		pr_warning("da830_evm_init: watchdog registration failed: %d\n",

		pr_warning("da830_evm_init: watchdog registration failed: %d\n",

				ret);

				ret);





	davinci_serial_init(&da830_evm_uart_config);

	davinci_serial_init(da8xx_serial_device);

	i2c_register_board_info(1, da830_evm_i2c_devices,

	i2c_register_board_info(1, da830_evm_i2c_devices,

			ARRAY_SIZE(da830_evm_i2c_devices));

			ARRAY_SIZE(da830_evm_i2c_devices));

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

+1 −5
Original line number Original line Diff line number Diff line
@@ -746,10 +746,6 @@ static struct davinci_i2c_platform_data da850_evm_i2c_0_pdata = { 
	.bus_delay	= 0,	/* usec */

	.bus_delay	= 0,	/* usec */

};

};





static struct davinci_uart_config da850_evm_uart_config __initdata = {

	.enabled_uarts = 0x7,

};



/* davinci da850 evm audio machine driver */

/* davinci da850 evm audio machine driver */

static u8 da850_iis_serializer_direction[] = {

static u8 da850_iis_serializer_direction[] = {

	INACTIVE_MODE,	INACTIVE_MODE,	INACTIVE_MODE,	INACTIVE_MODE,

	INACTIVE_MODE,	INACTIVE_MODE,	INACTIVE_MODE,	INACTIVE_MODE,
@@ -1494,7 +1490,7 @@ static __init void da850_evm_init(void) 
				__func__, ret);

				__func__, ret);

	}

	}





	davinci_serial_init(&da850_evm_uart_config);

	davinci_serial_init(da8xx_serial_device);





	i2c_register_board_info(1, da850_evm_i2c_devices,

	i2c_register_board_info(1, da850_evm_i2c_devices,

			ARRAY_SIZE(da850_evm_i2c_devices));

			ARRAY_SIZE(da850_evm_i2c_devices));

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

+1 −5
Original line number Original line Diff line number Diff line
@@ -314,10 +314,6 @@ static struct platform_device *davinci_evm_devices[] __initdata = { 
	&davinci_nand_device,

	&davinci_nand_device,

};

};





static struct davinci_uart_config uart_config __initdata = {

	.enabled_uarts = (1 << 0),

};



static void __init dm355_evm_map_io(void)

static void __init dm355_evm_map_io(void)

{

{

	dm355_init();

	dm355_init();
@@ -393,7 +389,7 @@ static __init void dm355_evm_init(void) 
	platform_add_devices(davinci_evm_devices,

	platform_add_devices(davinci_evm_devices,

			     ARRAY_SIZE(davinci_evm_devices));

			     ARRAY_SIZE(davinci_evm_devices));

	evm_init_i2c();

	evm_init_i2c();

	davinci_serial_init(&uart_config);

	davinci_serial_init(dm355_serial_device);





	/* NOTE:  NAND flash timings set by the UBL are slower than

	/* NOTE:  NAND flash timings set by the UBL are slower than

	 * needed by MT29F16G08FAA chips ... EMIF.A1CR is 0x40400204

	 * needed by MT29F16G08FAA chips ... EMIF.A1CR is 0x40400204

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

+1 −5
Original line number Original line Diff line number Diff line
@@ -172,10 +172,6 @@ static struct platform_device *davinci_leopard_devices[] __initdata = { 
	&davinci_nand_device,

	&davinci_nand_device,

};

};





static struct davinci_uart_config uart_config __initdata = {

	.enabled_uarts = (1 << 0),

};



static void __init dm355_leopard_map_io(void)

static void __init dm355_leopard_map_io(void)

{

{

	dm355_init();

	dm355_init();
@@ -251,7 +247,7 @@ static __init void dm355_leopard_init(void) 
	platform_add_devices(davinci_leopard_devices,

	platform_add_devices(davinci_leopard_devices,

			     ARRAY_SIZE(davinci_leopard_devices));

			     ARRAY_SIZE(davinci_leopard_devices));

	leopard_init_i2c();

	leopard_init_i2c();

	davinci_serial_init(&uart_config);

	davinci_serial_init(dm355_serial_device);





	/* NOTE:  NAND flash timings set by the UBL are slower than

	/* NOTE:  NAND flash timings set by the UBL are slower than

	 * needed by MT29F16G08FAA chips ... EMIF.A1CR is 0x40400204

	 * needed by MT29F16G08FAA chips ... EMIF.A1CR is 0x40400204

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

+1 −5
Original line number Original line Diff line number Diff line
@@ -718,10 +718,6 @@ fail: 
	/* REVISIT export switches: NTSC/PAL (SW5.6), EXTRA1 (SW5.2), etc */

	/* REVISIT export switches: NTSC/PAL (SW5.6), EXTRA1 (SW5.2), etc */

}

}





static struct davinci_uart_config uart_config __initdata = {

	.enabled_uarts = (1 << 0),

};



static void __init dm365_evm_map_io(void)

static void __init dm365_evm_map_io(void)

{

{

	dm365_init();

	dm365_init();
@@ -748,7 +744,7 @@ static struct spi_board_info dm365_evm_spi_info[] __initconst = { 
static __init void dm365_evm_init(void)

static __init void dm365_evm_init(void)

{

{

	evm_init_i2c();

	evm_init_i2c();

	davinci_serial_init(&uart_config);

	davinci_serial_init(dm365_serial_device);





	dm365evm_emac_configure();

	dm365evm_emac_configure();

	dm365evm_mmc_configure();

	dm365evm_mmc_configure();