public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 2.x development tree branch, core100, updated. ed974e08c54b293afb71405dc71e2cc56779fc9b
@ 2016-03-26 15:19 git
  0 siblings, 0 replies; only message in thread
From: git @ 2016-03-26 15:19 UTC (permalink / raw)
  To: ipfire-scm

[-- Attachment #1: Type: text/plain, Size: 19152 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, core100 has been updated
       via  ed974e08c54b293afb71405dc71e2cc56779fc9b (commit)
       via  36b2adc9ed86e21c9d9c1d9245c02e8f1c58956a (commit)
       via  545c15b0a1d7cbbe44d1cfec9fb435e73cf26709 (commit)
       via  9a7a6c52ed256506a4f000364f75b82cc5d899ae (commit)
      from  7940649e17a7499fbddb5552793294ee394c7541 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ed974e08c54b293afb71405dc71e2cc56779fc9b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Mar 26 15:35:31 2016 +0100

    hostapd: fix crash at txpower set on ath10k
    
    ath10k generate a fault if iwconfig try to set txpower
    while the device is down.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 36b2adc9ed86e21c9d9c1d9245c02e8f1c58956a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Mar 26 15:24:40 2016 +0100

    backports: ath10k fix logspam if channel was not set.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 545c15b0a1d7cbbe44d1cfec9fb435e73cf26709
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Mar 26 10:15:45 2016 +0100

    kernel: add PC Engines(TM) APU2 LED driver

commit 9a7a6c52ed256506a4f000364f75b82cc5d899ae
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Mar 26 10:08:18 2016 +0100

    kernel: k10temp: add family 16h model 30h pci id.
    
    used by AMD GX-412TC in PC Engines(TM) APU 2
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/kernel/kernel.config.i586-ipfire            |   1 +
 config/kernel/kernel.config.i586-ipfire-pae        |   1 +
 config/kernel/kernel.config.x86_64-ipfire          |   1 +
 lfs/backports                                      |   1 +
 lfs/hostapd                                        |   4 +-
 lfs/linux                                          |   5 +-
 src/initscripts/init.d/hostapd                     |   4 +-
 .../backports-4.2.6-1_ath10k_remove_logspam.patch  |  12 +
 src/patches/linux-3.14-apu_leds.patch              | 245 ++++++++++++++++++---
 .../linux-3.14.65-k10temp_add_16H_M30H_id.patch    |  12 +
 10 files changed, 255 insertions(+), 31 deletions(-)
 create mode 100644 src/patches/backports-4.2.6-1_ath10k_remove_logspam.patch
 create mode 100644 src/patches/linux-3.14.65-k10temp_add_16H_M30H_id.patch

Difference in files:
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index b0d78e1..11230e3 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -682,6 +682,7 @@ CONFIG_ALIX=y
 CONFIG_NET5501=y
 CONFIG_GEOS=y
 CONFIG_APULED=y
+CONFIG_APU2LED=y
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index 6272579..f596a44 100644
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -696,6 +696,7 @@ CONFIG_EISA_NAMES=y
 # CONFIG_NET5501 is not set
 # CONFIG_GEOS is not set
 CONFIG_APULED=y
+CONFIG_APU2LED=y
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index b5e1575..d3bdcf0 100644
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -633,6 +633,7 @@ CONFIG_PCI_LABEL=y
 #
 CONFIG_ISA_DMA_API=y
 CONFIG_APULED=y
+CONFIG_APU2LED=y
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
diff --git a/lfs/backports b/lfs/backports
index 39fa9b2..12bd83f 100644
--- a/lfs/backports
+++ b/lfs/backports
@@ -101,6 +101,7 @@ endif
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_rt2x00usb_suppress_queue_warnings.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-4.2.6-1-mt7601_upstream_fixes.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_add_libertas_uap.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-4.2.6-1_ath10k_remove_logspam.patch
 
 	# smsc mac address patch for pandaboard and raspberry pi
 ifeq "$(KCFG)" "-multi"
diff --git a/lfs/hostapd b/lfs/hostapd
index e928668..f393d91 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2016  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 34
+PAK_VER    = 35
 
 DEPS       = ""
 
diff --git a/lfs/linux b/lfs/linux
index 125228a..f7782ff 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -37,7 +37,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 65
+PAK_VER    = 66
 DEPS	   = ""
 
 KERNEL_ARCH = $(MACHINE)
@@ -160,6 +160,9 @@ endif
 	# Add PC Engines APU led support
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14-apu_leds.patch
 
+	# Add APU2 SoC ID to k10temp
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.65-k10temp_add_16H_M30H_id.patch
+
 	# Fix uevent PHYSDEVDRIVER
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch
diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index 209f969..02e8c16 100644
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -73,7 +73,9 @@ case "${1}" in
 		/usr/sbin/iw reg set $COUNTRY
 
 		/usr/sbin/iwconfig $INTERFACE channel $CHANNEL 2>/dev/null
-		/usr/sbin/iwconfig $INTERFACE txpower $TXPOWER
+
+		ip link set ${INTERFACE} up 2>/dev/null
+		/usr/sbin/iwconfig $INTERFACE txpower $TXPOWER 2>/dev/null
 
 		/usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf >/dev/null 2>&1 &
 
diff --git a/src/patches/backports-4.2.6-1_ath10k_remove_logspam.patch b/src/patches/backports-4.2.6-1_ath10k_remove_logspam.patch
new file mode 100644
index 0000000..bdb1534
--- /dev/null
+++ b/src/patches/backports-4.2.6-1_ath10k_remove_logspam.patch
@@ -0,0 +1,12 @@
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/ath/ath10k/htt_rx.c backports-4.2.6-1/drivers/net/wireless/ath/ath10k/htt_rx.c
+--- backports-4.2.6-1.org/drivers/net/wireless/ath/ath10k/htt_rx.c	2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/ath/ath10k/htt_rx.c	2016-03-26 10:48:17.189430101 +0100
+@@ -1476,7 +1476,7 @@
+ 	 */
+ 
+ 	if (!rx_status->freq) {
+-		ath10k_warn(ar, "no channel configured; ignoring frame(s)!\n");
++		ath10k_dbg(ar,ATH10K_DBG_DATA ,"no channel configured; ignoring frame(s)!\n");
+ 		return false;
+ 	}
+ 
diff --git a/src/patches/linux-3.14-apu_leds.patch b/src/patches/linux-3.14-apu_leds.patch
index 13d7c76..e887adc 100644
--- a/src/patches/linux-3.14-apu_leds.patch
+++ b/src/patches/linux-3.14-apu_leds.patch
@@ -1,6 +1,6 @@
-diff -Naur linux-3.14.43.org/arch/x86/Kconfig linux-3.14.43/arch/x86/Kconfig
---- linux-3.14.43.org/arch/x86/Kconfig	2015-05-17 18:54:01.000000000 +0200
-+++ linux-3.14.43/arch/x86/Kconfig	2015-09-19 20:14:52.436654988 +0200
+diff -Naur linux-3.14.65.org/arch/x86/Kconfig linux-3.14.65/arch/x86/Kconfig
+--- linux-3.14.65.org/arch/x86/Kconfig	2016-03-16 16:42:30.000000000 +0100
++++ linux-3.14.65/arch/x86/Kconfig	2016-03-25 14:36:22.953256019 +0100
 @@ -2287,6 +2287,7 @@
  	   - AC adapter status updates
  	   - Battery status updates
@@ -9,7 +9,7 @@ diff -Naur linux-3.14.43.org/arch/x86/Kconfig linux-3.14.43/arch/x86/Kconfig
  config ALIX
  	bool "PCEngines ALIX System Support (LED setup)"
  	select GPIOLIB
-@@ -2325,6 +2326,12 @@
+@@ -2325,6 +2326,18 @@
  
  endif # X86_32
  
@@ -17,14 +17,204 @@ diff -Naur linux-3.14.43.org/arch/x86/Kconfig linux-3.14.43/arch/x86/Kconfig
 +	bool "PCEngines APU Led Support"
 +	depends on DMI
 +	---help---
-+	  This option enables system support for the PCEngines APU.
++	  This option enables system support for the PCEngines APU1.
++
++config APU2LED
++	bool "PCEngines APU2 Led Support"
++	depends on DMI
++	---help---
++	  This option enables system support for the PCEngines APU2.
 +
  config AMD_NB
  	def_bool y
  	depends on CPU_SUP_AMD && PCI
-diff -Naur linux-3.14.43.org/arch/x86/platform/apu/apu-led.c linux-3.14.43/arch/x86/platform/apu/apu-led.c
---- linux-3.14.43.org/arch/x86/platform/apu/apu-led.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.43/arch/x86/platform/apu/apu-led.c	2015-09-19 20:12:20.520647636 +0200
+diff -Naur linux-3.14.65.org/arch/x86/platform/apu/apu2-led.c linux-3.14.65/arch/x86/platform/apu/apu2-led.c
+--- linux-3.14.65.org/arch/x86/platform/apu/apu2-led.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.14.65/arch/x86/platform/apu/apu2-led.c	2016-03-25 15:04:34.476689422 +0100
+@@ -0,0 +1,180 @@
++/*
++ * LEDs driver for PCEngines apu2
++ *
++ * this basic driver only set the output, configuration 
++ * has already done by bios/coreboot.
++ * suspend/resume was not tested because IPFire not use it.
++ *
++ * Copyright (C) 2016 Arne Fitzenreiter <arne_f(a)ipfire.org> ,
++ * based on Christian Herzog's apu_led.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/platform_device.h>
++#include <linux/leds.h>
++#include <linux/err.h>
++#include <asm/io.h>
++#include <linux/dmi.h>
++
++#define DRVNAME		"apu2-led"
++#define BASEADDR	(0xFED81610)
++
++static struct platform_device *pdev;
++unsigned int *apu2_led_p1;
++unsigned int *apu2_led_p2;
++unsigned int *apu2_led_p3;
++
++static void apu2_led_set_1(struct led_classdev *led_cdev,
++		enum led_brightness value) {
++	if (value)
++		iowrite32((ioread32(apu2_led_p1)&~BIT(22)), apu2_led_p1);
++	else
++		iowrite32((ioread32(apu2_led_p1)|BIT(22)), apu2_led_p1);
++}
++
++static void apu2_led_set_2(struct led_classdev *led_cdev,
++		enum led_brightness value) {
++	if (value)
++		iowrite32((ioread32(apu2_led_p2)&~BIT(22)), apu2_led_p2);
++	else
++		iowrite32((ioread32(apu2_led_p2)|BIT(22)), apu2_led_p2);
++}
++
++static void apu2_led_set_3(struct led_classdev *led_cdev,
++		enum led_brightness value) {
++	if (value)
++		iowrite32((ioread32(apu2_led_p3)&~BIT(22)), apu2_led_p3);
++	else
++		iowrite32((ioread32(apu2_led_p3)|BIT(22)), apu2_led_p3);
++}
++
++static struct led_classdev apu2_led_1 = {
++	.name		= "apu:1",
++	.brightness_set	= apu2_led_set_1,
++};
++
++static struct led_classdev apu2_led_2 = {
++	.name		= "apu:2",
++	.brightness_set	= apu2_led_set_2,
++};
++
++static struct led_classdev apu2_led_3 = {
++	.name		= "apu:3",
++	.brightness_set	= apu2_led_set_3,
++};
++
++
++#ifdef CONFIG_PM
++static int apu2_led_suspend(struct platform_device *dev,
++		pm_message_t state)
++{
++	led_classdev_suspend(&apu2_led_1);
++	led_classdev_suspend(&apu2_led_2);
++	led_classdev_suspend(&apu2_led_3);
++	return 0;
++}
++
++static int apu2_led_resume(struct platform_device *dev)
++{
++	led_classdev_resume(&apu2_led_1);
++	led_classdev_resume(&apu2_led_2);
++	led_classdev_resume(&apu2_led_3);
++	return 0;
++}
++#else
++#define apu2_led_suspend NULL
++#define apu2_led_resume NULL
++#endif
++
++static int apu2_led_probe(struct platform_device *pdev)
++{
++	int ret;
++
++	ret = led_classdev_register(&pdev->dev, &apu2_led_1);
++	if (ret == 0)
++	{
++		ret = led_classdev_register(&pdev->dev, &apu2_led_2);
++		if (ret >= 0)
++		{
++			ret = led_classdev_register(&pdev->dev, &apu2_led_3);
++			if (ret < 0)
++				led_classdev_unregister(&apu2_led_2);
++		}
++		if (ret < 0)
++			led_classdev_unregister(&apu2_led_1);
++	}
++	return ret;
++}
++
++static int apu2_led_remove(struct platform_device *pdev)
++{
++	led_classdev_unregister(&apu2_led_1);
++	led_classdev_unregister(&apu2_led_2);
++	led_classdev_unregister(&apu2_led_3);
++	return 0;
++}
++
++static struct platform_driver apu2_led_driver = {
++	.probe		= apu2_led_probe,
++	.remove		= apu2_led_remove,
++	.suspend	= apu2_led_suspend,
++	.resume		= apu2_led_resume,
++	.driver		= {
++	.name		= DRVNAME,
++	.owner		= THIS_MODULE,
++	},
++};
++
++static int __init apu2_led_init(void)
++{
++	int ret=0;
++	const char *vendor, *product;
++
++	vendor = dmi_get_system_info(DMI_SYS_VENDOR);
++	if (!vendor || strcmp(vendor, "PC Engines"))
++		goto out;
++
++	product = dmi_get_system_info(DMI_PRODUCT_NAME);
++	if (!product || strcmp(product, "apu2"))
++			goto out;
++
++	printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n",
++	       KBUILD_MODNAME, vendor, product);
++
++	ret = platform_driver_register(&apu2_led_driver);
++	if (ret < 0)
++		goto out;
++
++	pdev = platform_device_register_simple(DRVNAME, -1, NULL, 0);
++	if (IS_ERR(pdev)) {
++		ret = PTR_ERR(pdev);
++		platform_driver_unregister(&apu2_led_driver);
++		goto out;
++	}
++
++	apu2_led_p1 = ioremap(BASEADDR, 4);
++	apu2_led_p2 = ioremap(BASEADDR+4, 4);
++	apu2_led_p3 = ioremap(BASEADDR+8, 4);
++
++out:
++	return ret;
++}
++
++static void __exit apu2_led_exit(void)
++{
++	platform_device_unregister(pdev);
++	platform_driver_unregister(&apu2_led_driver);
++}
++
++module_init(apu2_led_init);
++module_exit(apu2_led_exit);
++
++MODULE_AUTHOR("Arne Fitzenreiter");
++MODULE_DESCRIPTION("PCEngines apu2 LED driver");
++MODULE_LICENSE("GPL");
+diff -Naur linux-3.14.65.org/arch/x86/platform/apu/apu-led.c linux-3.14.65/arch/x86/platform/apu/apu-led.c
+--- linux-3.14.65.org/arch/x86/platform/apu/apu-led.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.14.65/arch/x86/platform/apu/apu-led.c	2016-03-25 15:05:35.776693425 +0100
 @@ -0,0 +1,181 @@
 +/*
 + * LEDs driver for PCEngines apu
@@ -55,32 +245,32 @@ diff -Naur linux-3.14.43.org/arch/x86/platform/apu/apu-led.c linux-3.14.43/arch/
 +#define LEDOFF		(0xC8)
 +
 +static struct platform_device *pdev;
-+unsigned int *p1;
-+unsigned int *p2;
-+unsigned int *p3;
++unsigned int *apu_led_p1;
++unsigned int *apu_led_p2;
++unsigned int *apu_led_p3;
 +
 +static void apu_led_set_1(struct led_classdev *led_cdev,
 +		enum led_brightness value) {
 +	if (value)
-+		iowrite8(LEDON, p1);
++		iowrite8(LEDON, apu_led_p1);
 +	else
-+		iowrite8(LEDOFF, p1);
++		iowrite8(LEDOFF, apu_led_p1);
 +}
 +
 +static void apu_led_set_2(struct led_classdev *led_cdev,
 +		enum led_brightness value) {
 +	if (value)
-+		iowrite8(LEDON, p2);
++		iowrite8(LEDON, apu_led_p2);
 +	else
-+		iowrite8(LEDOFF, p2);
++		iowrite8(LEDOFF, apu_led_p2);
 +}
 +
 +static void apu_led_set_3(struct led_classdev *led_cdev,
 +		enum led_brightness value) {
 +	if (value)
-+		iowrite8(LEDON, p3);
++		iowrite8(LEDON, apu_led_p3);
 +	else
-+		iowrite8(LEDOFF, p3);
++		iowrite8(LEDOFF, apu_led_p3);
 +}
 +
 +static struct led_classdev apu_led_1 = {
@@ -187,9 +377,9 @@ diff -Naur linux-3.14.43.org/arch/x86/platform/apu/apu-led.c linux-3.14.43/arch/
 +		goto out;
 +	}
 +
-+	p1 = ioremap(BASEADDR, 1);
-+	p2 = ioremap(BASEADDR+1, 1);
-+	p3 = ioremap(BASEADDR+2, 1);
++	apu_led_p1 = ioremap(BASEADDR, 1);
++	apu_led_p2 = ioremap(BASEADDR+1, 1);
++	apu_led_p3 = ioremap(BASEADDR+2, 1);
 +
 +out:
 +	return ret;
@@ -207,14 +397,15 @@ diff -Naur linux-3.14.43.org/arch/x86/platform/apu/apu-led.c linux-3.14.43/arch/
 +MODULE_AUTHOR("Christian Herzog");
 +MODULE_DESCRIPTION("PCEngines apu LED driver");
 +MODULE_LICENSE("GPL");
-diff -Naur linux-3.14.43.org/arch/x86/platform/apu/Makefile linux-3.14.43/arch/x86/platform/apu/Makefile
---- linux-3.14.43.org/arch/x86/platform/apu/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.43/arch/x86/platform/apu/Makefile	2015-09-19 20:12:20.520647636 +0200
-@@ -0,0 +1 @@
+diff -Naur linux-3.14.65.org/arch/x86/platform/apu/Makefile linux-3.14.65/arch/x86/platform/apu/Makefile
+--- linux-3.14.65.org/arch/x86/platform/apu/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.14.65/arch/x86/platform/apu/Makefile	2016-03-25 14:35:30.506585952 +0100
+@@ -0,0 +1,2 @@
 +obj-$(CONFIG_APULED)		+= apu-led.o
-diff -Naur linux-3.14.43.org/arch/x86/platform/Makefile linux-3.14.43/arch/x86/platform/Makefile
---- linux-3.14.43.org/arch/x86/platform/Makefile	2015-05-17 18:54:01.000000000 +0200
-+++ linux-3.14.43/arch/x86/platform/Makefile	2015-09-19 20:12:20.520647636 +0200
++obj-$(CONFIG_APU2LED)		+= apu2-led.o
+diff -Naur linux-3.14.65.org/arch/x86/platform/Makefile linux-3.14.65/arch/x86/platform/Makefile
+--- linux-3.14.65.org/arch/x86/platform/Makefile	2016-03-16 16:42:30.000000000 +0100
++++ linux-3.14.65/arch/x86/platform/Makefile	2016-03-25 14:31:04.079903947 +0100
 @@ -1,4 +1,5 @@
  # Platform specific code goes here
 +obj-y	+= apu/
diff --git a/src/patches/linux-3.14.65-k10temp_add_16H_M30H_id.patch b/src/patches/linux-3.14.65-k10temp_add_16H_M30H_id.patch
new file mode 100644
index 0000000..878f44e
--- /dev/null
+++ b/src/patches/linux-3.14.65-k10temp_add_16H_M30H_id.patch
@@ -0,0 +1,12 @@
+diff -Naur linux-3.14.65.org/drivers/hwmon/k10temp.c linux-3.14.65/drivers/hwmon/k10temp.c
+--- linux-3.14.65.org/drivers/hwmon/k10temp.c	2016-03-16 16:42:30.000000000 +0100
++++ linux-3.14.65/drivers/hwmon/k10temp.c	2016-03-25 15:52:21.920190727 +0100
+@@ -212,6 +212,8 @@
+ 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },
+ 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F3) },
+ 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },
++//	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) },
++	{ PCI_VDEVICE(AMD, 0x1583) },
+ 	{}
+ };
+ MODULE_DEVICE_TABLE(pci, k10temp_id_table);


hooks/post-receive
--
IPFire 2.x development tree

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2016-03-26 15:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-26 15:19 [git.ipfire.org] IPFire 2.x development tree branch, core100, updated. ed974e08c54b293afb71405dc71e2cc56779fc9b git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox