Merge tag 'davinci-for-v5.1/soc-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into arm/late
DaVinci SoC updates for v5.1 (part 3) ------------------------------------- This pull request gets rid of mach-davinci private interrupt controller implmentations (aintc and cp_initc) and moves them to drivers/irqchip. mach/irqs.h usage outside of mach-davinci has been rid of. The driver changes (input and irqchip) have been acked by respective maintainers. * tag 'davinci-for-v5.1/soc-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: (57 commits) 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 ARM: davinci: aintc: unify error handling ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
@@ -46,5 +46,4 @@ enum {
|
||||
EMAC_VERSION_2, /* DM646x */
|
||||
};
|
||||
|
||||
void davinci_get_mac_addr(struct nvmem_device *nvmem, void *context);
|
||||
#endif
|
||||
|
27
include/linux/irqchip/irq-davinci-aintc.h
Normal file
27
include/linux/irqchip/irq-davinci-aintc.h
Normal file
@@ -0,0 +1,27 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
/*
|
||||
* Copyright (C) 2019 Texas Instruments
|
||||
*/
|
||||
|
||||
#ifndef _LINUX_IRQ_DAVINCI_AINTC_
|
||||
#define _LINUX_IRQ_DAVINCI_AINTC_
|
||||
|
||||
#include <linux/ioport.h>
|
||||
|
||||
/**
|
||||
* struct davinci_aintc_config - configuration data for davinci-aintc driver.
|
||||
*
|
||||
* @reg: register range to map
|
||||
* @num_irqs: number of HW interrupts supported by the controller
|
||||
* @prios: an array of size num_irqs containing priority settings for
|
||||
* each interrupt
|
||||
*/
|
||||
struct davinci_aintc_config {
|
||||
struct resource reg;
|
||||
unsigned int num_irqs;
|
||||
u8 *prios;
|
||||
};
|
||||
|
||||
void davinci_aintc_init(const struct davinci_aintc_config *config);
|
||||
|
||||
#endif /* _LINUX_IRQ_DAVINCI_AINTC_ */
|
25
include/linux/irqchip/irq-davinci-cp-intc.h
Normal file
25
include/linux/irqchip/irq-davinci-cp-intc.h
Normal file
@@ -0,0 +1,25 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
/*
|
||||
* Copyright (C) 2019 Texas Instruments
|
||||
*/
|
||||
|
||||
#ifndef _LINUX_IRQ_DAVINCI_CP_INTC_
|
||||
#define _LINUX_IRQ_DAVINCI_CP_INTC_
|
||||
|
||||
#include <linux/ioport.h>
|
||||
|
||||
/**
|
||||
* struct davinci_cp_intc_config - configuration data for davinci-cp-intc
|
||||
* driver.
|
||||
*
|
||||
* @reg: register range to map
|
||||
* @num_irqs: number of HW interrupts supported by the controller
|
||||
*/
|
||||
struct davinci_cp_intc_config {
|
||||
struct resource reg;
|
||||
unsigned int num_irqs;
|
||||
};
|
||||
|
||||
int davinci_cp_intc_init(const struct davinci_cp_intc_config *config);
|
||||
|
||||
#endif /* _LINUX_IRQ_DAVINCI_CP_INTC_ */
|
@@ -11,22 +11,8 @@
|
||||
#ifndef __ASM_ARCH_USB_H
|
||||
#define __ASM_ARCH_USB_H
|
||||
|
||||
struct da8xx_ohci_root_hub;
|
||||
|
||||
typedef void (*da8xx_ocic_handler_t)(struct da8xx_ohci_root_hub *hub,
|
||||
unsigned port);
|
||||
|
||||
/* Passed as the platform data to the OHCI driver */
|
||||
struct da8xx_ohci_root_hub {
|
||||
/* Switch the port power on/off */
|
||||
int (*set_power)(unsigned port, int on);
|
||||
/* Read the port power status */
|
||||
int (*get_power)(unsigned port);
|
||||
/* Read the port over-current indicator */
|
||||
int (*get_oci)(unsigned port);
|
||||
/* Over-current indicator change notification (pass NULL to disable) */
|
||||
int (*ocic_notify)(da8xx_ocic_handler_t handler);
|
||||
|
||||
/* Time from power on to power good (in 2 ms units) */
|
||||
u8 potpgt;
|
||||
};
|
||||
|
Reference in New Issue
Block a user