From: Jan-Benedict G. <jb...@he...> - 2006-11-07 06:54:15
|
arch/mips/gt64120/common/time.c | 4 arch/mips/gt64120/ev64120/setup.c | 2 arch/mips/gt64120/momenco_ocelot/setup.c | 3 arch/mips/kernel/irq.c | 42 +++ arch/mips/mm/c-sb1.c | 2 arch/mips/momentum/ocelot_3/Makefile | 2 arch/mips/momentum/ocelot_3/ocelot_3_fpga.h | 6 arch/mips/momentum/ocelot_3/platform.c | 235 ++++++++++++++++++++++ arch/mips/momentum/ocelot_3/prom.c | 58 ----- arch/mips/momentum/ocelot_3/setup.c | 2 arch/mips/momentum/ocelot_c/Makefile | 2 arch/mips/momentum/ocelot_c/ocelot_c_fpga.h | 6 arch/mips/momentum/ocelot_c/platform.c | 201 ++++++++++++++++++ arch/mips/momentum/ocelot_c/prom.c | 60 ----- arch/mips/momentum/ocelot_c/setup.c | 23 -- arch/mips/pci/Makefile | 2 arch/mips/pci/fixup-ev64120.c | 34 --- arch/mips/pci/pci-ev64120.c | 21 + arch/mips/sgi-ip27/ip27-irq.c | 23 -- arch/mips/sgi-ip27/ip27-timer.c | 2 drivers/media/common/saa7146_i2c.c | 10 drivers/media/dvb/dvb-usb/Kconfig | 12 - drivers/media/dvb/frontends/Kconfig | 2 drivers/media/dvb/frontends/bcm3510.h | 2 drivers/media/dvb/frontends/cx22700.h | 2 drivers/media/dvb/frontends/cx22702.h | 2 drivers/media/dvb/frontends/cx24110.h | 2 drivers/media/dvb/frontends/cx24123.h | 2 drivers/media/dvb/frontends/dib3000.h | 2 drivers/media/dvb/frontends/dib3000mc.h | 2 drivers/media/dvb/frontends/isl6421.h | 2 drivers/media/dvb/frontends/l64781.h | 2 drivers/media/dvb/frontends/lgdt330x.h | 2 drivers/media/dvb/frontends/lnbp21.h | 2 drivers/media/dvb/frontends/mt2060.h | 8 drivers/media/dvb/frontends/mt312.h | 2 drivers/media/dvb/frontends/mt352.h | 2 drivers/media/dvb/frontends/nxt200x.h | 2 drivers/media/dvb/frontends/nxt6000.h | 2 drivers/media/dvb/frontends/or51132.h | 2 drivers/media/dvb/frontends/or51211.h | 2 drivers/media/dvb/frontends/s5h1420.h | 2 drivers/media/dvb/frontends/sp8870.h | 2 drivers/media/dvb/frontends/sp887x.h | 2 drivers/media/dvb/frontends/stv0297.h | 2 drivers/media/dvb/frontends/stv0299.h | 2 drivers/media/dvb/frontends/tda10021.h | 2 drivers/media/dvb/frontends/tda1004x.h | 2 drivers/media/dvb/frontends/tda10086.h | 2 drivers/media/dvb/frontends/tda8083.h | 2 drivers/media/dvb/frontends/tda826x.h | 2 drivers/media/dvb/frontends/tua6100.h | 2 drivers/media/dvb/frontends/ves1820.h | 2 drivers/media/dvb/frontends/ves1x93.h | 2 drivers/media/dvb/frontends/zl10353.h | 2 drivers/media/dvb/ttpci/budget-ci.c | 10 drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 2 drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 drivers/media/video/saa7134/saa7134-dvb.c | 2 include/asm-mips/irq.h | 4 60 files changed, 594 insertions(+), 254 deletions(-) New commits: commit 0533f6bbe2c15dc5d18c7d06bbfea40de6c0d42d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0533f6bbe2c15dc5d18c7d06bbfea40de6c0d42d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0533f6bbe2c15dc5d18c7d06bbfea40de6c0d42d Merge: 17b784e7fa4c4a5a8de3b62cc7fa659b6b64a1f4 c836b7716a97021128da43e6fdb61096d5c4156d Author: Jan-Benedict Glaw <jb...@d2...> Date: Tue Nov 7 07:53:49 2006 +0100 Merge branch 'master' into getuptodate commit c836b7716a97021128da43e6fdb61096d5c4156d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c836b7716a97021128da43e6fdb61096d5c4156d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c836b7716a97021128da43e6fdb61096d5c4156d Merge: 846cf85e7137320ea59c29353071f9cdd97b92bc 73f4388aedade209650ed629ab767d3e2b636f7b Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 6 19:53:12 2006 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Fix EV64120 and Ocelot builds by providing a plat_timer_setup(). [MIPS] EV64120: Fix PCI interrupt allocation. [MIPS] Make irq number allocator generally available for fixing EV64120. [MIPS] EV64120: Fix timer initialization for HZ != 100. [MIPS] Ocelot 3: Fix MAC address detection after platform_device conversion. [MIPS] Ocelot C: Fix MAC address detection after platform_device conversion. [MIPS] SB1: On bootup only flush cache on local CPU. [MIPS] Ocelot 3: Fix large number of warnings. [MIPS] Ocelot C: Fix mapping of ioport address range. [MIPS] Ocelot C: Fix warning about missmatching format string. [MIPS] Ocelot C: fix eth registration after conversion to platform_device [MIPS] Ocelot C: Fix large number of warnings. commit 846cf85e7137320ea59c29353071f9cdd97b92bc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=846cf85e7137320ea59c29353071f9cdd97b92bc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=846cf85e7137320ea59c29353071f9cdd97b92bc Merge: 64651309a1f0de3da131c8dc1d279c932fa979c7 c5dec9fb248e3318f30a26f9984b3b064053a77f Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 6 19:52:29 2006 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (4751): Fix DBV_FE_CUSTOMISE for card drivers compiled into kernel V4L/DVB (4784): [saa7146_i2c] short_delay mode fixed for fast machines V4L/DVB (4770): Fix mode switch of Compro Videomate T300 V4L/DVB (4787): Budget-ci: Inversion setting fixed for Technotrend 1500 T V4L/DVB (4786): Pvrusb2: use NULL instead of 0 V4L/DVB (4785): Budget-ci: Change DEBIADDR_IR to a safer default V4L/DVB (4752): DVB: Add DVB_FE_CUSTOMISE support for MT2060 commit 73f4388aedade209650ed629ab767d3e2b636f7b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=73f4388aedade209650ed629ab767d3e2b636f7b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=73f4388aedade209650ed629ab767d3e2b636f7b Author: Ralf Baechle <ra...@li...> Date: Mon Nov 6 18:17:35 2006 +0000 [MIPS] Fix EV64120 and Ocelot builds by providing a plat_timer_setup(). Signed-off-by: Ralf Baechle <ra...@li...> commit 4e5852f31a22094a19bbc305e42651b6c92f3008 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4e5852f31a22094a19bbc305e42651b6c92f3008 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4e5852f31a22094a19bbc305e42651b6c92f3008 Author: Ralf Baechle <ra...@li...> Date: Mon Nov 6 18:05:08 2006 +0000 [MIPS] EV64120: Fix PCI interrupt allocation. Signed-off-by: Ralf Baechle <ra...@li...> commit 4a4cf77923eeb3cec40a302656d6ab5ced04ba48 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4a4cf77923eeb3cec40a302656d6ab5ced04ba48 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4a4cf77923eeb3cec40a302656d6ab5ced04ba48 Author: Ralf Baechle <ra...@li...> Date: Mon Nov 6 17:41:06 2006 +0000 [MIPS] Make irq number allocator generally available for fixing EV64120. Signed-off-by: Ralf Baechle <ra...@li...> commit 325d08d1a44b601fbf70c259fb61c38d2af7d309 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=325d08d1a44b601fbf70c259fb61c38d2af7d309 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=325d08d1a44b601fbf70c259fb61c38d2af7d309 Author: Ralf Baechle <ra...@li...> Date: Mon Nov 6 13:32:39 2006 +0000 [MIPS] EV64120: Fix timer initialization for HZ != 100. Signed-off-by: Ralf Baechle <ra...@li...> commit ff28cbd2804105b144a7054e0302615e1da6749f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ff28cbd2804105b144a7054e0302615e1da6749f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ff28cbd2804105b144a7054e0302615e1da6749f Author: Ralf Baechle <ra...@li...> Date: Sun Nov 5 01:18:43 2006 +0000 [MIPS] Ocelot 3: Fix MAC address detection after platform_device conversion. Signed-off-by: Ralf Baechle <ra...@li...> commit 907c51b2d1705b022c3fb65b66cb4e5e09346433 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=907c51b2d1705b022c3fb65b66cb4e5e09346433 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=907c51b2d1705b022c3fb65b66cb4e5e09346433 Author: Ralf Baechle <ra...@li...> Date: Sun Nov 5 01:18:11 2006 +0000 [MIPS] Ocelot C: Fix MAC address detection after platform_device conversion. Signed-off-by: Ralf Baechle <ra...@li...> commit d6b861c6402307e30c7df24dcda911df64a5f9d6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d6b861c6402307e30c7df24dcda911df64a5f9d6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d6b861c6402307e30c7df24dcda911df64a5f9d6 Author: Ralf Baechle <ra...@li...> Date: Sat Nov 4 23:26:27 2006 +0000 [MIPS] SB1: On bootup only flush cache on local CPU. This fixes a warning on bootup warning in smp_call_function. Signed-off-by: Ralf Baechle <ra...@li...> commit d19f7befe929d400df89699eb51b8d7f4ef1b2d8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d19f7befe929d400df89699eb51b8d7f4ef1b2d8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d19f7befe929d400df89699eb51b8d7f4ef1b2d8 Author: Ralf Baechle <ra...@li...> Date: Sat Nov 4 13:02:46 2006 +0000 [MIPS] Ocelot 3: Fix large number of warnings. Signed-off-by: Ralf Baechle <ra...@li...> commit ad0b365573718a4a83266f98c9a49305c8eaf0b8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ad0b365573718a4a83266f98c9a49305c8eaf0b8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ad0b365573718a4a83266f98c9a49305c8eaf0b8 Author: Ralf Baechle <ra...@li...> Date: Fri Nov 3 18:06:33 2006 +0000 [MIPS] Ocelot C: Fix mapping of ioport address range. o Fix warnings o 768MB worth of I/O ports were insane o 64-bit kernels don't need special handling because ioremap does the magic Signed-off-by: Ralf Baechle <ra...@li...> commit 2002d2bde1a9ad10e2521b8b117c11abfbc2ee93 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2002d2bde1a9ad10e2521b8b117c11abfbc2ee93 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2002d2bde1a9ad10e2521b8b117c11abfbc2ee93 Author: Ralf Baechle <ra...@li...> Date: Fri Nov 3 17:48:17 2006 +0000 [MIPS] Ocelot C: Fix warning about missmatching format string. CC arch/mips/momentum/ocelot_c/setup.o arch/mips/momentum/ocelot_c/setup.c: In function 'momenco_time_init': arch/mips/momentum/ocelot_c/setup.c:223: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int' Change data type to match format string; a 32-bit type better suits our needs. Signed-off-by: Ralf Baechle <ra...@li...> commit 9c422e2ad6a1d8bd03e2e9d49e5c63b82165d596 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9c422e2ad6a1d8bd03e2e9d49e5c63b82165d596 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9c422e2ad6a1d8bd03e2e9d49e5c63b82165d596 Author: Ralf Baechle <ra...@li...> Date: Fri Nov 3 17:45:25 2006 +0000 [MIPS] Ocelot C: fix eth registration after conversion to platform_device Signed-off-by: Ralf Baechle <ra...@li...> commit cca72333e71e348995859b88628c1abcb58b759e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cca72333e71e348995859b88628c1abcb58b759e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cca72333e71e348995859b88628c1abcb58b759e Author: Ralf Baechle <ra...@li...> Date: Fri Nov 3 17:42:47 2006 +0000 [MIPS] Ocelot C: Fix large number of warnings. Signed-off-by: Ralf Baechle <ra...@li...> commit c5dec9fb248e3318f30a26f9984b3b064053a77f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c5dec9fb248e3318f30a26f9984b3b064053a77f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c5dec9fb248e3318f30a26f9984b3b064053a77f Author: Trent Piepho <xy...@sp...> Date: Sat Oct 14 15:44:44 2006 -0300 V4L/DVB (4751): Fix DBV_FE_CUSTOMISE for card drivers compiled into kernel When a front-end is disabled, card drivers that use it are compiled with a stub version of the front-end's attach function. This way they have no references to the front-end's code and don't need it to be loaded. If a card driver is compiled into the kernel, and a front-end is a module, then that front-end is effectively disabled wrt the card driver. In this case, the card driver should get the stub version. This was not happening. The stub vs real attach function selection is changed so that when the front-end is a module the real attach function is only used if the card driver is a module as well. This means a module front-end will be supported by card drivers that are modules and not supported by card drivers compiled into the kernel. Signed-off-by: Trent Piepho <xy...@sp...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit 9bb6e2593ad4cb94944f547154baee64b4734598 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9bb6e2593ad4cb94944f547154baee64b4734598 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9bb6e2593ad4cb94944f547154baee64b4734598 Author: Oliver Endriss <o.e...@gm...> Date: Fri Oct 27 18:02:01 2006 -0300 V4L/DVB (4784): [saa7146_i2c] short_delay mode fixed for fast machines TT DVB-C 2300 runs at 137 kHz I2C speed. short_delay mode did not work reliably on fast machines with that speed. Increased max loop count from 20 to 50. Moved dummy access out of the loop. Signed-off-by: Oliver Endriss <o.e...@gm...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit 588f98312c7fd1d86290583189d2eb24da70f752 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=588f98312c7fd1d86290583189d2eb24da70f752 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=588f98312c7fd1d86290583189d2eb24da70f752 Author: Hartmut Hackmann <har...@t-...> Date: Wed Oct 18 17:30:42 2006 -0300 V4L/DVB (4770): Fix mode switch of Compro Videomate T300 The board did not return to analog mode since the board specific "demod sleep" function was not called. Signed-off-by: Hartmut Hackmann <har...@t-...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit 9e741b74afc975da51ec60c5a8147b2ebcf7e33a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9e741b74afc975da51ec60c5a8147b2ebcf7e33a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9e741b74afc975da51ec60c5a8147b2ebcf7e33a Author: Raymond Mantchala <ray...@st...> Date: Mon Oct 30 23:20:50 2006 -0300 V4L/DVB (4787): Budget-ci: Inversion setting fixed for Technotrend 1500 T Technotrend 1500 T card have "inverted inversion". This patch fixes that. Many thanks to Martin Zwickel from Technotrend for his confirmation and correction proposal. Signed-off-by: Raymond Mantchala <ray...@st...> Signed-off-by: Perceval Anichini <per...@st...> Signed-off-by: Oliver Endriss <o.e...@gm...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit c2625bff997f195e067ae11c9b0aa7217fb32991 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c2625bff997f195e067ae11c9b0aa7217fb32991 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c2625bff997f195e067ae11c9b0aa7217fb32991 Author: Randy Dunlap <ran...@or...> Date: Sun Oct 29 11:12:27 2006 -0300 V4L/DVB (4786): Pvrusb2: use NULL instead of 0 Fix sparse NULL usage warnings: drivers/media/video/pvrusb2/pvrusb2-v4l2.c:714:14: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-v4l2.c:715:16: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-v4l2.c:1079:10: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c:224:58: warning: Using plain integer as NULL pointer Signed-off-by: Randy Dunlap <ran...@or...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit ecba77f246011344f0b8f46eb25ae01ab4ae282d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ecba77f246011344f0b8f46eb25ae01ab4ae282d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ecba77f246011344f0b8f46eb25ae01ab4ae282d Author: David Härdeman <da...@ha...> Date: Fri Oct 27 20:56:51 2006 -0300 V4L/DVB (4785): Budget-ci: Change DEBIADDR_IR to a safer default The IR chip has no address decoding, so the IR data is always present in the high byte when doing a read from the saa7146 chip. This means that the DEBI address used is irrelevant to the IR decoding logic. DEBI addresses 0x1XXX are mapped to the registers on the CI module itself, but only the lowest two bits are actually used (see EN50221, section A.2.2.1), meaning that 0x1234 is equivalent to 0x1000 which maps to register 0 (the data register). A read from the data register is supposed to be preceded by a read from the size register, so some CI modules will be confused (the AlphaCrypt CAM will hang completely). The attached patch changes the address used when reading the IR data to use 0x4000 instead. This is the CI version address, which is a safer default, works with the AlphaCrypt CAM and matches the behaviour of the Windows driver (AFAIK). Signed-off-by: David Härdeman <da...@ha...> Signed-off-by: Oliver Endriss <o.e...@gm...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit 6c8c21b9119cfe68a99825085014bba4f9c0c768 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6c8c21b9119cfe68a99825085014bba4f9c0c768 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6c8c21b9119cfe68a99825085014bba4f9c0c768 Author: Trent Piepho <xy...@sp...> Date: Sat Oct 14 16:21:02 2006 -0300 V4L/DVB (4752): DVB: Add DVB_FE_CUSTOMISE support for MT2060 Let the MT2060 be customized like most of the other DVB PLLs/front-ends. Also, add a missing dependency on I2C. Signed-off-by: Trent Piepho <xy...@sp...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> |