From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2a72785cf89390e214bc0164bde29cded97e22a5
Date: Sat, 15 Feb 2014 16:43:02 +0100 [thread overview]
Message-ID: <20140215154302.925B421069@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 12934 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, next has been updated
via 2a72785cf89390e214bc0164bde29cded97e22a5 (commit)
via d10a7de134da43c509fc89452217b6a0160d6bfd (commit)
via 1e67b3c3bb15bda23ad072b216455b0eca912fa2 (commit)
via 6f7753ba85a454b8a74af4f1bbe37b3d10eb8c03 (commit)
from e3cbe60f5d46bbef7e4e257fbbae5a49f91d06df (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 2a72785cf89390e214bc0164bde29cded97e22a5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 15 16:41:40 2014 +0100
atm-status.cgi: display more values for solos-pci.
commit d10a7de134da43c509fc89452217b6a0160d6bfd
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 15 16:39:22 2014 +0100
leds: add geos router support, updated alix leds.
commit 1e67b3c3bb15bda23ad072b216455b0eca912fa2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 15 16:29:31 2014 +0100
kernel: cs5535audio spam the syslog with access errors.
On geos boards the cs5535 is present but the ac97 is not there.
commit 6f7753ba85a454b8a74af4f1bbe37b3d10eb8c03
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 15 16:27:20 2014 +0100
kernel: add some missing gpio modules.
the gpio modules are needed for led's on alix and geos boards.
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.i586-ipfire | 9 ++++----
config/kernel/kernel.config.i586-ipfire-pae | 15 ++++++------
config/rootfiles/common/i586/linux | 5 ++++
config/rootfiles/packages/linux-pae | 4 ++++
html/cgi-bin/atm-status.cgi | 23 ++++++++++++++++++
lfs/linux | 3 +++
src/initscripts/init.d/leds | 20 ++++++++++++++++
...x-3.10.30_cs5535audio_fix_logspam_on_geos.patch | 27 ++++++++++++++++++++++
8 files changed, 95 insertions(+), 11 deletions(-)
create mode 100644 src/patches/linux-3.10.30_cs5535audio_fix_logspam_on_geos.patch
Difference in files:
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 6628c64..8d36f13 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -4475,17 +4475,18 @@ CONFIG_LEDS_CLASS=y
CONFIG_LEDS_LM3530=m
CONFIG_LEDS_LM3533=m
CONFIG_LEDS_LM3642=m
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
CONFIG_LEDS_LP3944=m
CONFIG_LEDS_LP55XX_COMMON=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
CONFIG_LEDS_LP5562=m
CONFIG_LEDS_CLEVO_MAIL=m
-# CONFIG_LEDS_PCA955X is not set
+CONFIG_LEDS_PCA955X=m
CONFIG_LEDS_PCA9633=m
-# CONFIG_LEDS_BD2802 is not set
+CONFIG_LEDS_BD2802=m
CONFIG_LEDS_INTEL_SS4200=m
CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index fc619b8..9133feb 100644
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.11-ipfire Kernel Configuration
+# Linux/x86 3.10.30 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1105,7 +1105,7 @@ CONFIG_L2TP_V3=y
CONFIG_L2TP_IP=m
CONFIG_L2TP_ETH=m
CONFIG_STP=y
-CONFIG_GARP=y
+CONFIG_GARP=m
CONFIG_BRIDGE=y
CONFIG_BRIDGE_IGMP_SNOOPING=y
CONFIG_BRIDGE_VLAN_FILTERING=y
@@ -1728,6 +1728,7 @@ CONFIG_BCACHE=m
# CONFIG_BCACHE_DEBUG is not set
# CONFIG_BCACHE_EDEBUG is not set
# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
CONFIG_BLK_DEV_DM=y
# CONFIG_DM_DEBUG is not set
CONFIG_DM_BUFIO=m
@@ -4493,17 +4494,18 @@ CONFIG_LEDS_CLASS=y
CONFIG_LEDS_LM3530=m
CONFIG_LEDS_LM3533=m
CONFIG_LEDS_LM3642=m
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
CONFIG_LEDS_LP3944=m
CONFIG_LEDS_LP55XX_COMMON=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
CONFIG_LEDS_LP5562=m
CONFIG_LEDS_CLEVO_MAIL=m
-# CONFIG_LEDS_PCA955X is not set
+CONFIG_LEDS_PCA955X=m
CONFIG_LEDS_PCA9633=m
-# CONFIG_LEDS_BD2802 is not set
+CONFIG_LEDS_BD2802=m
CONFIG_LEDS_INTEL_SS4200=m
CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
@@ -4643,7 +4645,6 @@ CONFIG_DMA_ACPI=y
#
# DMA Clients
#
-CONFIG_NET_DMA=y
CONFIG_ASYNC_TX_DMA=y
# CONFIG_DMATEST is not set
CONFIG_DCA=m
diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux
index d662516..32a4823 100644
--- a/config/rootfiles/common/i586/linux
+++ b/config/rootfiles/common/i586/linux
@@ -281,6 +281,7 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/firmware/edd.ko
#lib/modules/KVER-ipfire/kernel/drivers/firmware/iscsi_ibft.ko
#lib/modules/KVER-ipfire/kernel/drivers/gpio
+#lib/modules/KVER-ipfire/kernel/drivers/gpio/gpio-cs5535.ko
#lib/modules/KVER-ipfire/kernel/drivers/gpio/gpio-ich.ko
#lib/modules/KVER-ipfire/kernel/drivers/gpio/gpio-sch.ko
#lib/modules/KVER-ipfire/kernel/drivers/gpio/gpio-ts5500.ko
@@ -619,8 +620,10 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp.ko
#lib/modules/KVER-ipfire/kernel/drivers/leds
#lib/modules/KVER-ipfire/kernel/drivers/leds/dell-led.ko
+#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-bd2802.ko
#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-blinkm.ko
#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-clevo-mail.ko
+#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-gpio.ko
#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-lm3530.ko
#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-lm3533.ko
#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-lm355x.ko
@@ -632,6 +635,8 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-lp55xx-common.ko
#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-lt3593.ko
#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-ot200.ko
+#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-pca9532.ko
+#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-pca955x.ko
#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-pca9633.ko
#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-ss4200.ko
#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-tca6507.ko
diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae
index a7eaf40..339d551 100644
--- a/config/rootfiles/packages/linux-pae
+++ b/config/rootfiles/packages/linux-pae
@@ -616,8 +616,10 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/mISDN/mISDN_dsp.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/leds
#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/dell-led.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-bd2802.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-blinkm.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-clevo-mail.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-gpio.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-lm3530.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-lm3533.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-lm355x.ko
@@ -629,6 +631,8 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-lp55xx-common.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-lt3593.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-ot200.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-pca9532.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-pca955x.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-pca9633.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-ss4200.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-tca6507.ko
diff --git a/html/cgi-bin/atm-status.cgi b/html/cgi-bin/atm-status.cgi
index 5c0fa8b..c2a9914 100644
--- a/html/cgi-bin/atm-status.cgi
+++ b/html/cgi-bin/atm-status.cgi
@@ -46,6 +46,27 @@ foreach (@modems){
my $lines=0;
print "<center><table>";
my $modem=$_;
+ my @pfile = `grep . /sys/class/atm/$modem/parameters/* 2>/dev/null`;
+ foreach (@pfile){
+ chomp($_);
+ my $param= `echo $_ | cut -d'/' -f7 | cut -d':' -f1`;
+ my $value= `cat /sys/class/atm/$modem/parameters/$param`;
+ chomp($param);
+ chomp($value);
+ if (!($param =~"uevent")
+ && !($param =~"resource")
+ && !($param eq "")
+ ) {
+
+ $lines++;
+ if ($lines % 2){
+ print "<tr bgcolor='$color{'color22'}'>";
+ }else{
+ print "<tr bgcolor='$color{'color20'}'>";
+ }
+ print "<td align='left'>$param</td><td align='left'>$value</td> ";
+ }
+ }
my @pfile = `grep . /sys/class/atm/$modem/device/* 2>/dev/null`;
foreach (@pfile){
chomp($_);
@@ -58,6 +79,8 @@ foreach (@modems){
&& !($param =~"bInterface")
&& !($param =~"bAlternateSetting")
&& !($param =~"bNumEndpoints")
+ && !($param =~"config matches")
+ && !($param =~"resource")
&& !($param eq "")
) {
diff --git a/lfs/linux b/lfs/linux
index 6aaa60e..2a7eb32 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -147,6 +147,9 @@ endif
# Add LED trigger
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.9-ledtrig-netdev-1.patch
+ # cs5535audio spams syslog if no ac97 was present (geos router)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.30_cs5535audio_fix_logspam_on_geos.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/leds b/src/initscripts/init.d/leds
index 3bd27a4..52ef270 100644
--- a/src/initscripts/init.d/leds
+++ b/src/initscripts/init.d/leds
@@ -50,6 +50,14 @@ disable_led_trigger ()
fi
}
+# enable LED
+enable_led ()
+{
+ if [ -d "/sys/class/leds/$1" ]; then
+ echo "1" > /sys/class/leds/$1/brightness
+ fi
+}
+
case "${1}" in
start)
# Alix LED start
@@ -57,6 +65,11 @@ case "${1}" in
setup_netdev_trigger alix:2 ${RED_DEV} rx
setup_netdev_trigger alix:3 ${RED_DEV} tx
+ # Geos LED start
+ setup_heartbeat_trigger geos:1
+ setup_netdev_trigger geos:2 ${RED_DEV} rx
+ setup_netdev_trigger geos:3 ${RED_DEV} tx
+
# Dreamplug
setup_netdev_trigger dreamplug:green:wlan ${GREEN_DEV} tx rx
setup_netdev_trigger dreamplug:blue:wlanap ${BLUE_DEV} tx rx
@@ -80,9 +93,16 @@ case "${1}" in
stop)
# Alix LED stop
disable_led_trigger alix:1
+ enable_led alix:1
disable_led_trigger alix:2
disable_led_trigger alix:3
+ # Geos LED stop
+ disable_led_trigger geos:1
+ enable_led geos:1
+ disable_led_trigger geos:2
+ disable_led_trigger geos:3
+
# Dreamplug
disable_led_trigger dreamplug:green:wlan
disable_led_trigger dreamplug:blue:wlanap
diff --git a/src/patches/linux-3.10.30_cs5535audio_fix_logspam_on_geos.patch b/src/patches/linux-3.10.30_cs5535audio_fix_logspam_on_geos.patch
new file mode 100644
index 0000000..490a34d
--- /dev/null
+++ b/src/patches/linux-3.10.30_cs5535audio_fix_logspam_on_geos.patch
@@ -0,0 +1,27 @@
+diff -Naur linux-3.10.30.org/sound/pci/cs5535audio/cs5535audio.c linux-3.10.30/sound/pci/cs5535audio/cs5535audio.c
+--- linux-3.10.30.org/sound/pci/cs5535audio/cs5535audio.c 2014-02-13 22:48:15.000000000 +0100
++++ linux-3.10.30/sound/pci/cs5535audio/cs5535audio.c 2014-02-15 12:45:49.545688703 +0100
+@@ -83,8 +83,8 @@
+ break;
+ udelay(1);
+ } while (--timeout);
+- if (!timeout)
+- snd_printk(KERN_ERR "Failure writing to cs5535 codec\n");
++// if (!timeout)
++// snd_printk(KERN_ERR "Failure writing to cs5535 codec\n");
+ }
+
+ static unsigned short snd_cs5535audio_codec_read(struct cs5535audio *cs5535au,
+@@ -108,9 +108,9 @@
+ break;
+ udelay(1);
+ } while (--timeout);
+- if (!timeout)
+- snd_printk(KERN_ERR "Failure reading codec reg 0x%x,"
+- "Last value=0x%x\n", reg, val);
++// if (!timeout)
++// snd_printk(KERN_ERR "Failure reading codec reg 0x%x,"
++// "Last value=0x%x\n", reg, val);
+
+ return (unsigned short) val;
+ }
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2014-02-15 15:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140215154302.925B421069@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox