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

Commit afe6fe70 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC late updates from Arnd Bergmann:
 "Here are two branches that came relatively late during the linux-5.0
  development cycle and have dependencies on the other branches:

   - On the TI OMAP platform, the CPSW Ethernet PHY mode selection
     driver is being replaced, this puts the final pieces in place

   - On the DaVinci platform, the interrupt handling code in arch/arm
     gets moved into a regular device driver in drivers/irqchip.

  Since they both had some time in linux-next after the 5.0-rc8 release,
  I'm sending them along with the other updates"

* tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (38 commits)
  net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver
  ARM: davinci: remove intc related fields from davinci_soc_info
  irqchip: davinci-cp-intc: move the driver to drivers/irqchip
  ARM: davinci: cp-intc: remove redundant comments
  ARM: davinci: cp-intc: drop GPL license boilerplate
  ARM: davinci: cp-intc: use readl/writel_relaxed()
  ARM: davinci: cp-intc: unify error handling
  ARM: davinci: cp-intc: improve coding style
  ARM: davinci: cp-intc: request the memory region before remapping it
  ARM: davinci: cp-intc: use the new-style config structure
  ARM: davinci: cp-intc: convert all hex numbers to lowercase
  ARM: davinci: cp-intc: use a common prefix for all symbols
  ARM: davinci: cp-intc: add the new config structures for da8xx SoCs
  irqchip: davinci-cp-intc: add a new config structure
  ARM: davinci: cp-intc: add a wrapper around cp_intc_init()
  ARM: davinci: cp-intc: remove cp_intc.h
  irqchip: davinci-aintc: move the driver to drivers/irqchip
  ARM: davinci: aintc: remove unnecessary includes
  ARM: davinci: aintc: remove the timer-specific irq_set_handler()
  ARM: davinci: aintc: request memory region before remapping it
  ...
parents 64b1b217 25476350

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -590,11 +590,13 @@ config ARCH_DAVINCI 
	select GENERIC_ALLOCATOR

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select GENERIC_IRQ_MULTI_HANDLER

	select GPIOLIB

	select HAVE_IDE

	select PM_GENERIC_DOMAINS if PM

	select PM_GENERIC_DOMAINS_OF if PM && OF

	select RESET_CONTROLLER

	select SPARSE_IRQ

	select USE_OF

	select ZONE_DMA

	help

arch/arm/mach-davinci/Kconfig

+6 −13
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

if ARCH_DAVINCI



config AINTC

	bool



config CP_INTC

	bool

	select IRQ_DOMAIN



config ARCH_DAVINCI_DMx

	bool
@@ -17,17 +10,17 @@ comment "DaVinci Core Type" 


config ARCH_DAVINCI_DM644x

	bool "DaVinci 644x based system"

	select AINTC

	select DAVINCI_AINTC

	select ARCH_DAVINCI_DMx



config ARCH_DAVINCI_DM355

	bool "DaVinci 355 based system"

	select AINTC

	select DAVINCI_AINTC

	select ARCH_DAVINCI_DMx



config ARCH_DAVINCI_DM646x

	bool "DaVinci 646x based system"

	select AINTC

	select DAVINCI_AINTC

	select ARCH_DAVINCI_DMx



config ARCH_DAVINCI_DA830
@@ -36,20 +29,20 @@ config ARCH_DAVINCI_DA830 
	select ARCH_DAVINCI_DA8XX

	# needed on silicon revs 1.0, 1.1:

	select CPU_DCACHE_WRITETHROUGH if !CPU_DCACHE_DISABLE

	select CP_INTC

	select DAVINCI_CP_INTC



config ARCH_DAVINCI_DA850

	bool "DA850/OMAP-L138/AM18x based system"

	depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT)

	select ARCH_DAVINCI_DA8XX

	select CP_INTC

	select DAVINCI_CP_INTC



config ARCH_DAVINCI_DA8XX

	bool



config ARCH_DAVINCI_DM365

	bool "DaVinci 365 based system"

	select AINTC

	select DAVINCI_AINTC

	select ARCH_DAVINCI_DMx



comment "DaVinci Board Type"

arch/arm/mach-davinci/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ obj-$(CONFIG_ARCH_DAVINCI_DM365) += dm365.o devices.o 
obj-$(CONFIG_ARCH_DAVINCI_DA830)	+= da830.o devices-da8xx.o usb-da8xx.o

obj-$(CONFIG_ARCH_DAVINCI_DA850)	+= da850.o devices-da8xx.o usb-da8xx.o



obj-$(CONFIG_AINTC)			+= irq.o

obj-$(CONFIG_CP_INTC)			+= cp_intc.o



# Board specific

obj-$(CONFIG_MACH_DA8XX_DT)		+= da8xx-dt.o pdata-quirks.o

obj-$(CONFIG_MACH_DAVINCI_EVM)  	+= board-dm644x-evm.o

arch/arm/mach-davinci/asp.h

+4 −4
Original line number Diff line number Diff line
@@ -49,9 +49,9 @@ 
#define DAVINCI_DA830_DMA_MCASP2_AXEVT	5



/* Interrupts */

#define DAVINCI_ASP0_RX_INT	IRQ_MBRINT

#define DAVINCI_ASP0_TX_INT	IRQ_MBXINT

#define DAVINCI_ASP1_RX_INT	IRQ_MBRINT

#define DAVINCI_ASP1_TX_INT	IRQ_MBXINT

#define DAVINCI_ASP0_RX_INT	DAVINCI_INTC_IRQ(IRQ_MBRINT)

#define DAVINCI_ASP0_TX_INT	DAVINCI_INTC_IRQ(IRQ_MBXINT)

#define DAVINCI_ASP1_RX_INT	DAVINCI_INTC_IRQ(IRQ_MBRINT)

#define DAVINCI_ASP1_TX_INT	DAVINCI_INTC_IRQ(IRQ_MBXINT)



#endif /* __ASM_ARCH_DAVINCI_ASP_H */

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

+3 −2
Original line number Diff line number Diff line
@@ -36,10 +36,11 @@ 
#include <asm/mach/arch.h>



#include <mach/common.h>

#include "cp_intc.h"

#include <mach/mux.h>

#include <mach/da8xx.h>



#include "irqs.h"



#define DA830_EVM_PHY_ID		""

/*

 * USB1 VBUS is controlled by GPIO1[15], over-current is reported on GPIO2[4].
@@ -633,7 +634,7 @@ static void __init da830_evm_map_io(void) 
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_irq	= da830_init_irq,

	.init_time	= da830_init_time,

	.init_machine	= da830_evm_init,

	.init_late	= davinci_init_late,