From 6dd213329aa10067c05a8f9f410cda5f612fd4c0 Mon Sep 17 00:00:00 2001 From: vpeter4 Date: Wed, 27 Feb 2013 09:05:16 +0100 Subject: [PATCH 1/7] create_addon: quoting $PKG_ARCH --- scripts/create_addon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/create_addon b/scripts/create_addon index aaa74590de..f1684250cc 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -36,7 +36,7 @@ if [ -z "$1" ]; then exit 1 fi -if [ -n $PKG_ARCH -a ! "$PKG_ARCH" = "any" ]; then +if [ -n "$PKG_ARCH" -a ! "$PKG_ARCH" = "any" ]; then echo "$PKG_ARCH" | grep -q "$TARGET_ARCH" || exit 0 echo "$PKG_ARCH" | grep -q "\-$TARGET_ARCH" && exit 0 fi From 028a6b291cb84b20418766f650ee19dbd75db628 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 27 Feb 2013 19:15:55 +0200 Subject: [PATCH 2/7] xbmc: init: cosmetics. conservative -> ondemand to not cause confusion ;) --- packages/mediacenter/xbmc/init.d/93_xbmc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc/init.d/93_xbmc b/packages/mediacenter/xbmc/init.d/93_xbmc index fa4606486f..ed0d4f6020 100644 --- a/packages/mediacenter/xbmc/init.d/93_xbmc +++ b/packages/mediacenter/xbmc/init.d/93_xbmc @@ -55,7 +55,7 @@ fi # wait for network wait_for_inet_addr -# set cpu's to 'conservative' +# set cpu's to 'ondemand' ( usleep 15000000 progress "set cpu's to 'ondemand'" cpupower frequency-set -g ondemand > /dev/null 2>&1 From 45d2ecfbf29a9c0629ecf35f57eff52d92b89121 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 27 Feb 2013 23:18:25 +0200 Subject: [PATCH 3/7] linux: update to linux-3.7.10 --- packages/linux/meta | 2 +- ...x-203-stb0899_enable_low_symbol_rate.patch | 0 ...-ene-ir-Fix-cleanup-on-probe-failure.patch | 0 ...obe-cleanup-goto-labels-more-verbose.patch | 0 ...3-media-rc-Set-rdev-before-irq-setup.patch | 0 ...-rc_register_device-before-irq-setup.patch | 0 .../{3.7.9 => 3.7.10}/linux-210-dvbsky.patch | 0 ...linux-212-mantis_stb0899_faster_lock.patch | 0 .../linux-213-cinergy_s2_usb_r2.patch | 0 ...-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch | 0 ...xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch | 0 ...8xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch | 0 .../linux-221-ngene-octopus.patch | 0 .../linux-222-stb0899_signal_quality.patch | 0 .../linux-700-jmicron_1_0_8_5.patch | 0 ...x-950-saa716x_PCIe_interface_chipset.patch | 0 ...ound_for_conflicting_IEC958_controls.patch | 0 ...inux-990.03-media-ds3000_firmware-01.patch | 0 ...inux-990.03-media-ds3000_firmware-02.patch | 0 ...ken-workaround-for-HDMI-SPDIF-confli.patch | 0 ...utputting-HDMI-audio-before-prepare-.patch | 0 ...ault-multichannel-HDMI-mapping-regre.patch | 66 ------------------- 22 files changed, 1 insertion(+), 67 deletions(-) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-203-stb0899_enable_low_symbol_rate.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-210-dvbsky.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-212-mantis_stb0899_faster_lock.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-213-cinergy_s2_usb_r2.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-221-ngene-octopus.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-222-stb0899_signal_quality.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-700-jmicron_1_0_8_5.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-950-saa716x_PCIe_interface_chipset.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-990.01-hda_Add_workaround_for_conflicting_IEC958_controls.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-990.03-media-ds3000_firmware-01.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-990.03-media-ds3000_firmware-02.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-990.04-hda-Fix-broken-workaround-for-HDMI-SPDIF-confli.patch (100%) rename packages/linux/patches/{3.7.9 => 3.7.10}/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch (100%) delete mode 100644 packages/linux/patches/3.7.9/linux-990.02-hda-Fix-default-multichannel-HDMI-mapping-regre.patch diff --git a/packages/linux/meta b/packages/linux/meta index 4c6beae170..42bee3e347 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="linux" -PKG_VERSION="3.7.9" +PKG_VERSION="3.7.10" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux/patches/3.7.9/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/3.7.10/linux-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/3.7.10/linux-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/3.7.9/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch b/packages/linux/patches/3.7.10/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch rename to packages/linux/patches/3.7.10/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch diff --git a/packages/linux/patches/3.7.9/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch b/packages/linux/patches/3.7.10/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch rename to packages/linux/patches/3.7.10/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch diff --git a/packages/linux/patches/3.7.9/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch b/packages/linux/patches/3.7.10/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch rename to packages/linux/patches/3.7.10/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch diff --git a/packages/linux/patches/3.7.9/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch b/packages/linux/patches/3.7.10/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch rename to packages/linux/patches/3.7.10/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch diff --git a/packages/linux/patches/3.7.9/linux-210-dvbsky.patch b/packages/linux/patches/3.7.10/linux-210-dvbsky.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-210-dvbsky.patch rename to packages/linux/patches/3.7.10/linux-210-dvbsky.patch diff --git a/packages/linux/patches/3.7.9/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/3.7.10/linux-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/3.7.10/linux-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/3.7.9/linux-213-cinergy_s2_usb_r2.patch b/packages/linux/patches/3.7.10/linux-213-cinergy_s2_usb_r2.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-213-cinergy_s2_usb_r2.patch rename to packages/linux/patches/3.7.10/linux-213-cinergy_s2_usb_r2.patch diff --git a/packages/linux/patches/3.7.9/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch b/packages/linux/patches/3.7.10/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch rename to packages/linux/patches/3.7.10/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch diff --git a/packages/linux/patches/3.7.9/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch b/packages/linux/patches/3.7.10/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch rename to packages/linux/patches/3.7.10/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch diff --git a/packages/linux/patches/3.7.9/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch b/packages/linux/patches/3.7.10/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch rename to packages/linux/patches/3.7.10/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch diff --git a/packages/linux/patches/3.7.9/linux-221-ngene-octopus.patch b/packages/linux/patches/3.7.10/linux-221-ngene-octopus.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-221-ngene-octopus.patch rename to packages/linux/patches/3.7.10/linux-221-ngene-octopus.patch diff --git a/packages/linux/patches/3.7.9/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/3.7.10/linux-222-stb0899_signal_quality.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-222-stb0899_signal_quality.patch rename to packages/linux/patches/3.7.10/linux-222-stb0899_signal_quality.patch diff --git a/packages/linux/patches/3.7.9/linux-700-jmicron_1_0_8_5.patch b/packages/linux/patches/3.7.10/linux-700-jmicron_1_0_8_5.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-700-jmicron_1_0_8_5.patch rename to packages/linux/patches/3.7.10/linux-700-jmicron_1_0_8_5.patch diff --git a/packages/linux/patches/3.7.9/linux-950-saa716x_PCIe_interface_chipset.patch b/packages/linux/patches/3.7.10/linux-950-saa716x_PCIe_interface_chipset.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-950-saa716x_PCIe_interface_chipset.patch rename to packages/linux/patches/3.7.10/linux-950-saa716x_PCIe_interface_chipset.patch diff --git a/packages/linux/patches/3.7.9/linux-990.01-hda_Add_workaround_for_conflicting_IEC958_controls.patch b/packages/linux/patches/3.7.10/linux-990.01-hda_Add_workaround_for_conflicting_IEC958_controls.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-990.01-hda_Add_workaround_for_conflicting_IEC958_controls.patch rename to packages/linux/patches/3.7.10/linux-990.01-hda_Add_workaround_for_conflicting_IEC958_controls.patch diff --git a/packages/linux/patches/3.7.9/linux-990.03-media-ds3000_firmware-01.patch b/packages/linux/patches/3.7.10/linux-990.03-media-ds3000_firmware-01.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-990.03-media-ds3000_firmware-01.patch rename to packages/linux/patches/3.7.10/linux-990.03-media-ds3000_firmware-01.patch diff --git a/packages/linux/patches/3.7.9/linux-990.03-media-ds3000_firmware-02.patch b/packages/linux/patches/3.7.10/linux-990.03-media-ds3000_firmware-02.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-990.03-media-ds3000_firmware-02.patch rename to packages/linux/patches/3.7.10/linux-990.03-media-ds3000_firmware-02.patch diff --git a/packages/linux/patches/3.7.9/linux-990.04-hda-Fix-broken-workaround-for-HDMI-SPDIF-confli.patch b/packages/linux/patches/3.7.10/linux-990.04-hda-Fix-broken-workaround-for-HDMI-SPDIF-confli.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-990.04-hda-Fix-broken-workaround-for-HDMI-SPDIF-confli.patch rename to packages/linux/patches/3.7.10/linux-990.04-hda-Fix-broken-workaround-for-HDMI-SPDIF-confli.patch diff --git a/packages/linux/patches/3.7.9/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch b/packages/linux/patches/3.7.10/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch similarity index 100% rename from packages/linux/patches/3.7.9/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch rename to packages/linux/patches/3.7.10/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch diff --git a/packages/linux/patches/3.7.9/linux-990.02-hda-Fix-default-multichannel-HDMI-mapping-regre.patch b/packages/linux/patches/3.7.9/linux-990.02-hda-Fix-default-multichannel-HDMI-mapping-regre.patch deleted file mode 100644 index b62de2e517..0000000000 --- a/packages/linux/patches/3.7.9/linux-990.02-hda-Fix-default-multichannel-HDMI-mapping-regre.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b3ed803a1f4012a5067087674b8b1efad22d2bb0 Mon Sep 17 00:00:00 2001 -From: Anssi Hannula -Date: Sun, 3 Feb 2013 17:28:34 +0200 -Subject: [PATCH] ALSA: hda - Fix default multichannel HDMI mapping regression - -Commit d45e6889ee69456a4d5b1bbb32252f460cd48fa9 ("ALSA: hda - Provide -the proper channel mapping for generic HDMI driver") added support for -custom channel maps in the HDA HDMI driver. Due to a mistake in an -'if' condition the custom map is always used even when no such map has -been set. This causes incorrect channel mapping for multichannel audio -by default. - -Pass per_pin->chmap_set to hdmi_setup_channel_mapping() as a parameter -so that it can use it for detecting if a custom map has been set instead -of checking if map is NULL (which is never the case). - -Reported-by: Staffan Lindberg -Signed-off-by: Anssi Hannula -Cc: stable@vger.kernel.org ---- - -This also affects stable 3.7, but not earlier versions. - - sound/pci/hda/patch_hdmi.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c -index 807a2aa..e85959f 100644 ---- a/sound/pci/hda/patch_hdmi.c -+++ b/sound/pci/hda/patch_hdmi.c -@@ -714,9 +714,10 @@ static void hdmi_setup_fake_chmap(unsigned char *map, int ca) - - static void hdmi_setup_channel_mapping(struct hda_codec *codec, - hda_nid_t pin_nid, bool non_pcm, int ca, -- int channels, unsigned char *map) -+ int channels, unsigned char *map, -+ bool chmap_set) - { -- if (!non_pcm && map) { -+ if (!non_pcm && chmap_set) { - hdmi_manual_setup_channel_mapping(codec, pin_nid, - channels, map); - } else { -@@ -905,7 +906,8 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, int pin_idx, - pin_nid, - channels); - hdmi_setup_channel_mapping(codec, pin_nid, non_pcm, ca, -- channels, per_pin->chmap); -+ channels, per_pin->chmap, -+ per_pin->chmap_set); - hdmi_stop_infoframe_trans(codec, pin_nid); - hdmi_fill_audio_infoframe(codec, pin_nid, - ai.bytes, sizeof(ai)); -@@ -915,7 +917,8 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, int pin_idx, - * accordingly */ - if (per_pin->non_pcm != non_pcm) - hdmi_setup_channel_mapping(codec, pin_nid, non_pcm, ca, -- channels, per_pin->chmap); -+ channels, per_pin->chmap, -+ per_pin->chmap_set); - } - - per_pin->non_pcm = non_pcm; --- -1.7.10 - From d990769bab658466072d89e05f762218312b6100 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 28 Feb 2013 11:35:55 +0100 Subject: [PATCH 4/7] busybox: add upstream patches Signed-off-by: Stephan Raue --- .../busybox/patches/busybox-1.21.0-mdev.patch | 35 ++++++++ .../patches/busybox-1.21.0-platform.patch | 24 ++++++ .../busybox/patches/busybox-1.21.0-xz.patch | 84 +++++++++++++++++++ 3 files changed, 143 insertions(+) create mode 100644 packages/sysutils/busybox/patches/busybox-1.21.0-mdev.patch create mode 100644 packages/sysutils/busybox/patches/busybox-1.21.0-platform.patch create mode 100644 packages/sysutils/busybox/patches/busybox-1.21.0-xz.patch diff --git a/packages/sysutils/busybox/patches/busybox-1.21.0-mdev.patch b/packages/sysutils/busybox/patches/busybox-1.21.0-mdev.patch new file mode 100644 index 0000000000..cb873fafc1 --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.21.0-mdev.patch @@ -0,0 +1,35 @@ +--- busybox-1.21.0/util-linux/mdev.c ++++ busybox-1.21.0-mdev/util-linux/mdev.c +@@ -661,6 +661,8 @@ static void make_device(char *device_nam + if (mknod(node_name, rule->mode | type, makedev(major, minor)) && errno != EEXIST) + bb_perror_msg("can't create '%s'", node_name); + if (ENABLE_FEATURE_MDEV_CONF) { ++ if (G.verbose) ++ bb_error_msg("chmod: %o chown: %u:%u", rule->mode, rule->ugid.uid, rule->ugid.gid); + chmod(node_name, rule->mode); + chown(node_name, rule->ugid.uid, rule->ugid.gid); + } +@@ -813,6 +815,7 @@ static void load_firmware(const char *fi + full_write(loading_fd, "-1", 2); + + out: ++ xchdir("/dev"); + if (ENABLE_FEATURE_CLEAN_UP) { + close(firmware_fd); + close(loading_fd); +@@ -919,11 +922,13 @@ int mdev_main(int argc UNUSED_PARAM, cha + } + + { +- int logfd = open("/dev/mdev.log", O_WRONLY | O_APPEND); ++ int logfd = open("mdev.log", O_WRONLY | O_APPEND); + if (logfd >= 0) { + xmove_fd(logfd, STDERR_FILENO); + G.verbose = 1; +- bb_error_msg("seq: %s action: %s", seq, action); ++ if (seq) ++ applet_name = xasprintf("%s[%s]", applet_name, seq); ++ bb_error_msg("action: %s", action); + } + } + diff --git a/packages/sysutils/busybox/patches/busybox-1.21.0-platform.patch b/packages/sysutils/busybox/patches/busybox-1.21.0-platform.patch new file mode 100644 index 0000000000..9be6cb8f21 --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.21.0-platform.patch @@ -0,0 +1,24 @@ +--- busybox-1.21.0/archival/libarchive/decompress_unxz.c ++++ busybox-1.21.0-platform/archival/libarchive/decompress_unxz.c +@@ -30,8 +30,8 @@ static uint32_t xz_crc32(const uint8_t * + /* We use arch-optimized unaligned accessors */ + #define get_unaligned_le32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_LE32(v); }) + #define get_unaligned_be32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_BE32(v); }) +-#define put_unaligned_le32(val, buf) move_to_unaligned16(buf, SWAP_LE32(val)) +-#define put_unaligned_be32(val, buf) move_to_unaligned16(buf, SWAP_BE32(val)) ++#define put_unaligned_le32(val, buf) move_to_unaligned32(buf, SWAP_LE32(val)) ++#define put_unaligned_be32(val, buf) move_to_unaligned32(buf, SWAP_BE32(val)) + + #include "unxz/xz_dec_bcj.c" + #include "unxz/xz_dec_lzma2.c" +--- busybox-1.21.0/include/platform.h ++++ busybox-1.21.0-platform/include/platform.h +@@ -228,7 +228,7 @@ typedef uint32_t bb__aliased_uint32_t FI + # define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4)) + # define move_to_unaligned16(u16p, v) do { \ + uint16_t __t = (v); \ +- memcpy((u16p), &__t, 4); \ ++ memcpy((u16p), &__t, 2); \ + } while (0) + # define move_to_unaligned32(u32p, v) do { \ + uint32_t __t = (v); \ diff --git a/packages/sysutils/busybox/patches/busybox-1.21.0-xz.patch b/packages/sysutils/busybox/patches/busybox-1.21.0-xz.patch new file mode 100644 index 0000000000..56ba1a2731 --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.21.0-xz.patch @@ -0,0 +1,84 @@ +--- busybox-1.21.0/archival/libarchive/decompress_unxz.c ++++ busybox-1.21.0-xz/archival/libarchive/decompress_unxz.c +@@ -40,6 +40,7 @@ static uint32_t xz_crc32(const uint8_t * + IF_DESKTOP(long long) int FAST_FUNC + unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd) + { ++ enum xz_ret xz_result; + struct xz_buf iobuf; + struct xz_dec *state; + unsigned char *membuf; +@@ -63,9 +64,8 @@ unpack_xz_stream(transformer_aux_data_t + /* Limit memory usage to about 64 MiB. */ + state = xz_dec_init(XZ_DYNALLOC, 64*1024*1024); + ++ xz_result = X_OK; + while (1) { +- enum xz_ret r; +- + if (iobuf.in_pos == iobuf.in_size) { + int rd = safe_read(src_fd, membuf, BUFSIZ); + if (rd < 0) { +@@ -73,28 +73,57 @@ unpack_xz_stream(transformer_aux_data_t + total = -1; + break; + } ++ if (rd == 0 && xz_result == XZ_STREAM_END) ++ break; + iobuf.in_size = rd; + iobuf.in_pos = 0; + } ++ if (xz_result == XZ_STREAM_END) { ++ /* ++ * Try to start decoding next concatenated stream. ++ * Stream padding must always be a multiple of four ++ * bytes to preserve four-byte alignment. To keep the ++ * code slightly smaller, we aren't as strict here as ++ * the .xz spec requires. We just skip all zero-bytes ++ * without checking the alignment and thus can accept ++ * files that aren't valid, e.g. the XZ utils test ++ * files bad-0pad-empty.xz and bad-0catpad-empty.xz. ++ */ ++ do { ++ if (membuf[iobuf.in_pos] != 0) { ++ xz_dec_reset(state); ++ goto do_run; ++ } ++ iobuf.in_pos++; ++ } while (iobuf.in_pos < iobuf.in_size); ++ } ++ do_run: + // bb_error_msg(">in pos:%d size:%d out pos:%d size:%d", + // iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size); +- r = xz_dec_run(state, &iobuf); ++ xz_result = xz_dec_run(state, &iobuf); + // bb_error_msg(" Date: Thu, 28 Feb 2013 11:36:37 +0100 Subject: [PATCH 5/7] projects/RPi/patches/linux: update RPi patches Signed-off-by: Stephan Raue --- ...=> linux-3.6-01-RPi_support-89caf39.patch} | 1256 +++++++++++++---- ...inux-3.6-21-RPi_add_LIRC_RPi_support.patch | 737 ---------- 2 files changed, 993 insertions(+), 1000 deletions(-) rename projects/RPi/patches/linux/{linux-3.6-01-RPi_support-95009db.patch => linux-3.6-01-RPi_support-89caf39.patch} (98%) delete mode 100644 projects/RPi/patches/linux/linux-3.6-21-RPi_add_LIRC_RPi_support.patch diff --git a/projects/RPi/patches/linux/linux-3.6-01-RPi_support-95009db.patch b/projects/RPi/patches/linux/linux-3.6-01-RPi_support-89caf39.patch similarity index 98% rename from projects/RPi/patches/linux/linux-3.6-01-RPi_support-95009db.patch rename to projects/RPi/patches/linux/linux-3.6-01-RPi_support-89caf39.patch index cb1f0ff331..bb317c6693 100644 --- a/projects/RPi/patches/linux/linux-3.6-01-RPi_support-95009db.patch +++ b/projects/RPi/patches/linux/linux-3.6-01-RPi_support-89caf39.patch @@ -1,6 +1,6 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_cutdown_defconfig --- linux-3.6.11/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_cutdown_defconfig 2013-02-17 02:54:20.932607606 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_cutdown_defconfig 2013-02-28 04:23:24.903596383 +0100 @@ -0,0 +1,546 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_LOCALVERSION="-cutdown" @@ -550,8 +550,8 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi-3.6. +CONFIG_LIBCRC32C=y diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_defconfig --- linux-3.6.11/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_defconfig 2013-02-17 02:54:20.930607617 +0100 -@@ -0,0 +1,999 @@ ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_defconfig 2013-02-28 04:23:24.901596390 +0100 +@@ -0,0 +1,1001 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -652,7 +652,6 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.y/arch/a +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CT_PROTO_DCCP=m -+CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m @@ -715,7 +714,6 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.y/arch/a +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m -+CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m @@ -791,6 +789,8 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.y/arch/a +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_ULOG=m +CONFIG_BRIDGE_EBT_NFLOG=m ++CONFIG_IP_SCTP=m ++CONFIG_SCTP_HMAC_SHA1=y +CONFIG_L2TP=m +CONFIG_BRIDGE=m +CONFIG_VLAN_8021Q=m @@ -1411,6 +1411,8 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.y/arch/a +CONFIG_VT6656=m +CONFIG_ZRAM=m +CONFIG_ZSMALLOC=m ++CONFIG_SPEAKUP=m ++CONFIG_SPEAKUP_SYNTH_SOFT=m +CONFIG_STAGING_MEDIA=y +CONFIG_DVB_AS102=m +CONFIG_EASYCAP=m @@ -1553,7 +1555,7 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.y/arch/a +CONFIG_LIBCRC32C=y diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_emergency_defconfig --- linux-3.6.11/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_emergency_defconfig 2013-02-17 02:54:20.927607634 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_emergency_defconfig 2013-02-28 04:23:24.899596397 +0100 @@ -0,0 +1,532 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -2089,7 +2091,7 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi-3. +CONFIG_LIBCRC32C=y diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_quick_defconfig --- linux-3.6.11/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_quick_defconfig 2013-02-17 02:54:20.920607674 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_quick_defconfig 2013-02-28 04:23:24.894596418 +0100 @@ -0,0 +1,298 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_EXPERIMENTAL=y @@ -2391,7 +2393,7 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi-3.6.y/ +CONFIG_AVERAGE=y diff -Naur linux-3.6.11/arch/arm/include/asm/fiq.h linux-rpi-3.6.y/arch/arm/include/asm/fiq.h --- linux-3.6.11/arch/arm/include/asm/fiq.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/include/asm/fiq.h 2013-02-17 02:54:20.959607451 +0100 ++++ linux-rpi-3.6.y/arch/arm/include/asm/fiq.h 2013-02-28 04:23:24.927596289 +0100 @@ -42,6 +42,7 @@ /* helpers defined in fiqasm.S: */ extern void __set_fiq_regs(unsigned long const *regs); @@ -2402,7 +2404,7 @@ diff -Naur linux-3.6.11/arch/arm/include/asm/fiq.h linux-rpi-3.6.y/arch/arm/incl { diff -Naur linux-3.6.11/arch/arm/Kconfig linux-rpi-3.6.y/arch/arm/Kconfig --- linux-3.6.11/arch/arm/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/Kconfig 2013-02-17 02:54:20.971607383 +0100 ++++ linux-rpi-3.6.y/arch/arm/Kconfig 2013-02-28 04:23:24.936596253 +0100 @@ -999,6 +999,23 @@ help Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx). @@ -2437,7 +2439,7 @@ diff -Naur linux-3.6.11/arch/arm/Kconfig linux-rpi-3.6.y/arch/arm/Kconfig config ARCH_ACORN diff -Naur linux-3.6.11/arch/arm/Kconfig.debug linux-rpi-3.6.y/arch/arm/Kconfig.debug --- linux-3.6.11/arch/arm/Kconfig.debug 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/Kconfig.debug 2013-02-17 02:54:21.098606656 +0100 ++++ linux-rpi-3.6.y/arch/arm/Kconfig.debug 2013-02-28 04:23:25.032595878 +0100 @@ -371,6 +371,14 @@ For more details about semihosting, please see chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd. @@ -2455,7 +2457,7 @@ diff -Naur linux-3.6.11/arch/arm/Kconfig.debug linux-rpi-3.6.y/arch/arm/Kconfig. config EARLY_PRINTK diff -Naur linux-3.6.11/arch/arm/kernel/fiqasm.S linux-rpi-3.6.y/arch/arm/kernel/fiqasm.S --- linux-3.6.11/arch/arm/kernel/fiqasm.S 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/kernel/fiqasm.S 2013-02-17 02:54:20.621609384 +0100 ++++ linux-rpi-3.6.y/arch/arm/kernel/fiqasm.S 2013-02-28 04:23:24.670597292 +0100 @@ -47,3 +47,7 @@ mov r0, r0 @ avoid hazard prior to ARMv4 mov pc, lr @@ -2466,7 +2468,7 @@ diff -Naur linux-3.6.11/arch/arm/kernel/fiqasm.S linux-rpi-3.6.y/arch/arm/kernel +ENDPROC(__FIQ_Branch) diff -Naur linux-3.6.11/arch/arm/kernel/fiq.c linux-rpi-3.6.y/arch/arm/kernel/fiq.c --- linux-3.6.11/arch/arm/kernel/fiq.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/kernel/fiq.c 2013-02-17 02:54:20.629609338 +0100 ++++ linux-rpi-3.6.y/arch/arm/kernel/fiq.c 2013-02-28 04:23:24.677597265 +0100 @@ -137,6 +137,7 @@ EXPORT_SYMBOL(set_fiq_handler); EXPORT_SYMBOL(__set_fiq_regs); /* defined in fiqasm.S */ @@ -2477,7 +2479,7 @@ diff -Naur linux-3.6.11/arch/arm/kernel/fiq.c linux-rpi-3.6.y/arch/arm/kernel/fi EXPORT_SYMBOL(enable_fiq); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/armctrl.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.c --- linux-3.6.11/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.c 2013-02-17 02:54:20.340610991 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.c 2013-02-28 04:23:24.455598131 +0100 @@ -0,0 +1,227 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -2708,7 +2710,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/armctrl.c linux-rpi-3.6.y/arch/arm +} diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/armctrl.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.h --- linux-3.6.11/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.h 2013-02-17 02:54:20.341610985 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.h 2013-02-28 04:23:24.456598127 +0100 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -2739,7 +2741,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/armctrl.h linux-rpi-3.6.y/arch/arm +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.c --- linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.c 2013-02-17 02:54:20.339610996 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.c 2013-02-28 04:23:24.454598135 +0100 @@ -0,0 +1,947 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c @@ -3690,7 +3692,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.6.y/arch/arm +module_param(uart_clock, uint, 0644); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708_gpio.c --- linux-3.6.11/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708_gpio.c 2013-02-17 02:54:20.340610991 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708_gpio.c 2013-02-28 04:23:24.455598131 +0100 @@ -0,0 +1,339 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -4033,7 +4035,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.6.y/arc +MODULE_LICENSE("GPL"); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.h --- linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.h 2013-02-17 02:54:20.339610996 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.h 2013-02-28 04:23:24.455598131 +0100 @@ -0,0 +1,51 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -4088,7 +4090,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.h linux-rpi-3.6.y/arch/arm +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/clock.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.c --- linux-3.6.11/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.c 2013-02-17 02:54:20.338611002 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.c 2013-02-28 04:23:24.454598135 +0100 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -4153,7 +4155,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/clock.c linux-rpi-3.6.y/arch/arm/m +EXPORT_SYMBOL(clk_set_rate); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/clock.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.h --- linux-3.6.11/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.h 2013-02-17 02:54:20.340610991 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.h 2013-02-28 04:23:24.455598131 +0100 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -4181,7 +4183,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/clock.h linux-rpi-3.6.y/arch/arm/m +}; diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/delay.S linux-rpi-3.6.y/arch/arm/mach-bcm2708/delay.S --- linux-3.6.11/arch/arm/mach-bcm2708/delay.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/delay.S 2013-02-17 02:54:20.341610985 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/delay.S 2013-02-28 04:23:24.456598127 +0100 @@ -0,0 +1,21 @@ +/* + * linux/arch/arm/lib/delay.S @@ -4206,7 +4208,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/delay.S linux-rpi-3.6.y/arch/arm/m +ENDPROC(bcm2708_delay) diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dma.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/dma.c --- linux-3.6.11/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dma.c 2013-02-17 02:54:20.341610985 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dma.c 2013-02-28 04:23:24.456598127 +0100 @@ -0,0 +1,397 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -4607,7 +4609,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dma.c linux-rpi-3.6.y/arch/arm/mac +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/dmaer.c --- linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dmaer.c 2013-02-17 02:54:20.347610951 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dmaer.c 2013-02-28 04:23:24.460598112 +0100 @@ -0,0 +1,887 @@ +#include +#include @@ -5498,7 +5500,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_control.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_control.h 2013-02-17 02:54:20.343610973 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_control.h 2013-02-28 04:23:24.457598123 +0100 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -5921,7 +5923,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-r +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_power.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_power.h 2013-02-17 02:54:20.346610956 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_power.h 2013-02-28 04:23:24.460598112 +0100 @@ -0,0 +1,60 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -5985,7 +5987,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/clkdev.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/clkdev.h 2013-02-17 02:54:20.345610962 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/clkdev.h 2013-02-28 04:23:24.458598120 +0100 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -5996,7 +5998,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi-3. +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/debug-macro.S --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2013-02-17 02:54:20.343610973 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2013-02-28 04:23:24.457598123 +0100 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -6022,7 +6024,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-r +#include diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/dma.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/dma.h 2013-02-17 02:54:20.344610967 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/dma.h 2013-02-28 04:23:24.458598120 +0100 @@ -0,0 +1,84 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -6110,7 +6112,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi-3.6.y +#endif /* _MACH_BCM2708_DMA_H */ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/entry-macro.S --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2013-02-17 02:54:20.345610962 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2013-02-28 04:23:24.459598116 +0100 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -6183,7 +6185,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-r + .endm diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/frc.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/frc.h 2013-02-17 02:54:20.343610973 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/frc.h 2013-02-28 04:23:24.458598120 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6225,7 +6227,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi-3.6.y +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/gpio.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/gpio.h 2013-02-17 02:54:20.346610956 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/gpio.h 2013-02-28 04:23:24.459598116 +0100 @@ -0,0 +1,48 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -6277,7 +6279,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi-3.6. + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/hardware.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/hardware.h 2013-02-17 02:54:20.344610967 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/hardware.h 2013-02-28 04:23:24.458598120 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -6309,7 +6311,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi- +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/io.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/io.h 2013-02-17 02:54:20.345610962 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/io.h 2013-02-28 04:23:24.459598116 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -6341,7 +6343,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi-3.6.y/ +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/irqs.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/irqs.h 2013-02-17 02:54:20.342610979 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/irqs.h 2013-02-28 04:23:24.457598123 +0100 @@ -0,0 +1,199 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -6544,7 +6546,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi-3.6. +#endif /* _BCM2708_IRQS_H_ */ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/memory.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/memory.h 2013-02-17 02:54:20.344610967 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/memory.h 2013-02-28 04:23:24.458598120 +0100 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -6605,7 +6607,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi-3. +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/platform.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/platform.h 2013-02-17 02:54:20.345610962 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/platform.h 2013-02-28 04:23:24.458598120 +0100 @@ -0,0 +1,226 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -6835,7 +6837,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi- +/* END */ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/power.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/power.h 2013-02-17 02:54:20.344610967 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/power.h 2013-02-28 04:23:24.458598120 +0100 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -6865,7 +6867,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi-3.6 +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/system.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/system.h 2013-02-17 02:54:20.342610979 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/system.h 2013-02-28 04:23:24.457598123 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -6907,7 +6909,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi-3. +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/timex.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/timex.h 2013-02-17 02:54:20.346610956 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/timex.h 2013-02-28 04:23:24.459598116 +0100 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6934,7 +6936,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi-3.6 +#define CLOCK_TICK_RATE (1000000) diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/uncompress.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/uncompress.h 2013-02-17 02:54:20.345610962 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/uncompress.h 2013-02-28 04:23:24.458598120 +0100 @@ -0,0 +1,85 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -7023,7 +7025,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rp + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vcio.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vcio.h 2013-02-17 02:54:20.343610973 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vcio.h 2013-02-28 04:23:24.457598123 +0100 @@ -0,0 +1,141 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -7168,7 +7170,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi-3.6. +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_mem.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2013-02-17 02:54:20.346610956 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2013-02-28 04:23:24.459598116 +0100 @@ -0,0 +1,36 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -7208,7 +7210,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi-3. + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_support.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_support.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_support.h 2013-02-17 02:54:20.346610956 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_support.h 2013-02-28 04:23:24.459598116 +0100 @@ -0,0 +1,69 @@ +#ifndef _VC_SUPPORT_H_ +#define _VC_SUPPORT_H_ @@ -7281,7 +7283,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-rp +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vmalloc.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2013-02-17 02:54:20.342610979 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2013-02-28 04:23:24.457598123 +0100 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -7305,7 +7307,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi-3 +#define VMALLOC_END (0xe8000000) diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Kconfig linux-rpi-3.6.y/arch/arm/mach-bcm2708/Kconfig --- linux-3.6.11/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Kconfig 2013-02-17 02:54:20.347610951 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Kconfig 2013-02-28 04:23:24.460598112 +0100 @@ -0,0 +1,41 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -7350,7 +7352,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Kconfig linux-rpi-3.6.y/arch/arm/m +endmenu diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Makefile linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile --- linux-3.6.11/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile 2013-02-17 02:54:20.339610996 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile 2013-02-28 04:23:24.454598135 +0100 @@ -0,0 +1,11 @@ +# +# Makefile for the linux kernel. @@ -7365,14 +7367,14 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Makefile linux-rpi-3.6.y/arch/arm/ + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Makefile.boot linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile.boot --- linux-3.6.11/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile.boot 2013-02-17 02:54:20.347610951 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile.boot 2013-02-28 04:23:24.460598112 +0100 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/power.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/power.c --- linux-3.6.11/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/power.c 2013-02-17 02:54:20.338611002 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/power.c 2013-02-28 04:23:24.453598139 +0100 @@ -0,0 +1,194 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -7570,7 +7572,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/power.c linux-rpi-3.6.y/arch/arm/m +MODULE_LICENSE("GPL"); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/vcio.c --- linux-3.6.11/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vcio.c 2013-02-17 02:54:20.341610985 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vcio.c 2013-02-28 04:23:24.455598131 +0100 @@ -0,0 +1,474 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c @@ -8048,7 +8050,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.6.y/arch/arm/ma +MODULE_ALIAS("platform:bcm-mbox"); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vc_mem.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_mem.c --- linux-3.6.11/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_mem.c 2013-02-17 02:54:20.338611002 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_mem.c 2013-02-28 04:23:24.454598135 +0100 @@ -0,0 +1,458 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -8510,7 +8512,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vc_mem.c linux-rpi-3.6.y/arch/arm/ + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vc_support.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_support.c --- linux-3.6.11/arch/arm/mach-bcm2708/vc_support.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_support.c 2013-02-17 02:54:20.347610951 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_support.c 2013-02-28 04:23:24.460598112 +0100 @@ -0,0 +1,319 @@ +/* + * vc_support.c @@ -8833,7 +8835,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vc_support.c linux-rpi-3.6.y/arch/ + diff -Naur linux-3.6.11/arch/arm/Makefile linux-rpi-3.6.y/arch/arm/Makefile --- linux-3.6.11/arch/arm/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/Makefile 2013-02-17 02:54:20.547609807 +0100 ++++ linux-rpi-3.6.y/arch/arm/Makefile 2013-02-28 04:23:24.614597511 +0100 @@ -198,6 +198,7 @@ machine-$(CONFIG_MACH_SPEAR320) := spear3xx machine-$(CONFIG_MACH_SPEAR600) := spear6xx @@ -8844,7 +8846,7 @@ diff -Naur linux-3.6.11/arch/arm/Makefile linux-rpi-3.6.y/arch/arm/Makefile # by CONFIG_* macro name. diff -Naur linux-3.6.11/arch/arm/mm/alignment.c linux-rpi-3.6.y/arch/arm/mm/alignment.c --- linux-3.6.11/arch/arm/mm/alignment.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mm/alignment.c 2013-02-17 02:54:20.495610104 +0100 ++++ linux-rpi-3.6.y/arch/arm/mm/alignment.c 2013-02-28 04:23:24.577597656 +0100 @@ -856,9 +856,11 @@ case 0x08000000: /* ldm or stm, or thumb-2 32bit instruction */ if (thumb2_32b) @@ -8861,7 +8863,7 @@ diff -Naur linux-3.6.11/arch/arm/mm/alignment.c linux-rpi-3.6.y/arch/arm/mm/alig goto bad; diff -Naur linux-3.6.11/arch/arm/mm/Kconfig linux-rpi-3.6.y/arch/arm/mm/Kconfig --- linux-3.6.11/arch/arm/mm/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mm/Kconfig 2013-02-17 02:54:20.506610041 +0100 ++++ linux-rpi-3.6.y/arch/arm/mm/Kconfig 2013-02-28 04:23:24.585597624 +0100 @@ -354,7 +354,7 @@ # ARMv6 @@ -8873,7 +8875,7 @@ diff -Naur linux-3.6.11/arch/arm/mm/Kconfig linux-rpi-3.6.y/arch/arm/mm/Kconfig select CPU_PABRT_V6 diff -Naur linux-3.6.11/arch/arm/mm/proc-v6.S linux-rpi-3.6.y/arch/arm/mm/proc-v6.S --- linux-3.6.11/arch/arm/mm/proc-v6.S 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mm/proc-v6.S 2013-02-17 02:54:20.505610047 +0100 ++++ linux-rpi-3.6.y/arch/arm/mm/proc-v6.S 2013-02-28 04:23:24.584597628 +0100 @@ -73,10 +73,19 @@ * * IRQs are already disabled. @@ -8899,7 +8901,7 @@ diff -Naur linux-3.6.11/arch/arm/mm/proc-v6.S linux-rpi-3.6.y/arch/arm/mm/proc-v ENTRY(cpu_v6_dcache_clean_area) diff -Naur linux-3.6.11/arch/arm/tools/mach-types linux-rpi-3.6.y/arch/arm/tools/mach-types --- linux-3.6.11/arch/arm/tools/mach-types 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/tools/mach-types 2013-02-17 02:54:20.758608600 +0100 ++++ linux-rpi-3.6.y/arch/arm/tools/mach-types 2013-02-28 04:23:24.768596910 +0100 @@ -519,6 +519,7 @@ prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103 paz00 MACH_PAZ00 PAZ00 3128 @@ -8908,9 +8910,21 @@ diff -Naur linux-3.6.11/arch/arm/tools/mach-types linux-rpi-3.6.y/arch/arm/tools ag5evm MACH_AG5EVM AG5EVM 3189 tsunagi MACH_TSUNAGI TSUNAGI 3197 ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206 +diff -Naur linux-3.6.11/arch/arm/vfp/vfpmodule.c linux-rpi-3.6.y/arch/arm/vfp/vfpmodule.c +--- linux-3.6.11/arch/arm/vfp/vfpmodule.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/vfp/vfpmodule.c 2013-02-28 04:23:24.732597050 +0100 +@@ -413,7 +413,7 @@ + * If there isn't a second FP instruction, exit now. Note that + * the FPEXC.FP2V bit is valid only if FPEXC.EX is 1. + */ +- if (fpexc ^ (FPEXC_EX | FPEXC_FP2V)) ++ if ((fpexc & (FPEXC_EX | FPEXC_FP2V)) != (FPEXC_EX | FPEXC_FP2V)) + goto exit; + + /* diff -Naur linux-3.6.11/drivers/char/broadcom/Kconfig linux-rpi-3.6.y/drivers/char/broadcom/Kconfig --- linux-3.6.11/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/broadcom/Kconfig 2013-02-17 02:54:34.693528920 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/Kconfig 2013-02-28 04:23:36.673550432 +0100 @@ -0,0 +1,18 @@ +# +# Broadcom char driver config @@ -8932,13 +8946,13 @@ diff -Naur linux-3.6.11/drivers/char/broadcom/Kconfig linux-rpi-3.6.y/drivers/ch + diff -Naur linux-3.6.11/drivers/char/broadcom/Makefile linux-rpi-3.6.y/drivers/char/broadcom/Makefile --- linux-3.6.11/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/broadcom/Makefile 2013-02-17 02:54:34.693528920 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/Makefile 2013-02-28 04:23:36.672550436 +0100 @@ -0,0 +1,2 @@ +obj-$(CONFIG_BCM_VC_CMA) += vc_cma/ + diff -Naur linux-3.6.11/drivers/char/broadcom/vc_cma/Makefile linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/Makefile --- linux-3.6.11/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/Makefile 2013-02-17 02:54:34.693528920 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/Makefile 2013-02-28 04:23:36.672550436 +0100 @@ -0,0 +1,15 @@ +EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs +EXTRA_CFLAGS += -Werror @@ -8957,7 +8971,7 @@ diff -Naur linux-3.6.11/drivers/char/broadcom/vc_cma/Makefile linux-rpi-3.6.y/dr + diff -Naur linux-3.6.11/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/vc_cma.c --- linux-3.6.11/drivers/char/broadcom/vc_cma/vc_cma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/vc_cma.c 2013-02-17 02:54:34.693528920 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/vc_cma.c 2013-02-28 04:23:36.672550436 +0100 @@ -0,0 +1,1145 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -10106,7 +10120,7 @@ diff -Naur linux-3.6.11/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.6.y/dr +MODULE_AUTHOR("Broadcom Corporation"); diff -Naur linux-3.6.11/drivers/char/hw_random/bcm2708-rng.c linux-rpi-3.6.y/drivers/char/hw_random/bcm2708-rng.c --- linux-3.6.11/drivers/char/hw_random/bcm2708-rng.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/hw_random/bcm2708-rng.c 2013-02-17 02:54:34.698528891 +0100 ++++ linux-rpi-3.6.y/drivers/char/hw_random/bcm2708-rng.c 2013-02-28 04:23:36.677550418 +0100 @@ -0,0 +1,117 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -10227,7 +10241,7 @@ diff -Naur linux-3.6.11/drivers/char/hw_random/bcm2708-rng.c linux-rpi-3.6.y/dri +MODULE_LICENSE("GPL and additional rights"); diff -Naur linux-3.6.11/drivers/char/hw_random/Kconfig linux-rpi-3.6.y/drivers/char/hw_random/Kconfig --- linux-3.6.11/drivers/char/hw_random/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/hw_random/Kconfig 2013-02-17 02:54:34.697528897 +0100 ++++ linux-rpi-3.6.y/drivers/char/hw_random/Kconfig 2013-02-28 04:23:36.676550421 +0100 @@ -289,3 +289,14 @@ module will be called exynos-rng. @@ -10246,7 +10260,7 @@ diff -Naur linux-3.6.11/drivers/char/hw_random/Kconfig linux-rpi-3.6.y/drivers/c \ Kein Zeilenumbruch am Dateiende. diff -Naur linux-3.6.11/drivers/char/hw_random/Makefile linux-rpi-3.6.y/drivers/char/hw_random/Makefile --- linux-3.6.11/drivers/char/hw_random/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/hw_random/Makefile 2013-02-17 02:54:34.695528909 +0100 ++++ linux-rpi-3.6.y/drivers/char/hw_random/Makefile 2013-02-28 04:23:36.674550428 +0100 @@ -25,3 +25,4 @@ obj-$(CONFIG_HW_RANDOM_PPC4XX) += ppc4xx-rng.o obj-$(CONFIG_HW_RANDOM_PSERIES) += pseries-rng.o @@ -10254,7 +10268,7 @@ diff -Naur linux-3.6.11/drivers/char/hw_random/Makefile linux-rpi-3.6.y/drivers/ +obj-$(CONFIG_HW_RANDOM_BCM2708) += bcm2708-rng.o diff -Naur linux-3.6.11/drivers/char/Kconfig linux-rpi-3.6.y/drivers/char/Kconfig --- linux-3.6.11/drivers/char/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/Kconfig 2013-02-17 02:54:34.708528834 +0100 ++++ linux-rpi-3.6.y/drivers/char/Kconfig 2013-02-28 04:23:36.686550383 +0100 @@ -585,6 +585,8 @@ source "drivers/s390/char/Kconfig" @@ -10266,7 +10280,7 @@ diff -Naur linux-3.6.11/drivers/char/Kconfig linux-rpi-3.6.y/drivers/char/Kconfi default n diff -Naur linux-3.6.11/drivers/char/Makefile linux-rpi-3.6.y/drivers/char/Makefile --- linux-3.6.11/drivers/char/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/Makefile 2013-02-17 02:54:34.684528972 +0100 ++++ linux-rpi-3.6.y/drivers/char/Makefile 2013-02-28 04:23:36.666550460 +0100 @@ -63,3 +63,6 @@ js-rtc-y = rtc.o @@ -10276,7 +10290,7 @@ diff -Naur linux-3.6.11/drivers/char/Makefile linux-rpi-3.6.y/drivers/char/Makef + diff -Naur linux-3.6.11/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi-3.6.y/drivers/cpufreq/bcm2835-cpufreq.c --- linux-3.6.11/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/cpufreq/bcm2835-cpufreq.c 2013-02-17 02:54:33.823533895 +0100 ++++ linux-rpi-3.6.y/drivers/cpufreq/bcm2835-cpufreq.c 2013-02-28 04:23:35.792553872 +0100 @@ -0,0 +1,239 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -10519,7 +10533,7 @@ diff -Naur linux-3.6.11/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi-3.6.y/driver + diff -Naur linux-3.6.11/drivers/cpufreq/Kconfig.arm linux-rpi-3.6.y/drivers/cpufreq/Kconfig.arm --- linux-3.6.11/drivers/cpufreq/Kconfig.arm 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/cpufreq/Kconfig.arm 2013-02-17 02:54:33.828533866 +0100 ++++ linux-rpi-3.6.y/drivers/cpufreq/Kconfig.arm 2013-02-28 04:23:35.803553830 +0100 @@ -76,3 +76,12 @@ help This adds the CPUFreq driver for Samsung EXYNOS5250 @@ -10535,7 +10549,7 @@ diff -Naur linux-3.6.11/drivers/cpufreq/Kconfig.arm linux-rpi-3.6.y/drivers/cpuf + diff -Naur linux-3.6.11/drivers/cpufreq/Makefile linux-rpi-3.6.y/drivers/cpufreq/Makefile --- linux-3.6.11/drivers/cpufreq/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/cpufreq/Makefile 2013-02-17 02:54:33.823533895 +0100 ++++ linux-rpi-3.6.y/drivers/cpufreq/Makefile 2013-02-28 04:23:35.791553876 +0100 @@ -48,6 +48,7 @@ obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ) += exynos5250-cpufreq.o @@ -10546,7 +10560,7 @@ diff -Naur linux-3.6.11/drivers/cpufreq/Makefile linux-rpi-3.6.y/drivers/cpufreq # PowerPC platform drivers diff -Naur linux-3.6.11/drivers/hwmon/bcm2835-hwmon.c linux-rpi-3.6.y/drivers/hwmon/bcm2835-hwmon.c --- linux-3.6.11/drivers/hwmon/bcm2835-hwmon.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/hwmon/bcm2835-hwmon.c 2013-02-17 02:54:33.856533706 +0100 ++++ linux-rpi-3.6.y/drivers/hwmon/bcm2835-hwmon.c 2013-02-28 04:23:35.871553564 +0100 @@ -0,0 +1,219 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -10769,7 +10783,7 @@ diff -Naur linux-3.6.11/drivers/hwmon/bcm2835-hwmon.c linux-rpi-3.6.y/drivers/hw +module_platform_driver(bcm2835_hwmon_driver); diff -Naur linux-3.6.11/drivers/hwmon/Kconfig linux-rpi-3.6.y/drivers/hwmon/Kconfig --- linux-3.6.11/drivers/hwmon/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/hwmon/Kconfig 2013-02-17 02:54:33.870533626 +0100 ++++ linux-rpi-3.6.y/drivers/hwmon/Kconfig 2013-02-28 04:23:35.893553478 +0100 @@ -1411,6 +1411,16 @@ help Support for the A/D converter on MC13783 and MC13892 PMIC. @@ -10789,7 +10803,7 @@ diff -Naur linux-3.6.11/drivers/hwmon/Kconfig linux-rpi-3.6.y/drivers/hwmon/Kcon comment "ACPI drivers" diff -Naur linux-3.6.11/drivers/hwmon/Makefile linux-rpi-3.6.y/drivers/hwmon/Makefile --- linux-3.6.11/drivers/hwmon/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/hwmon/Makefile 2013-02-17 02:54:33.845533769 +0100 ++++ linux-rpi-3.6.y/drivers/hwmon/Makefile 2013-02-28 04:23:35.846553661 +0100 @@ -129,6 +129,7 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o @@ -10800,7 +10814,7 @@ diff -Naur linux-3.6.11/drivers/hwmon/Makefile linux-rpi-3.6.y/drivers/hwmon/Mak diff -Naur linux-3.6.11/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-3.6.y/drivers/i2c/busses/i2c-bcm2708.c --- linux-3.6.11/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/i2c/busses/i2c-bcm2708.c 2013-02-17 02:54:33.972533043 +0100 ++++ linux-rpi-3.6.y/drivers/i2c/busses/i2c-bcm2708.c 2013-02-28 04:23:36.074552771 +0100 @@ -0,0 +1,400 @@ +/* + * Driver for Broadcom BCM2708 BSC Controllers @@ -11204,7 +11218,7 @@ diff -Naur linux-3.6.11/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-3.6.y/drivers +MODULE_ALIAS("platform:" DRV_NAME); diff -Naur linux-3.6.11/drivers/i2c/busses/Kconfig linux-rpi-3.6.y/drivers/i2c/busses/Kconfig --- linux-3.6.11/drivers/i2c/busses/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/i2c/busses/Kconfig 2013-02-17 02:54:33.979533003 +0100 ++++ linux-rpi-3.6.y/drivers/i2c/busses/Kconfig 2013-02-28 04:23:36.086552725 +0100 @@ -314,6 +314,25 @@ This driver can also be built as a module. If so, the module will be called i2c-au1550. @@ -11233,7 +11247,7 @@ diff -Naur linux-3.6.11/drivers/i2c/busses/Kconfig linux-rpi-3.6.y/drivers/i2c/b depends on BLACKFIN diff -Naur linux-3.6.11/drivers/i2c/busses/Makefile linux-rpi-3.6.y/drivers/i2c/busses/Makefile --- linux-3.6.11/drivers/i2c/busses/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/i2c/busses/Makefile 2013-02-17 02:54:33.970533054 +0100 ++++ linux-rpi-3.6.y/drivers/i2c/busses/Makefile 2013-02-28 04:23:36.071552784 +0100 @@ -30,6 +30,7 @@ # Embedded system I2C/SMBus host controller drivers obj-$(CONFIG_I2C_AT91) += i2c-at91.o @@ -11244,7 +11258,7 @@ diff -Naur linux-3.6.11/drivers/i2c/busses/Makefile linux-rpi-3.6.y/drivers/i2c/ obj-$(CONFIG_I2C_DAVINCI) += i2c-davinci.o diff -Naur linux-3.6.11/drivers/misc/Kconfig linux-rpi-3.6.y/drivers/misc/Kconfig --- linux-3.6.11/drivers/misc/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/Kconfig 2013-02-17 02:54:37.948510307 +0100 ++++ linux-rpi-3.6.y/drivers/misc/Kconfig 2013-02-28 04:23:39.683538681 +0100 @@ -517,4 +517,6 @@ source "drivers/misc/carma/Kconfig" source "drivers/misc/altera-stapl/Kconfig" @@ -11254,7 +11268,7 @@ diff -Naur linux-3.6.11/drivers/misc/Kconfig linux-rpi-3.6.y/drivers/misc/Kconfi + diff -Naur linux-3.6.11/drivers/misc/Makefile linux-rpi-3.6.y/drivers/misc/Makefile --- linux-3.6.11/drivers/misc/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/Makefile 2013-02-17 02:54:37.907510542 +0100 ++++ linux-rpi-3.6.y/drivers/misc/Makefile 2013-02-28 04:23:39.671538729 +0100 @@ -50,3 +50,4 @@ obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ @@ -11262,7 +11276,7 @@ diff -Naur linux-3.6.11/drivers/misc/Makefile linux-rpi-3.6.y/drivers/misc/Makef +obj-$(CONFIG_BCM2708_VCHIQ) += vc04_services/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/connections/connection.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2013-02-17 02:54:37.964510216 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2013-02-28 04:23:39.695538635 +0100 @@ -0,0 +1,328 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -11594,7 +11608,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/connections/co +/****************************** End of file **********************************/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2013-02-17 02:54:37.964510216 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2013-02-28 04:23:39.695538635 +0100 @@ -0,0 +1,204 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -11802,7 +11816,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/message_driver +/****************************** End of file ***********************************/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2013-02-17 02:54:37.963510222 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2013-02-28 04:23:39.694538639 +0100 @@ -0,0 +1,224 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12030,7 +12044,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h lin +/****************************** End of file **********************************/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2013-02-17 02:54:37.962510227 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2013-02-28 04:23:39.693538643 +0100 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12105,7 +12119,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg_inter +#endif /*VCHI_CFG_INTERNAL_H_*/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_common.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2013-02-17 02:54:37.963510222 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2013-02-28 04:23:39.694538639 +0100 @@ -0,0 +1,163 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12272,7 +12286,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_common.h +#endif // VCHI_COMMON_H_ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi.h 2013-02-17 02:54:37.963510222 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi.h 2013-02-28 04:23:39.694538639 +0100 @@ -0,0 +1,373 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12649,7 +12663,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi.h linux-r +/****************************** End of file **********************************/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_mh.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2013-02-17 02:54:37.963510222 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2013-02-28 04:23:39.694538639 +0100 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12695,7 +12709,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linu +#endif diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2013-02-17 02:54:37.959510245 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2013-02-28 04:23:39.691538650 +0100 @@ -0,0 +1,538 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -13237,7 +13251,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_283 +} diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2013-02-17 02:54:37.961510233 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2013-02-28 04:23:39.693538643 +0100 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -13283,7 +13297,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_283 +#endif /* VCHIQ_2835_H */ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2013-02-17 02:54:37.957510256 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2013-02-28 04:23:39.687538667 +0100 @@ -0,0 +1,2802 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16089,7 +16103,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm +MODULE_AUTHOR("Broadcom Corporation"); diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2013-02-17 02:54:37.962510227 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2013-02-28 04:23:39.693538643 +0100 @@ -0,0 +1,212 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16305,7 +16319,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm +#endif /* VCHIQ_ARM_H */ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2013-02-17 02:54:37.958510250 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2013-02-28 04:23:39.688538663 +0100 @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16346,7 +16360,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_bui +const char *vchiq_get_build_date(void); diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2013-02-17 02:54:37.959510245 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2013-02-28 04:23:39.691538650 +0100 @@ -0,0 +1,60 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16410,7 +16424,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg +#endif /* VCHIQ_CFG_H */ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2013-02-17 02:54:37.960510239 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2013-02-28 04:23:39.692538647 +0100 @@ -0,0 +1,119 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16533,7 +16547,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_con +EXPORT_SYMBOL(vchiq_add_connected_callback); diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2013-02-17 02:54:37.961510233 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2013-02-28 04:23:39.692538647 +0100 @@ -0,0 +1,51 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16588,7 +16602,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_con + diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2013-02-17 02:54:37.957510256 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2013-02-28 04:23:39.687538667 +0100 @@ -0,0 +1,3818 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -20410,7 +20424,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cor +} diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2013-02-17 02:54:37.961510233 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2013-02-28 04:23:39.692538647 +0100 @@ -0,0 +1,703 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -21117,7 +21131,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cor +#endif diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2013-02-17 02:54:37.959510245 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2013-02-28 04:23:39.689538659 +0100 @@ -0,0 +1,89 @@ +#!/usr/bin/perl -w + @@ -21210,7 +21224,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_gen + diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2013-02-17 02:54:37.956510262 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2013-02-28 04:23:39.686538670 +0100 @@ -0,0 +1,41 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -21255,7 +21269,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h l + diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2013-02-17 02:54:37.962510227 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2013-02-28 04:23:39.693538643 +0100 @@ -0,0 +1,185 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -21444,7 +21458,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if. +#endif /* VCHIQ_IF_H */ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2013-02-17 02:54:37.958510250 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2013-02-28 04:23:39.688538663 +0100 @@ -0,0 +1,129 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -21577,7 +21591,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioc +#endif diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2013-02-17 02:54:37.960510239 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2013-02-28 04:23:39.691538650 +0100 @@ -0,0 +1,454 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -22035,7 +22049,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ker +} diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2013-02-17 02:54:37.961510233 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2013-02-28 04:23:39.693538643 +0100 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -22110,7 +22124,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_mem +#endif diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2013-02-17 02:54:37.960510239 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2013-02-28 04:23:39.692538647 +0100 @@ -0,0 +1,58 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -22172,7 +22186,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pag +#endif /* VCHIQ_PAGELIST_H */ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2013-02-17 02:54:37.958510250 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2013-02-28 04:23:39.688538663 +0100 @@ -0,0 +1,240 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -22416,7 +22430,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pro + diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2013-02-17 02:54:37.960510239 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2013-02-28 04:23:39.692538647 +0100 @@ -0,0 +1,815 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -23235,7 +23249,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shi +EXPORT_SYMBOL(vchi_service_release); diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2013-02-17 02:54:37.959510245 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2013-02-28 04:23:39.689538659 +0100 @@ -0,0 +1,120 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -23359,7 +23373,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_uti +} diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2013-02-17 02:54:37.959510245 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2013-02-28 04:23:39.689538659 +0100 @@ -0,0 +1,82 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -23445,7 +23459,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_uti + diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2013-02-17 02:54:37.958510250 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2013-02-28 04:23:39.687538667 +0100 @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -23508,7 +23522,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ver +} diff -Naur linux-3.6.11/drivers/misc/vc04_services/Kconfig linux-rpi-3.6.y/drivers/misc/vc04_services/Kconfig --- linux-3.6.11/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/Kconfig 2013-02-17 02:54:37.965510210 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/Kconfig 2013-02-28 04:23:39.695538635 +0100 @@ -0,0 +1,10 @@ +config BCM2708_VCHIQ + tristate "Videocore VCHIQ" @@ -23522,7 +23536,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/Kconfig linux-rpi-3.6.y/drive + diff -Naur linux-3.6.11/drivers/misc/vc04_services/Makefile linux-rpi-3.6.y/drivers/misc/vc04_services/Makefile --- linux-3.6.11/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/Makefile 2013-02-17 02:54:37.956510262 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/Makefile 2013-02-28 04:23:39.685538674 +0100 @@ -0,0 +1,18 @@ +ifeq ($(CONFIG_MACH_BCM2708),y) + @@ -23544,7 +23558,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/Makefile linux-rpi-3.6.y/driv + diff -Naur linux-3.6.11/drivers/mmc/card/block.c linux-rpi-3.6.y/drivers/mmc/card/block.c --- linux-3.6.11/drivers/mmc/card/block.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/card/block.c 2013-02-17 02:54:34.902527725 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/card/block.c 2013-02-28 04:23:36.975549254 +0100 @@ -1135,7 +1135,7 @@ brq->data.blocks = 1; } @@ -23556,7 +23570,7 @@ diff -Naur linux-3.6.11/drivers/mmc/card/block.c linux-rpi-3.6.y/drivers/mmc/car */ diff -Naur linux-3.6.11/drivers/mmc/core/sd.c linux-rpi-3.6.y/drivers/mmc/core/sd.c --- linux-3.6.11/drivers/mmc/core/sd.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/core/sd.c 2013-02-17 02:54:34.898527748 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/core/sd.c 2013-02-28 04:23:36.971549269 +0100 @@ -13,6 +13,8 @@ #include #include @@ -23717,7 +23731,7 @@ diff -Naur linux-3.6.11/drivers/mmc/core/sd.c linux-rpi-3.6.y/drivers/mmc/core/s * Fetch and process SD Status register. diff -Naur linux-3.6.11/drivers/mmc/host/Kconfig linux-rpi-3.6.y/drivers/mmc/host/Kconfig --- linux-3.6.11/drivers/mmc/host/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/Kconfig 2013-02-17 02:54:34.890527794 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/Kconfig 2013-02-28 04:23:36.965549292 +0100 @@ -229,6 +229,27 @@ YMMV. @@ -23748,7 +23762,7 @@ diff -Naur linux-3.6.11/drivers/mmc/host/Kconfig linux-rpi-3.6.y/drivers/mmc/hos depends on ARCH_OMAP diff -Naur linux-3.6.11/drivers/mmc/host/Makefile linux-rpi-3.6.y/drivers/mmc/host/Makefile --- linux-3.6.11/drivers/mmc/host/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/Makefile 2013-02-17 02:54:34.882527839 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/Makefile 2013-02-28 04:23:36.959549316 +0100 @@ -13,6 +13,7 @@ obj-$(CONFIG_MMC_SDHCI_PXAV2) += sdhci-pxav2.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o @@ -23759,7 +23773,7 @@ diff -Naur linux-3.6.11/drivers/mmc/host/Makefile linux-rpi-3.6.y/drivers/mmc/ho obj-$(CONFIG_MMC_OMAP) += omap.o diff -Naur linux-3.6.11/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.6.y/drivers/mmc/host/sdhci-bcm2708.c --- linux-3.6.11/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/sdhci-bcm2708.c 2013-02-17 02:54:34.886527816 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/sdhci-bcm2708.c 2013-02-28 04:23:36.962549305 +0100 @@ -0,0 +1,1413 @@ +/* + * sdhci-bcm2708.c Support for SDHCI device on BCM2708 @@ -25176,7 +25190,7 @@ diff -Naur linux-3.6.11/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.6.y/drivers + diff -Naur linux-3.6.11/drivers/mmc/host/sdhci.c linux-rpi-3.6.y/drivers/mmc/host/sdhci.c --- linux-3.6.11/drivers/mmc/host/sdhci.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.c 2013-02-17 02:54:34.884527828 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.c 2013-02-28 04:23:36.960549313 +0100 @@ -28,6 +28,7 @@ #include #include @@ -26049,7 +26063,7 @@ diff -Naur linux-3.6.11/drivers/mmc/host/sdhci.c linux-rpi-3.6.y/drivers/mmc/hos sdhci_disable_card_detection(host); diff -Naur linux-3.6.11/drivers/mmc/host/sdhci.h linux-rpi-3.6.y/drivers/mmc/host/sdhci.h --- linux-3.6.11/drivers/mmc/host/sdhci.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.h 2013-02-17 02:54:34.891527788 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.h 2013-02-28 04:23:36.966549289 +0100 @@ -275,6 +275,20 @@ void (*platform_reset_enter)(struct sdhci_host *host, u8 mask); void (*platform_reset_exit)(struct sdhci_host *host, u8 mask); @@ -26112,7 +26126,7 @@ diff -Naur linux-3.6.11/drivers/mmc/host/sdhci.h linux-rpi-3.6.y/drivers/mmc/hos #endif /* __SDHCI_HW_H */ diff -Naur linux-3.6.11/drivers/net/usb/smsc95xx.c linux-rpi-3.6.y/drivers/net/usb/smsc95xx.c --- linux-3.6.11/drivers/net/usb/smsc95xx.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.c 2013-02-17 02:54:35.950521732 +0100 ++++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.c 2013-02-28 04:23:37.785546091 +0100 @@ -46,11 +46,23 @@ #define SMSC95XX_INTERNAL_PHY_ID (1) #define SMSC95XX_TX_OVERHEAD (8) @@ -27129,7 +27143,7 @@ diff -Naur linux-3.6.11/drivers/net/usb/smsc95xx.c linux-rpi-3.6.y/drivers/net/u }; diff -Naur linux-3.6.11/drivers/net/usb/smsc95xx.h linux-rpi-3.6.y/drivers/net/usb/smsc95xx.h --- linux-3.6.11/drivers/net/usb/smsc95xx.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.h 2013-02-17 02:54:35.946521755 +0100 ++++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.h 2013-02-28 04:23:37.782546104 +0100 @@ -63,6 +63,7 @@ #define INT_STS_TDFO_ (0x00001000) #define INT_STS_RXDF_ (0x00000800) @@ -27170,7 +27184,7 @@ diff -Naur linux-3.6.11/drivers/net/usb/smsc95xx.h linux-rpi-3.6.y/drivers/net/u #define Tx_COE_EN_ (0x00010000) diff -Naur linux-3.6.11/drivers/net/usb/usbnet.c linux-rpi-3.6.y/drivers/net/usb/usbnet.c --- linux-3.6.11/drivers/net/usb/usbnet.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/net/usb/usbnet.c 2013-02-17 02:54:35.944521767 +0100 ++++ linux-rpi-3.6.y/drivers/net/usb/usbnet.c 2013-02-28 04:23:37.780546112 +0100 @@ -359,10 +359,12 @@ void usbnet_defer_kevent (struct usbnet *dev, int work) { @@ -27356,7 +27370,7 @@ diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c li diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/wlan0dhcp linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/wlan0dhcp diff -Naur linux-3.6.11/drivers/spi/Kconfig linux-rpi-3.6.y/drivers/spi/Kconfig --- linux-3.6.11/drivers/spi/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/spi/Kconfig 2013-02-17 02:54:34.779528428 +0100 ++++ linux-rpi-3.6.y/drivers/spi/Kconfig 2013-02-28 04:23:36.903549535 +0100 @@ -74,6 +74,14 @@ This selects a driver for the Atmel SPI Controller, present on many AT32 (AVR32) and AT91 (ARM) chips. @@ -27374,7 +27388,7 @@ diff -Naur linux-3.6.11/drivers/spi/Kconfig linux-rpi-3.6.y/drivers/spi/Kconfig depends on BLACKFIN diff -Naur linux-3.6.11/drivers/spi/Makefile linux-rpi-3.6.y/drivers/spi/Makefile --- linux-3.6.11/drivers/spi/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/spi/Makefile 2013-02-17 02:54:34.753528577 +0100 ++++ linux-rpi-3.6.y/drivers/spi/Makefile 2013-02-28 04:23:36.897549558 +0100 @@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_AU1550) += spi-au1550.o obj-$(CONFIG_SPI_BCM63XX) += spi-bcm63xx.o @@ -27385,7 +27399,7 @@ diff -Naur linux-3.6.11/drivers/spi/Makefile linux-rpi-3.6.y/drivers/spi/Makefil obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o diff -Naur linux-3.6.11/drivers/spi/spi-bcm2708.c linux-rpi-3.6.y/drivers/spi/spi-bcm2708.c --- linux-3.6.11/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/spi/spi-bcm2708.c 2013-02-17 02:54:34.753528577 +0100 ++++ linux-rpi-3.6.y/drivers/spi/spi-bcm2708.c 2013-02-28 04:23:36.898549554 +0100 @@ -0,0 +1,600 @@ +/* + * Driver for Broadcom BCM2708 SPI Controllers @@ -27988,12 +28002,732 @@ diff -Naur linux-3.6.11/drivers/spi/spi-bcm2708.c linux-rpi-3.6.y/drivers/spi/sp +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); diff -Naur linux-3.6.11/drivers/staging/media/lirc/Kconfig linux-rpi-3.6.y/drivers/staging/media/lirc/Kconfig +--- linux-3.6.11/drivers/staging/media/lirc/Kconfig 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/staging/media/lirc/Kconfig 2013-02-28 04:23:38.473543405 +0100 +@@ -38,6 +38,12 @@ + help + Driver for Homebrew Parallel Port Receivers + ++config LIRC_RPI ++ tristate "Homebrew GPIO Port Receiver/Transmitter for the RaspberryPi" ++ depends on LIRC ++ help ++ Driver for Homebrew GPIO Port Receiver/Transmitter for the RaspberryPi ++ + config LIRC_SASEM + tristate "Sasem USB IR Remote" + depends on LIRC && USB diff -Naur linux-3.6.11/drivers/staging/media/lirc/lirc_rpi.c linux-rpi-3.6.y/drivers/staging/media/lirc/lirc_rpi.c +--- linux-3.6.11/drivers/staging/media/lirc/lirc_rpi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/staging/media/lirc/lirc_rpi.c 2013-02-28 04:23:38.474543402 +0100 +@@ -0,0 +1,692 @@ ++/* ++ * lirc_rpi.c ++ * ++ * lirc_rpi - Device driver that records pulse- and pause-lengths ++ * (space-lengths) (just like the lirc_serial driver does) ++ * between GPIO interrupt events on the Raspberry Pi. ++ * Lots of code has been taken from the lirc_serial module, ++ * so I would like say thanks to the authors. ++ * ++ * Copyright (C) 2012 Aron Robert Szabo , ++ * Michael Bishop ++ * 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 ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define LIRC_DRIVER_NAME "lirc_rpi" ++#define RBUF_LEN 256 ++#define LIRC_TRANSMITTER_LATENCY 256 ++ ++#ifndef MAX_UDELAY_MS ++#define MAX_UDELAY_US 5000 ++#else ++#define MAX_UDELAY_US (MAX_UDELAY_MS*1000) ++#endif ++ ++#define dprintk(fmt, args...) \ ++ do { \ ++ if (debug) \ ++ printk(KERN_DEBUG LIRC_DRIVER_NAME ": " \ ++ fmt, ## args); \ ++ } while (0) ++ ++/* module parameters */ ++ ++/* set the default GPIO input pin */ ++static int gpio_in_pin = 18; ++/* set the default GPIO output pin */ ++static int gpio_out_pin = 17; ++/* enable debugging messages */ ++static int debug; ++/* -1 = auto, 0 = active high, 1 = active low */ ++static int sense = -1; ++/* use softcarrier by default */ ++static int softcarrier = 1; ++/* 0 = do not invert output, 1 = invert output */ ++static int invert = 0; ++ ++struct gpio_chip *gpiochip; ++struct irq_chip *irqchip; ++struct irq_data *irqdata; ++ ++/* forward declarations */ ++static long send_pulse(unsigned long length); ++static void send_space(long length); ++static void lirc_rpi_exit(void); ++ ++int valid_gpio_pins[] = { 0, 1, 4, 8, 7, 9, 10, 11, 14, 15, 17, 18, 21, 22, 23, ++ 24, 25 }; ++ ++static struct platform_device *lirc_rpi_dev; ++static struct timeval lasttv = { 0, 0 }; ++static struct lirc_buffer rbuf; ++static spinlock_t lock; ++ ++/* initialized/set in init_timing_params() */ ++static unsigned int freq = 38000; ++static unsigned int duty_cycle = 50; ++static unsigned long period; ++static unsigned long pulse_width; ++static unsigned long space_width; ++ ++static void safe_udelay(unsigned long usecs) ++{ ++ while (usecs > MAX_UDELAY_US) { ++ udelay(MAX_UDELAY_US); ++ usecs -= MAX_UDELAY_US; ++ } ++ udelay(usecs); ++} ++ ++static int init_timing_params(unsigned int new_duty_cycle, ++ unsigned int new_freq) ++{ ++ /* ++ * period, pulse/space width are kept with 8 binary places - ++ * IE multiplied by 256. ++ */ ++ if (256 * 1000000L / new_freq * new_duty_cycle / 100 <= ++ LIRC_TRANSMITTER_LATENCY) ++ return -EINVAL; ++ if (256 * 1000000L / new_freq * (100 - new_duty_cycle) / 100 <= ++ LIRC_TRANSMITTER_LATENCY) ++ return -EINVAL; ++ duty_cycle = new_duty_cycle; ++ freq = new_freq; ++ period = 256 * 1000000L / freq; ++ pulse_width = period * duty_cycle / 100; ++ space_width = period - pulse_width; ++ dprintk("in init_timing_params, freq=%d pulse=%ld, " ++ "space=%ld\n", freq, pulse_width, space_width); ++ return 0; ++} ++ ++static long send_pulse_softcarrier(unsigned long length) ++{ ++ int flag; ++ unsigned long actual, target, d; ++ ++ length <<= 8; ++ ++ actual = 0; target = 0; flag = 0; ++ while (actual < length) { ++ if (flag) { ++ gpiochip->set(gpiochip, gpio_out_pin, invert); ++ target += space_width; ++ } else { ++ gpiochip->set(gpiochip, gpio_out_pin, !invert); ++ target += pulse_width; ++ } ++ d = (target - actual - ++ LIRC_TRANSMITTER_LATENCY + 128) >> 8; ++ /* ++ * Note - we've checked in ioctl that the pulse/space ++ * widths are big enough so that d is > 0 ++ */ ++ udelay(d); ++ actual += (d << 8) + LIRC_TRANSMITTER_LATENCY; ++ flag = !flag; ++ } ++ return (actual-length) >> 8; ++} ++ ++static long send_pulse(unsigned long length) ++{ ++ if (length <= 0) ++ return 0; ++ ++ if (softcarrier) { ++ return send_pulse_softcarrier(length); ++ } else { ++ gpiochip->set(gpiochip, gpio_out_pin, !invert); ++ safe_udelay(length); ++ return 0; ++ } ++} ++ ++static void send_space(long length) ++{ ++ gpiochip->set(gpiochip, gpio_out_pin, invert); ++ if (length <= 0) ++ return; ++ safe_udelay(length); ++} ++ ++static void rbwrite(int l) ++{ ++ if (lirc_buffer_full(&rbuf)) { ++ /* no new signals will be accepted */ ++ dprintk("Buffer overrun\n"); ++ return; ++ } ++ lirc_buffer_write(&rbuf, (void *)&l); ++} ++ ++static void frbwrite(int l) ++{ ++ /* simple noise filter */ ++ static int pulse, space; ++ static unsigned int ptr; ++ ++ if (ptr > 0 && (l & PULSE_BIT)) { ++ pulse += l & PULSE_MASK; ++ if (pulse > 250) { ++ rbwrite(space); ++ rbwrite(pulse | PULSE_BIT); ++ ptr = 0; ++ pulse = 0; ++ } ++ return; ++ } ++ if (!(l & PULSE_BIT)) { ++ if (ptr == 0) { ++ if (l > 20000) { ++ space = l; ++ ptr++; ++ return; ++ } ++ } else { ++ if (l > 20000) { ++ space += pulse; ++ if (space > PULSE_MASK) ++ space = PULSE_MASK; ++ space += l; ++ if (space > PULSE_MASK) ++ space = PULSE_MASK; ++ pulse = 0; ++ return; ++ } ++ rbwrite(space); ++ rbwrite(pulse | PULSE_BIT); ++ ptr = 0; ++ pulse = 0; ++ } ++ } ++ rbwrite(l); ++} ++ ++static irqreturn_t irq_handler(int i, void *blah, struct pt_regs *regs) ++{ ++ struct timeval tv; ++ long deltv; ++ int data; ++ int signal; ++ ++ /* use the GPIO signal level */ ++ signal = gpiochip->get(gpiochip, gpio_in_pin); ++ ++ /* unmask the irq */ ++ irqchip->irq_unmask(irqdata); ++ ++ if (sense != -1) { ++ /* get current time */ ++ do_gettimeofday(&tv); ++ ++ /* calc time since last interrupt in microseconds */ ++ deltv = tv.tv_sec-lasttv.tv_sec; ++ if (tv.tv_sec < lasttv.tv_sec || ++ (tv.tv_sec == lasttv.tv_sec && ++ tv.tv_usec < lasttv.tv_usec)) { ++ printk(KERN_WARNING LIRC_DRIVER_NAME ++ ": AIEEEE: your clock just jumped backwards\n"); ++ printk(KERN_WARNING LIRC_DRIVER_NAME ++ ": %d %d %lx %lx %lx %lx\n", signal, sense, ++ tv.tv_sec, lasttv.tv_sec, ++ tv.tv_usec, lasttv.tv_usec); ++ data = PULSE_MASK; ++ } else if (deltv > 15) { ++ data = PULSE_MASK; /* really long time */ ++ if (!(signal^sense)) { ++ /* sanity check */ ++ printk(KERN_WARNING LIRC_DRIVER_NAME ++ ": AIEEEE: %d %d %lx %lx %lx %lx\n", ++ signal, sense, tv.tv_sec, lasttv.tv_sec, ++ tv.tv_usec, lasttv.tv_usec); ++ /* ++ * detecting pulse while this ++ * MUST be a space! ++ */ ++ sense = sense ? 0 : 1; ++ } ++ } else { ++ data = (int) (deltv*1000000 + ++ (tv.tv_usec - lasttv.tv_usec)); ++ } ++ frbwrite(signal^sense ? data : (data|PULSE_BIT)); ++ lasttv = tv; ++ wake_up_interruptible(&rbuf.wait_poll); ++ } ++ ++ return IRQ_HANDLED; ++} ++ ++static int is_right_chip(struct gpio_chip *chip, void *data) ++{ ++ dprintk("is_right_chip %s %d\n", chip->label, strcmp(data, chip->label)); ++ ++ if (strcmp(data, chip->label) == 0) ++ return 1; ++ return 0; ++} ++ ++static int init_port(void) ++{ ++ int i, nlow, nhigh, ret, irq; ++ ++ gpiochip = gpiochip_find("bcm2708_gpio", is_right_chip); ++ ++ if (!gpiochip) ++ return -ENODEV; ++ ++ if (gpio_request(gpio_out_pin, LIRC_DRIVER_NAME " ir/out")) { ++ printk(KERN_ALERT LIRC_DRIVER_NAME ++ ": cant claim gpio pin %d\n", gpio_out_pin); ++ ret = -ENODEV; ++ goto exit_init_port; ++ } ++ ++ if (gpio_request(gpio_in_pin, LIRC_DRIVER_NAME " ir/in")) { ++ printk(KERN_ALERT LIRC_DRIVER_NAME ++ ": cant claim gpio pin %d\n", gpio_in_pin); ++ ret = -ENODEV; ++ goto exit_gpio_free_out_pin; ++ } ++ ++ gpiochip->direction_input(gpiochip, gpio_in_pin); ++ gpiochip->direction_output(gpiochip, gpio_out_pin, 1); ++ gpiochip->set(gpiochip, gpio_out_pin, invert); ++ ++ irq = gpiochip->to_irq(gpiochip, gpio_in_pin); ++ dprintk("to_irq %d\n", irq); ++ irqdata = irq_get_irq_data(irq); ++ ++ if (irqdata && irqdata->chip) { ++ irqchip = irqdata->chip; ++ } else { ++ ret = -ENODEV; ++ goto exit_gpio_free_in_pin; ++ } ++ ++ /* if pin is high, then this must be an active low receiver. */ ++ if (sense == -1) { ++ /* wait 1/2 sec for the power supply */ ++ msleep(500); ++ ++ /* ++ * probe 9 times every 0.04s, collect "votes" for ++ * active high/low ++ */ ++ nlow = 0; ++ nhigh = 0; ++ for (i = 0; i < 9; i++) { ++ if (gpiochip->get(gpiochip, gpio_in_pin)) ++ nlow++; ++ else ++ nhigh++; ++ msleep(40); ++ } ++ sense = (nlow >= nhigh ? 1 : 0); ++ printk(KERN_INFO LIRC_DRIVER_NAME ++ ": auto-detected active %s receiver on GPIO pin %d\n", ++ sense ? "low" : "high", gpio_in_pin); ++ } else { ++ printk(KERN_INFO LIRC_DRIVER_NAME ++ ": manually using active %s receiver on GPIO pin %d\n", ++ sense ? "low" : "high", gpio_in_pin); ++ } ++ ++ return 0; ++ ++ exit_gpio_free_in_pin: ++ gpio_free(gpio_in_pin); ++ ++ exit_gpio_free_out_pin: ++ gpio_free(gpio_out_pin); ++ ++ exit_init_port: ++ return ret; ++} ++ ++// called when the character device is opened ++static int set_use_inc(void *data) ++{ ++ int result; ++ unsigned long flags; ++ ++ /* initialize timestamp */ ++ do_gettimeofday(&lasttv); ++ ++ result = request_irq(gpiochip->to_irq(gpiochip, gpio_in_pin), ++ (irq_handler_t) irq_handler, 0, ++ LIRC_DRIVER_NAME, (void*) 0); ++ ++ switch (result) { ++ case -EBUSY: ++ printk(KERN_ERR LIRC_DRIVER_NAME ++ ": IRQ %d is busy\n", ++ gpiochip->to_irq(gpiochip, gpio_in_pin)); ++ return -EBUSY; ++ case -EINVAL: ++ printk(KERN_ERR LIRC_DRIVER_NAME ++ ": Bad irq number or handler\n"); ++ return -EINVAL; ++ default: ++ dprintk("Interrupt %d obtained\n", ++ gpiochip->to_irq(gpiochip, gpio_in_pin)); ++ break; ++ }; ++ ++ /* initialize pulse/space widths */ ++ init_timing_params(duty_cycle, freq); ++ ++ spin_lock_irqsave(&lock, flags); ++ ++ /* GPIO Pin Falling/Rising Edge Detect Enable */ ++ irqchip->irq_set_type(irqdata, ++ IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING); ++ ++ /* unmask the irq */ ++ irqchip->irq_unmask(irqdata); ++ ++ spin_unlock_irqrestore(&lock, flags); ++ ++ return 0; ++} ++ ++static void set_use_dec(void *data) ++{ ++ unsigned long flags; ++ ++ spin_lock_irqsave(&lock, flags); ++ ++ /* GPIO Pin Falling/Rising Edge Detect Disable */ ++ irqchip->irq_set_type(irqdata, 0); ++ irqchip->irq_mask(irqdata); ++ ++ spin_unlock_irqrestore(&lock, flags); ++ ++ free_irq(gpiochip->to_irq(gpiochip, gpio_in_pin), (void *) 0); ++ ++ dprintk(KERN_INFO LIRC_DRIVER_NAME ++ ": freed IRQ %d\n", gpiochip->to_irq(gpiochip, gpio_in_pin)); ++} ++ ++static ssize_t lirc_write(struct file *file, const char *buf, ++ size_t n, loff_t *ppos) ++{ ++ int i, count; ++ unsigned long flags; ++ long delta = 0; ++ int *wbuf; ++ ++ count = n / sizeof(int); ++ if (n % sizeof(int) || count % 2 == 0) ++ return -EINVAL; ++ wbuf = memdup_user(buf, n); ++ if (IS_ERR(wbuf)) ++ return PTR_ERR(wbuf); ++ spin_lock_irqsave(&lock, flags); ++ ++ for (i = 0; i < count; i++) { ++ if (i%2) ++ send_space(wbuf[i] - delta); ++ else ++ delta = send_pulse(wbuf[i]); ++ } ++ gpiochip->set(gpiochip, gpio_out_pin, invert); ++ ++ spin_unlock_irqrestore(&lock, flags); ++ kfree(wbuf); ++ return n; ++} ++ ++static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) ++{ ++ int result; ++ __u32 value; ++ ++ switch (cmd) { ++ case LIRC_GET_SEND_MODE: ++ return -ENOIOCTLCMD; ++ break; ++ ++ case LIRC_SET_SEND_MODE: ++ result = get_user(value, (__u32 *) arg); ++ if (result) ++ return result; ++ /* only LIRC_MODE_PULSE supported */ ++ if (value != LIRC_MODE_PULSE) ++ return -ENOSYS; ++ break; ++ ++ case LIRC_GET_LENGTH: ++ return -ENOSYS; ++ break; ++ ++ case LIRC_SET_SEND_DUTY_CYCLE: ++ dprintk("SET_SEND_DUTY_CYCLE\n"); ++ result = get_user(value, (__u32 *) arg); ++ if (result) ++ return result; ++ if (value <= 0 || value > 100) ++ return -EINVAL; ++ return init_timing_params(value, freq); ++ break; ++ ++ case LIRC_SET_SEND_CARRIER: ++ dprintk("SET_SEND_CARRIER\n"); ++ result = get_user(value, (__u32 *) arg); ++ if (result) ++ return result; ++ if (value > 500000 || value < 20000) ++ return -EINVAL; ++ return init_timing_params(duty_cycle, value); ++ break; ++ ++ default: ++ return lirc_dev_fop_ioctl(filep, cmd, arg); ++ } ++ return 0; ++} ++ ++static const struct file_operations lirc_fops = { ++ .owner = THIS_MODULE, ++ .write = lirc_write, ++ .unlocked_ioctl = lirc_ioctl, ++ .read = lirc_dev_fop_read, ++ .poll = lirc_dev_fop_poll, ++ .open = lirc_dev_fop_open, ++ .release = lirc_dev_fop_close, ++ .llseek = no_llseek, ++}; ++ ++static struct lirc_driver driver = { ++ .name = LIRC_DRIVER_NAME, ++ .minor = -1, ++ .code_length = 1, ++ .sample_rate = 0, ++ .data = NULL, ++ .add_to_buf = NULL, ++ .rbuf = &rbuf, ++ .set_use_inc = set_use_inc, ++ .set_use_dec = set_use_dec, ++ .fops = &lirc_fops, ++ .dev = NULL, ++ .owner = THIS_MODULE, ++}; ++ ++static struct platform_driver lirc_rpi_driver = { ++ .driver = { ++ .name = LIRC_DRIVER_NAME, ++ .owner = THIS_MODULE, ++ }, ++}; ++ ++static int __init lirc_rpi_init(void) ++{ ++ int result; ++ ++ /* Init read buffer. */ ++ result = lirc_buffer_init(&rbuf, sizeof(int), RBUF_LEN); ++ if (result < 0) ++ return -ENOMEM; ++ ++ result = platform_driver_register(&lirc_rpi_driver); ++ if (result) { ++ printk(KERN_ERR LIRC_DRIVER_NAME ++ ": lirc register returned %d\n", result); ++ goto exit_buffer_free; ++ } ++ ++ lirc_rpi_dev = platform_device_alloc(LIRC_DRIVER_NAME, 0); ++ if (!lirc_rpi_dev) { ++ result = -ENOMEM; ++ goto exit_driver_unregister; ++ } ++ ++ result = platform_device_add(lirc_rpi_dev); ++ if (result) ++ goto exit_device_put; ++ ++ return 0; ++ ++ exit_device_put: ++ platform_device_put(lirc_rpi_dev); ++ ++ exit_driver_unregister: ++ platform_driver_unregister(&lirc_rpi_driver); ++ ++ exit_buffer_free: ++ lirc_buffer_free(&rbuf); ++ ++ return result; ++} ++ ++static void lirc_rpi_exit(void) ++{ ++ gpio_free(gpio_out_pin); ++ gpio_free(gpio_in_pin); ++ platform_device_unregister(lirc_rpi_dev); ++ platform_driver_unregister(&lirc_rpi_driver); ++ lirc_buffer_free(&rbuf); ++} ++ ++static int __init lirc_rpi_init_module(void) ++{ ++ int result, i; ++ ++ result = lirc_rpi_init(); ++ if (result) ++ return result; ++ ++ /* check if the module received valid gpio pin numbers */ ++ result = 0; ++ if (gpio_in_pin != gpio_out_pin) { ++ for(i = 0; (i < ARRAY_SIZE(valid_gpio_pins)) && (result != 2); i++) { ++ if (gpio_in_pin == valid_gpio_pins[i] || ++ gpio_out_pin == valid_gpio_pins[i]) { ++ result++; ++ } ++ } ++ } ++ ++ if (result != 2) { ++ result = -EINVAL; ++ printk(KERN_ERR LIRC_DRIVER_NAME ++ ": invalid GPIO pin(s) specified!\n"); ++ goto exit_rpi; ++ } ++ ++ driver.features = LIRC_CAN_SET_SEND_DUTY_CYCLE | ++ LIRC_CAN_SET_SEND_CARRIER | ++ LIRC_CAN_SEND_PULSE | ++ LIRC_CAN_REC_MODE2; ++ ++ driver.dev = &lirc_rpi_dev->dev; ++ driver.minor = lirc_register_driver(&driver); ++ ++ if (driver.minor < 0) { ++ printk(KERN_ERR LIRC_DRIVER_NAME ++ ": device registration failed with %d\n", result); ++ result = -EIO; ++ goto exit_rpi; ++ } ++ ++ printk(KERN_INFO LIRC_DRIVER_NAME ": driver registered!\n"); ++ ++ result = init_port(); ++ if (result < 0) ++ goto exit_rpi; ++ ++ return 0; ++ ++ exit_rpi: ++ lirc_rpi_exit(); ++ ++ return result; ++} ++ ++static void __exit lirc_rpi_exit_module(void) ++{ ++ lirc_rpi_exit(); ++ ++ lirc_unregister_driver(driver.minor); ++ printk(KERN_INFO LIRC_DRIVER_NAME ": cleaned up module\n"); ++} ++ ++module_init(lirc_rpi_init_module); ++module_exit(lirc_rpi_exit_module); ++ ++MODULE_DESCRIPTION("Infra-red receiver and blaster driver for Raspberry Pi GPIO."); ++MODULE_AUTHOR("Aron Robert Szabo "); ++MODULE_AUTHOR("Michael Bishop "); ++MODULE_LICENSE("GPL"); ++ ++module_param(gpio_out_pin, int, S_IRUGO); ++MODULE_PARM_DESC(gpio_out_pin, "GPIO output/transmitter pin number of the BCM" ++ " processor. Valid pin numbers are: 0, 1, 4, 8, 7, 9, 10, 11," ++ " 14, 15, 17, 18, 21, 22, 23, 24, 25, default 17"); ++ ++module_param(gpio_in_pin, int, S_IRUGO); ++MODULE_PARM_DESC(gpio_in_pin, "GPIO input pin number of the BCM processor." ++ " Valid pin numbers are: 0, 1, 4, 8, 7, 9, 10, 11, 14, 15," ++ " 17, 18, 21, 22, 23, 24, 25, default 18"); ++ ++module_param(sense, bool, S_IRUGO); ++MODULE_PARM_DESC(sense, "Override autodetection of IR receiver circuit" ++ " (0 = active high, 1 = active low )"); ++ ++module_param(softcarrier, bool, S_IRUGO); ++MODULE_PARM_DESC(softcarrier, "Software carrier (0 = off, 1 = on, default on)"); ++ ++module_param(invert, bool, S_IRUGO); ++MODULE_PARM_DESC(invert, "Invert output (0 = off, 1 = on, default off"); ++ ++module_param(debug, bool, S_IRUGO | S_IWUSR); ++MODULE_PARM_DESC(debug, "Enable debugging messages"); diff -Naur linux-3.6.11/drivers/staging/media/lirc/Makefile linux-rpi-3.6.y/drivers/staging/media/lirc/Makefile +--- linux-3.6.11/drivers/staging/media/lirc/Makefile 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/staging/media/lirc/Makefile 2013-02-28 04:23:38.472543409 +0100 +@@ -7,6 +7,7 @@ + obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o + obj-$(CONFIG_LIRC_IMON) += lirc_imon.o + obj-$(CONFIG_LIRC_PARALLEL) += lirc_parallel.o ++obj-$(CONFIG_LIRC_RPI) += lirc_rpi.o + obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o + obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o + obj-$(CONFIG_LIRC_SIR) += lirc_sir.o diff -Naur linux-3.6.11/drivers/thermal/bcm2835-thermal.c linux-rpi-3.6.y/drivers/thermal/bcm2835-thermal.c --- linux-3.6.11/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/thermal/bcm2835-thermal.c 2013-02-17 02:54:37.868510765 +0100 -@@ -0,0 +1,208 @@ ++++ linux-rpi-3.6.y/drivers/thermal/bcm2835-thermal.c 2013-02-28 04:23:39.657538784 +0100 +@@ -0,0 +1,184 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. +* @@ -28029,7 +28763,6 @@ diff -Naur linux-3.6.11/drivers/thermal/bcm2835-thermal.c linux-rpi-3.6.y/driver +#define print_debug(fmt,...) +#endif +#define print_err(fmt,...) printk(KERN_ERR "%s:%s:%d: "fmt"\n", MODULE_NAME, __func__,__LINE__, ##__VA_ARGS__) -+#define print_info(fmt,...) printk(KERN_INFO "%s: "fmt"\n", MODULE_NAME, ##__VA_ARGS__) + +#define VC_TAG_GET_TEMP 0x00030006 +#define VC_TAG_GET_MAX_TEMP 0x0003000A @@ -28062,12 +28795,6 @@ diff -Naur linux-3.6.11/drivers/thermal/bcm2835-thermal.c linux-rpi-3.6.y/driver + struct vc_msg msg; +}; + -+/* --- PROTOTYPES --- */ -+static int bcm2835_get_temp(struct thermal_zone_device *thermal_dev, unsigned long *); -+static int bcm2835_get_max_temp(struct thermal_zone_device *thermal_dev, int, unsigned long *); -+static int bcm2835_get_trip_type(struct thermal_zone_device *thermal_dev, int trip_num, enum thermal_trip_type *trip_type); -+static int bcm2835_get_mode(struct thermal_zone_device *thermal_dev, enum thermal_device_mode *dev_mode); -+ +/* --- GLOBALS --- */ +static struct bcm2835_thermal_data bcm2835_data; + @@ -28075,64 +28802,47 @@ diff -Naur linux-3.6.11/drivers/thermal/bcm2835-thermal.c linux-rpi-3.6.y/driver +static struct thermal_zone_device_ops ops; + +/* --- FUNCTIONS --- */ -+static int bcm2835_get_max_temp(struct thermal_zone_device *thermal_dev, int trip_num, unsigned long *temp) -+{ -+ int result; + ++static int bcm2835_get_temp_or_max(struct thermal_zone_device *thermal_dev, unsigned long *temp, unsigned tag_id) ++{ ++ int result = -1, retry = 3; + print_debug("IN"); + -+ /* wipe all previous message data */ -+ memset(&bcm2835_data.msg, 0, sizeof bcm2835_data.msg); ++ *temp = 0; ++ while (result != 0 && retry-- > 0) { ++ /* wipe all previous message data */ ++ memset(&bcm2835_data.msg, 0, sizeof bcm2835_data.msg); + -+ /* prepare message */ -+ bcm2835_data.msg.msg_size = sizeof bcm2835_data.msg; -+ bcm2835_data.msg.tag.buffer_size = 8; -+ bcm2835_data.msg.tag.tag_id = VC_TAG_GET_MAX_TEMP; ++ /* prepare message */ ++ bcm2835_data.msg.msg_size = sizeof bcm2835_data.msg; ++ bcm2835_data.msg.tag.buffer_size = 8; ++ bcm2835_data.msg.tag.tag_id = tag_id; + -+ /* send the message */ -+ result = bcm_mailbox_property(&bcm2835_data.msg, sizeof bcm2835_data.msg); ++ /* send the message */ ++ result = bcm_mailbox_property(&bcm2835_data.msg, sizeof bcm2835_data.msg); ++ print_debug("Got %stemperature as %u (%d,%x)\n", tag_id==VC_TAG_GET_MAX_TEMP ? "max ":"", (uint)bcm2835_data.msg.tag.val, result, bcm2835_data.msg.request_code); ++ if (!(bcm2835_data.msg.request_code & 0x80000000)) ++ result = -1; ++ } + + /* check if it was all ok and return the rate in milli degrees C */ -+ if (result == 0 && (bcm2835_data.msg.request_code & 0x80000000)) ++ if (result == 0) + *temp = (uint)bcm2835_data.msg.tag.val; -+ #ifdef THERMAL_DEBUG_ENABLE + else -+ print_debug("Failed to get temperature!"); -+ #endif -+ print_debug("Got temperature as %u",(uint)*temp); ++ print_err("Failed to get temperature! (%x:%d)\n", tag_id, result); + print_debug("OUT"); -+ return 0; ++ return result; +} + +static int bcm2835_get_temp(struct thermal_zone_device *thermal_dev, unsigned long *temp) +{ -+ int result; -+ -+ print_debug("IN"); -+ -+ /* wipe all previous message data */ -+ memset(&bcm2835_data.msg, 0, sizeof bcm2835_data.msg); -+ -+ /* prepare message */ -+ bcm2835_data.msg.msg_size = sizeof bcm2835_data.msg; -+ bcm2835_data.msg.tag.buffer_size = 8; -+ bcm2835_data.msg.tag.tag_id = VC_TAG_GET_TEMP; -+ -+ /* send the message */ -+ result = bcm_mailbox_property(&bcm2835_data.msg, sizeof bcm2835_data.msg); -+ -+ /* check if it was all ok and return the rate in milli degrees C */ -+ if (result == 0 && (bcm2835_data.msg.request_code & 0x80000000)) -+ *temp = (uint)bcm2835_data.msg.tag.val; -+ #ifdef THERMAL_DEBUG_ENABLE -+ else -+ print_debug("Failed to get temperature!"); -+ #endif -+ print_debug("Got temperature as %u",(uint)*temp); -+ print_debug("OUT"); -+ return 0; ++ return bcm2835_get_temp_or_max(thermal_dev, temp, VC_TAG_GET_TEMP); +} + ++static int bcm2835_get_max_temp(struct thermal_zone_device *thermal_dev, int trip_num, unsigned long *temp) ++{ ++ return bcm2835_get_temp_or_max(thermal_dev, temp, VC_TAG_GET_MAX_TEMP); ++} + +static int bcm2835_get_trip_type(struct thermal_zone_device * thermal_dev, int trip_num, enum thermal_trip_type *trip_type) +{ @@ -28204,7 +28914,7 @@ diff -Naur linux-3.6.11/drivers/thermal/bcm2835-thermal.c linux-rpi-3.6.y/driver +module_platform_driver(bcm2835_thermal_driver); diff -Naur linux-3.6.11/drivers/thermal/Kconfig linux-rpi-3.6.y/drivers/thermal/Kconfig --- linux-3.6.11/drivers/thermal/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/thermal/Kconfig 2013-02-17 02:54:37.869510759 +0100 ++++ linux-rpi-3.6.y/drivers/thermal/Kconfig 2013-02-28 04:23:39.658538780 +0100 @@ -27,3 +27,14 @@ help Enable this to plug the SPEAr thermal sensor driver into the Linux @@ -28222,7 +28932,7 @@ diff -Naur linux-3.6.11/drivers/thermal/Kconfig linux-rpi-3.6.y/drivers/thermal/ + diff -Naur linux-3.6.11/drivers/thermal/Makefile linux-rpi-3.6.y/drivers/thermal/Makefile --- linux-3.6.11/drivers/thermal/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/thermal/Makefile 2013-02-17 02:54:37.867510771 +0100 ++++ linux-rpi-3.6.y/drivers/thermal/Makefile 2013-02-28 04:23:39.657538784 +0100 @@ -3,4 +3,5 @@ # @@ -28233,7 +28943,7 @@ diff -Naur linux-3.6.11/drivers/thermal/Makefile linux-rpi-3.6.y/drivers/thermal +obj-$(CONFIG_THERMAL_BCM2835) += bcm2835-thermal.o diff -Naur linux-3.6.11/drivers/usb/core/generic.c linux-rpi-3.6.y/drivers/usb/core/generic.c --- linux-3.6.11/drivers/usb/core/generic.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/core/generic.c 2013-02-17 02:54:37.494512903 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/generic.c 2013-02-28 04:23:39.515539338 +0100 @@ -149,6 +149,7 @@ dev_warn(&udev->dev, "no configuration chosen from %d choice%s\n", @@ -28244,7 +28954,7 @@ diff -Naur linux-3.6.11/drivers/usb/core/generic.c linux-rpi-3.6.y/drivers/usb/c } diff -Naur linux-3.6.11/drivers/usb/core/hub.c linux-rpi-3.6.y/drivers/usb/core/hub.c --- linux-3.6.11/drivers/usb/core/hub.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/core/hub.c 2013-02-17 02:54:37.497512886 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/hub.c 2013-02-28 04:23:39.517539330 +0100 @@ -25,7 +25,6 @@ #include #include @@ -28367,7 +29077,7 @@ diff -Naur linux-3.6.11/drivers/usb/core/hub.c linux-rpi-3.6.y/drivers/usb/core/ !hcd->driver->port_handed_over || diff -Naur linux-3.6.11/drivers/usb/core/message.c linux-rpi-3.6.y/drivers/usb/core/message.c --- linux-3.6.11/drivers/usb/core/message.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/core/message.c 2013-02-17 02:54:37.491512921 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/message.c 2013-02-28 04:23:39.513539346 +0100 @@ -1877,6 +1877,85 @@ if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) @@ -28456,7 +29166,7 @@ diff -Naur linux-3.6.11/drivers/usb/core/message.c linux-rpi-3.6.y/drivers/usb/c usb_unlocked_enable_lpm(dev); diff -Naur linux-3.6.11/drivers/usb/core/otg_whitelist.h linux-rpi-3.6.y/drivers/usb/core/otg_whitelist.h --- linux-3.6.11/drivers/usb/core/otg_whitelist.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/core/otg_whitelist.h 2013-02-17 02:54:37.490512926 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/otg_whitelist.h 2013-02-28 04:23:39.513539346 +0100 @@ -19,33 +19,82 @@ static struct usb_device_id whitelist_table [] = { @@ -28674,7 +29384,7 @@ diff -Naur linux-3.6.11/drivers/usb/core/otg_whitelist.h linux-rpi-3.6.y/drivers diff -Naur linux-3.6.11/drivers/usb/gadget/file_storage.c linux-rpi-3.6.y/drivers/usb/gadget/file_storage.c --- linux-3.6.11/drivers/usb/gadget/file_storage.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/gadget/file_storage.c 2013-02-17 02:54:37.442513201 +0100 ++++ linux-rpi-3.6.y/drivers/usb/gadget/file_storage.c 2013-02-28 04:23:39.510539357 +0100 @@ -573,8 +573,37 @@ .iConfiguration = FSG_STRING_CONFIG, .bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER, @@ -28804,7 +29514,7 @@ diff -Naur linux-3.6.11/drivers/usb/gadget/file_storage.c linux-rpi-3.6.y/driver if (!req) diff -Naur linux-3.6.11/drivers/usb/gadget/Kconfig linux-rpi-3.6.y/drivers/usb/gadget/Kconfig --- linux-3.6.11/drivers/usb/gadget/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/gadget/Kconfig 2013-02-17 02:54:37.437513229 +0100 ++++ linux-rpi-3.6.y/drivers/usb/gadget/Kconfig 2013-02-28 04:23:39.505539378 +0100 @@ -505,6 +505,12 @@ bool depends on USB_GADGET_DUALSPEED @@ -28820,7 +29530,7 @@ diff -Naur linux-3.6.11/drivers/usb/gadget/Kconfig linux-rpi-3.6.y/drivers/usb/g # diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/changes.txt linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/changes.txt --- linux-3.6.11/drivers/usb/host/dwc_common_port/changes.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/changes.txt 2013-02-17 02:54:37.290514070 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/changes.txt 2013-02-28 04:23:39.411539743 +0100 @@ -0,0 +1,174 @@ + +dwc_read_reg32() and friends now take an additional parameter, a pointer to an @@ -28998,7 +29708,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/changes.txt linux-rpi-3 +library code directly into a driver module, instead of as a standalone module. diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/doc/doxygen.cfg --- linux-3.6.11/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2013-02-17 02:54:37.293514053 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2013-02-28 04:23:39.413539736 +0100 @@ -0,0 +1,270 @@ +# Doxyfile 1.4.5 + @@ -29272,7 +29982,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-r +SEARCHENGINE = NO diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.c 2013-02-17 02:54:37.291514064 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.c 2013-02-28 04:23:39.411539743 +0100 @@ -0,0 +1,532 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $ @@ -29808,7 +30518,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi-3.6. +#endif /* DWC_CCLIB */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.h 2013-02-17 02:54:37.296514036 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.h 2013-02-28 04:23:39.414539733 +0100 @@ -0,0 +1,225 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $ @@ -30037,7 +30747,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi-3.6. + diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2013-02-17 02:54:37.296514036 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2013-02-28 04:23:39.414539733 +0100 @@ -0,0 +1,1308 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -31349,7 +32059,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_linux.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2013-02-17 02:54:37.292514059 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2013-02-28 04:23:39.412539740 +0100 @@ -0,0 +1,1421 @@ +#include +#include @@ -32774,7 +33484,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_linux.c linu +#endif /* DWC_LIBMODULE */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2013-02-17 02:54:37.293514053 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2013-02-28 04:23:39.413539736 +0100 @@ -0,0 +1,1275 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -34053,7 +34763,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.c 2013-02-17 02:54:37.290514070 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.c 2013-02-28 04:23:39.410539747 +0100 @@ -0,0 +1,308 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $ @@ -34365,7 +35075,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi- +#endif /* DWC_CRYPTOLIB */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.h 2013-02-17 02:54:37.296514036 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.h 2013-02-28 04:23:39.414539733 +0100 @@ -0,0 +1,111 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $ @@ -34480,7 +35190,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi- +#endif /* _DWC_CRYPTO_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.c 2013-02-17 02:54:37.290514070 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.c 2013-02-28 04:23:39.411539743 +0100 @@ -0,0 +1,291 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $ @@ -34775,7 +35485,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi-3.6. +#endif /* DWC_CRYPTOLIB */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.h 2013-02-17 02:54:37.291514064 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.h 2013-02-28 04:23:39.411539743 +0100 @@ -0,0 +1,106 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $ @@ -34885,7 +35595,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi-3.6. +#endif /* _DWC_DH_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_list.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_list.h 2013-02-17 02:54:37.292514059 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_list.h 2013-02-28 04:23:39.412539740 +0100 @@ -0,0 +1,594 @@ +/* $OpenBSD: queue.h,v 1.26 2004/05/04 16:59:32 grange Exp $ */ +/* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ @@ -35483,7 +36193,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi-3. +#endif /* _DWC_LIST_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_mem.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_mem.c 2013-02-17 02:54:37.291514064 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_mem.c 2013-02-28 04:23:39.412539740 +0100 @@ -0,0 +1,245 @@ +/* Memory Debugging */ +#ifdef DWC_DEBUG_MEMORY @@ -35732,7 +36442,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi-3.6 +#endif /* DWC_DEBUG_MEMORY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.c 2013-02-17 02:54:37.293514053 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.c 2013-02-28 04:23:39.413539736 +0100 @@ -0,0 +1,636 @@ +/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows. + * @@ -36372,7 +37082,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi- +#endif /*DWC_CRYPTOLIB */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.h 2013-02-17 02:54:37.292514059 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.h 2013-02-28 04:23:39.412539740 +0100 @@ -0,0 +1,34 @@ +/* + * dwc_modpow.h @@ -36410,7 +37120,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi- +#endif /* _LINUX_BIGNUM_H */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.c 2013-02-17 02:54:37.291514064 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.c 2013-02-28 04:23:39.411539743 +0100 @@ -0,0 +1,319 @@ +#ifdef DWC_NOTIFYLIB + @@ -36733,7 +37443,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rp +#endif /* DWC_NOTIFYLIB */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.h 2013-02-17 02:54:37.292514059 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.h 2013-02-28 04:23:39.412539740 +0100 @@ -0,0 +1,122 @@ + +#ifndef __DWC_NOTIFIER_H__ @@ -36859,7 +37569,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rp +#endif /* __DWC_NOTIFIER_H__ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_os.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_os.h 2013-02-17 02:54:37.293514053 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_os.h 2013-02-28 04:23:39.413539736 +0100 @@ -0,0 +1,1260 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $ @@ -38123,7 +38833,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi-3.6. +#endif /* _DWC_OS_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile --- linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile 2013-02-17 02:54:37.291514064 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile 2013-02-28 04:23:39.412539740 +0100 @@ -0,0 +1,58 @@ +# +# Makefile for DWC_common library @@ -38185,7 +38895,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile linux-rpi-3.6. + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.fbsd --- linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.fbsd 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.fbsd 2013-02-17 02:54:37.294514047 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.fbsd 2013-02-28 04:23:39.414539733 +0100 @@ -0,0 +1,17 @@ +CFLAGS += -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include +CFLAGS += -DDWC_FREEBSD @@ -38206,7 +38916,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi +.include diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.linux --- linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.linux 2013-02-17 02:54:37.290514070 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.linux 2013-02-28 04:23:39.410539747 +0100 @@ -0,0 +1,49 @@ +# +# Makefile for DWC_common library @@ -38259,7 +38969,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.linux linux-rp + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/usb.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/usb.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/usb.h 2013-02-17 02:54:37.295514041 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/usb.h 2013-02-28 04:23:39.414539733 +0100 @@ -0,0 +1,946 @@ +/* + * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -39209,7 +39919,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/usb.h linux-rpi-3.6.y/d +#endif /* _USB_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi-3.6.y/drivers/usb/host/dwc_otg/doc/doxygen.cfg --- linux-3.6.11/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2013-02-17 02:54:37.264514219 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2013-02-28 04:23:39.084541020 +0100 @@ -0,0 +1,224 @@ +# Doxyfile 1.3.9.1 + @@ -39437,7 +40147,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi-3.6.y +SEARCHENGINE = NO diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dummy_audio.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dummy_audio.c 2013-02-17 02:54:37.268514196 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dummy_audio.c 2013-02-28 04:23:39.087541009 +0100 @@ -0,0 +1,1575 @@ +/* + * zero.c -- Gadget Zero, for USB development @@ -41016,7 +41726,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi-3.6.y/d +module_exit (cleanup); diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_cfi_common.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2013-02-17 02:54:37.254514276 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2013-02-28 04:23:39.078541044 +0100 @@ -0,0 +1,142 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -41162,7 +41872,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi-3.6. +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2013-02-17 02:54:37.269514190 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2013-02-28 04:23:39.087541009 +0100 @@ -0,0 +1,854 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $ @@ -42020,7 +42730,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi-3.6.y/d +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2013-02-17 02:54:37.254514276 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2013-02-28 04:23:39.077541047 +0100 @@ -0,0 +1,80 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $ @@ -42104,7 +42814,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi-3.6.y/d +#endif //__DWC_OTG_ADP_H__ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2013-02-17 02:54:37.263514224 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2013-02-28 04:23:39.082541028 +0100 @@ -0,0 +1,1210 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $ @@ -43318,7 +44028,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi-3.6.y/ +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2013-02-17 02:54:37.268514196 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2013-02-28 04:23:39.087541009 +0100 @@ -0,0 +1,89 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $ @@ -43411,7 +44121,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi-3.6.y/ +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2013-02-17 02:54:37.264514219 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2013-02-28 04:23:39.084541020 +0100 @@ -0,0 +1,1876 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -45291,7 +46001,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi-3.6.y/d +#endif //DWC_UTE_CFI diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2013-02-17 02:54:37.265514213 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2013-02-28 04:23:39.084541020 +0100 @@ -0,0 +1,320 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -45615,7 +46325,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi-3.6.y/d +#endif /* (__DWC_OTG_CFI_H__) */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2013-02-17 02:54:37.271514179 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2013-02-28 04:23:39.088541004 +0100 @@ -0,0 +1,7151 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $ @@ -52770,7 +53480,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi-3.6.y/d +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2013-02-17 02:54:37.266514207 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2013-02-28 04:23:39.085541017 +0100 @@ -0,0 +1,1464 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $ @@ -54238,7 +54948,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi-3.6.y/d +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2013-02-17 02:54:37.255514270 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2013-02-28 04:23:39.079541040 +0100 @@ -0,0 +1,1571 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $ @@ -55813,7 +56523,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi-3. +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_core_if.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2013-02-17 02:54:37.265514213 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2013-02-28 04:23:39.084541020 +0100 @@ -0,0 +1,705 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $ @@ -56522,7 +57232,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi-3.6 +#endif /* __DWC_CORE_IF_H__ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_dbg.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2013-02-17 02:54:37.255514270 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2013-02-28 04:23:39.078541044 +0100 @@ -0,0 +1,117 @@ +/* ========================================================================== + * @@ -56643,7 +57353,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi-3.6.y/d +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2013-02-17 02:54:37.262514230 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2013-02-28 04:23:39.081541032 +0100 @@ -0,0 +1,1732 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $ @@ -58379,7 +59089,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi-3.6. +*/ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2013-02-17 02:54:37.260514242 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2013-02-28 04:23:39.080541036 +0100 @@ -0,0 +1,86 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $ @@ -58469,7 +59179,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi-3.6. +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2013-02-17 02:54:37.263514224 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2013-02-28 04:23:39.083541024 +0100 @@ -0,0 +1,3493 @@ + +/* ========================================================================== @@ -61966,7 +62676,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi-3.6.y/d +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2013-02-17 02:54:37.268514196 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2013-02-28 04:23:39.086541013 +0100 @@ -0,0 +1,1132 @@ +/*========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $ @@ -63102,7 +63812,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi-3. +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2013-02-17 02:54:37.252514287 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2013-02-28 04:23:39.076541051 +0100 @@ -0,0 +1,829 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $ @@ -63935,7 +64645,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi-3.6.y/d +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2013-02-17 02:54:37.265514213 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2013-02-28 04:23:39.085541017 +0100 @@ -0,0 +1,417 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $ @@ -64356,7 +65066,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi-3.6. +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2013-02-17 02:54:37.257514259 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2013-02-28 04:23:39.080541036 +0100 @@ -0,0 +1,2248 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $ @@ -66608,7 +67318,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3. +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2013-02-17 02:54:37.253514281 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2013-02-28 04:23:39.077541047 +0100 @@ -0,0 +1,938 @@ + +/* ========================================================================== @@ -67550,7 +68260,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi-3 +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2013-02-17 02:54:37.255514270 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2013-02-28 04:23:39.079541040 +0100 @@ -0,0 +1,958 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $ @@ -68512,7 +69222,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi-3 +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 2013-02-17 02:54:37.255514270 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 2013-02-28 04:23:39.078541044 +0100 @@ -0,0 +1,113 @@ +#include "dwc_otg_regs.h" +#include "dwc_otg_dbg.h" @@ -68629,7 +69339,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-rpi-3. +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 2013-02-17 02:54:37.253514281 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 2013-02-28 04:23:39.077541047 +0100 @@ -0,0 +1,36 @@ +#ifndef __DWC_OTG_MPHI_FIX_H__ +#define __DWC_OTG_MPHI_FIX_H__ @@ -68669,7 +69379,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-rpi-3. +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2013-02-17 02:54:37.268514196 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2013-02-28 04:23:39.087541009 +0100 @@ -0,0 +1,188 @@ +#ifndef _DWC_OS_DEP_H_ +#define _DWC_OS_DEP_H_ @@ -68861,7 +69571,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi-3.6. +#endif /* _DWC_OS_DEP_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2013-02-17 02:54:37.260514242 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2013-02-28 04:23:39.080541036 +0100 @@ -0,0 +1,2708 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $ @@ -71573,7 +72283,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi-3.6.y/d +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2013-02-17 02:54:37.262514230 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2013-02-28 04:23:39.082541028 +0100 @@ -0,0 +1,266 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $ @@ -71843,7 +72553,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi-3.6.y/d +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2013-02-17 02:54:37.253514281 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2013-02-28 04:23:39.077541047 +0100 @@ -0,0 +1,360 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $ @@ -72207,7 +72917,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi-3.6. +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2013-02-17 02:54:37.261514236 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2013-02-28 04:23:39.081541032 +0100 @@ -0,0 +1,5147 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $ @@ -77358,7 +78068,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi-3. +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2013-02-17 02:54:37.266514207 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2013-02-28 04:23:39.085541017 +0100 @@ -0,0 +1,1374 @@ + /* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $ @@ -78736,7 +79446,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi-3 +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_regs.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2013-02-17 02:54:37.263514224 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2013-02-28 04:23:39.082541028 +0100 @@ -0,0 +1,2550 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $ @@ -81290,7 +82000,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi-3.6.y/ +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/Makefile linux-rpi-3.6.y/drivers/usb/host/dwc_otg/Makefile --- linux-3.6.11/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/Makefile 2013-02-17 02:54:37.254514276 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/Makefile 2013-02-28 04:23:39.077541047 +0100 @@ -0,0 +1,81 @@ +# +# Makefile for DWC_otg Highspeed USB controller driver @@ -81375,7 +82085,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/Makefile linux-rpi-3.6.y/driver +endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm --- linux-3.6.11/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2013-02-17 02:54:37.267514201 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2013-02-28 04:23:39.086541013 +0100 @@ -0,0 +1,337 @@ +package dwc_otg_test; + @@ -81716,7 +82426,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi- +1; diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/Makefile linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/Makefile --- linux-3.6.11/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/Makefile 2013-02-17 02:54:37.267514201 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/Makefile 2013-02-28 04:23:39.086541013 +0100 @@ -0,0 +1,16 @@ + +PERL=/usr/bin/perl @@ -81736,7 +82446,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/Makefile linux-rpi-3.6.y/d + done diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_mod_param.pl --- linux-3.6.11/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2013-02-17 02:54:37.267514201 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2013-02-28 04:23:39.086541013 +0100 @@ -0,0 +1,133 @@ +#!/usr/bin/perl -w +# @@ -81873,7 +82583,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rp +0; diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_sysfs.pl --- linux-3.6.11/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2013-02-17 02:54:37.267514201 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2013-02-28 04:23:39.086541013 +0100 @@ -0,0 +1,193 @@ +#!/usr/bin/perl -w +# @@ -82070,7 +82780,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi-3. +0; diff -Naur linux-3.6.11/drivers/usb/host/Kconfig linux-rpi-3.6.y/drivers/usb/host/Kconfig --- linux-3.6.11/drivers/usb/host/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/Kconfig 2013-02-17 02:54:37.308513967 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/Kconfig 2013-02-28 04:23:39.422539701 +0100 @@ -610,6 +610,19 @@ To compile this driver a module, choose M here: the module will be called "hwa-hc". @@ -82093,7 +82803,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/Kconfig linux-rpi-3.6.y/drivers/usb/hos depends on USB && ARM && ARCH_MXC diff -Naur linux-3.6.11/drivers/usb/host/Makefile linux-rpi-3.6.y/drivers/usb/host/Makefile --- linux-3.6.11/drivers/usb/host/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/Makefile 2013-02-17 02:54:37.283514110 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/Makefile 2013-02-28 04:23:39.404539771 +0100 @@ -37,6 +37,8 @@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o @@ -82105,7 +82815,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/Makefile linux-rpi-3.6.y/drivers/usb/ho obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o diff -Naur linux-3.6.11/drivers/usb/Makefile linux-rpi-3.6.y/drivers/usb/Makefile --- linux-3.6.11/drivers/usb/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/Makefile 2013-02-17 02:54:37.337513801 +0100 ++++ linux-rpi-3.6.y/drivers/usb/Makefile 2013-02-28 04:23:39.440539631 +0100 @@ -25,6 +25,7 @@ obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ @@ -82116,7 +82826,7 @@ diff -Naur linux-3.6.11/drivers/usb/Makefile linux-rpi-3.6.y/drivers/usb/Makefil diff -Naur linux-3.6.11/drivers/video/bcm2708_fb.c linux-rpi-3.6.y/drivers/video/bcm2708_fb.c --- linux-3.6.11/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/bcm2708_fb.c 2013-02-17 02:54:34.498530035 +0100 ++++ linux-rpi-3.6.y/drivers/video/bcm2708_fb.c 2013-02-28 04:23:36.517551041 +0100 @@ -0,0 +1,491 @@ +/* + * linux/drivers/video/bcm2708_fb.c @@ -82609,9 +83319,30 @@ diff -Naur linux-3.6.11/drivers/video/bcm2708_fb.c linux-rpi-3.6.y/drivers/video +MODULE_PARM_DESC(fbwidth, "Width of ARM Framebuffer"); +MODULE_PARM_DESC(fbheight, "Height of ARM Framebuffer"); +MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer"); +diff -Naur linux-3.6.11/drivers/video/console/fbcon.c linux-rpi-3.6.y/drivers/video/console/fbcon.c +--- linux-3.6.11/drivers/video/console/fbcon.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/video/console/fbcon.c 2013-02-28 04:23:36.601550714 +0100 +@@ -1242,8 +1242,16 @@ + if (!height || !width) + return; + +- if (sy < vc->vc_top && vc->vc_top == logo_lines) ++ if (sy < vc->vc_top && vc->vc_top == logo_lines) { + vc->vc_top = 0; ++ /* ++ * If the font dimensions are not an integral of the display ++ * dimensions then the ops->clear below won't end up clearing ++ * the margins. Call clear_margins here in case the logo ++ * bitmap stretched into the margin area. ++ */ ++ fbcon_clear_margins(vc, 0); ++ } + + /* Split blits that cross physical y_wrap boundary */ + diff -Naur linux-3.6.11/drivers/video/Kconfig linux-rpi-3.6.y/drivers/video/Kconfig --- linux-3.6.11/drivers/video/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/Kconfig 2013-02-17 02:54:34.628529292 +0100 ++++ linux-rpi-3.6.y/drivers/video/Kconfig 2013-02-28 04:23:36.619550644 +0100 @@ -312,6 +312,20 @@ help Support the Permedia2 FIFO disconnect feature. @@ -82635,7 +83366,7 @@ diff -Naur linux-3.6.11/drivers/video/Kconfig linux-rpi-3.6.y/drivers/video/Kcon depends on FB && ARM && ARM_AMBA diff -Naur linux-3.6.11/drivers/video/logo/logo_linux_clut224.ppm linux-rpi-3.6.y/drivers/video/logo/logo_linux_clut224.ppm --- linux-3.6.11/drivers/video/logo/logo_linux_clut224.ppm 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/logo/logo_linux_clut224.ppm 2013-02-17 02:54:34.593529492 +0100 ++++ linux-rpi-3.6.y/drivers/video/logo/logo_linux_clut224.ppm 2013-02-28 04:23:36.591550752 +0100 @@ -1,1604 +1,883 @@ P3 -# Standard 224-color Linux logo @@ -85124,7 +85855,7 @@ diff -Naur linux-3.6.11/drivers/video/logo/logo_linux_clut224.ppm linux-rpi-3.6. +0 0 0 0 0 0 0 0 0 diff -Naur linux-3.6.11/drivers/video/Makefile linux-rpi-3.6.y/drivers/video/Makefile --- linux-3.6.11/drivers/video/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/Makefile 2013-02-17 02:54:34.537529812 +0100 ++++ linux-rpi-3.6.y/drivers/video/Makefile 2013-02-28 04:23:36.548550920 +0100 @@ -99,6 +99,7 @@ obj-$(CONFIG_FB_PVR2) += pvr2fb.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o @@ -85135,7 +85866,7 @@ diff -Naur linux-3.6.11/drivers/video/Makefile linux-rpi-3.6.y/drivers/video/Mak obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o diff -Naur linux-3.6.11/drivers/watchdog/bcm2708_wdog.c linux-rpi-3.6.y/drivers/watchdog/bcm2708_wdog.c --- linux-3.6.11/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/watchdog/bcm2708_wdog.c 2013-02-17 02:54:38.562506796 +0100 ++++ linux-rpi-3.6.y/drivers/watchdog/bcm2708_wdog.c 2013-02-28 04:23:40.165536800 +0100 @@ -0,0 +1,385 @@ +/* + * Broadcom BCM2708 watchdog driver. @@ -85524,7 +86255,7 @@ diff -Naur linux-3.6.11/drivers/watchdog/bcm2708_wdog.c linux-rpi-3.6.y/drivers/ + diff -Naur linux-3.6.11/drivers/watchdog/Kconfig linux-rpi-3.6.y/drivers/watchdog/Kconfig --- linux-3.6.11/drivers/watchdog/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/watchdog/Kconfig 2013-02-17 02:54:38.571506745 +0100 ++++ linux-rpi-3.6.y/drivers/watchdog/Kconfig 2013-02-28 04:23:40.185536723 +0100 @@ -352,6 +352,12 @@ To compile this driver as a module, choose M here: the module will be called imx2_wdt. @@ -85540,7 +86271,7 @@ diff -Naur linux-3.6.11/drivers/watchdog/Kconfig linux-rpi-3.6.y/drivers/watchdo config AT32AP700X_WDT diff -Naur linux-3.6.11/drivers/watchdog/Makefile linux-rpi-3.6.y/drivers/watchdog/Makefile --- linux-3.6.11/drivers/watchdog/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/watchdog/Makefile 2013-02-17 02:54:38.556506831 +0100 ++++ linux-rpi-3.6.y/drivers/watchdog/Makefile 2013-02-28 04:23:40.149536862 +0100 @@ -52,6 +52,7 @@ obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o @@ -85549,10 +86280,9 @@ diff -Naur linux-3.6.11/drivers/watchdog/Makefile linux-rpi-3.6.y/drivers/watchd # AVR32 Architecture obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o -diff -Naur linux-3.6.11/.gitignore linux-rpi-3.6.y/.gitignore diff -Naur linux-3.6.11/include/linux/broadcom/vc_cma.h linux-rpi-3.6.y/include/linux/broadcom/vc_cma.h --- linux-3.6.11/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/include/linux/broadcom/vc_cma.h 2013-02-17 02:54:25.167583390 +0100 ++++ linux-rpi-3.6.y/include/linux/broadcom/vc_cma.h 2013-02-28 04:23:28.681581633 +0100 @@ -0,0 +1,30 @@ +/***************************************************************************** +* Copyright 2012 Broadcom Corporation. All rights reserved. @@ -85586,7 +86316,7 @@ diff -Naur linux-3.6.11/include/linux/broadcom/vc_cma.h linux-rpi-3.6.y/include/ + diff -Naur linux-3.6.11/include/linux/mmc/host.h linux-rpi-3.6.y/include/linux/mmc/host.h --- linux-3.6.11/include/linux/mmc/host.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/include/linux/mmc/host.h 2013-02-17 02:54:25.120583659 +0100 ++++ linux-rpi-3.6.y/include/linux/mmc/host.h 2013-02-28 04:23:28.637581805 +0100 @@ -257,6 +257,7 @@ #define MMC_CAP2_HC_ERASE_SZ (1 << 9) /* High-capacity erase size */ #define MMC_CAP2_CD_ACTIVE_HIGH (1 << 10) /* Card-detect signal active high */ @@ -85597,7 +86327,7 @@ diff -Naur linux-3.6.11/include/linux/mmc/host.h linux-rpi-3.6.y/include/linux/m unsigned int power_notify_type; diff -Naur linux-3.6.11/include/linux/mmc/sdhci.h linux-rpi-3.6.y/include/linux/mmc/sdhci.h --- linux-3.6.11/include/linux/mmc/sdhci.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/include/linux/mmc/sdhci.h 2013-02-17 02:54:25.123583642 +0100 ++++ linux-rpi-3.6.y/include/linux/mmc/sdhci.h 2013-02-28 04:23:28.639581797 +0100 @@ -93,6 +93,7 @@ #define SDHCI_QUIRK2_HOST_OFF_CARD_ON (1<<0) @@ -85624,7 +86354,7 @@ diff -Naur linux-3.6.11/include/linux/mmc/sdhci.h linux-rpi-3.6.y/include/linux/ diff -Naur linux-3.6.11/include/net/bluetooth/hci.h linux-rpi-3.6.y/include/net/bluetooth/hci.h --- linux-3.6.11/include/net/bluetooth/hci.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/include/net/bluetooth/hci.h 2013-02-17 02:54:25.515581401 +0100 ++++ linux-rpi-3.6.y/include/net/bluetooth/hci.h 2013-02-28 04:23:28.955580564 +0100 @@ -142,7 +142,7 @@ #define HCI_DISCONN_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */ #define HCI_PAIRING_TIMEOUT msecs_to_jiffies(60000) /* 60 seconds */ @@ -85636,7 +86366,7 @@ diff -Naur linux-3.6.11/include/net/bluetooth/hci.h linux-rpi-3.6.y/include/net/ diff -Naur linux-3.6.11/kernel/module.c linux-rpi-3.6.y/kernel/module.c --- linux-3.6.11/kernel/module.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/kernel/module.c 2013-02-17 02:54:24.301588342 +0100 ++++ linux-rpi-3.6.y/kernel/module.c 2013-02-28 04:23:27.986584347 +0100 @@ -2680,20 +2680,23 @@ memset(ptr, 0, mod->core_size); mod->module_core = ptr; @@ -85676,7 +86406,7 @@ diff -Naur linux-3.6.11/kernel/module.c linux-rpi-3.6.y/kernel/module.c pr_debug("final section addresses:\n"); diff -Naur linux-3.6.11/net/core/skbuff.c linux-rpi-3.6.y/net/core/skbuff.c --- linux-3.6.11/net/core/skbuff.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/net/core/skbuff.c 2013-02-17 02:54:24.543586958 +0100 ++++ linux-rpi-3.6.y/net/core/skbuff.c 2013-02-28 04:23:28.190583549 +0100 @@ -340,43 +340,57 @@ EXPORT_SYMBOL(build_skb); @@ -85753,7 +86483,7 @@ diff -Naur linux-3.6.11/net/core/skbuff.c linux-rpi-3.6.y/net/core/skbuff.c local_irq_restore(flags); diff -Naur linux-3.6.11/sound/arm/bcm2835.c linux-rpi-3.6.y/sound/arm/bcm2835.c --- linux-3.6.11/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835.c 2013-02-17 02:54:26.046578364 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835.c 2013-02-28 04:23:29.322579131 +0100 @@ -0,0 +1,413 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -86170,7 +86900,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835.c linux-rpi-3.6.y/sound/arm/bcm2835.c +MODULE_ALIAS("platform:bcm2835_alsa"); diff -Naur linux-3.6.11/sound/arm/bcm2835-ctl.c linux-rpi-3.6.y/sound/arm/bcm2835-ctl.c --- linux-3.6.11/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835-ctl.c 2013-02-17 02:54:26.045578370 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835-ctl.c 2013-02-28 04:23:29.321579135 +0100 @@ -0,0 +1,200 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -86374,7 +87104,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835-ctl.c linux-rpi-3.6.y/sound/arm/bcm283 +} diff -Naur linux-3.6.11/sound/arm/bcm2835.h linux-rpi-3.6.y/sound/arm/bcm2835.h --- linux-3.6.11/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835.h 2013-02-17 02:54:26.043578381 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835.h 2013-02-28 04:23:29.320579139 +0100 @@ -0,0 +1,155 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -86533,7 +87263,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835.h linux-rpi-3.6.y/sound/arm/bcm2835.h +#endif /* __SOUND_ARM_BCM2835_H */ diff -Naur linux-3.6.11/sound/arm/bcm2835-pcm.c linux-rpi-3.6.y/sound/arm/bcm2835-pcm.c --- linux-3.6.11/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835-pcm.c 2013-02-17 02:54:26.043578381 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835-pcm.c 2013-02-28 04:23:29.319579142 +0100 @@ -0,0 +1,409 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -86946,7 +87676,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835-pcm.c linux-rpi-3.6.y/sound/arm/bcm283 +} diff -Naur linux-3.6.11/sound/arm/bcm2835-vchiq.c linux-rpi-3.6.y/sound/arm/bcm2835-vchiq.c --- linux-3.6.11/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835-vchiq.c 2013-02-17 02:54:26.044578376 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835-vchiq.c 2013-02-28 04:23:29.321579135 +0100 @@ -0,0 +1,844 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -87794,7 +88524,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835-vchiq.c linux-rpi-3.6.y/sound/arm/bcm2 +MODULE_PARM_DESC(force_bulk, "Force use of vchiq bulk for audio"); diff -Naur linux-3.6.11/sound/arm/Kconfig linux-rpi-3.6.y/sound/arm/Kconfig --- linux-3.6.11/sound/arm/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/Kconfig 2013-02-17 02:54:26.045578370 +0100 ++++ linux-rpi-3.6.y/sound/arm/Kconfig 2013-02-28 04:23:29.322579131 +0100 @@ -39,5 +39,12 @@ Say Y or M if you want to support any AC97 codec attached to the PXA2xx AC97 interface. @@ -87810,7 +88540,7 @@ diff -Naur linux-3.6.11/sound/arm/Kconfig linux-rpi-3.6.y/sound/arm/Kconfig diff -Naur linux-3.6.11/sound/arm/Makefile linux-rpi-3.6.y/sound/arm/Makefile --- linux-3.6.11/sound/arm/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/Makefile 2013-02-17 02:54:26.043578381 +0100 ++++ linux-rpi-3.6.y/sound/arm/Makefile 2013-02-28 04:23:29.320579139 +0100 @@ -14,3 +14,9 @@ obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o @@ -87823,7 +88553,7 @@ diff -Naur linux-3.6.11/sound/arm/Makefile linux-rpi-3.6.y/sound/arm/Makefile + diff -Naur linux-3.6.11/sound/arm/vc_vchi_audioserv_defs.h linux-rpi-3.6.y/sound/arm/vc_vchi_audioserv_defs.h --- linux-3.6.11/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/vc_vchi_audioserv_defs.h 2013-02-17 02:54:26.045578370 +0100 ++++ linux-rpi-3.6.y/sound/arm/vc_vchi_audioserv_defs.h 2013-02-28 04:23:29.322579131 +0100 @@ -0,0 +1,116 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -87943,7 +88673,7 @@ diff -Naur linux-3.6.11/sound/arm/vc_vchi_audioserv_defs.h linux-rpi-3.6.y/sound +#endif // _VC_AUDIO_DEFS_H_ diff -Naur linux-3.6.11/sound/pci/Kconfig linux-rpi-3.6.y/sound/pci/Kconfig --- linux-3.6.11/sound/pci/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/sound/pci/Kconfig 2013-02-17 02:54:26.188577553 +0100 ++++ linux-rpi-3.6.y/sound/pci/Kconfig 2013-02-28 04:23:29.449578634 +0100 @@ -2,8 +2,8 @@ config SND_TEA575X diff --git a/projects/RPi/patches/linux/linux-3.6-21-RPi_add_LIRC_RPi_support.patch b/projects/RPi/patches/linux/linux-3.6-21-RPi_add_LIRC_RPi_support.patch deleted file mode 100644 index 31737b5c17..0000000000 --- a/projects/RPi/patches/linux/linux-3.6-21-RPi_add_LIRC_RPi_support.patch +++ /dev/null @@ -1,737 +0,0 @@ -From 91abd8700cc73dff72332135c4bdf4cdf7afe2b1 Mon Sep 17 00:00:00 2001 -From: Aron Szabo -Date: Sat, 16 Jun 2012 12:15:55 +0200 -Subject: [PATCH] lirc: added support for RaspberryPi GPIO - ---- - drivers/staging/media/lirc/Kconfig | 6 + - drivers/staging/media/lirc/Makefile | 1 + - drivers/staging/media/lirc/lirc_rpi.c | 687 +++++++++++++++++++++++++++++++++ - 3 files changed, 694 insertions(+) - create mode 100644 drivers/staging/media/lirc/lirc_rpi.c - -diff --git a/drivers/staging/media/lirc/Kconfig b/drivers/staging/media/lirc/Kconfig -index 526ec0f..c7c6288 100644 ---- a/drivers/staging/media/lirc/Kconfig -+++ b/drivers/staging/media/lirc/Kconfig -@@ -38,6 +38,12 @@ config LIRC_PARALLEL - help - Driver for Homebrew Parallel Port Receivers - -+config LIRC_RPI -+ tristate "Homebrew GPIO Port Receiver/Transmitter for the RaspberryPi" -+ depends on LIRC -+ help -+ Driver for Homebrew GPIO Port Receiver/Transmitter for the RaspberryPi -+ - config LIRC_SASEM - tristate "Sasem USB IR Remote" - depends on LIRC && USB -diff --git a/drivers/staging/media/lirc/Makefile b/drivers/staging/media/lirc/Makefile -index d76b0fa..af4be00 100644 ---- a/drivers/staging/media/lirc/Makefile -+++ b/drivers/staging/media/lirc/Makefile -@@ -7,6 +7,7 @@ obj-$(CONFIG_LIRC_BT829) += lirc_bt829.o - obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o - obj-$(CONFIG_LIRC_IMON) += lirc_imon.o - obj-$(CONFIG_LIRC_PARALLEL) += lirc_parallel.o -+obj-$(CONFIG_LIRC_RPI) += lirc_rpi.o - obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o - obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o - obj-$(CONFIG_LIRC_SIR) += lirc_sir.o -diff --git a/drivers/staging/media/lirc/lirc_rpi.c b/drivers/staging/media/lirc/lirc_rpi.c -new file mode 100644 -index 0000000..96acab0 ---- /dev/null -+++ b/drivers/staging/media/lirc/lirc_rpi.c -@@ -0,0 +1,687 @@ -+/* -+ * lirc_rpi.c -+ * -+ * lirc_rpi - Device driver that records pulse- and pause-lengths -+ * (space-lengths) (just like the lirc_serial driver does) -+ * between GPIO interrupt events on the Raspberry Pi. -+ * Lots of code has been taken from the lirc_serial module, -+ * so I would like say thanks to the authors. -+ * -+ * Copyright (C) 2012 Aron Robert Szabo , -+ * Michael Bishop -+ * 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 -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define LIRC_DRIVER_NAME "lirc_rpi" -+#define RBUF_LEN 256 -+#define LIRC_TRANSMITTER_LATENCY 256 -+ -+#ifndef MAX_UDELAY_MS -+#define MAX_UDELAY_US 5000 -+#else -+#define MAX_UDELAY_US (MAX_UDELAY_MS*1000) -+#endif -+ -+#define dprintk(fmt, args...) \ -+ do { \ -+ if (debug) \ -+ printk(KERN_DEBUG LIRC_DRIVER_NAME ": " \ -+ fmt, ## args); \ -+ } while (0) -+ -+/* module parameters */ -+ -+/* set the default GPIO input pin */ -+static int gpio_in_pin = 18; -+/* set the default GPIO output pin */ -+static int gpio_out_pin = 17; -+/* enable debugging messages */ -+static int debug; -+/* -1 = auto, 0 = active high, 1 = active low */ -+static int sense = -1; -+/* use softcarrier by default */ -+static int softcarrier = 1; -+ -+struct gpio_chip *gpiochip; -+struct irq_chip *irqchip; -+struct irq_data *irqdata; -+ -+/* forward declarations */ -+static long send_pulse(unsigned long length); -+static void send_space(long length); -+static void lirc_rpi_exit(void); -+ -+int valid_gpio_pins[] = { 0, 1, 4, 8, 7, 9, 10, 11, 14, 15, 17, 18, 21, 22, 23, -+ 24, 25 }; -+ -+static struct platform_device *lirc_rpi_dev; -+static struct timeval lasttv = { 0, 0 }; -+static struct lirc_buffer rbuf; -+static spinlock_t lock; -+ -+/* initialized/set in init_timing_params() */ -+static unsigned int freq = 38000; -+static unsigned int duty_cycle = 50; -+static unsigned long period; -+static unsigned long pulse_width; -+static unsigned long space_width; -+ -+static void safe_udelay(unsigned long usecs) -+{ -+ while (usecs > MAX_UDELAY_US) { -+ udelay(MAX_UDELAY_US); -+ usecs -= MAX_UDELAY_US; -+ } -+ udelay(usecs); -+} -+ -+static int init_timing_params(unsigned int new_duty_cycle, -+ unsigned int new_freq) -+{ -+ /* -+ * period, pulse/space width are kept with 8 binary places - -+ * IE multiplied by 256. -+ */ -+ if (256 * 1000000L / new_freq * new_duty_cycle / 100 <= -+ LIRC_TRANSMITTER_LATENCY) -+ return -EINVAL; -+ if (256 * 1000000L / new_freq * (100 - new_duty_cycle) / 100 <= -+ LIRC_TRANSMITTER_LATENCY) -+ return -EINVAL; -+ duty_cycle = new_duty_cycle; -+ freq = new_freq; -+ period = 256 * 1000000L / freq; -+ pulse_width = period * duty_cycle / 100; -+ space_width = period - pulse_width; -+ dprintk("in init_timing_params, freq=%d pulse=%ld, " -+ "space=%ld\n", freq, pulse_width, space_width); -+ return 0; -+} -+ -+static long send_pulse_softcarrier(unsigned long length) -+{ -+ int flag; -+ unsigned long actual, target, d; -+ -+ length <<= 8; -+ -+ actual = 0; target = 0; flag = 0; -+ while (actual < length) { -+ if (flag) { -+ gpiochip->set(gpiochip, gpio_out_pin, 0); -+ target += space_width; -+ } else { -+ gpiochip->set(gpiochip, gpio_out_pin, 1); -+ target += pulse_width; -+ } -+ d = (target - actual - -+ LIRC_TRANSMITTER_LATENCY + 128) >> 8; -+ /* -+ * Note - we've checked in ioctl that the pulse/space -+ * widths are big enough so that d is > 0 -+ */ -+ udelay(d); -+ actual += (d << 8) + LIRC_TRANSMITTER_LATENCY; -+ flag = !flag; -+ } -+ return (actual-length) >> 8; -+} -+ -+static long send_pulse(unsigned long length) -+{ -+ if (length <= 0) -+ return 0; -+ -+ if (softcarrier) { -+ return send_pulse_softcarrier(length); -+ } else { -+ gpiochip->set(gpiochip, gpio_out_pin, 1); -+ safe_udelay(length); -+ return 0; -+ } -+} -+ -+static void send_space(long length) -+{ -+ gpiochip->set(gpiochip, gpio_out_pin, 0); -+ if (length <= 0) -+ return; -+ safe_udelay(length); -+} -+ -+static void rbwrite(int l) -+{ -+ if (lirc_buffer_full(&rbuf)) { -+ /* no new signals will be accepted */ -+ dprintk("Buffer overrun\n"); -+ return; -+ } -+ lirc_buffer_write(&rbuf, (void *)&l); -+} -+ -+static void frbwrite(int l) -+{ -+ /* simple noise filter */ -+ static int pulse, space; -+ static unsigned int ptr; -+ -+ if (ptr > 0 && (l & PULSE_BIT)) { -+ pulse += l & PULSE_MASK; -+ if (pulse > 250) { -+ rbwrite(space); -+ rbwrite(pulse | PULSE_BIT); -+ ptr = 0; -+ pulse = 0; -+ } -+ return; -+ } -+ if (!(l & PULSE_BIT)) { -+ if (ptr == 0) { -+ if (l > 20000) { -+ space = l; -+ ptr++; -+ return; -+ } -+ } else { -+ if (l > 20000) { -+ space += pulse; -+ if (space > PULSE_MASK) -+ space = PULSE_MASK; -+ space += l; -+ if (space > PULSE_MASK) -+ space = PULSE_MASK; -+ pulse = 0; -+ return; -+ } -+ rbwrite(space); -+ rbwrite(pulse | PULSE_BIT); -+ ptr = 0; -+ pulse = 0; -+ } -+ } -+ rbwrite(l); -+} -+ -+static irqreturn_t irq_handler(int i, void *blah, struct pt_regs *regs) -+{ -+ struct timeval tv; -+ long deltv; -+ int data; -+ int signal; -+ -+ /* use the GPIO signal level */ -+ signal = gpiochip->get(gpiochip, gpio_in_pin); -+ -+ /* unmask the irq */ -+ irqchip->irq_unmask(irqdata); -+ -+ if (sense != -1) { -+ /* get current time */ -+ do_gettimeofday(&tv); -+ -+ /* calc time since last interrupt in microseconds */ -+ deltv = tv.tv_sec-lasttv.tv_sec; -+ if (tv.tv_sec < lasttv.tv_sec || -+ (tv.tv_sec == lasttv.tv_sec && -+ tv.tv_usec < lasttv.tv_usec)) { -+ printk(KERN_WARNING LIRC_DRIVER_NAME -+ ": AIEEEE: your clock just jumped backwards\n"); -+ printk(KERN_WARNING LIRC_DRIVER_NAME -+ ": %d %d %lx %lx %lx %lx\n", signal, sense, -+ tv.tv_sec, lasttv.tv_sec, -+ tv.tv_usec, lasttv.tv_usec); -+ data = PULSE_MASK; -+ } else if (deltv > 15) { -+ data = PULSE_MASK; /* really long time */ -+ if (!(signal^sense)) { -+ /* sanity check */ -+ printk(KERN_WARNING LIRC_DRIVER_NAME -+ ": AIEEEE: %d %d %lx %lx %lx %lx\n", -+ signal, sense, tv.tv_sec, lasttv.tv_sec, -+ tv.tv_usec, lasttv.tv_usec); -+ /* -+ * detecting pulse while this -+ * MUST be a space! -+ */ -+ sense = sense ? 0 : 1; -+ } -+ } else { -+ data = (int) (deltv*1000000 + -+ (tv.tv_usec - lasttv.tv_usec)); -+ } -+ frbwrite(signal^sense ? data : (data|PULSE_BIT)); -+ lasttv = tv; -+ wake_up_interruptible(&rbuf.wait_poll); -+ } -+ -+ return IRQ_HANDLED; -+} -+ -+static int is_right_chip(struct gpio_chip *chip, void *data) -+{ -+ dprintk("is_right_chip %s %d\n", chip->label, strcmp(data, chip->label)); -+ -+ if (strcmp(data, chip->label) == 0) -+ return 1; -+ return 0; -+} -+ -+static int init_port(void) -+{ -+ int i, nlow, nhigh, ret, irq; -+ -+ gpiochip = gpiochip_find("bcm2708_gpio", is_right_chip); -+ -+ if (!gpiochip) -+ return -ENODEV; -+ -+ if (gpio_request(gpio_out_pin, LIRC_DRIVER_NAME " ir/out")) { -+ printk(KERN_ALERT LIRC_DRIVER_NAME -+ ": cant claim gpio pin %d\n", gpio_out_pin); -+ ret = -ENODEV; -+ goto exit_init_port; -+ } -+ -+ if (gpio_request(gpio_in_pin, LIRC_DRIVER_NAME " ir/in")) { -+ printk(KERN_ALERT LIRC_DRIVER_NAME -+ ": cant claim gpio pin %d\n", gpio_in_pin); -+ ret = -ENODEV; -+ goto exit_gpio_free_out_pin; -+ } -+ -+ gpiochip->direction_input(gpiochip, gpio_in_pin); -+ gpiochip->direction_output(gpiochip, gpio_out_pin, 1); -+ gpiochip->set(gpiochip, gpio_out_pin, 0); -+ -+ irq = gpiochip->to_irq(gpiochip, gpio_in_pin); -+ dprintk("to_irq %d\n", irq); -+ irqdata = irq_get_irq_data(irq); -+ -+ if (irqdata && irqdata->chip) { -+ irqchip = irqdata->chip; -+ } else { -+ ret = -ENODEV; -+ goto exit_gpio_free_in_pin; -+ } -+ -+ /* if pin is high, then this must be an active low receiver. */ -+ if (sense == -1) { -+ /* wait 1/2 sec for the power supply */ -+ msleep(500); -+ -+ /* -+ * probe 9 times every 0.04s, collect "votes" for -+ * active high/low -+ */ -+ nlow = 0; -+ nhigh = 0; -+ for (i = 0; i < 9; i++) { -+ if (gpiochip->get(gpiochip, gpio_in_pin)) -+ nlow++; -+ else -+ nhigh++; -+ msleep(40); -+ } -+ sense = (nlow >= nhigh ? 1 : 0); -+ printk(KERN_INFO LIRC_DRIVER_NAME -+ ": auto-detected active %s receiver on GPIO pin %d\n", -+ sense ? "low" : "high", gpio_in_pin); -+ } else { -+ printk(KERN_INFO LIRC_DRIVER_NAME -+ ": manually using active %s receiver on GPIO pin %d\n", -+ sense ? "low" : "high", gpio_in_pin); -+ } -+ -+ return 0; -+ -+ exit_gpio_free_in_pin: -+ gpio_free(gpio_in_pin); -+ -+ exit_gpio_free_out_pin: -+ gpio_free(gpio_out_pin); -+ -+ exit_init_port: -+ return ret; -+} -+ -+// called when the character device is opened -+static int set_use_inc(void *data) -+{ -+ int result; -+ unsigned long flags; -+ -+ /* initialize timestamp */ -+ do_gettimeofday(&lasttv); -+ -+ result = request_irq(gpiochip->to_irq(gpiochip, gpio_in_pin), -+ (irq_handler_t) irq_handler, 0, -+ LIRC_DRIVER_NAME, (void*) 0); -+ -+ switch (result) { -+ case -EBUSY: -+ printk(KERN_ERR LIRC_DRIVER_NAME -+ ": IRQ %d is busy\n", -+ gpiochip->to_irq(gpiochip, gpio_in_pin)); -+ return -EBUSY; -+ case -EINVAL: -+ printk(KERN_ERR LIRC_DRIVER_NAME -+ ": Bad irq number or handler\n"); -+ return -EINVAL; -+ default: -+ dprintk("Interrupt %d obtained\n", -+ gpiochip->to_irq(gpiochip, gpio_in_pin)); -+ break; -+ }; -+ -+ /* initialize pulse/space widths */ -+ init_timing_params(duty_cycle, freq); -+ -+ spin_lock_irqsave(&lock, flags); -+ -+ /* GPIO Pin Falling/Rising Edge Detect Enable */ -+ irqchip->irq_set_type(irqdata, -+ IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING); -+ -+ /* unmask the irq */ -+ irqchip->irq_unmask(irqdata); -+ -+ spin_unlock_irqrestore(&lock, flags); -+ -+ return 0; -+} -+ -+static void set_use_dec(void *data) -+{ -+ unsigned long flags; -+ -+ spin_lock_irqsave(&lock, flags); -+ -+ /* GPIO Pin Falling/Rising Edge Detect Disable */ -+ irqchip->irq_set_type(irqdata, 0); -+ irqchip->irq_mask(irqdata); -+ -+ spin_unlock_irqrestore(&lock, flags); -+ -+ free_irq(gpiochip->to_irq(gpiochip, gpio_in_pin), (void *) 0); -+ -+ dprintk(KERN_INFO LIRC_DRIVER_NAME -+ ": freed IRQ %d\n", gpiochip->to_irq(gpiochip, gpio_in_pin)); -+} -+ -+static ssize_t lirc_write(struct file *file, const char *buf, -+ size_t n, loff_t *ppos) -+{ -+ int i, count; -+ unsigned long flags; -+ long delta = 0; -+ int *wbuf; -+ -+ count = n / sizeof(int); -+ if (n % sizeof(int) || count % 2 == 0) -+ return -EINVAL; -+ wbuf = memdup_user(buf, n); -+ if (IS_ERR(wbuf)) -+ return PTR_ERR(wbuf); -+ spin_lock_irqsave(&lock, flags); -+ -+ for (i = 0; i < count; i++) { -+ if (i%2) -+ send_space(wbuf[i] - delta); -+ else -+ delta = send_pulse(wbuf[i]); -+ } -+ gpiochip->set(gpiochip, gpio_out_pin, 0); -+ -+ spin_unlock_irqrestore(&lock, flags); -+ kfree(wbuf); -+ return n; -+} -+ -+static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) -+{ -+ int result; -+ __u32 value; -+ -+ switch (cmd) { -+ case LIRC_GET_SEND_MODE: -+ return -ENOIOCTLCMD; -+ break; -+ -+ case LIRC_SET_SEND_MODE: -+ result = get_user(value, (__u32 *) arg); -+ if (result) -+ return result; -+ /* only LIRC_MODE_PULSE supported */ -+ if (value != LIRC_MODE_PULSE) -+ return -ENOSYS; -+ break; -+ -+ case LIRC_GET_LENGTH: -+ return -ENOSYS; -+ break; -+ -+ case LIRC_SET_SEND_DUTY_CYCLE: -+ dprintk("SET_SEND_DUTY_CYCLE\n"); -+ result = get_user(value, (__u32 *) arg); -+ if (result) -+ return result; -+ if (value <= 0 || value > 100) -+ return -EINVAL; -+ return init_timing_params(value, freq); -+ break; -+ -+ case LIRC_SET_SEND_CARRIER: -+ dprintk("SET_SEND_CARRIER\n"); -+ result = get_user(value, (__u32 *) arg); -+ if (result) -+ return result; -+ if (value > 500000 || value < 20000) -+ return -EINVAL; -+ return init_timing_params(duty_cycle, value); -+ break; -+ -+ default: -+ return lirc_dev_fop_ioctl(filep, cmd, arg); -+ } -+ return 0; -+} -+ -+static const struct file_operations lirc_fops = { -+ .owner = THIS_MODULE, -+ .write = lirc_write, -+ .unlocked_ioctl = lirc_ioctl, -+ .read = lirc_dev_fop_read, -+ .poll = lirc_dev_fop_poll, -+ .open = lirc_dev_fop_open, -+ .release = lirc_dev_fop_close, -+ .llseek = no_llseek, -+}; -+ -+static struct lirc_driver driver = { -+ .name = LIRC_DRIVER_NAME, -+ .minor = -1, -+ .code_length = 1, -+ .sample_rate = 0, -+ .data = NULL, -+ .add_to_buf = NULL, -+ .rbuf = &rbuf, -+ .set_use_inc = set_use_inc, -+ .set_use_dec = set_use_dec, -+ .fops = &lirc_fops, -+ .dev = NULL, -+ .owner = THIS_MODULE, -+}; -+ -+static struct platform_driver lirc_rpi_driver = { -+ .driver = { -+ .name = LIRC_DRIVER_NAME, -+ .owner = THIS_MODULE, -+ }, -+}; -+ -+static int __init lirc_rpi_init(void) -+{ -+ int result; -+ -+ /* Init read buffer. */ -+ result = lirc_buffer_init(&rbuf, sizeof(int), RBUF_LEN); -+ if (result < 0) -+ return -ENOMEM; -+ -+ result = platform_driver_register(&lirc_rpi_driver); -+ if (result) { -+ printk(KERN_ERR LIRC_DRIVER_NAME -+ ": lirc register returned %d\n", result); -+ goto exit_buffer_free; -+ } -+ -+ lirc_rpi_dev = platform_device_alloc(LIRC_DRIVER_NAME, 0); -+ if (!lirc_rpi_dev) { -+ result = -ENOMEM; -+ goto exit_driver_unregister; -+ } -+ -+ result = platform_device_add(lirc_rpi_dev); -+ if (result) -+ goto exit_device_put; -+ -+ return 0; -+ -+ exit_device_put: -+ platform_device_put(lirc_rpi_dev); -+ -+ exit_driver_unregister: -+ platform_driver_unregister(&lirc_rpi_driver); -+ -+ exit_buffer_free: -+ lirc_buffer_free(&rbuf); -+ -+ return result; -+} -+ -+static void lirc_rpi_exit(void) -+{ -+ gpio_free(gpio_out_pin); -+ gpio_free(gpio_in_pin); -+ platform_device_unregister(lirc_rpi_dev); -+ platform_driver_unregister(&lirc_rpi_driver); -+ lirc_buffer_free(&rbuf); -+} -+ -+static int __init lirc_rpi_init_module(void) -+{ -+ int result, i; -+ -+ result = lirc_rpi_init(); -+ if (result) -+ return result; -+ -+ /* check if the module received valid gpio pin numbers */ -+ result = 0; -+ if (gpio_in_pin != gpio_out_pin) { -+ for(i = 0; (i < ARRAY_SIZE(valid_gpio_pins)) && (result != 2); i++) { -+ if (gpio_in_pin == valid_gpio_pins[i] || -+ gpio_out_pin == valid_gpio_pins[i]) { -+ result++; -+ } -+ } -+ } -+ -+ if (result != 2) { -+ result = -EINVAL; -+ printk(KERN_ERR LIRC_DRIVER_NAME -+ ": invalid GPIO pin(s) specified!\n"); -+ goto exit_rpi; -+ } -+ -+ driver.features = LIRC_CAN_SET_SEND_DUTY_CYCLE | -+ LIRC_CAN_SET_SEND_CARRIER | -+ LIRC_CAN_SEND_PULSE | -+ LIRC_CAN_REC_MODE2; -+ -+ driver.dev = &lirc_rpi_dev->dev; -+ driver.minor = lirc_register_driver(&driver); -+ -+ if (driver.minor < 0) { -+ printk(KERN_ERR LIRC_DRIVER_NAME -+ ": device registration failed with %d\n", result); -+ result = -EIO; -+ goto exit_rpi; -+ } -+ -+ printk(KERN_INFO LIRC_DRIVER_NAME ": driver registered!\n"); -+ -+ result = init_port(); -+ if (result < 0) -+ goto exit_rpi; -+ -+ return 0; -+ -+ exit_rpi: -+ lirc_rpi_exit(); -+ -+ return result; -+} -+ -+static void __exit lirc_rpi_exit_module(void) -+{ -+ lirc_rpi_exit(); -+ -+ lirc_unregister_driver(driver.minor); -+ printk(KERN_INFO LIRC_DRIVER_NAME ": cleaned up module\n"); -+} -+ -+module_init(lirc_rpi_init_module); -+module_exit(lirc_rpi_exit_module); -+ -+MODULE_DESCRIPTION("Infra-red receiver and blaster driver for Raspberry Pi GPIO."); -+MODULE_AUTHOR("Aron Robert Szabo "); -+MODULE_AUTHOR("Michael Bishop "); -+MODULE_LICENSE("GPL"); -+ -+module_param(gpio_out_pin, int, S_IRUGO); -+MODULE_PARM_DESC(gpio_out_pin, "GPIO output/transmitter pin number of the BCM" -+ " processor. Valid pin numbers are: 0, 1, 4, 8, 7, 9, 10, 11," -+ " 14, 15, 17, 18, 21, 22, 23, 24, 25, default 17"); -+ -+module_param(gpio_in_pin, int, S_IRUGO); -+MODULE_PARM_DESC(gpio_in_pin, "GPIO input pin number of the BCM processor." -+ " Valid pin numbers are: 0, 1, 4, 8, 7, 9, 10, 11, 14, 15," -+ " 17, 18, 21, 22, 23, 24, 25, default 18"); -+ -+module_param(sense, bool, S_IRUGO); -+MODULE_PARM_DESC(sense, "Override autodetection of IR receiver circuit" -+ " (0 = active high, 1 = active low )"); -+ -+module_param(softcarrier, bool, S_IRUGO); -+MODULE_PARM_DESC(softcarrier, "Software carrier (0 = off, 1 = on, default on)"); -+ -+module_param(debug, bool, S_IRUGO | S_IWUSR); -+MODULE_PARM_DESC(debug, "Enable debugging messages"); --- -1.7.10 - From a7ca4e3979a8f0b5b4e72c6545f3e11077317979 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 28 Feb 2013 11:37:28 +0100 Subject: [PATCH 6/7] bcm2835-driver: update to bcm2835-driver-fea69f6 Signed-off-by: Stephan Raue --- packages/graphics/bcm2835-driver/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/bcm2835-driver/meta b/packages/graphics/bcm2835-driver/meta index 7cb88c098e..b6685c33c8 100644 --- a/packages/graphics/bcm2835-driver/meta +++ b/packages/graphics/bcm2835-driver/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-driver" -PKG_VERSION="4697c2b" +PKG_VERSION="fea69f6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="nonfree" From 1ed44a9b27002871906035e02b017b18e3090adf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 28 Feb 2013 11:37:48 +0100 Subject: [PATCH 7/7] bcm2835-bootloader: update to bcm2835-bootloader-fea69f6 Signed-off-by: Stephan Raue --- packages/tools/bcm2835-bootloader/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/bcm2835-bootloader/meta b/packages/tools/bcm2835-bootloader/meta index 31fbe7a4f8..4b036de570 100644 --- a/packages/tools/bcm2835-bootloader/meta +++ b/packages/tools/bcm2835-bootloader/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-bootloader" -PKG_VERSION="4697c2b" +PKG_VERSION="fea69f6" PKG_REV="1" PKG_ARCH="arm" PKG_LICENSE="nonfree"