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

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.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5644f690 951e3956
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* Device Tree for DA850 EVM board * 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/; /dts-v1/;
#include "da850.dtsi" #include "da850.dtsi"
......
...@@ -201,15 +201,13 @@ config MACH_MITYOMAPL138 ...@@ -201,15 +201,13 @@ config MACH_MITYOMAPL138
help help
Say Y here to select the Critical Link MityDSP-L138/MityARM-1808 Say Y here to select the Critical Link MityDSP-L138/MityARM-1808
System on Module. Information on this SoM may be found at System on Module. Information on this SoM may be found at
http://www.mitydsp.com https://www.mitydsp.com
config MACH_OMAPL138_HAWKBOARD config MACH_OMAPL138_HAWKBOARD
bool "TI AM1808 / OMAPL-138 Hawkboard platform" bool "TI AM1808 / OMAPL-138 Hawkboard platform"
depends on ARCH_DAVINCI_DA850 depends on ARCH_DAVINCI_DA850
help help
Say Y here to select the TI AM1808 / OMAPL-138 Hawkboard platform . 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 config DAVINCI_MUX
bool "DAVINCI multiplexing support" bool "DAVINCI multiplexing support"
......
...@@ -266,7 +266,7 @@ static struct mtd_partition da830_evm_nand_partitions[] = { ...@@ -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_bbt_pattern[] = { 'B', 'b', 't', '0' };
static uint8_t da830_evm_nand_mirror_pattern[] = { '1', 't', 'b', 'B' }; static uint8_t da830_evm_nand_mirror_pattern[] = { '1', 't', 'b', 'B' };
......
/* /*
* TI DA850/OMAP-L138 EVM board * 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 * Derived from: arch/arm/mach-davinci/board-da830-evm.c
* Original Copyrights follow: * Original Copyrights follow:
......
...@@ -267,20 +267,15 @@ static int evm_sw_setup(struct i2c_client *client, int gpio, ...@@ -267,20 +267,15 @@ static int evm_sw_setup(struct i2c_client *client, int gpio,
evm_sw_gpio[i] = gpio++; evm_sw_gpio[i] = gpio++;
status = gpio_direction_input(evm_sw_gpio[i]); status = gpio_direction_input(evm_sw_gpio[i]);
if (status) { if (status)
gpio_free(evm_sw_gpio[i]);
evm_sw_gpio[i] = -EINVAL;
goto out_free; goto out_free;
}
status = gpio_export(evm_sw_gpio[i], 0); status = gpio_export(evm_sw_gpio[i], 0);
if (status) { if (status)
gpio_free(evm_sw_gpio[i]);
evm_sw_gpio[i] = -EINVAL;
goto out_free; goto out_free;
}
} }
return status; return 0;
out_free: out_free:
for (i = 0; i < 4; ++i) { for (i = 0; i < 4; ++i) {
if (evm_sw_gpio[i] != -EINVAL) { if (evm_sw_gpio[i] != -EINVAL) {
......
/* /*
* Critical Link MityOMAP-L138 SoM * Critical Link MityOMAP-L138 SoM
* *
* Copyright (C) 2010 Critical Link LLC - http://www.criticallink.com * Copyright (C) 2010 Critical Link LLC - https://www.criticallink.com
* *
* This file is licensed under the terms of the GNU General Public License * This file is licensed under the terms of the GNU General Public License
* version 2. This program is licensed "as is" without any warranty of * version 2. This program is licensed "as is" without any warranty of
......
...@@ -214,7 +214,7 @@ static __init void davinci_ntosd2_init(void) ...@@ -214,7 +214,7 @@ static __init void davinci_ntosd2_init(void)
* Mux the pins to be GPIOs, VLYNQEN is already done at startup. * Mux the pins to be GPIOs, VLYNQEN is already done at startup.
* The AEAWx are five new AEAW pins that can be muxed by separately. * The AEAWx are five new AEAW pins that can be muxed by separately.
* They are a bitmask for GPIO management. According TI * They are a bitmask for GPIO management. According TI
* documentation (http://www.ti.com/lit/gpn/tms320dm6446) to employ * documentation (https://www.ti.com/lit/gpn/tms320dm6446) to employ
* gpio(10,11,12,13) for leds any combination of bits works except * gpio(10,11,12,13) for leds any combination of bits works except
* four last. So we are to reset all five. * four last. So we are to reset all five.
*/ */
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Initial code: Syed Mohammed Khasim * Initial code: Syed Mohammed Khasim
* *
* Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com * Copyright (C) 2009 Texas Instruments Incorporated - https://www.ti.com
* *
* This file is licensed under the terms of the GNU General Public License * This file is licensed under the terms of the GNU General Public License
* version 2. This program is licensed "as is" without any warranty of * version 2. This program is licensed "as is" without any warranty of
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* CPU idle for DaVinci SoCs * CPU idle for DaVinci SoCs
* *
* Copyright (C) 2009 Texas Instruments Incorporated. http://www.ti.com/ * Copyright (C) 2009 Texas Instruments Incorporated. https://www.ti.com/
* *
* Derived from Marvell Kirkwood CPU idle code * Derived from Marvell Kirkwood CPU idle code
* (arch/arm/mach-kirkwood/cpuidle.c) * (arch/arm/mach-kirkwood/cpuidle.c)
......
/* /*
* TI DaVinci cpuidle platform support * TI DaVinci cpuidle platform support
* *
* 2009 (C) Texas Instruments, Inc. http://www.ti.com/ * 2009 (C) Texas Instruments, Inc. https://www.ti.com/
* *
* This file is licensed under the terms of the GNU General Public License * This file is licensed under the terms of the GNU General Public License
* version 2. This program is licensed "as is" without any warranty of any * version 2. This program is licensed "as is" without any warranty of any
......
/* /*
* TI DA850/OMAP-L138 chip specific setup * TI DA850/OMAP-L138 chip specific setup
* *
* 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/da830.c * Derived from: arch/arm/mach-davinci/da830.c
* Original Copyrights follow: * Original Copyrights follow:
......
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ * Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/
* *
* Modified from mach-omap/omap2/board-generic.c * Modified from mach-omap/omap2/board-generic.c
*/ */
......
/* /*
* TI DaVinci platform support for power management. * TI DaVinci platform support for power management.
* *
* Copyright (C) 2009 Texas Instruments, Inc. http://www.ti.com/ * Copyright (C) 2009 Texas Instruments, Inc. https://www.ti.com/
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* DaVinci Power Management Routines * DaVinci Power Management Routines
* *
* Copyright (C) 2009 Texas Instruments, Inc. http://www.ti.com/ * Copyright (C) 2009 Texas Instruments, Inc. https://www.ti.com/
*/ */
#include <linux/pm.h> #include <linux/pm.h>
......
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
/* /*
* (C) Copyright 2009, Texas Instruments, Inc. http://www.ti.com/ * (C) Copyright 2009, Texas Instruments, Inc. https://www.ti.com/
*/ */
/* replicated define because linux/bitops.h cannot be included in assembly */ /* replicated define because linux/bitops.h cannot be included in assembly */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment