Commit 63e850f1 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v5.10/soc-signed' of... 

Merge tag 'omap-for-v5.10/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc

SoC changes for omaps for v5.10

Few changes to replace HTTP links with HTTPS, and a change to
delete a duplicate word for omap1 mux.h comments.

* tag 'omap-for-v5.10/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  arm: mach-omap1: mux.h: delete duplicate word
  ARM: OMAP2+: Replace HTTP links with HTTPS ones
  ARM: OMAP2+: pm33xx-core: Replace HTTP links with HTTPS ones
  ARM: OMAP2+: hwmod: Replace HTTP links with HTTPS ones
  ARM: OMAP2+: Replace HTTP links with HTTPS ones
  ARM: OMAP2+: PRM: Replace HTTP links with HTTPS ones

Link: https://lore.kernel.org/r/pull-1599132307-761202@atomide.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c9c7ddd0 501e69b0

arch/arm/mach-omap1/include/mach/mux.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ 
 * OMAP730/850 has a slightly different config for the pin mux.

 * - config regs are the OMAP7XX_IO_CONF_x regs (see omap7xx.h) regs and

 *   not the FUNC_MUX_CTRL_x regs from hardware.h

 * - for pull-up/down, only has one enable bit which is is in the same register

 * - for pull-up/down, only has one enable bit which is in the same register

 *   as mux config

 */

#define MUX_CFG_7XX(desc, mux_reg, mode_offset, mode,	\

arch/arm/mach-omap2/am33xx.h

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

 * This file contains the address info for various AM33XX modules.

 *

 * Copyright (C) 2011 Texas Instruments, Inc. - http://www.ti.com/

 * Copyright (C) 2011 Texas Instruments, Inc. - https://www.ti.com/

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

arch/arm/mach-omap2/board-generic.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * Copyright (C) 2005 Nokia Corporation

 * Author: Paul Mundt <paul.mundt@nokia.com>

 *

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

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

 *

 * Modified from the original mach-omap/omap2/board-generic.c did by Paul

 * to support the OMAP2+ device tree boards with an unique board file.

arch/arm/mach-omap2/clockdomains33xx_data.c

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

 * AM33XX Clock Domain data.

 *

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

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

 * Vaibhav Hiremath <hvaibhav@ti.com>

 *

 * This program is free software; you can redistribute it and/or

arch/arm/mach-omap2/clockdomains81xx_data.c

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

 * TI81XX Clock Domain data.

 *

 * Copyright (C) 2010 Texas Instruments, Inc. - http://www.ti.com/

 * Copyright (C) 2010 Texas Instruments, Inc. - https://www.ti.com/

 * Copyright (C) 2013 SKTB SKiT, http://www.skitlab.ru/

 *

 * This program is free software; you can redistribute it and/or

CRA Git | Maintained and supported by SUSTech CRA and CCSE