Commit 92607f8a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'davinci-for-v5.9/soc' of... 

Merge tag 'davinci-for-v5.9/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into arm/soc

DaVinci SoC updates for v5.9

This pull requests contains some clean-ups for SoC support.
No functional changes included.

* tag 'davinci-for-v5.9/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: dm646x-evm: Simplify error handling in 'evm_sw_setup()'
  ARM: davinci: Fix trivial spelling
  ARM: davinci: Replace HTTP links with HTTPS ones

Link: https://lore.kernel.org/r/348578af-71ea-812e-ec42-31afe7847b85@ti.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5644f690 951e3956

arch/arm/boot/dts/da850-evm.dts

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

 * Device Tree for DA850 EVM board

 *

 * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/

 * Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/

 */

/dts-v1/;

#include "da850.dtsi"

arch/arm/mach-davinci/Kconfig

+1 −3
Original line number Diff line number Diff line
@@ -201,15 +201,13 @@ config MACH_MITYOMAPL138 
	help

	  Say Y here to select the Critical Link MityDSP-L138/MityARM-1808

	  System on Module.  Information on this SoM may be found at

	  http://www.mitydsp.com

	  https://www.mitydsp.com



config MACH_OMAPL138_HAWKBOARD

	bool "TI AM1808 / OMAPL-138 Hawkboard platform"

	depends on ARCH_DAVINCI_DA850

	help

	  Say Y here to select the TI AM1808 / OMAPL-138 Hawkboard platform .

	  Information of this board may be found at

	  http://www.hawkboard.org/



config DAVINCI_MUX

	bool "DAVINCI multiplexing support"

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

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static struct mtd_partition da830_evm_nand_partitions[] = { 
	}

};



/* flash bbt decriptors */

/* flash bbt descriptors */

static uint8_t da830_evm_nand_bbt_pattern[] = { 'B', 'b', 't', '0' };

static uint8_t da830_evm_nand_mirror_pattern[] = { '1', 't', 'b', 'B' };

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

+1 −1
Original line number Diff line number Diff line 
/*

 * TI DA850/OMAP-L138 EVM board

 *

 * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/

 * Copyright (C) 2009 Texas Instruments Incorporated - https://www.ti.com/

 *

 * Derived from: arch/arm/mach-davinci/board-da830-evm.c

 * Original Copyrights follow:

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

+4 −9
Original line number Diff line number Diff line
@@ -267,20 +267,15 @@ static int evm_sw_setup(struct i2c_client *client, int gpio, 
		evm_sw_gpio[i] = gpio++;



		status = gpio_direction_input(evm_sw_gpio[i]);

		if (status) {

			gpio_free(evm_sw_gpio[i]);

			evm_sw_gpio[i] = -EINVAL;

		if (status)

			goto out_free;

		}



		status = gpio_export(evm_sw_gpio[i], 0);

		if (status) {

			gpio_free(evm_sw_gpio[i]);

			evm_sw_gpio[i] = -EINVAL;

		if (status)

			goto out_free;

	}

	}

	return status;

	return 0;



out_free:

	for (i = 0; i < 4; ++i) {

		if (evm_sw_gpio[i] != -EINVAL) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE