Commit c7bedc7b authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files

updated to newer kernel

parent 11fd64cc
Loading
Loading
Loading
Loading
+8 −6
Original line number Diff line number Diff line
--- a/drivers/ata/ahci.h	2016-09-13 17:18:35.579259846 -0600
+++ b/drivers/ata/ahci.h	2016-08-01 11:57:06.306630339 -0600
@@ -396,6 +396,7 @@ void ahci_print_info(struct ata_host *ho
 int ahci_host_activate(struct ata_host *host, int irq,
 		       struct scsi_host_template *sht);
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index 0cc08f8..ef752b20 100644
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -412,6 +412,7 @@ void ahci_print_info(struct ata_host *host, const char *scc_s);
 int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht);
 void ahci_error_handler(struct ata_port *ap);
+irqreturn_t ahci_single_irq_intr(int irq, void *dev_instance);
 u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked);
+irqreturn_t ahci_single_level_irq_intr(int irq, void *dev_instance);
 
 static inline void __iomem *__ahci_port_base(struct ata_host *host,
 					     unsigned int port_no)
+11 −9
Original line number Diff line number Diff line
--- a/drivers/ata/libahci.c	2016-09-13 17:18:35.579259846 -0600
+++ b/drivers/ata/libahci.c	2016-07-27 20:25:34.217095567 -0600
@@ -1826,7 +1826,7 @@ static irqreturn_t ahci_multi_irqs_intr(
 	return IRQ_WAKE_THREAD;
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 0d028ea..587e2b12 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -1921,7 +1921,7 @@ u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked)
 }
 EXPORT_SYMBOL_GPL(ahci_handle_port_intr);
 
-static irqreturn_t ahci_single_irq_intr(int irq, void *dev_instance)
+irqreturn_t ahci_single_irq_intr(int irq, void *dev_instance)
-static irqreturn_t ahci_single_level_irq_intr(int irq, void *dev_instance)
+irqreturn_t ahci_single_level_irq_intr(int irq, void *dev_instance)
 {
 	struct ata_host *host = dev_instance;
 	struct ahci_host_priv *hpriv;
@@ -1885,6 +1885,7 @@ static irqreturn_t ahci_single_irq_intr(
@@ -1962,6 +1962,7 @@ static irqreturn_t ahci_single_level_irq_intr(int irq, void *dev_instance)
 
 	return IRQ_RETVAL(handled);
 	return IRQ_RETVAL(rc);
 }
+EXPORT_SYMBOL_GPL(ahci_single_irq_intr);
+EXPORT_SYMBOL_GPL(ahci_single_level_irq_intr);
 
 unsigned int ahci_qc_issue(struct ata_queued_cmd *qc)
 {
+37 −30
Original line number Diff line number Diff line
diff -Naur a/drivers/clk/Kconfig b/drivers/clk/Kconfig
--- a/drivers/clk/Kconfig	2016-01-25 18:31:43.413779725 -0700
+++ b/drivers/clk/Kconfig	2016-01-25 19:09:12.833821955 -0700
@@ -59,6 +59,16 @@
 	  clocked at 32KHz each. Clkout1 is always on, Clkout2 can off
 	  by control register.
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index dccb111..1e5276b 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -57,6 +57,16 @@ config COMMON_CLK_SCPI
 	  This driver uses SCPI Message Protocol to interact with the
 	  firmware providing all the clock controls.
 
+config COMMON_CLK_SI5338
+	tristate "Support Silicon Laboratories SI5338 Quad Clock Generator"
@@ -18,23 +19,25 @@ diff -Naur a/drivers/clk/Kconfig b/drivers/clk/Kconfig
 config COMMON_CLK_SI5351
 	tristate "Clock driver for SiLabs 5351A/B/C"
 	depends on I2C
diff -Naur a/drivers/clk/Makefile b/drivers/clk/Makefile
--- a/drivers/clk/Makefile	2016-01-25 18:31:43.413779725 -0700
+++ b/drivers/clk/Makefile	2016-01-25 19:09:46.217822582 -0700
@@ -35,6 +35,7 @@
 obj-$(CONFIG_CLK_QORIQ)			+= clk-qoriq.o
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 0760449..1231275 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -38,6 +38,7 @@ obj-$(CONFIG_CLK_QORIQ)			+= clk-qoriq.o
 obj-$(CONFIG_COMMON_CLK_RK808)		+= clk-rk808.o
 obj-$(CONFIG_COMMON_CLK_S2MPS11)	+= clk-s2mps11.o
 obj-$(CONFIG_COMMON_CLK_SCPI)           += clk-scpi.o
+obj-$(CONFIG_COMMON_CLK_SI5338)		+= clk-si5338.o
 obj-$(CONFIG_COMMON_CLK_SI5351)		+= clk-si5351.o
 obj-$(CONFIG_COMMON_CLK_SI514)		+= clk-si514.o
 obj-$(CONFIG_COMMON_CLK_SI570)		+= clk-si570.o
 obj-$(CONFIG_CLK_TWL6040)		+= clk-twl6040.o
diff -Naur a/drivers/misc/Kconfig b/drivers/misc/Kconfig
--- a/drivers/misc/Kconfig	2016-01-28 19:14:34.610694113 -0700
+++ b/drivers/misc/Kconfig	2016-01-28 19:42:44.730725843 -0700
@@ -515,6 +515,23 @@
 	  bus. System Configuration interface is one of the possible means
 	  of generating transactions on this bus.
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 247b09b..fb7e25e 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -796,6 +796,23 @@ config XILINX_VCU
        help
           Driver for the Xilinx VCU Init based on the logicoreIP.
 
+config VSC330X
+	tristate "Support VSC330X crosspoint switch"
@@ -53,15 +56,19 @@ diff -Naur a/drivers/misc/Kconfig b/drivers/misc/Kconfig
+	  The default driver is found at drivers/regulator/ltc3589.c and
+	  enabled with CONFIG_REGULATOR_LTC3589=y
+
 config XILINX_TRAFGEN
 	tristate "Xilinx Traffic Generator"
 	depends on MICROBLAZE || ARCH_ZYNQ
diff -Naur a/drivers/misc/Makefile b/drivers/misc/Makefile
--- a/drivers/misc/Makefile	2016-01-28 19:14:34.610694113 -0700
+++ b/drivers/misc/Makefile	2016-01-28 19:19:56.638700159 -0700
@@ -58,3 +58,5 @@
 obj-$(CONFIG_ECHO)		+= echo/
 source "drivers/misc/jesd204b/Kconfig"
 source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index e0bb6e0..e72c313 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -57,6 +57,8 @@ obj-$(CONFIG_ECHO)		+= echo/
 obj-$(CONFIG_VEXPRESS_SYSCFG)	+= vexpress-syscfg.o
 obj-$(CONFIG_CXL_BASE)		+= cxl/
 obj-$(CONFIG_PANEL)             += panel.o
+obj-$(CONFIG_VSC330X)	        += vsc330x.o
+obj-$(CONFIG_LTC3589)	        += ltc3589.o
 
 lkdtm-$(CONFIG_LKDTM)		+= lkdtm_core.o
 lkdtm-$(CONFIG_LKDTM)		+= lkdtm_bugs.o