diff --git a/packages/linux/meta b/packages/linux/meta index 2bd880a2bc..f74cc556f7 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="linux" -PKG_VERSION="3.2.22" +PKG_VERSION="3.2.23" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux/patches/linux-3.2.22-607-RPi_fix_alsamixer_control.patch b/packages/linux/patches/linux-3.2.22-607-RPi_fix_alsamixer_control.patch deleted file mode 100644 index 30d46cf2d1..0000000000 --- a/packages/linux/patches/linux-3.2.22-607-RPi_fix_alsamixer_control.patch +++ /dev/null @@ -1,63 +0,0 @@ -From d0735c7d129d35bd91ba1c2c5b5a5201ed4a6c37 Mon Sep 17 00:00:00 2001 -From: Arne Fitzenreiter -Date: Wed, 6 Jun 2012 08:02:10 +0200 -Subject: [PATCH] bcm2835-ctl: fix alsamixer control. - -alsamixer read the volume for the screen controller so we had to -scale the chipvol back to db for reading. ---- - sound/arm/bcm2835-ctl.c | 22 ++++++++++++++++------ - 1 file changed, 16 insertions(+), 6 deletions(-) - -diff --git a/sound/arm/bcm2835-ctl.c b/sound/arm/bcm2835-ctl.c -index c0546e35..828a820 100755 ---- a/sound/arm/bcm2835-ctl.c -+++ b/sound/arm/bcm2835-ctl.c -@@ -33,6 +33,19 @@ - - #include "bcm2835.h" - -+ -+/* functions to convert alsa to chip volume and back. */ -+int alsa2chip(int vol) -+{ -+ return -((vol << 8) / 100); -+} -+ -+int chip2alsa(int vol) -+{ -+ return -((vol * 100) >> 8); -+} -+ -+ - static int snd_bcm2835_ctl_info(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_info *uinfo) - { -@@ -64,7 +77,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol, - BUG_ON(!chip && !(chip->avail_substreams & AVAIL_SUBSTREAMS_MASK)); - - if (kcontrol->private_value == PCM_PLAYBACK_VOLUME) -- ucontrol->value.integer.value[0] = chip->volume; -+ ucontrol->value.integer.value[0] = chip2alsa(chip->volume); - else if (kcontrol->private_value == PCM_PLAYBACK_MUTE) - ucontrol->value.integer.value[0] = chip->mute; - else if (kcontrol->private_value == PCM_PLAYBACK_DEVICE) -@@ -85,13 +98,10 @@ static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol, - changed = 1; - } - if (changed -- || (ucontrol->value.integer.value[0] != chip->volume)) { -- int atten; -+ || (ucontrol->value.integer.value[0] != chip2alsa(chip->volume))) { - -- chip->volume = ucontrol->value.integer.value[0]; -+ chip->volume = alsa2chip(ucontrol->value.integer.value[0]); - changed = 1; -- atten = -((chip->volume << 8) / 100); -- chip->volume = atten; - } - - } else if (kcontrol->private_value == PCM_PLAYBACK_MUTE) { --- -1.7.10 - diff --git a/packages/linux/patches/linux-3.2.22-608-RPi_limit_maximal_volume_to_4db.patch b/packages/linux/patches/linux-3.2.22-608-RPi_limit_maximal_volume_to_4db.patch deleted file mode 100644 index f04ca2d877..0000000000 --- a/packages/linux/patches/linux-3.2.22-608-RPi_limit_maximal_volume_to_4db.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 829da61c0229c0734a109339f5de308bf8205bf6 Mon Sep 17 00:00:00 2001 -From: Arne Fitzenreiter -Date: Wed, 6 Jun 2012 08:06:15 +0200 -Subject: [PATCH] bcm2835-ctl: limit maximal volume to 4db. - -it makes no sense to set 23.04db as maximum volume since around 3db it start to cliping. So with 4db the alsamixer is much better to control. (86% is 0db) ---- - sound/arm/bcm2835-ctl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sound/arm/bcm2835-ctl.c b/sound/arm/bcm2835-ctl.c -index 828a820..f901ddd 100755 ---- a/sound/arm/bcm2835-ctl.c -+++ b/sound/arm/bcm2835-ctl.c -@@ -53,7 +53,7 @@ static int snd_bcm2835_ctl_info(struct snd_kcontrol *kcontrol, - uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; - uinfo->count = 1; - uinfo->value.integer.min = -10240; -- uinfo->value.integer.max = 2303; -+ uinfo->value.integer.max = 400; /* 2303 */ - } else if (kcontrol->private_value == PCM_PLAYBACK_MUTE) { - uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; - uinfo->count = 1; --- -1.7.10 - diff --git a/packages/linux/patches/linux-3.2.22-000_crosscompile.patch b/packages/linux/patches/linux-3.2.23-000_crosscompile.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-000_crosscompile.patch rename to packages/linux/patches/linux-3.2.23-000_crosscompile.patch diff --git a/packages/linux/patches/linux-3.2.22-003-no_dev_console.patch b/packages/linux/patches/linux-3.2.23-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-003-no_dev_console.patch rename to packages/linux/patches/linux-3.2.23-003-no_dev_console.patch diff --git a/packages/linux/patches/linux-3.2.22-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-3.2.23-004_lower_undefined_mode_timeout.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-004_lower_undefined_mode_timeout.patch rename to packages/linux/patches/linux-3.2.23-004_lower_undefined_mode_timeout.patch diff --git a/packages/linux/patches/linux-3.2.22-006_enable_utf8.patch b/packages/linux/patches/linux-3.2.23-006_enable_utf8.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-006_enable_utf8.patch rename to packages/linux/patches/linux-3.2.23-006_enable_utf8.patch diff --git a/packages/linux/patches/linux-3.2.22-007_die_floppy_die.patch b/packages/linux/patches/linux-3.2.23-007_die_floppy_die.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-007_die_floppy_die.patch rename to packages/linux/patches/linux-3.2.23-007_die_floppy_die.patch diff --git a/packages/linux/patches/linux-3.2.22-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-3.2.23-009_disable_i8042_check_on_apple_mac.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-009_disable_i8042_check_on_apple_mac.patch rename to packages/linux/patches/linux-3.2.23-009_disable_i8042_check_on_apple_mac.patch diff --git a/packages/linux/patches/linux-3.2.22-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/linux-3.2.23-052-aureal_remote_quirk-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-052-aureal_remote_quirk-0.1.patch rename to packages/linux/patches/linux-3.2.23-052-aureal_remote_quirk-0.1.patch diff --git a/packages/linux/patches/linux-3.2.22-053-spinelplus-remote-0.1.patch b/packages/linux/patches/linux-3.2.23-053-spinelplus-remote-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-053-spinelplus-remote-0.1.patch rename to packages/linux/patches/linux-3.2.23-053-spinelplus-remote-0.1.patch diff --git a/packages/linux/patches/linux-3.2.22-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch b/packages/linux/patches/linux-3.2.23-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch rename to packages/linux/patches/linux-3.2.23-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch diff --git a/packages/linux/patches/linux-3.2.22-056-Formosa-IR606.patch b/packages/linux/patches/linux-3.2.23-056-Formosa-IR606.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-056-Formosa-IR606.patch rename to packages/linux/patches/linux-3.2.23-056-Formosa-IR606.patch diff --git a/packages/linux/patches/linux-3.2.22-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch b/packages/linux/patches/linux-3.2.23-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch rename to packages/linux/patches/linux-3.2.23-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch diff --git a/packages/linux/patches/linux-3.2.22-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch b/packages/linux/patches/linux-3.2.23-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch rename to packages/linux/patches/linux-3.2.23-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch diff --git a/packages/linux/patches/linux-3.2.22-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch b/packages/linux/patches/linux-3.2.23-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch rename to packages/linux/patches/linux-3.2.23-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch diff --git a/packages/linux/patches/linux-3.2.22-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch b/packages/linux/patches/linux-3.2.23-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch rename to packages/linux/patches/linux-3.2.23-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch diff --git a/packages/linux/patches/linux-3.2.22-071-silence_i915_agp-module-0.1.patch b/packages/linux/patches/linux-3.2.23-071-silence_i915_agp-module-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-071-silence_i915_agp-module-0.1.patch rename to packages/linux/patches/linux-3.2.23-071-silence_i915_agp-module-0.1.patch diff --git a/packages/linux/patches/linux-3.2.22-081-drm_cea_modes.patch b/packages/linux/patches/linux-3.2.23-081-drm_cea_modes.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-081-drm_cea_modes.patch rename to packages/linux/patches/linux-3.2.23-081-drm_cea_modes.patch diff --git a/packages/linux/patches/linux-3.2.22-201-add_Anysee_T2C_support-0.1.patch b/packages/linux/patches/linux-3.2.23-201-add_Anysee_T2C_support-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-201-add_Anysee_T2C_support-0.1.patch rename to packages/linux/patches/linux-3.2.23-201-add_Anysee_T2C_support-0.1.patch diff --git a/packages/linux/patches/linux-3.2.22-202-add_HVR930C_support-0.1.patch b/packages/linux/patches/linux-3.2.23-202-add_HVR930C_support-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-202-add_HVR930C_support-0.1.patch rename to packages/linux/patches/linux-3.2.23-202-add_HVR930C_support-0.1.patch diff --git a/packages/linux/patches/linux-3.2.22-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/linux-3.2.23-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/linux-3.2.23-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/linux-3.2.22-204-add_Formosa_eHome_Infrared_Receiver.patch b/packages/linux/patches/linux-3.2.23-204-add_Formosa_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-204-add_Formosa_eHome_Infrared_Receiver.patch rename to packages/linux/patches/linux-3.2.23-204-add_Formosa_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/linux-3.2.22-210-add_DVBSky_support.patch b/packages/linux/patches/linux-3.2.23-210-add_DVBSky_support.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-210-add_DVBSky_support.patch rename to packages/linux/patches/linux-3.2.23-210-add_DVBSky_support.patch diff --git a/packages/linux/patches/linux-3.2.22-211-add_TeVii_s471_support.patch b/packages/linux/patches/linux-3.2.23-211-add_TeVii_s471_support.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-211-add_TeVii_s471_support.patch rename to packages/linux/patches/linux-3.2.23-211-add_TeVii_s471_support.patch diff --git a/packages/linux/patches/linux-3.2.22-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/linux-3.2.23-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/linux-3.2.23-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/linux-3.2.22-213-cinergy_s2_usb_r2.patch b/packages/linux/patches/linux-3.2.23-213-cinergy_s2_usb_r2.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-213-cinergy_s2_usb_r2.patch rename to packages/linux/patches/linux-3.2.23-213-cinergy_s2_usb_r2.patch diff --git a/packages/linux/patches/linux-3.2.22-251-acpi-5.0_support.patch b/packages/linux/patches/linux-3.2.23-251-acpi-5.0_support.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-251-acpi-5.0_support.patch rename to packages/linux/patches/linux-3.2.23-251-acpi-5.0_support.patch diff --git a/packages/linux/patches/linux-3.2.22-601-RPi_support-5b0ccb0.patch b/packages/linux/patches/linux-3.2.23-601-RPi_support-f23da7f.patch similarity index 96% rename from packages/linux/patches/linux-3.2.22-601-RPi_support-5b0ccb0.patch rename to packages/linux/patches/linux-3.2.23-601-RPi_support-f23da7f.patch index 7aa56f487a..5c3f10d942 100644 --- a/packages/linux/patches/linux-3.2.22-601-RPi_support-5b0ccb0.patch +++ b/packages/linux/patches/linux-3.2.23-601-RPi_support-f23da7f.patch @@ -1,6 +1,6 @@ -diff -Naur linux-3.2.21/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.2.21-bootc-5b0ccb0/arch/arm/configs/bcmrpi_cutdown_defconfig ---- linux-3.2.21/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/configs/bcmrpi_cutdown_defconfig 2012-07-02 13:42:13.347277970 +0200 +diff -Naur linux-3.2.23/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi-bootc-3.2.23/arch/arm/configs/bcmrpi_cutdown_defconfig +--- linux-3.2.23/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/configs/bcmrpi_cutdown_defconfig 2012-07-15 20:28:26.407092434 +0200 @@ -0,0 +1,494 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -496,9 +496,9 @@ diff -Naur linux-3.2.21/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.2.21-b +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Naur linux-3.2.21/arch/arm/configs/bcmrpi_defconfig linux-3.2.21-bootc-5b0ccb0/arch/arm/configs/bcmrpi_defconfig ---- linux-3.2.21/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/configs/bcmrpi_defconfig 2012-07-02 13:42:13.340277828 +0200 +diff -Naur linux-3.2.23/arch/arm/configs/bcmrpi_defconfig linux-rpi-bootc-3.2.23/arch/arm/configs/bcmrpi_defconfig +--- linux-3.2.23/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/configs/bcmrpi_defconfig 2012-07-15 20:28:26.377091869 +0200 @@ -0,0 +1,530 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -1030,9 +1030,9 @@ diff -Naur linux-3.2.21/arch/arm/configs/bcmrpi_defconfig linux-3.2.21-bootc-5b0 +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Naur linux-3.2.21/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.2.21-bootc-5b0ccb0/arch/arm/configs/bcmrpi_emergency_defconfig ---- linux-3.2.21/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/configs/bcmrpi_emergency_defconfig 2012-07-02 13:42:13.348277990 +0200 +diff -Naur linux-3.2.23/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi-bootc-3.2.23/arch/arm/configs/bcmrpi_emergency_defconfig +--- linux-3.2.23/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/configs/bcmrpi_emergency_defconfig 2012-07-15 20:28:26.408092453 +0200 @@ -0,0 +1,532 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -1566,9 +1566,9 @@ diff -Naur linux-3.2.21/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.2.21 +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Naur linux-3.2.21/arch/arm/Kconfig linux-3.2.21-bootc-5b0ccb0/arch/arm/Kconfig ---- linux-3.2.21/arch/arm/Kconfig 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/Kconfig 2012-07-02 13:42:13.242275826 +0200 +diff -Naur linux-3.2.23/arch/arm/Kconfig linux-rpi-bootc-3.2.23/arch/arm/Kconfig +--- linux-3.2.23/arch/arm/Kconfig 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/arch/arm/Kconfig 2012-07-15 20:28:26.140087409 +0200 @@ -955,6 +955,21 @@ help Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx). @@ -1599,9 +1599,9 @@ diff -Naur linux-3.2.21/arch/arm/Kconfig linux-3.2.21-bootc-5b0ccb0/arch/arm/Kco # Definitions to make life easier config ARCH_ACORN -diff -Naur linux-3.2.21/arch/arm/Kconfig.debug linux-3.2.21-bootc-5b0ccb0/arch/arm/Kconfig.debug ---- linux-3.2.21/arch/arm/Kconfig.debug 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/Kconfig.debug 2012-07-02 13:42:13.063272167 +0200 +diff -Naur linux-3.2.23/arch/arm/Kconfig.debug linux-rpi-bootc-3.2.23/arch/arm/Kconfig.debug +--- linux-3.2.23/arch/arm/Kconfig.debug 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/arch/arm/Kconfig.debug 2012-07-15 20:28:25.899082875 +0200 @@ -247,6 +247,14 @@ their output to the standard serial port on the RealView PB1176 platform. @@ -1617,9 +1617,9 @@ diff -Naur linux-3.2.21/arch/arm/Kconfig.debug linux-3.2.21-bootc-5b0ccb0/arch/a endchoice config EARLY_PRINTK -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/armctrl.c linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/armctrl.c ---- linux-3.2.21/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/armctrl.c 2012-07-02 13:42:13.235275683 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/armctrl.c linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/armctrl.c +--- linux-3.2.23/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/armctrl.c 2012-07-15 20:28:26.133087278 +0200 @@ -0,0 +1,399 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -2020,9 +2020,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/armctrl.c linux-3.2.21-bootc-5b0cc + armctrl_pm_register(base, irq_start, resume_sources); + return 0; +} -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/armctrl.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/armctrl.h ---- linux-3.2.21/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/armctrl.h 2012-07-02 13:42:13.232275620 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/armctrl.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/armctrl.h +--- linux-3.2.23/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/armctrl.h 2012-07-15 20:28:26.130087221 +0200 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -2051,10 +2051,10 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/armctrl.h linux-3.2.21-bootc-5b0cc + u32 armctrl_sources, u32 resume_sources); + +#endif -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/bcm2708.c linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/bcm2708.c ---- linux-3.2.21/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/bcm2708.c 2012-07-02 13:42:13.232275620 +0200 -@@ -0,0 +1,763 @@ +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/bcm2708.c +--- linux-3.2.23/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/bcm2708.c 2012-07-15 20:28:26.130087221 +0200 +@@ -0,0 +1,769 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c + * @@ -2198,9 +2198,16 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/bcm2708.c linux-3.2.21-bootc-5b0cc + iotable_init(bcm2708_io_desc, ARRAY_SIZE(bcm2708_io_desc)); +} + -+// The STC is a free running counter that increments at the rate of 1MHz ++/* The STC is a free running counter that increments at the rate of 1MHz */ +#define STC_FREQ_HZ 1000000 + ++/* ++ * Constants generated by clocks_calc_mult_shift(m, s, 1MHz, NSEC_PER_SEC, 60). ++ * This gives a resolution of about 1us and a wrap period of about 1h11min. ++ */ ++#define SC_MULT 4194304000u ++#define SC_SHIFT 22 ++ +static cycle_t stc_read_cycles(struct clocksource *cs) +{ + /* STC: a free running counter that increments at the rate of 1MHz */ @@ -2222,7 +2229,6 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/bcm2708.c linux-3.2.21-bootc-5b0cc + +static void __init bcm2708_clocksource_init(void) +{ -+ // calculate .shift and .mult values and register clocksource + if (clocksource_register_hz(&clocksource_stc, STC_FREQ_HZ)) { + printk(KERN_ERR "timer: failed to initialize clock " + "source %s\n", clocksource_stc.name); @@ -2233,7 +2239,7 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/bcm2708.c linux-3.2.21-bootc-5b0cc +{ + u32 cyc = clocksource_stc.read(&clocksource_stc); + return cyc_to_fixed_sched_clock(&cd, cyc, clocksource_stc.mask, -+ clocksource_stc.mult, clocksource_stc.shift); ++ SC_MULT, SC_SHIFT); +} + +static void notrace bcm2708_update_sched_clock(void) @@ -2760,7 +2766,7 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/bcm2708.c linux-3.2.21-bootc-5b0cc + setup_irq(IRQ_TIMER3, &bcm2708_timer_irq); + + init_fixed_sched_clock(&cd, bcm2708_update_sched_clock, 32, -+ STC_FREQ_HZ, clocksource_stc.mult, clocksource_stc.shift); ++ STC_FREQ_HZ, SC_MULT, SC_SHIFT); + + timer0_clockevent.mult = + div_sc(STC_FREQ_HZ, NSEC_PER_SEC, timer0_clockevent.shift); @@ -2818,9 +2824,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/bcm2708.c linux-3.2.21-bootc-5b0cc + &bcm2708_timer,.init_machine = + bcm2708_init, MACHINE_END module_param(boardrev, uint, 0644); +module_param(serial, uint, 0644); -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/bcm2708_gpio.c ---- linux-3.2.21/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/bcm2708_gpio.c 2012-07-02 13:42:13.232275620 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/bcm2708_gpio.c +--- linux-3.2.23/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/bcm2708_gpio.c 2012-07-15 20:28:26.130087221 +0200 @@ -0,0 +1,336 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -3158,9 +3164,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.2.21-bootc- +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver"); +MODULE_LICENSE("GPL"); + -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/bcm2708.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/bcm2708.h ---- linux-3.2.21/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/bcm2708.h 2012-07-02 13:42:13.235275683 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/bcm2708.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/bcm2708.h +--- linux-3.2.23/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/bcm2708.h 2012-07-15 20:28:26.133087278 +0200 @@ -0,0 +1,51 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -3213,9 +3219,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/bcm2708.h linux-3.2.21-bootc-5b0cc +} + +#endif -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/clock.c linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/clock.c ---- linux-3.2.21/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/clock.c 2012-07-02 13:42:13.232275620 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/clock.c linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/clock.c +--- linux-3.2.23/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/clock.c 2012-07-15 20:28:26.130087221 +0200 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -3278,9 +3284,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/clock.c linux-3.2.21-bootc-5b0ccb0 + return -EIO; +} +EXPORT_SYMBOL(clk_set_rate); -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/clock.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/clock.h ---- linux-3.2.21/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/clock.h 2012-07-02 13:42:13.233275641 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/clock.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/clock.h +--- linux-3.2.23/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/clock.h 2012-07-15 20:28:26.131087240 +0200 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -3306,9 +3312,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/clock.h linux-3.2.21-bootc-5b0ccb0 +struct clk { + unsigned long rate; +}; -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/dma.c linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/dma.c ---- linux-3.2.21/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/dma.c 2012-07-02 13:42:13.235275683 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/dma.c linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/dma.c +--- linux-3.2.23/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/dma.c 2012-07-15 20:28:26.133087278 +0200 @@ -0,0 +1,397 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -3707,9 +3713,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/dma.c linux-3.2.21-bootc-5b0ccb0/a +MODULE_LICENSE("GPL"); + +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/arm_control.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/arm_control.h 2012-07-02 13:42:13.233275641 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/arm_control.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/arm_control.h 2012-07-15 20:28:26.131087240 +0200 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -4130,9 +4136,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3 +#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c) + +#endif -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/arm_power.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/arm_power.h 2012-07-02 13:42:13.234275662 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/arm_power.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/arm_power.h 2012-07-15 20:28:26.132087259 +0200 @@ -0,0 +1,60 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -4194,9 +4200,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.2 +}; + +#endif -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/clkdev.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/clkdev.h 2012-07-02 13:42:13.234275662 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/clkdev.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/clkdev.h 2012-07-15 20:28:26.132087259 +0200 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -4205,9 +4211,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.2.21 +#define __clk_put(clk) do { } while (0) + +#endif -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/debug-macro.S ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2012-07-02 13:42:13.234275662 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/debug-macro.S +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2012-07-15 20:28:26.132087259 +0200 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -4231,9 +4237,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3 + .endm + +#include -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/dma.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/dma.h 2012-07-02 13:42:13.233275641 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/dma.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/dma.h 2012-07-15 20:28:26.131087240 +0200 @@ -0,0 +1,84 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -4319,9 +4325,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.2.21-bo + + +#endif /* _MACH_BCM2708_DMA_H */ -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/entry-macro.S ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2012-07-02 13:42:13.234275662 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/entry-macro.S +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2012-07-15 20:28:26.132087259 +0200 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -4392,9 +4398,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3 +1020: @ EQ will be set if no irqs pending + + .endm -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/frc.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/frc.h 2012-07-02 13:42:13.234275662 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/frc.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/frc.h 2012-07-15 20:28:26.132087259 +0200 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -4434,9 +4440,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.2.21-bo +extern unsigned long long frc_clock_ticks63(void); + +#endif -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/gpio.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/gpio.h 2012-07-02 13:42:13.235275683 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/gpio.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/gpio.h 2012-07-15 20:28:26.133087278 +0200 @@ -0,0 +1,47 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -4485,9 +4491,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.2.21-b +#endif /* CONFIG_GPIOLIB */ + +#endif -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/hardware.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/hardware.h 2012-07-02 13:42:13.234275662 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/hardware.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/hardware.h 2012-07-15 20:28:26.132087259 +0200 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -4517,9 +4523,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.2. +#include + +#endif -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/io.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/io.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/io.h 2012-07-02 13:42:13.234275662 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/io.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/io.h 2012-07-15 20:28:26.132087259 +0200 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -4549,9 +4555,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/io.h linux-3.2.21-boo +#define __mem_pci(a) (a) + +#endif -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/irqs.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/irqs.h 2012-07-02 13:42:13.233275641 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/irqs.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/irqs.h 2012-07-15 20:28:26.131087240 +0200 @@ -0,0 +1,196 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -4749,9 +4755,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.2.21-b + + +#endif /* _BCM2708_IRQS_H_ */ -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/memory.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/memory.h 2012-07-02 13:42:13.234275662 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/memory.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/memory.h 2012-07-15 20:28:26.132087259 +0200 @@ -0,0 +1,64 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -4817,9 +4823,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.2.21 +#define CONSISTENT_DMA_SIZE 0x00200000 + +#endif -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/platform.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/platform.h 2012-07-02 13:42:13.234275662 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/platform.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/platform.h 2012-07-15 20:28:26.132087259 +0200 @@ -0,0 +1,224 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -5045,9 +5051,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.2. +#endif + +/* END */ -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/power.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/power.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/power.h 2012-07-02 13:42:13.234275662 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/power.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/power.h 2012-07-15 20:28:26.132087259 +0200 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -5075,9 +5081,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/power.h linux-3.2.21- +extern int bcm_power_close(BCM_POWER_HANDLE_T handle); + +#endif -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/system.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/system.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/system.h 2012-07-02 13:42:13.234275662 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/system.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/system.h 2012-07-15 20:28:26.132087259 +0200 @@ -0,0 +1,53 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -5132,9 +5138,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/system.h linux-3.2.21 +} + +#endif -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/timex.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/timex.h 2012-07-02 13:42:13.234275662 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/timex.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/timex.h 2012-07-15 20:28:26.132087259 +0200 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -5159,9 +5165,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.2.21- + */ + +#define CLOCK_TICK_RATE (1000000) -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/uncompress.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/uncompress.h 2012-07-02 13:42:13.233275641 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/uncompress.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/uncompress.h 2012-07-15 20:28:26.131087240 +0200 @@ -0,0 +1,84 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -5247,9 +5253,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3. + * nothing to do + */ +#define arch_decomp_wdog() -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/vcio.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/vcio.h 2012-07-02 13:42:13.233275641 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/vcio.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/vcio.h 2012-07-15 20:28:26.131087240 +0200 @@ -0,0 +1,42 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -5293,9 +5299,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.2.21-b +extern int /*rc*/ bcm_mailbox_write(unsigned chan, uint32_t data28); + +#endif -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/vc_mem.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2012-07-02 13:42:13.233275641 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/vc_mem.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2012-07-15 20:28:26.131087240 +0200 @@ -0,0 +1,35 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -5332,9 +5338,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.2.21 + +#endif /* VC_MEM_H */ + -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/vmalloc.h ---- linux-3.2.21/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2012-07-02 13:42:13.233275641 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/vmalloc.h +--- linux-3.2.23/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2012-07-15 20:28:26.131087240 +0200 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -5356,9 +5362,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.2.2 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#define VMALLOC_END (0xd8000000) -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/Kconfig linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/Kconfig ---- linux-3.2.21/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/Kconfig 2012-07-02 13:42:13.232275620 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/Kconfig linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/Kconfig +--- linux-3.2.23/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/Kconfig 2012-07-15 20:28:26.130087221 +0200 @@ -0,0 +1,32 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -5392,9 +5398,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/Kconfig linux-3.2.21-bootc-5b0ccb0 + Do not allow ARM to use GPU's L2 cache. Requires disable_l2cache in config.txt. + +endmenu -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/Makefile linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/Makefile ---- linux-3.2.21/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/Makefile 2012-07-02 13:42:13.232275620 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/Makefile linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/Makefile +--- linux-3.2.23/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/Makefile 2012-07-15 20:28:26.130087221 +0200 @@ -0,0 +1,8 @@ +# +# Makefile for the linux kernel. @@ -5404,16 +5410,16 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/Makefile linux-3.2.21-bootc-5b0ccb +obj-$(CONFIG_BCM2708_GPIO) += bcm2708_gpio.o +obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o + -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/Makefile.boot linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/Makefile.boot ---- linux-3.2.21/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/Makefile.boot 2012-07-02 13:42:13.232275620 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/Makefile.boot linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/Makefile.boot +--- linux-3.2.23/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/Makefile.boot 2012-07-15 20:28:26.130087221 +0200 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/power.c linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/power.c ---- linux-3.2.21/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/power.c 2012-07-02 13:42:13.235275683 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/power.c linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/power.c +--- linux-3.2.23/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/power.c 2012-07-15 20:28:26.133087278 +0200 @@ -0,0 +1,194 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -5609,10 +5615,10 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/power.c linux-3.2.21-bootc-5b0ccb0 +MODULE_AUTHOR("Phil Elwell"); +MODULE_DESCRIPTION("Interface to BCM2708 power management"); +MODULE_LICENSE("GPL"); -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/vcio.c linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/vcio.c ---- linux-3.2.21/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/vcio.c 2012-07-02 13:42:13.232275620 +0200 -@@ -0,0 +1,308 @@ +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/vcio.c linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/vcio.c +--- linux-3.2.23/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/vcio.c 2012-07-15 20:28:26.130087221 +0200 +@@ -0,0 +1,304 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c + * @@ -5734,14 +5740,10 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/vcio.c linux-3.2.21-bootc-5b0ccb0/ + if (mbox->magic != MBOX_MAGIC) + rc = -EINVAL; + else { -+ if (down_interruptible(&mbox->sema[chan]) == 0) { -+ *data28 = MBOX_DATA28(mbox->msg[chan]); -+ mbox->msg[chan] = 0; -+ rc = 0; -+ } else { -+ /* The wait was interrupted */ -+ rc = -EINTR; -+ } ++ down(&mbox->sema[chan]); ++ *data28 = MBOX_DATA28(mbox->msg[chan]); ++ mbox->msg[chan] = 0; ++ rc = 0; + } + return rc; +} @@ -5921,9 +5923,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/vcio.c linux-3.2.21-bootc-5b0ccb0/ +MODULE_DESCRIPTION("ARM I/O to VideoCore processor"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm-mbox"); -diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/vc_mem.c linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/vc_mem.c ---- linux-3.2.21/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mach-bcm2708/vc_mem.c 2012-07-02 13:42:13.235275683 +0200 +diff -Naur linux-3.2.23/arch/arm/mach-bcm2708/vc_mem.c linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/vc_mem.c +--- linux-3.2.23/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/arch/arm/mach-bcm2708/vc_mem.c 2012-07-15 20:28:26.133087278 +0200 @@ -0,0 +1,466 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -6391,9 +6393,9 @@ diff -Naur linux-3.2.21/arch/arm/mach-bcm2708/vc_mem.c linux-3.2.21-bootc-5b0ccb +module_exit(vc_mem_exit); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Broadcom Corporation"); -diff -Naur linux-3.2.21/arch/arm/Makefile linux-3.2.21-bootc-5b0ccb0/arch/arm/Makefile ---- linux-3.2.21/arch/arm/Makefile 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/Makefile 2012-07-02 13:42:13.008271044 +0200 +diff -Naur linux-3.2.23/arch/arm/Makefile linux-rpi-bootc-3.2.23/arch/arm/Makefile +--- linux-3.2.23/arch/arm/Makefile 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/arch/arm/Makefile 2012-07-15 20:28:25.861082159 +0200 @@ -198,6 +198,7 @@ machine-$(CONFIG_MACH_SPEAR320) := spear3xx machine-$(CONFIG_MACH_SPEAR600) := spear6xx @@ -6402,9 +6404,9 @@ diff -Naur linux-3.2.21/arch/arm/Makefile linux-3.2.21-bootc-5b0ccb0/arch/arm/Ma # Platform directory name. This list is sorted alphanumerically # by CONFIG_* macro name. -diff -Naur linux-3.2.21/arch/arm/mm/alignment.c linux-3.2.21-bootc-5b0ccb0/arch/arm/mm/alignment.c ---- linux-3.2.21/arch/arm/mm/alignment.c 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mm/alignment.c 2012-07-02 13:42:13.231275600 +0200 +diff -Naur linux-3.2.23/arch/arm/mm/alignment.c linux-rpi-bootc-3.2.23/arch/arm/mm/alignment.c +--- linux-3.2.23/arch/arm/mm/alignment.c 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/arch/arm/mm/alignment.c 2012-07-15 20:28:26.129087202 +0200 @@ -855,9 +855,11 @@ case 0x08000000: /* ldm or stm, or thumb-2 32bit instruction */ if (thumb2_32b) @@ -6419,9 +6421,9 @@ diff -Naur linux-3.2.21/arch/arm/mm/alignment.c linux-3.2.21-bootc-5b0ccb0/arch/ default: goto bad; -diff -Naur linux-3.2.21/arch/arm/mm/Kconfig linux-3.2.21-bootc-5b0ccb0/arch/arm/mm/Kconfig ---- linux-3.2.21/arch/arm/mm/Kconfig 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mm/Kconfig 2012-07-02 13:42:13.227275520 +0200 +diff -Naur linux-3.2.23/arch/arm/mm/Kconfig linux-rpi-bootc-3.2.23/arch/arm/mm/Kconfig +--- linux-3.2.23/arch/arm/mm/Kconfig 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/arch/arm/mm/Kconfig 2012-07-15 20:28:26.120087033 +0200 @@ -390,7 +390,7 @@ # ARMv6 @@ -6431,9 +6433,9 @@ diff -Naur linux-3.2.21/arch/arm/mm/Kconfig linux-3.2.21-bootc-5b0ccb0/arch/arm/ select CPU_32v6 select CPU_ABRT_EV6 select CPU_PABRT_V6 -diff -Naur linux-3.2.21/arch/arm/mm/proc-v6.S linux-3.2.21-bootc-5b0ccb0/arch/arm/mm/proc-v6.S ---- linux-3.2.21/arch/arm/mm/proc-v6.S 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/arch/arm/mm/proc-v6.S 2012-07-02 13:42:13.230275580 +0200 +diff -Naur linux-3.2.23/arch/arm/mm/proc-v6.S linux-rpi-bootc-3.2.23/arch/arm/mm/proc-v6.S +--- linux-3.2.23/arch/arm/mm/proc-v6.S 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/arch/arm/mm/proc-v6.S 2012-07-15 20:28:26.128087183 +0200 @@ -70,10 +70,19 @@ * * IRQs are already disabled. @@ -6457,9 +6459,9 @@ diff -Naur linux-3.2.21/arch/arm/mm/proc-v6.S linux-3.2.21-bootc-5b0ccb0/arch/ar mov pc, lr ENTRY(cpu_v6_dcache_clean_area) -diff -Naur linux-3.2.21/drivers/i2c/busses/i2c-bcm2708.c linux-3.2.21-bootc-5b0ccb0/drivers/i2c/busses/i2c-bcm2708.c ---- linux-3.2.21/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/i2c/busses/i2c-bcm2708.c 2012-07-02 13:42:15.960331367 +0200 +diff -Naur linux-3.2.23/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-bootc-3.2.23/drivers/i2c/busses/i2c-bcm2708.c +--- linux-3.2.23/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/i2c/busses/i2c-bcm2708.c 2012-07-15 20:29:11.415939334 +0200 @@ -0,0 +1,379 @@ +/* + * Driver for Broadcom BCM2708 BSC Controllers @@ -6840,9 +6842,9 @@ diff -Naur linux-3.2.21/drivers/i2c/busses/i2c-bcm2708.c linux-3.2.21-bootc-5b0c +MODULE_AUTHOR("Chris Boot "); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); -diff -Naur linux-3.2.21/drivers/i2c/busses/Kconfig linux-3.2.21-bootc-5b0ccb0/drivers/i2c/busses/Kconfig ---- linux-3.2.21/drivers/i2c/busses/Kconfig 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/i2c/busses/Kconfig 2012-07-02 13:42:15.960331367 +0200 +diff -Naur linux-3.2.23/drivers/i2c/busses/Kconfig linux-rpi-bootc-3.2.23/drivers/i2c/busses/Kconfig +--- linux-3.2.23/drivers/i2c/busses/Kconfig 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/i2c/busses/Kconfig 2012-07-15 20:29:12.757964595 +0200 @@ -308,6 +308,14 @@ This driver can also be built as a module. If so, the module will be called i2c-au1550. @@ -6858,9 +6860,9 @@ diff -Naur linux-3.2.21/drivers/i2c/busses/Kconfig linux-3.2.21-bootc-5b0ccb0/dr config I2C_BLACKFIN_TWI tristate "Blackfin TWI I2C support" depends on BLACKFIN -diff -Naur linux-3.2.21/drivers/i2c/busses/Makefile linux-3.2.21-bootc-5b0ccb0/drivers/i2c/busses/Makefile ---- linux-3.2.21/drivers/i2c/busses/Makefile 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/i2c/busses/Makefile 2012-07-02 13:42:15.958331325 +0200 +diff -Naur linux-3.2.23/drivers/i2c/busses/Makefile linux-rpi-bootc-3.2.23/drivers/i2c/busses/Makefile +--- linux-3.2.23/drivers/i2c/busses/Makefile 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/i2c/busses/Makefile 2012-07-15 20:29:11.329937716 +0200 @@ -30,6 +30,7 @@ # Embedded system I2C/SMBus host controller drivers obj-$(CONFIG_I2C_AT91) += i2c-at91.o @@ -6869,9 +6871,9 @@ diff -Naur linux-3.2.21/drivers/i2c/busses/Makefile linux-3.2.21-bootc-5b0ccb0/d obj-$(CONFIG_I2C_BLACKFIN_TWI) += i2c-bfin-twi.o obj-$(CONFIG_I2C_CPM) += i2c-cpm.o obj-$(CONFIG_I2C_DAVINCI) += i2c-davinci.o -diff -Naur linux-3.2.21/drivers/misc/Kconfig linux-3.2.21-bootc-5b0ccb0/drivers/misc/Kconfig ---- linux-3.2.21/drivers/misc/Kconfig 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/Kconfig 2012-07-02 13:42:15.982331817 +0200 +diff -Naur linux-3.2.23/drivers/misc/Kconfig linux-rpi-bootc-3.2.23/drivers/misc/Kconfig +--- linux-3.2.23/drivers/misc/Kconfig 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/misc/Kconfig 2012-07-15 20:29:13.403976727 +0200 @@ -508,5 +508,6 @@ source "drivers/misc/lis3lv02d/Kconfig" source "drivers/misc/carma/Kconfig" @@ -6879,17 +6881,17 @@ diff -Naur linux-3.2.21/drivers/misc/Kconfig linux-3.2.21-bootc-5b0ccb0/drivers/ +source "drivers/misc/vc04_services/Kconfig" endif # MISC_DEVICES -diff -Naur linux-3.2.21/drivers/misc/Makefile linux-3.2.21-bootc-5b0ccb0/drivers/misc/Makefile ---- linux-3.2.21/drivers/misc/Makefile 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/Makefile 2012-07-02 13:42:15.976331692 +0200 +diff -Naur linux-3.2.23/drivers/misc/Makefile linux-rpi-bootc-3.2.23/drivers/misc/Makefile +--- linux-3.2.23/drivers/misc/Makefile 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/misc/Makefile 2012-07-15 20:29:13.129971586 +0200 @@ -48,3 +48,4 @@ obj-y += carma/ obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ +obj-y += vc04_services/ -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchi/connections/connection.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2012-07-02 13:42:15.996332103 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchi/connections/connection.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2012-07-15 20:29:13.762983497 +0200 @@ -0,0 +1,309 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -7200,9 +7202,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchi/connections/co +#endif /* CONNECTION_H_ */ + +/****************************** End of file **********************************/ -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2012-07-02 13:42:15.996332103 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2012-07-15 20:29:13.752983309 +0200 @@ -0,0 +1,186 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -7390,9 +7392,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchi/message_driver +#endif // _VCHI_MESSAGE_H_ + +/****************************** End of file ***********************************/ -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2012-07-02 13:42:15.996332103 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2012-07-15 20:29:13.752983309 +0200 @@ -0,0 +1,214 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -7608,9 +7610,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h lin +#endif /* VCHI_CFG_H_ */ + +/****************************** End of file **********************************/ -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2012-07-02 13:42:15.995332082 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2012-07-15 20:29:13.751983290 +0200 @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -7668,9 +7670,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchi/vchi_cfg_inter +//#define VCHI_RX_NANOLOCKS + +#endif /*VCHI_CFG_INTERNAL_H_*/ -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchi/vchi_common.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2012-07-02 13:42:15.995332082 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi_common.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2012-07-15 20:29:13.751983290 +0200 @@ -0,0 +1,152 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -7824,9 +7826,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchi/vchi_common.h + + +#endif // VCHI_COMMON_H_ -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchi/vchi.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchi/vchi.h 2012-07-02 13:42:15.995332082 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi.h 2012-07-15 20:29:13.751983290 +0200 @@ -0,0 +1,347 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8175,9 +8177,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3 +#endif /* VCHI_H_ */ + +/****************************** End of file **********************************/ -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchi/vchi_mh.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2012-07-02 13:42:15.995332082 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi_mh.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2012-07-15 20:29:13.750983271 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -8206,9 +8208,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linu +#define VCHI_MEM_HANDLE_INVALID 0 + +#endif -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2012-07-02 13:42:15.993332040 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2012-07-15 20:29:13.666981713 +0200 @@ -0,0 +1,512 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8722,9 +8724,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_283 + kfree(pagelist); +} + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2012-07-02 13:42:15.994332061 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2012-07-15 20:29:13.734982971 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8753,9 +8755,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_283 +#define VCHIQ_PLATFORM_FRAGMENTS_COUNT_IDX 1 + +#endif /* VCHIQ_2835_H */ -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2012-07-02 13:42:15.993332040 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2012-07-15 20:29:13.723982762 +0200 @@ -0,0 +1,1912 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -10669,9 +10671,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm +module_exit(vchiq_exit); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Broadcom Corporation"); -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2012-07-02 13:42:15.993332040 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2012-07-15 20:29:13.674981835 +0200 @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -10791,9 +10793,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm + + +#endif /* VCHIQ_ARM_H */ -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2012-07-02 13:42:15.994332061 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2012-07-15 20:29:13.725982798 +0200 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -10838,9 +10840,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg +#endif + +#endif /* VCHIQ_CFG_H */ -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2012-07-02 13:42:15.995332082 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2012-07-15 20:29:13.750983271 +0200 @@ -0,0 +1,101 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -10943,9 +10945,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_con +} + +EXPORT_SYMBOL( vchiq_add_connected_callback ); -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2012-07-02 13:42:15.994332061 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2012-07-15 20:29:13.733982952 +0200 @@ -0,0 +1,32 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -10979,9 +10981,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_con + +#endif /* VCHIQ_CONNECTED_H */ + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2012-07-02 13:42:15.995332082 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2012-07-15 20:29:13.749983252 +0200 @@ -0,0 +1,2717 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -13700,9 +13702,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cor + } + return status; +} -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2012-07-02 13:42:15.994332061 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2012-07-15 20:29:13.724982778 +0200 @@ -0,0 +1,506 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -14210,9 +14212,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cor +vchiq_platform_conn_state_changed(VCHIQ_STATE_T* state, VCHIQ_CONNSTATE_T oldstate, VCHIQ_CONNSTATE_T newstate); + +#endif -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2012-07-02 13:42:15.994332061 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2012-07-15 20:29:13.724982778 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -14241,9 +14243,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h l + +#endif + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2012-07-02 13:42:15.994332061 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2012-07-15 20:29:13.725982798 +0200 @@ -0,0 +1,155 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -14400,9 +14402,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if. +extern VCHIQ_STATUS_T vchiq_dump_phys_mem( VCHIQ_SERVICE_HANDLE_T service, void *ptr, size_t num_bytes ); + +#endif /* VCHIQ_IF_H */ -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2012-07-02 13:42:15.995332082 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2012-07-15 20:29:13.742983121 +0200 @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -14509,9 +14511,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioc +#define VCHIQ_IOC_MAX 15 + +#endif -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2012-07-02 13:42:15.994332061 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2012-07-15 20:29:13.734982971 +0200 @@ -0,0 +1,297 @@ +/***************************************************************************** +* Copyright 2001 - 2011 Broadcom Corporation. All rights reserved. @@ -14810,9 +14812,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ker +EXPORT_SYMBOL(vchiq_open_service); +EXPORT_SYMBOL(vchiq_add_service_params); +EXPORT_SYMBOL(vchiq_open_service_params); -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 2012-07-02 13:42:15.994332061 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 2012-07-15 20:29:13.726982820 +0200 @@ -0,0 +1,1628 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -16442,9 +16444,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib + free_msgbufs = buf; + vcos_mutex_unlock(&vchiq_lib_mutex); +} -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2012-07-02 13:42:15.994332061 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2012-07-15 20:29:13.733982952 +0200 @@ -0,0 +1,45 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -16491,9 +16493,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_mem +VCHIQ_STATUS_T vchiq_memdrv_initialise(void); + +#endif -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2012-07-02 13:42:15.993332040 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2012-07-15 20:29:13.723982762 +0200 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -16538,9 +16540,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pag +} FRAGMENTS_T; + +#endif /* VCHIQ_PAGELIST_H */ -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2012-07-02 13:42:15.993332040 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2012-07-15 20:29:13.724982778 +0200 @@ -0,0 +1,1001 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -17543,9 +17545,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shi +EXPORT_SYMBOL(vchi_service_use); +EXPORT_SYMBOL(vchi_service_release); +#endif -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2012-07-02 13:42:15.995332082 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2012-07-15 20:29:13.750983271 +0200 @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -17644,9 +17646,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_uti + + return header; +} -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2012-07-02 13:42:15.993332040 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2012-07-15 20:29:13.674981835 +0200 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -17695,9 +17697,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_uti + +#endif + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 2012-07-02 13:42:15.990331980 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 2012-07-15 20:29:13.594980335 +0200 @@ -0,0 +1,681 @@ +/***************************************************************************** +* Copyright 2009 - 2011 Broadcom Corporation. All rights reserved. @@ -18380,9 +18382,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_c + return VCOS_SUCCESS; +} + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 2012-07-02 13:42:15.990331980 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 2012-07-15 20:29:13.587980204 +0200 @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -18471,9 +18473,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_c +VCOSPRE_ void VCOSPOST_ vcos_timer_init(void); +#endif + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 2012-07-02 13:42:15.991332000 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 2012-07-15 20:29:13.595980354 +0200 @@ -0,0 +1,271 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -18746,9 +18748,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_g +#endif +#endif /* VCOS_GENERIC_BLOCKPOOL_H */ + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 2012-07-02 13:42:15.990331980 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 2012-07-15 20:29:13.594980335 +0200 @@ -0,0 +1,311 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19061,9 +19063,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_g +} + +#endif -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 2012-07-02 13:42:15.991332000 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 2012-07-15 20:29:13.597980392 +0200 @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19183,9 +19185,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_g +#endif +#endif + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 2012-07-02 13:42:15.991332000 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 2012-07-15 20:29:13.596980373 +0200 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19279,9 +19281,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_g +#endif + + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 2012-07-02 13:42:15.991332000 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 2012-07-15 20:29:13.595980354 +0200 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19369,9 +19371,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_g +#endif + + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 2012-07-02 13:42:15.991332000 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 2012-07-15 20:29:13.595980354 +0200 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19459,9 +19461,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_g +#endif + + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 2012-07-02 13:42:15.990331980 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 2012-07-15 20:29:13.571979902 +0200 @@ -0,0 +1,155 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19618,9 +19620,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_g +#endif + + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 2012-07-02 13:42:15.991332000 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 2012-07-15 20:29:13.596980373 +0200 @@ -0,0 +1,214 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19836,9 +19838,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_j +} +#endif +#endif /* VCOS_JOINABLE_THREAD_FROM_PLAIN_H */ -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 2012-07-02 13:42:15.991332000 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 2012-07-15 20:29:13.596980373 +0200 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19899,9 +19901,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_l + +#endif /* VCOS_INLINE_BODIES */ + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 2012-07-02 13:42:15.990331980 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 2012-07-15 20:29:13.593980317 +0200 @@ -0,0 +1,560 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20463,9 +20465,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_l + } +} + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 2012-07-02 13:42:15.990331980 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 2012-07-15 20:29:13.582980110 +0200 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20551,9 +20553,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_m + _vcos_platform_free(h->ptr); +} + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 2012-07-02 13:42:15.990331980 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 2012-07-15 20:29:13.571979902 +0200 @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20620,9 +20622,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_m +#endif /* VCOS_INLINE_BODIES */ + + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 2012-07-02 13:42:15.991332000 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 2012-07-15 20:29:13.596980373 +0200 @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20703,9 +20705,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_m + + + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 2012-07-02 13:42:15.990331980 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 2012-07-15 20:29:13.588980223 +0200 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20753,9 +20755,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/generic/vcos_t +#endif + + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 2012-07-02 13:42:15.988331939 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 2012-07-15 20:29:13.465977909 +0200 @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20788,9 +20790,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/st +#include /* includes integer types */ + +#endif /* _VCOS_PLATFORM_LINUX_STDINT_H */ -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 2012-07-02 13:42:15.989331960 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 2012-07-15 20:29:13.472978040 +0200 @@ -0,0 +1,627 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -21419,9 +21421,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +EXPORT_SYMBOL( vcos_verify_bkpts_enabled ); + +EXPORT_SYMBOL( vcos_strdup ); -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 2012-07-02 13:42:15.988331939 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 2012-07-15 20:29:13.471978021 +0200 @@ -0,0 +1,332 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -21755,9 +21757,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc + +EXPORT_SYMBOL_GPL( vcos_cfg_get_proc_entry ); + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 2012-07-02 13:42:15.988331939 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 2012-07-15 20:29:13.472978040 +0200 @@ -0,0 +1,111 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -21870,9 +21872,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc + +// END ######################################################################### +// ############################################################################# -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 2012-07-02 13:42:15.988331939 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 2012-07-15 20:29:13.471978021 +0200 @@ -0,0 +1,64 @@ +/***************************************************************************** +* Copyright 2006 - 2008 Broadcom Corporation. All rights reserved. @@ -21938,9 +21940,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +MODULE_LICENSE( "GPL" ); +MODULE_VERSION( "1.0" ); + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 2012-07-02 13:42:15.988331939 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 2012-07-15 20:29:13.470978002 +0200 @@ -0,0 +1,507 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -22449,9 +22451,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc + +#endif /* VCOS_PLATFORM_H */ + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 2012-07-02 13:42:15.989331960 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 2012-07-15 20:29:13.483978247 +0200 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -22512,9 +22514,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +#define PRIx64 "llx" + +#endif -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 2012-07-02 13:42:15.989331960 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 2012-07-15 20:29:13.484978266 +0200 @@ -0,0 +1,129 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -22645,9 +22647,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc + + return *vcos_thread_storage; +} -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 2012-07-02 13:42:15.989331960 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 2012-07-15 20:29:13.483978247 +0200 @@ -0,0 +1,39 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -22688,9 +22690,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +VCOS_THREAD_T *vcos_kthread_current(void); + +#endif /*VCOS_THREAD_MAP_H */ -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_assert.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_assert.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 2012-07-02 13:42:15.992332020 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_assert.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_assert.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 2012-07-15 20:29:13.598980411 +0200 @@ -0,0 +1,280 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -22972,9 +22974,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_assert.h +#endif + +#endif /* VCOS_ASSERT_H */ -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 2012-07-02 13:42:15.991332000 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 2012-07-15 20:29:13.597980392 +0200 @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23059,9 +23061,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_atomic_fl +#endif + +#endif -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 2012-07-02 13:42:15.988331939 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 2012-07-15 20:29:13.463977871 +0200 @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23086,9 +23088,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_build_inf +const char *vcos_get_build_time( void ); +const char *vcos_get_build_date( void ); + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 2012-07-02 13:42:15.988331939 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 2012-07-15 20:29:13.462977852 +0200 @@ -0,0 +1,113 @@ +/***************************************************************************** +* Copyright 2009 - 2011 Broadcom Corporation. All rights reserved. @@ -23203,9 +23205,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h lin +#endif +#endif + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 2012-07-02 13:42:15.989331960 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 2012-07-15 20:29:13.502978604 +0200 @@ -0,0 +1,98 @@ +/***************************************************************************** +* Copyright 2009 - 2011 Broadcom Corporation. All rights reserved. @@ -23305,9 +23307,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h lin + +#endif /* VCOS_CMD_H */ + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 2012-07-02 13:42:15.992332020 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 2012-07-15 20:29:13.600980449 +0200 @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23349,9 +23351,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h l + +#endif + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 2012-07-02 13:42:15.992332020 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 2012-07-15 20:29:13.598980411 +0200 @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23433,9 +23435,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h l +#endif + + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 2012-07-02 13:42:15.989331960 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 2012-07-15 20:29:13.493978435 +0200 @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23546,9 +23548,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_event_fla + +#endif + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_event.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_event.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_event.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_event.h 2012-07-02 13:42:15.989331960 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_event.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_event.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_event.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_event.h 2012-07-15 20:29:13.501978585 +0200 @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23658,9 +23660,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_event.h l +#endif + + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos.h 2012-07-02 13:42:15.990331980 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos.h 2012-07-15 20:29:13.554979584 +0200 @@ -0,0 +1,212 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23874,9 +23876,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos.h linux-3 + +#endif /* VCOS_H */ + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_init.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_init.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_init.h 2012-07-02 13:42:15.993332040 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_init.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_init.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_init.h 2012-07-15 20:29:13.607980580 +0200 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23932,9 +23934,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_init.h li +} +#endif + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_logging.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_logging.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 2012-07-02 13:42:15.989331960 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_logging.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_logging.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 2012-07-15 20:29:13.516978868 +0200 @@ -0,0 +1,290 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24226,9 +24228,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_logging.h +#endif /* VCOS_LOGGING_H */ + + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 2012-07-02 13:42:15.992332020 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 2012-07-15 20:29:13.599980430 +0200 @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24348,9 +24350,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_ +#endif +#endif + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_mem.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_mem.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 2012-07-02 13:42:15.992332020 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_mem.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_mem.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 2012-07-15 20:29:13.599980430 +0200 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24444,9 +24446,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_mem.h lin +#endif + + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 2012-07-02 13:42:15.992332020 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 2012-07-15 20:29:13.600980449 +0200 @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24616,9 +24618,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue. +#endif + + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 2012-07-02 13:42:15.989331960 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 2012-07-15 20:29:13.501978585 +0200 @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24723,9 +24725,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h l +} +#endif +#endif -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_once.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_once.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_once.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_once.h 2012-07-02 13:42:15.991332000 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_once.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_once.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_once.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_once.h 2012-07-15 20:29:13.597980392 +0200 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24780,9 +24782,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_once.h li +#endif +#endif + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 2012-07-02 13:42:15.992332020 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 2012-07-15 20:29:13.597980392 +0200 @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24910,9 +24912,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_semaphore +#endif +#endif + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 2012-07-02 13:42:15.993332040 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 2012-07-15 20:29:13.609980618 +0200 @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24948,9 +24950,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h +#endif /* __cplusplus */ + +#endif -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 2012-07-02 13:42:15.992332020 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 2012-07-15 20:29:13.600980449 +0200 @@ -0,0 +1,203 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25155,9 +25157,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h +#endif /* VCOS_STDINT_H */ + + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_string.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_string.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_string.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_string.h 2012-07-02 13:42:15.992332020 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_string.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_string.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_string.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_string.h 2012-07-15 20:29:13.598980411 +0200 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25243,9 +25245,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_string.h +} +#endif +#endif -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 2012-07-02 13:42:15.989331960 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 2012-07-15 20:29:13.554979584 +0200 @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25334,9 +25336,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_thread_at +} +#endif +#endif -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_thread.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_thread.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 2012-07-02 13:42:15.992332020 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_thread.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_thread.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 2012-07-15 20:29:13.599980430 +0200 @@ -0,0 +1,270 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25608,9 +25610,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_thread.h +} +#endif +#endif -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_timer.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_timer.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 2012-07-02 13:42:15.992332020 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_timer.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_timer.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 2012-07-15 20:29:13.599980430 +0200 @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25718,9 +25720,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_timer.h l +} +#endif +#endif -diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_types.h linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_types.h ---- linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_types.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/interface/vcos/vcos_types.h 2012-07-02 13:42:15.989331960 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_types.h linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_types.h +--- linux-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_types.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/interface/vcos/vcos_types.h 2012-07-15 20:29:13.497978511 +0200 @@ -0,0 +1,211 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25933,9 +25935,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/interface/vcos/vcos_types.h l +typedef vcos_fourcc_t FOURCC_T; + +#endif -diff -Naur linux-3.2.21/drivers/misc/vc04_services/Kconfig linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/Kconfig ---- linux-3.2.21/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/Kconfig 2012-07-02 13:42:15.996332103 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/Kconfig linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/Kconfig +--- linux-3.2.23/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/Kconfig 2012-07-15 20:29:13.762983497 +0200 @@ -0,0 +1,7 @@ +config BCM2708_VCHIQ + tristate "Videocore VCHIQ" @@ -25944,9 +25946,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/Kconfig linux-3.2.21-bootc-5b + help + Helper for communication for VideoCore. + -diff -Naur linux-3.2.21/drivers/misc/vc04_services/Makefile linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/Makefile ---- linux-3.2.21/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/misc/vc04_services/Makefile 2012-07-02 13:42:15.996332103 +0200 +diff -Naur linux-3.2.23/drivers/misc/vc04_services/Makefile linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/Makefile +--- linux-3.2.23/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/misc/vc04_services/Makefile 2012-07-15 20:29:13.762983497 +0200 @@ -0,0 +1,21 @@ +obj-$(CONFIG_BCM2708_VCHIQ) += vchiq.o + @@ -25969,9 +25971,9 @@ diff -Naur linux-3.2.21/drivers/misc/vc04_services/Makefile linux-3.2.21-bootc-5 + + + -diff -Naur linux-3.2.21/drivers/mmc/core/core.c linux-3.2.21-bootc-5b0ccb0/drivers/mmc/core/core.c ---- linux-3.2.21/drivers/mmc/core/core.c 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/mmc/core/core.c 2012-07-02 13:42:16.308338477 +0200 +diff -Naur linux-3.2.23/drivers/mmc/core/core.c linux-rpi-bootc-3.2.23/drivers/mmc/core/core.c +--- linux-3.2.23/drivers/mmc/core/core.c 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/mmc/core/core.c 2012-07-15 20:29:21.657132039 +0200 @@ -514,10 +514,14 @@ if (data->flags & MMC_DATA_WRITE) @@ -25990,9 +25992,9 @@ diff -Naur linux-3.2.21/drivers/mmc/core/core.c linux-3.2.21-bootc-5b0ccb0/drive else limit_us = 100000; -diff -Naur linux-3.2.21/drivers/mmc/host/bcm2708_mci.c linux-3.2.21-bootc-5b0ccb0/drivers/mmc/host/bcm2708_mci.c ---- linux-3.2.21/drivers/mmc/host/bcm2708_mci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/mmc/host/bcm2708_mci.c 2012-07-02 13:42:16.304338397 +0200 +diff -Naur linux-3.2.23/drivers/mmc/host/bcm2708_mci.c linux-rpi-bootc-3.2.23/drivers/mmc/host/bcm2708_mci.c +--- linux-3.2.23/drivers/mmc/host/bcm2708_mci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/mmc/host/bcm2708_mci.c 2012-07-15 20:29:21.578130550 +0200 @@ -0,0 +1,889 @@ +/* + * linux/drivers/mmc/host/bcm2708_mci.c - Broadcom BCM2708 MCI driver @@ -26883,9 +26885,9 @@ diff -Naur linux-3.2.21/drivers/mmc/host/bcm2708_mci.c linux-3.2.21-bootc-5b0ccb +MODULE_DESCRIPTION("BCM2708 Multimedia Card Interface driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm2708_mci"); -diff -Naur linux-3.2.21/drivers/mmc/host/bcm2708_mci.h linux-3.2.21-bootc-5b0ccb0/drivers/mmc/host/bcm2708_mci.h ---- linux-3.2.21/drivers/mmc/host/bcm2708_mci.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/mmc/host/bcm2708_mci.h 2012-07-02 13:42:16.300338314 +0200 +diff -Naur linux-3.2.23/drivers/mmc/host/bcm2708_mci.h linux-rpi-bootc-3.2.23/drivers/mmc/host/bcm2708_mci.h +--- linux-3.2.23/drivers/mmc/host/bcm2708_mci.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/mmc/host/bcm2708_mci.h 2012-07-15 20:29:21.556130136 +0200 @@ -0,0 +1,101 @@ +/* + * linux/drivers/mmc/host/bcm2708_mci.c - Broadcom BCM2708 MCI driver @@ -26988,9 +26990,9 @@ diff -Naur linux-3.2.21/drivers/mmc/host/bcm2708_mci.h linux-3.2.21-bootc-5b0ccb + kunmap_atomic(buffer, KM_BIO_SRC_IRQ); +// local_irq_restore(*flags); +} -diff -Naur linux-3.2.21/drivers/mmc/host/Kconfig linux-3.2.21-bootc-5b0ccb0/drivers/mmc/host/Kconfig ---- linux-3.2.21/drivers/mmc/host/Kconfig 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/mmc/host/Kconfig 2012-07-02 13:42:16.302338356 +0200 +diff -Naur linux-3.2.23/drivers/mmc/host/Kconfig linux-rpi-bootc-3.2.23/drivers/mmc/host/Kconfig +--- linux-3.2.23/drivers/mmc/host/Kconfig 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/mmc/host/Kconfig 2012-07-15 20:29:21.572130435 +0200 @@ -229,6 +229,27 @@ YMMV. @@ -27034,9 +27036,9 @@ diff -Naur linux-3.2.21/drivers/mmc/host/Kconfig linux-3.2.21-bootc-5b0ccb0/driv config MMC_ATMELMCI_DMA bool "Atmel MCI DMA support" -diff -Naur linux-3.2.21/drivers/mmc/host/Makefile linux-3.2.21-bootc-5b0ccb0/drivers/mmc/host/Makefile ---- linux-3.2.21/drivers/mmc/host/Makefile 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/mmc/host/Makefile 2012-07-02 13:42:16.299338293 +0200 +diff -Naur linux-3.2.23/drivers/mmc/host/Makefile linux-rpi-bootc-3.2.23/drivers/mmc/host/Makefile +--- linux-3.2.23/drivers/mmc/host/Makefile 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/mmc/host/Makefile 2012-07-15 20:29:21.525129552 +0200 @@ -13,6 +13,7 @@ obj-$(CONFIG_MMC_SDHCI_PXAV2) += sdhci-pxav2.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o @@ -27053,9 +27055,9 @@ diff -Naur linux-3.2.21/drivers/mmc/host/Makefile linux-3.2.21-bootc-5b0ccb0/dri obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o obj-$(CONFIG_MMC_DW) += dw_mmc.o obj-$(CONFIG_MMC_SH_MMCIF) += sh_mmcif.o -diff -Naur linux-3.2.21/drivers/mmc/host/sdhci-bcm2708.c linux-3.2.21-bootc-5b0ccb0/drivers/mmc/host/sdhci-bcm2708.c ---- linux-3.2.21/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/mmc/host/sdhci-bcm2708.c 2012-07-02 13:42:16.304338397 +0200 +diff -Naur linux-3.2.23/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-bootc-3.2.23/drivers/mmc/host/sdhci-bcm2708.c +--- linux-3.2.23/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/mmc/host/sdhci-bcm2708.c 2012-07-15 20:29:21.576130512 +0200 @@ -0,0 +1,1477 @@ +/* + * sdhci-bcm2708.c Support for SDHCI device on BCM2708 @@ -28534,9 +28536,9 @@ diff -Naur linux-3.2.21/drivers/mmc/host/sdhci-bcm2708.c linux-3.2.21-bootc-5b0c +MODULE_PARM_DESC(emmc_clock_freq, "Specify the speed of emmc clock"); + + -diff -Naur linux-3.2.21/drivers/mmc/host/sdhci.c linux-3.2.21-bootc-5b0ccb0/drivers/mmc/host/sdhci.c ---- linux-3.2.21/drivers/mmc/host/sdhci.c 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/mmc/host/sdhci.c 2012-07-02 13:42:16.301338335 +0200 +diff -Naur linux-3.2.23/drivers/mmc/host/sdhci.c linux-rpi-bootc-3.2.23/drivers/mmc/host/sdhci.c +--- linux-3.2.23/drivers/mmc/host/sdhci.c 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/mmc/host/sdhci.c 2012-07-15 20:29:21.558130173 +0200 @@ -27,6 +27,7 @@ #include @@ -29084,9 +29086,9 @@ diff -Naur linux-3.2.21/drivers/mmc/host/sdhci.c linux-3.2.21-bootc-5b0ccb0/driv (host->flags & SDHCI_USE_ADMA) ? "ADMA" : (host->flags & SDHCI_USE_SDMA) ? "DMA" : "PIO"); -diff -Naur linux-3.2.21/drivers/mmc/host/sdhci.h linux-3.2.21-bootc-5b0ccb0/drivers/mmc/host/sdhci.h ---- linux-3.2.21/drivers/mmc/host/sdhci.h 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/mmc/host/sdhci.h 2012-07-02 13:42:16.301338335 +0200 +diff -Naur linux-3.2.23/drivers/mmc/host/sdhci.h linux-rpi-bootc-3.2.23/drivers/mmc/host/sdhci.h +--- linux-3.2.23/drivers/mmc/host/sdhci.h 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/mmc/host/sdhci.h 2012-07-15 20:29:21.559130191 +0200 @@ -273,6 +273,25 @@ void (*platform_reset_enter)(struct sdhci_host *host, u8 mask); void (*platform_reset_exit)(struct sdhci_host *host, u8 mask); @@ -29143,9 +29145,9 @@ diff -Naur linux-3.2.21/drivers/mmc/host/sdhci.h linux-3.2.21-bootc-5b0ccb0/driv #ifdef CONFIG_PM_RUNTIME extern int sdhci_runtime_suspend_host(struct sdhci_host *host); extern int sdhci_runtime_resume_host(struct sdhci_host *host); -diff -Naur linux-3.2.21/drivers/net/usb/smsc95xx.c linux-3.2.21-bootc-5b0ccb0/drivers/net/usb/smsc95xx.c ---- linux-3.2.21/drivers/net/usb/smsc95xx.c 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/net/usb/smsc95xx.c 2012-07-02 13:42:16.808348695 +0200 +diff -Naur linux-3.2.23/drivers/net/usb/smsc95xx.c linux-rpi-bootc-3.2.23/drivers/net/usb/smsc95xx.c +--- linux-3.2.23/drivers/net/usb/smsc95xx.c 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/net/usb/smsc95xx.c 2012-07-15 20:29:39.445466746 +0200 @@ -46,6 +46,7 @@ #define SMSC95XX_INTERNAL_PHY_ID (1) #define SMSC95XX_TX_OVERHEAD (8) @@ -29233,9 +29235,9 @@ diff -Naur linux-3.2.21/drivers/net/usb/smsc95xx.c linux-3.2.21-bootc-5b0ccb0/dr return 0; } -diff -Naur linux-3.2.21/drivers/spi/Kconfig linux-3.2.21-bootc-5b0ccb0/drivers/spi/Kconfig ---- linux-3.2.21/drivers/spi/Kconfig 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/spi/Kconfig 2012-07-02 13:42:17.511363062 +0200 +diff -Naur linux-3.2.23/drivers/spi/Kconfig linux-rpi-bootc-3.2.23/drivers/spi/Kconfig +--- linux-3.2.23/drivers/spi/Kconfig 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/spi/Kconfig 2012-07-15 20:29:50.559675875 +0200 @@ -74,6 +74,14 @@ This selects a driver for the Atmel SPI Controller, present on many AT32 (AVR32) and AT91 (ARM) chips. @@ -29251,9 +29253,9 @@ diff -Naur linux-3.2.21/drivers/spi/Kconfig linux-3.2.21-bootc-5b0ccb0/drivers/s config SPI_BFIN tristate "SPI controller driver for ADI Blackfin5xx" depends on BLACKFIN -diff -Naur linux-3.2.21/drivers/spi/Makefile linux-3.2.21-bootc-5b0ccb0/drivers/spi/Makefile ---- linux-3.2.21/drivers/spi/Makefile 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/spi/Makefile 2012-07-02 13:42:17.503362897 +0200 +diff -Naur linux-3.2.23/drivers/spi/Makefile linux-rpi-bootc-3.2.23/drivers/spi/Makefile +--- linux-3.2.23/drivers/spi/Makefile 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/spi/Makefile 2012-07-15 20:29:50.511674973 +0200 @@ -14,6 +14,7 @@ obj-$(CONFIG_SPI_ATMEL) += spi-atmel.o obj-$(CONFIG_SPI_ATH79) += spi-ath79.o @@ -29262,9 +29264,9 @@ diff -Naur linux-3.2.21/drivers/spi/Makefile linux-3.2.21-bootc-5b0ccb0/drivers/ obj-$(CONFIG_SPI_BFIN) += spi-bfin5xx.o obj-$(CONFIG_SPI_BFIN_SPORT) += spi-bfin-sport.o obj-$(CONFIG_SPI_BITBANG) += spi-bitbang.o -diff -Naur linux-3.2.21/drivers/spi/spi-bcm2708.c linux-3.2.21-bootc-5b0ccb0/drivers/spi/spi-bcm2708.c ---- linux-3.2.21/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/spi/spi-bcm2708.c 2012-07-02 13:42:17.533363509 +0200 +diff -Naur linux-3.2.23/drivers/spi/spi-bcm2708.c linux-rpi-bootc-3.2.23/drivers/spi/spi-bcm2708.c +--- linux-3.2.23/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/spi/spi-bcm2708.c 2012-07-15 20:29:50.590676460 +0200 @@ -0,0 +1,579 @@ +/* + * Driver for Broadcom BCM2708 SPI Controllers @@ -29845,9 +29847,9 @@ diff -Naur linux-3.2.21/drivers/spi/spi-bcm2708.c linux-3.2.21-bootc-5b0ccb0/dri +MODULE_AUTHOR("Chris Boot "); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); -diff -Naur linux-3.2.21/drivers/usb/core/generic.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/core/generic.c ---- linux-3.2.21/drivers/usb/core/generic.c 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/core/generic.c 2012-07-02 13:42:16.283337966 +0200 +diff -Naur linux-3.2.23/drivers/usb/core/generic.c linux-rpi-bootc-3.2.23/drivers/usb/core/generic.c +--- linux-3.2.23/drivers/usb/core/generic.c 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/usb/core/generic.c 2012-07-15 20:29:20.586111884 +0200 @@ -149,6 +149,7 @@ dev_warn(&udev->dev, "no configuration chosen from %d choice%s\n", @@ -29856,9 +29858,9 @@ diff -Naur linux-3.2.21/drivers/usb/core/generic.c linux-3.2.21-bootc-5b0ccb0/dr } return i; } -diff -Naur linux-3.2.21/drivers/usb/core/hub.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/core/hub.c ---- linux-3.2.21/drivers/usb/core/hub.c 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/core/hub.c 2012-07-02 13:42:16.284337987 +0200 +diff -Naur linux-3.2.23/drivers/usb/core/hub.c linux-rpi-bootc-3.2.23/drivers/usb/core/hub.c +--- linux-3.2.23/drivers/usb/core/hub.c 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/usb/core/hub.c 2012-07-15 20:29:20.587111902 +0200 @@ -1075,6 +1075,8 @@ INIT_WORK(&hub->tt.clear_work, hub_tt_work); switch (hdev->descriptor.bDeviceProtocol) { @@ -29961,9 +29963,9 @@ diff -Naur linux-3.2.21/drivers/usb/core/hub.c linux-3.2.21-bootc-5b0ccb0/driver } if (hub->hdev->parent || !hcd->driver->port_handed_over || -diff -Naur linux-3.2.21/drivers/usb/core/message.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/core/message.c ---- linux-3.2.21/drivers/usb/core/message.c 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/core/message.c 2012-07-02 13:42:16.283337966 +0200 +diff -Naur linux-3.2.23/drivers/usb/core/message.c linux-rpi-bootc-3.2.23/drivers/usb/core/message.c +--- linux-3.2.23/drivers/usb/core/message.c 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/usb/core/message.c 2012-07-15 20:29:20.581111790 +0200 @@ -1838,6 +1838,85 @@ if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) @@ -30050,9 +30052,9 @@ diff -Naur linux-3.2.21/drivers/usb/core/message.c linux-3.2.21-bootc-5b0ccb0/dr /* Now that all the interfaces are set up, register them * to trigger binding of drivers to interfaces. probe() -diff -Naur linux-3.2.21/drivers/usb/core/otg_whitelist.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/core/otg_whitelist.h ---- linux-3.2.21/drivers/usb/core/otg_whitelist.h 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/core/otg_whitelist.h 2012-07-02 13:42:16.283337966 +0200 +diff -Naur linux-3.2.23/drivers/usb/core/otg_whitelist.h linux-rpi-bootc-3.2.23/drivers/usb/core/otg_whitelist.h +--- linux-3.2.23/drivers/usb/core/otg_whitelist.h 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/usb/core/otg_whitelist.h 2012-07-15 20:29:20.586111884 +0200 @@ -19,33 +19,82 @@ static struct usb_device_id whitelist_table [] = { @@ -30268,9 +30270,9 @@ diff -Naur linux-3.2.21/drivers/usb/core/otg_whitelist.h linux-3.2.21-bootc-5b0c #endif } -diff -Naur linux-3.2.21/drivers/usb/gadget/file_storage.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/gadget/file_storage.c ---- linux-3.2.21/drivers/usb/gadget/file_storage.c 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/gadget/file_storage.c 2012-07-02 13:42:16.269337681 +0200 +diff -Naur linux-3.2.23/drivers/usb/gadget/file_storage.c linux-rpi-bootc-3.2.23/drivers/usb/gadget/file_storage.c +--- linux-3.2.23/drivers/usb/gadget/file_storage.c 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/usb/gadget/file_storage.c 2012-07-15 20:29:20.327107010 +0200 @@ -573,8 +573,37 @@ .iConfiguration = FSG_STRING_CONFIG, .bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER, @@ -30398,9 +30400,9 @@ diff -Naur linux-3.2.21/drivers/usb/gadget/file_storage.c linux-3.2.21-bootc-5b0 /* Allocate the request and buffer for endpoint 0 */ fsg->ep0req = req = usb_ep_alloc_request(fsg->ep0, GFP_KERNEL); if (!req) -diff -Naur linux-3.2.21/drivers/usb/gadget/Kconfig linux-3.2.21-bootc-5b0ccb0/drivers/usb/gadget/Kconfig ---- linux-3.2.21/drivers/usb/gadget/Kconfig 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/gadget/Kconfig 2012-07-02 13:42:16.275337804 +0200 +diff -Naur linux-3.2.23/drivers/usb/gadget/Kconfig linux-rpi-bootc-3.2.23/drivers/usb/gadget/Kconfig +--- linux-3.2.23/drivers/usb/gadget/Kconfig 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/usb/gadget/Kconfig 2012-07-15 20:29:20.412108609 +0200 @@ -552,6 +552,12 @@ depends on USB_GADGET depends on USB_GADGET_DUALSPEED @@ -30414,9 +30416,9 @@ diff -Naur linux-3.2.21/drivers/usb/gadget/Kconfig linux-3.2.21-bootc-5b0ccb0/dr # # USB Gadget Drivers # -diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/dwc_cc.c ---- linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/dwc_cc.c 2012-07-02 13:42:16.232336925 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/dwc_cc.c +--- linux-3.2.23/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/dwc_cc.c 2012-07-15 20:29:18.989081834 +0200 @@ -0,0 +1,506 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_cc.c $ @@ -30924,9 +30926,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.2.21-b + + return retval; +} -diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/dwc_cc.h ---- linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/dwc_cc.h 2012-07-02 13:42:16.232336925 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/dwc_cc.h +--- linux-3.2.23/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/dwc_cc.h 2012-07-15 20:29:18.989081834 +0200 @@ -0,0 +1,209 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_cc.h $ @@ -31137,9 +31139,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.2.21-b + +#endif /* _DWC_CC_H_ */ + -diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/dwc_common_linux.c ---- linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2012-07-02 13:42:16.232336925 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/dwc_common_linux.c +--- linux-3.2.23/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2012-07-15 20:29:18.989081834 +0200 @@ -0,0 +1,1138 @@ +#include "dwc_cc.h" +#include "dwc_notifier.h" @@ -32055,7 +32057,7 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_common_linux.c linu +{ + dwc_timer_t *timer = (dwc_timer_t *)data; + set_scheduled(timer, 0); -+ DWC_DEBUG("Timer %s callback", timer->name); ++ /*DWC_DEBUG("Timer %s callback", timer->name);*/ + timer->cb(timer->data); +} + @@ -32279,9 +32281,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_common_linux.c linu + DWC_WAITQ_TRIGGER(wq); +} +EXPORT_SYMBOL(DWC_WAITQ_ABORT); -diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/dwc_list.h ---- linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/dwc_list.h 2012-07-02 13:42:16.232336925 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/dwc_list.h +--- linux-3.2.23/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/dwc_list.h 2012-07-15 20:29:18.990081853 +0200 @@ -0,0 +1,616 @@ +/* $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 $ */ @@ -32899,9 +32901,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.2.21 +} while (0) + +#endif /* !_SYS_QUEUE_H_ */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/dwc_mem.c ---- linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/dwc_mem.c 2012-07-02 13:42:16.231336905 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/dwc_mem.c +--- linux-3.2.23/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/dwc_mem.c 2012-07-15 20:29:18.989081834 +0200 @@ -0,0 +1,172 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -33075,9 +33077,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.2.21- +} + +#endif /* DEBUG_MEMORY */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/dwc_notifier.c ---- linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/dwc_notifier.c 2012-07-02 13:42:16.232336925 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/dwc_notifier.c +--- linux-3.2.23/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/dwc_notifier.c 2012-07-15 20:29:18.989081834 +0200 @@ -0,0 +1,256 @@ +#include "dwc_notifier.h" +#include "dwc_list.h" @@ -33335,9 +33337,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3. + } +} + -diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/dwc_notifier.h ---- linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/dwc_notifier.h 2012-07-02 13:42:16.232336925 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/dwc_notifier.h +--- linux-3.2.23/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/dwc_notifier.h 2012-07-15 20:29:18.989081834 +0200 @@ -0,0 +1,112 @@ + +#ifndef __DWC_NOTIFIER_H__ @@ -33451,9 +33453,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3. +void dwc_notify(dwc_notifier_t *notifier, char *notification, void *notification_data); + +#endif /* __DWC_NOTIFIER_H__ */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/dwc_os.h ---- linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/dwc_os.h 2012-07-02 13:42:16.232336925 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/dwc_os.h +--- linux-3.2.23/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/dwc_os.h 2012-07-15 20:29:18.989081834 +0200 @@ -0,0 +1,925 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_os.h $ @@ -34380,9 +34382,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.2.21-b + * threading should be able to be implemented with the defined behavior. + * + */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/Makefile linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/Makefile ---- linux-3.2.21/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/Makefile 2012-07-02 13:42:16.231336905 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_common_port/Makefile linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/Makefile +--- linux-3.2.23/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/Makefile 2012-07-15 20:29:18.989081834 +0200 @@ -0,0 +1,46 @@ +# +# Makefile for DWC_common library @@ -34430,9 +34432,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/Makefile linux-3.2.21-b +clean: + rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers + -diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/Makefile.linux ---- linux-3.2.21/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/Makefile.linux 2012-07-02 13:42:16.232336925 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/Makefile.linux +--- linux-3.2.23/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/Makefile.linux 2012-07-15 20:29:18.989081834 +0200 @@ -0,0 +1,36 @@ +# +# Makefile for DWC_common library @@ -34470,9 +34472,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/Makefile.linux linux-3. +clean: + rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers + -diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/usb.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/usb.h ---- linux-3.2.21/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_common_port/usb.h 2012-07-02 13:42:16.232336925 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_common_port/usb.h linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/usb.h +--- linux-3.2.23/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_common_port/usb.h 2012-07-15 20:29:18.989081834 +0200 @@ -0,0 +1,850 @@ +/* + * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -35324,9 +35326,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_common_port/usb.h linux-3.2.21-boot + + +#endif /* _USB_H_ */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dummy_audio.c ---- linux-3.2.21/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dummy_audio.c 2012-07-02 13:42:16.242337130 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dummy_audio.c +--- linux-3.2.23/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dummy_audio.c 2012-07-15 20:29:19.078083509 +0200 @@ -0,0 +1,1575 @@ +/* + * zero.c -- Gadget Zero, for USB development @@ -36903,9 +36905,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.2.21-boot + remove_proc_entry("isoc_test", NULL); +} +module_exit (cleanup); -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_cfi_common.h ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2012-07-02 13:42:16.242337130 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_cfi_common.h +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2012-07-15 20:29:19.078083509 +0200 @@ -0,0 +1,142 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -37049,9 +37051,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.2.21-b +typedef struct cfi_string cfi_string_t; + +#endif -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_attr.c ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2012-07-02 13:42:16.244337170 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_attr.c +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2012-07-15 20:29:19.198085765 +0200 @@ -0,0 +1,1316 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $ @@ -38369,9 +38371,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.2.21-boo + device_remove_file(&dev->dev, &dev_attr_sleep_status); +#endif +} -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_attr.h ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2012-07-02 13:42:16.241337110 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_attr.h +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2012-07-15 20:29:19.065083268 +0200 @@ -0,0 +1,88 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $ @@ -38461,9 +38463,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.2.21-boo +#endif + ); +#endif -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_cfi.c ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2012-07-02 13:42:16.244337170 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cfi.c +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2012-07-15 20:29:19.180085427 +0200 @@ -0,0 +1,1876 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -40341,9 +40343,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.2.21-boot +} + +#endif //DWC_UTE_CFI -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_cfi.h ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2012-07-02 13:42:16.243337150 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cfi.h +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2012-07-15 20:29:19.104083997 +0200 @@ -0,0 +1,319 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -40664,9 +40666,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.2.21-boot +int cfi_setup(struct dwc_otg_pcd *pcd, struct cfi_usb_ctrlrequest *ctrl); + +#endif /* (__DWC_OTG_CFI_H__) */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_cil.c ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2012-07-02 13:42:16.241337110 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cil.c +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2012-07-15 20:29:19.065083268 +0200 @@ -0,0 +1,5410 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $ @@ -46078,9 +46080,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.2.21-boot +{ + return dwc_read_reg32(&core_if->core_global_regs->hptxfsiz); +} -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_cil.h ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2012-07-02 13:42:16.241337110 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cil.h +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2012-07-15 20:29:19.070083357 +0200 @@ -0,0 +1,1143 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $ @@ -47225,9 +47227,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.2.21-boot + void *_p); + +#endif -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2012-07-02 13:42:16.243337150 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2012-07-15 20:29:19.135084581 +0200 @@ -0,0 +1,846 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $ @@ -48075,9 +48077,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.2.21 + } + return retval; +} -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_core_if.h ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2012-07-02 13:42:16.243337150 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_core_if.h +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2012-07-15 20:29:19.140084674 +0200 @@ -0,0 +1,642 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $ @@ -48721,9 +48723,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.2.21- +/** @} */ + +#endif /* __DWC_CORE_IF_H__ */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_dbg.h ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2012-07-02 13:42:16.244337170 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_dbg.h +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2012-07-15 20:29:19.197085746 +0200 @@ -0,0 +1,113 @@ +/* ========================================================================== + * @@ -48838,10 +48840,10 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.2.21-boot + +#endif /*DEBUG*/ +#endif -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_driver.c ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2012-07-02 13:42:16.240337089 +0200 -@@ -0,0 +1,1577 @@ +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_driver.c +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2012-07-15 20:29:19.058083099 +0200 +@@ -0,0 +1,1726 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $ + * $Revision: #76 $ @@ -48926,6 +48928,11 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.2.21-b + +# include + ++#ifdef SOF_FIX ++#include ++#include ++#endif ++ +#include + + @@ -49022,6 +49029,8 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.2.21-b + int32_t lpm_enable; + int32_t ic_usb_cap; + int32_t ahb_thr_ratio; ++ int32_t sof_setting; // 0=off, 1=on ++ int32_t proc_init_done; // 0=not done, 1=done +}; + +static struct dwc_otg_driver_module_params dwc_otg_module_params = { @@ -49098,9 +49107,139 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.2.21-b + .lpm_enable = -1, + .ic_usb_cap = -1, + .ahb_thr_ratio = -1, ++ .sof_setting = 0, ++ .proc_init_done = 0, +}; + +/** ++ * PROC_FS SUPPORT ++ * proc_fs support for setting the Start-of-Frame (SOF) interrupt processing ++ * fix (reducing SOF interrupts by an order of magnitude). When set ++ * to "on" the SOF interrupt will only be turned on once per tick, for ++ * 3 micro-frame times. When set to "off" it will not turn off the ++ * SOF interrupt, and process all 8000 per second. ++ */ ++ ++#ifdef SOF_FIX ++ ++static struct proc_dir_entry *proc_dir, *proc_file; ++ ++int sof_setting(void) ++{ ++ return dwc_otg_module_params.sof_setting; ++} ++ ++static int sof_read_data (char *page, ++ char **start, ++ off_t off, ++ int count, ++ int *eof, ++ void *data) ++{ ++ ++ if (dwc_otg_module_params.sof_setting == 1) ++ { ++ sprintf(page, "on\n"); ++ return 4; ++ } ++ else ++ { ++ sprintf(page, "off\n"); ++ return 5; ++ } ++ return 0; ++} ++ ++#define PROC_FS_MAX_SIZE 1024 ++#define PROC_FS_NAME "SOF_reduction" ++ ++static char proc_fs_buffer[PROC_FS_MAX_SIZE]; ++ ++static int sof_write_data (struct file *file, ++ const char __user *buffer, ++ unsigned long count, ++ void *data) ++{ ++ unsigned long buffer_size = count; ++ ++ if (buffer_size > PROC_FS_MAX_SIZE) ++ buffer_size = PROC_FS_MAX_SIZE; ++ ++ memset(proc_fs_buffer, 0, sizeof(proc_fs_buffer)); ++ ++ if (copy_from_user(proc_fs_buffer, buffer, buffer_size)) ++ { ++ printk(KERN_ERR "\nSOF_write_data: copy_from_user failure\n"); ++ return -EFAULT; ++ } ++ ++ if ((strnlen(proc_fs_buffer, PROC_FS_MAX_SIZE) == 3) && ++ (strncmp(proc_fs_buffer, "on", 2) == 0)) ++ { ++ printk(KERN_ERR "\n%s: Setting SOF (reduction) ON.\n", PROC_FS_NAME); ++ dwc_otg_module_params.sof_setting = 1; ++ } ++ else if ((strnlen(proc_fs_buffer, PROC_FS_MAX_SIZE) == 4) && ++ (strncmp(proc_fs_buffer, "off", 3) == 0)) ++ { ++ printk(KERN_ERR "\n%s: Setting SOF reduction OFF.\n",PROC_FS_NAME); ++ dwc_otg_module_params.sof_setting = 0; ++ } ++ else ++ printk(KERN_ERR "\n%s: input not \'on\' or \'off\', ignored.\n", PROC_FS_NAME); ++#ifdef DEBUG_SOF_FIX ++ printk(KERN_ERR "\n%s:buffer %s, len = %d.\n",__func__, ++ proc_fs_buffer, strnlen(proc_fs_buffer, PROC_FS_MAX_SIZE)); ++#endif ++ ++ return buffer_size; ++} ++ ++/** ++ * Initialize proc_fs entry for SOF setting. ++ */ ++static int init_proc_fs(void) ++{ ++ int retval = 0; ++ ++ if (dwc_otg_module_params.proc_init_done) ++ return 0; ++ ++ proc_dir = proc_mkdir_mode("dwc_sof", 0755, NULL); ++ ++ if(proc_dir == NULL) ++ { ++ retval = -ENOMEM; ++ printk("Error creating dir\n"); ++ return retval; ++ } ++ ++ proc_file = create_proc_entry(PROC_FS_NAME, 0666, proc_dir); ++ ++ if (proc_file != NULL) ++ { ++ dwc_otg_module_params.proc_init_done = 1; ++ proc_file->read_proc = sof_read_data; ++ proc_file->write_proc = sof_write_data; ++ proc_file->mode = S_IFREG | S_IRUGO; ++ proc_file->uid = 0; ++ proc_file->gid = 0; ++ proc_file->gid = PROC_FS_MAX_SIZE; ++ } ++ else ++ { ++ retval = -ENOMEM; ++ printk("Error creating file\n"); ++ remove_proc_entry(PROC_FS_NAME, NULL); ++ } ++ ++ return retval; ++} ++ ++#endif ++ ++ ++/** + * This function shows the Driver Version. + */ +static ssize_t version_show(struct device_driver *dev, char *buf) @@ -49689,6 +49828,12 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.2.21-b + dev_dbg(&_dev->dev, "Calling attr_create\n"); + dwc_otg_attr_create(_dev); + ++#ifdef SOF_FIX ++ retval = init_proc_fs(); ++ if (retval) ++ goto fail; ++#endif ++ + /* + * Disable the global interrupt until all the interrupt + * handlers are installed. @@ -49859,6 +50004,7 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.2.21-b + * + * @return + */ ++ +static int __init dwc_otg_driver_init(void) +{ + int retval = 0; @@ -49893,6 +50039,11 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.2.21-b + error = driver_create_file(&dwc_otg_driver.driver, + &driver_attr_debuglevel); +#endif ++ ++#ifdef SOF_FIX ++ retval = init_proc_fs(); ++#endif ++ + return retval; +} + @@ -50419,9 +50570,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.2.21-b + + +*/ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_driver.h ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2012-07-02 13:42:16.243337150 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_driver.h +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2012-07-15 20:29:19.139084655 +0200 @@ -0,0 +1,101 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $ @@ -50524,10 +50675,10 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.2.21-b +#endif + +#endif -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_hcd.c ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2012-07-02 13:42:16.243337150 +0200 -@@ -0,0 +1,3334 @@ +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd.c +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2012-07-15 20:29:19.129084467 +0200 +@@ -0,0 +1,3390 @@ + +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.c $ @@ -50594,6 +50745,37 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.2.21-boot + __DWC_ERROR("Device Not Connected/Responding\n"); +} + ++/** ++ * SOF_FIX: Reduce the SOF overhead by disabling the SOF interrupt except ++ * when there are USB transfers pending. Re-enable the interrupt ++ * every tick for periodic transaction handling. MSO 5/31/12 ++ * SOF (Start of Frame) timeout function. Kick the driver by re-enabling ++ * the SOF interrupt ++ */ ++#ifdef SOF_FIX ++void dwc_otg_hcd_sof_timeout(void *ptr) ++{ ++ dwc_otg_hcd_t * hcd = (dwc_otg_hcd_t *)ptr; ++ dwc_otg_core_if_t *core_if = hcd->core_if; ++ gintmsk_data_t gintmsk = {.d32 = 0}; ++ dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs; ++ unsigned int intmsk; ++ ++ // turn on Start-of-Frame interrupt ++ gintmsk.d32 = dwc_read_reg32(&global_regs->gintmsk); ++ intmsk = gintmsk.d32; ++ gintmsk.b.sofintr |= 1; ++ dwc_write_reg32(&global_regs->gintmsk, gintmsk.d32); ++ DWC_TIMER_SCHEDULE(hcd->sof_timer, 1); /* 1ms */ ++#ifdef DEBUG_SOF_FIX ++ if ((++sof_timeout_count % 10000) == 0) ++ printk(KERN_ERR "%s: %d timeouts handled, read 0x%x wrote 0x%x.", ++ __FUNCTION__, sof_timeout_count, intmsk, gintmsk.d32); ++#endif ++ ++} ++#endif ++ +#ifdef DEBUG +static void dump_channel_info(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh) +{ @@ -51322,6 +51504,13 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.2.21-boot + hcd->conn_timer = DWC_TIMER_ALLOC("Connection timer", + dwc_otg_hcd_connect_timeout, 0); + ++#ifdef SOF_FIX ++ /* Initialize the Start of Frame interrupt timeout timer. */ ++ hcd->sof_timer = DWC_TIMER_ALLOC("SOF timer", ++ dwc_otg_hcd_sof_timeout, hcd); ++ DWC_TIMER_SCHEDULE(hcd->sof_timer, 1); /* 1ms */ ++#endif ++ + /* Initialize reset tasklet. */ + hcd->reset_tasklet = DWC_TASK_ALLOC(reset_tasklet_func, hcd); + @@ -51837,6 +52026,11 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.2.21-boot + dwc_otg_qh_t *qh; + int num_channels; + dwc_otg_transaction_type_e ret_val = DWC_OTG_TRANSACTION_NONE; ++#ifdef SOF_FIX ++ dwc_otg_core_if_t *core_if = hcd->core_if; ++ gintmsk_data_t gintmsk = {.d32 = 0}; ++ dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs; ++#endif + +#ifdef DEBUG_SOF + DWC_DEBUGPL(DBG_HCD, " Select Transactions\n"); @@ -51876,6 +52070,19 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.2.21-boot + } +#endif + } ++#ifdef SOF_FIX ++ /* ++ * If there are transactions queued then enable the SOF interrupt to send them to ++ * the controller. ++ */ ++ if (ret_val != DWC_OTG_TRANSACTION_NONE) ++ { ++ // turn on Start-of-Frame interrupt ++ gintmsk.d32 = dwc_read_reg32(&global_regs->gintmsk); ++ gintmsk.b.sofintr |= 1; ++ dwc_write_reg32(&global_regs->gintmsk, gintmsk.d32); ++ } ++#endif + + /* + * Process entries in the inactive portion of the non-periodic @@ -53862,9 +54069,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.2.21-boot +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2012-07-02 13:42:16.244337170 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2012-07-15 20:29:19.150084862 +0200 @@ -0,0 +1,1106 @@ +/*========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $ @@ -54972,10 +55179,10 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.2.21 +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_hcd.h ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2012-07-02 13:42:16.244337170 +0200 -@@ -0,0 +1,804 @@ +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd.h +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2012-07-15 20:29:19.173085296 +0200 +@@ -0,0 +1,813 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $ + * $Revision: #52 $ @@ -55547,6 +55754,15 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.2.21-boot + uint32_t hfnum_other_samples_b; + uint64_t hfnum_other_frrem_accum_b; +#endif ++#ifdef SOF_FIX ++ /** ++ * SOF wakeup timer. We disable the SOF interrupt if there is nothing ++ * to do. However, that eventually gets us into trouble. So, re-enable ++ * the SOF interrupt every tick so we can handle any backlog that does ++ * not trigger any other interrupt. ++ */ ++ dwc_timer_t *sof_timer; ++#endif +}; + +/** @name Transaction Execution Functions */ @@ -55780,9 +55996,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.2.21-boot +#endif +#endif +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2012-07-02 13:42:16.245337190 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2012-07-15 20:29:19.209085970 +0200 @@ -0,0 +1,393 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $ @@ -56177,10 +56393,10 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.2.21-b + +#endif /* __DWC_HCD_IF_H__ */ +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2012-07-02 13:42:16.243337150 +0200 -@@ -0,0 +1,2065 @@ +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2012-07-15 20:29:19.104083997 +0200 +@@ -0,0 +1,2158 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $ + * $Revision: #77 $ @@ -56215,6 +56431,8 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.2.21 + * ========================================================================== */ +#ifndef DWC_DEVICE_ONLY + ++#include ++#include +#include "dwc_otg_hcd.h" +#include "dwc_otg_regs.h" + @@ -56222,6 +56440,19 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.2.21 + * This file contains the implementation of the HCD Interrupt handlers. + */ + ++/** ++ * SOF_FIX: Reduce SOF interrupt handling by disabling the SOF interrupt except ++ * when there are actual USB transfers pending. MSO 5/31/12 ++ */ ++#ifdef SOF_FIX ++ extern int sof_setting(void); ++ unsigned int g_dwc_otg_hcd_handle_intr_count = 0; ++ #ifdef DEBUG_SOF_FIX ++ unsigned int g_dwc_otg_interrupt_counts[10] = {0,0,0,0,0,0,0,0,0,0}; ++ extern int g_softintr_ref_cnt; ++ #endif ++#endif ++ +/** This function handles interrupts for the HCD. */ +int32_t dwc_otg_hcd_handle_intr(dwc_otg_hcd_t * dwc_otg_hcd) +{ @@ -56229,9 +56460,12 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.2.21 + + dwc_otg_core_if_t *core_if = dwc_otg_hcd->core_if; + gintsts_data_t gintsts; -+#ifdef DEBUG ++#ifdef SOF_FIX + dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs; ++ gintmsk_data_t gintmsk; ++#endif + ++#ifdef DEBUG + //GRAYG: debugging + if (NULL == global_regs) { + DWC_DEBUGPL(DBG_HCD, "**** NULL regs: dwc_otg_hcd=%p " @@ -56240,7 +56474,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.2.21 + return retval; + } +#endif -+ ++#ifdef SOF_FIX ++ g_dwc_otg_hcd_handle_intr_count++; ++#endif + /* Check if HOST Mode */ + if (dwc_otg_is_host_mode(core_if)) { + gintsts.d32 = dwc_otg_read_core_intr(core_if); @@ -56264,29 +56500,64 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.2.21 + gintsts.d32, core_if); +#endif + -+ if (gintsts.b.sofintr) { ++ /* ++ * If SOF handle it. If not, it probably means that there is work to do, ++ * so enable SOF for the next micro-frame. ++ */ ++ if (gintsts.b.sofintr) ++ { ++#ifdef DEBUG_SOF_FIX ++ g_dwc_otg_interrupt_counts[0]++; ++#endif + retval |= dwc_otg_hcd_handle_sof_intr(dwc_otg_hcd); + } ++#ifdef SOF_FIX ++ else ++ { ++ // turn on Start-of-Frame interrupt ++ gintmsk.d32 = dwc_read_reg32(&global_regs->gintmsk); ++ gintmsk.b.sofintr |= 1; ++ dwc_write_reg32(&global_regs->gintmsk, gintmsk.d32); ++ } ++#endif + if (gintsts.b.rxstsqlvl) { ++#ifdef DEBUG_SOF_FIX ++ g_dwc_otg_interrupt_counts[1]++; ++#endif + retval |= + dwc_otg_hcd_handle_rx_status_q_level_intr + (dwc_otg_hcd); + } + if (gintsts.b.nptxfempty) { ++#ifdef DEBUG_SOF_FIX ++ g_dwc_otg_interrupt_counts[2]++; ++#endif + retval |= + dwc_otg_hcd_handle_np_tx_fifo_empty_intr + (dwc_otg_hcd); + } + if (gintsts.b.i2cintr) { ++#ifdef DEBUG_SOF_FIX ++ g_dwc_otg_interrupt_counts[3]++; ++#endif + /** @todo Implement i2cintr handler. */ + } + if (gintsts.b.portintr) { ++#ifdef DEBUG_SOF_FIX ++ g_dwc_otg_interrupt_counts[4]++; ++#endif + retval |= dwc_otg_hcd_handle_port_intr(dwc_otg_hcd); + } + if (gintsts.b.hcintr) { ++#ifdef DEBUG_SOF_FIX ++ g_dwc_otg_interrupt_counts[5]++; ++#endif + retval |= dwc_otg_hcd_handle_hc_intr(dwc_otg_hcd); + } + if (gintsts.b.ptxfempty) { ++#ifdef DEBUG_SOF_FIX ++ g_dwc_otg_interrupt_counts[6]++; ++#endif + retval |= + dwc_otg_hcd_handle_perio_tx_fifo_empty_intr + (dwc_otg_hcd); @@ -56313,7 +56584,21 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.2.21 +#endif + + } -+ ++#if defined(SOF_FIX) && defined(DEBUG_SOF_FIX) ++ if ((g_dwc_otg_hcd_handle_intr_count % 80000) == 0) ++ { ++ printk(KERN_ERR "dwc_otg_hcd_handle_intr: %u handled, %u, %u, %u, %u, %u, %u, %u, %u.\n", ++ g_dwc_otg_hcd_handle_intr_count, ++ g_dwc_otg_interrupt_counts[0], ++ g_dwc_otg_interrupt_counts[1], ++ g_dwc_otg_interrupt_counts[2], ++ g_dwc_otg_interrupt_counts[3], ++ g_dwc_otg_interrupt_counts[4], ++ g_dwc_otg_interrupt_counts[5], ++ g_dwc_otg_interrupt_counts[6], ++ g_dwc_otg_interrupt_counts[7]); ++ } ++#endif + return retval; +} + @@ -56357,6 +56642,10 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.2.21 + * (micro)frame. Periodic transactions may be queued to the controller for the + * next (micro)frame. + */ ++#ifdef SOF_FIX ++#define SOF_INTR_DELAY_COUNT 3 ++static int g_sof_intr_delay_count = SOF_INTR_DELAY_COUNT; ++#endif +int32_t dwc_otg_hcd_handle_sof_intr(dwc_otg_hcd_t * hcd) +{ + hfnum_data_t hfnum; @@ -56364,6 +56653,11 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.2.21 + dwc_otg_qh_t *qh; + dwc_otg_transaction_type_e tr_type; + gintsts_data_t gintsts = {.d32 = 0 }; ++#ifdef SOF_FIX ++ dwc_otg_core_if_t *core_if = hcd->core_if; ++ gintmsk_data_t gintmsk = {.d32 = 0 }; ++ dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs; ++#endif + + hfnum.d32 = + dwc_read_reg32(&hcd->core_if->host_if->host_global_regs->hfnum); @@ -56396,9 +56690,24 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.2.21 + } + } + tr_type = dwc_otg_hcd_select_transactions(hcd); -+ if (tr_type != DWC_OTG_TRANSACTION_NONE) { ++ if (tr_type != DWC_OTG_TRANSACTION_NONE) ++ { + dwc_otg_hcd_queue_transactions(hcd, tr_type); + } ++#ifdef SOF_FIX ++ else ++ { ++ // turn off Start-of-Frame interrupt ++ if ((sof_setting()) && ++ (g_sof_intr_delay_count-- == 0)) ++ { ++ gintmsk.d32 = dwc_read_reg32(&global_regs->gintmsk); ++ gintmsk.b.sofintr &= 0; ++ dwc_write_reg32(&global_regs->gintmsk, gintmsk.d32); ++ g_sof_intr_delay_count = SOF_INTR_DELAY_COUNT; ++ } ++ } ++#endif + + /* Clear interrupt */ + gintsts.b.sofintr = 1; @@ -58246,10 +58555,10 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.2.21 +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2012-07-02 13:42:16.244337170 +0200 -@@ -0,0 +1,855 @@ +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2012-07-15 20:29:19.190085613 +0200 +@@ -0,0 +1,890 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_linux.c $ + * $Revision: #11 $ @@ -58322,6 +58631,7 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.2.2 +#include "dwc_otg_hcd_if.h" +#include "dwc_otg_dbg.h" +#include "dwc_otg_driver.h" ++#include "dwc_otg_hcd.h" + +/** + * Gets the endpoint number from a _bEndpointAddress argument. The endpoint is @@ -58512,10 +58822,20 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.2.2 + * Sets the final status of an URB and returns it to the device driver. Any + * required cleanup of the URB is performed. + */ ++#ifdef DEBUG_SOF_FIX ++extern unsigned int g_dwc_otg_interrupt_counts[10]; ++#endif ++ +static int _complete(dwc_otg_hcd_t * hcd, void *urb_handle, + dwc_otg_hcd_urb_t * dwc_otg_urb, int32_t status) +{ ++ uint64_t flags; + struct urb *urb = (struct urb *)urb_handle; ++ ++#ifdef DEBUG_SOF_FIX ++ g_dwc_otg_interrupt_counts[7]++; ++#endif ++ +#ifdef DEBUG + if (CHK_DEBUG_LEVEL(DBG_HCDV | DBG_HCD_URB)) { + DWC_PRINTF("%s: urb %p, device %d, ep %d %s, status=%d\n", @@ -58599,7 +58919,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.2.2 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) + usb_hcd_giveback_urb(dwc_otg_hcd_to_hcd(hcd), urb); +#else ++ DWC_SPINLOCK_IRQSAVE(hcd->lock, &flags); + usb_hcd_unlink_urb_from_ep(dwc_otg_hcd_to_hcd(hcd), urb); ++ DWC_SPINUNLOCK_IRQRESTORE(hcd->lock, flags); + usb_hcd_giveback_urb(dwc_otg_hcd_to_hcd(hcd), urb, status); +#endif + return 0; @@ -59010,6 +59332,8 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.2.2 +static int urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) +#endif +{ ++ int rc; ++ uint64_t flags; + dwc_otg_hcd_t *dwc_otg_hcd; + DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD URB Dequeue\n"); + @@ -59031,8 +59355,18 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.2.2 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) + usb_hcd_giveback_urb(hcd, urb); +#else -+ usb_hcd_unlink_urb_from_ep(hcd, urb); -+ usb_hcd_giveback_urb(hcd, urb, status); ++ DWC_SPINLOCK_IRQSAVE(dwc_otg_hcd->lock, &flags); ++ rc = usb_hcd_check_unlink_urb(hcd, urb, status); ++ if(!rc) ++ { ++ usb_hcd_unlink_urb_from_ep(hcd, urb); ++ } ++ ++ DWC_SPINUNLOCK_IRQRESTORE(dwc_otg_hcd->lock, flags); ++ if (!rc) ++ { ++ usb_hcd_giveback_urb(hcd, urb, status); ++ } +#endif + if (CHK_DEBUG_LEVEL(DBG_HCDV | DBG_HCD_URB)) { + DWC_PRINTF("Called usb_hcd_giveback_urb()\n"); @@ -59062,6 +59396,10 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.2.2 + * interrupt. + * + * This function is called by the USB core when an interrupt occurs */ ++ ++#ifdef DEBUG_SOF_FIX ++unsigned int g_dwc_otg_hcd_irq_count = 0; ++#endif +static irqreturn_t dwc_otg_hcd_irq(struct usb_hcd *hcd) +{ + dwc_otg_hcd_t *dwc_otg_hcd = hcd_to_dwc_otg_hcd(hcd); @@ -59069,6 +59407,12 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.2.2 + if (retval != 0) { + S3C2410X_CLEAR_EINTPEND(); + } ++ ++#ifdef DEBUG_SOF_FIX ++ ++g_dwc_otg_hcd_irq_count; ++ if ((++g_dwc_otg_hcd_irq_count %10000) == 0) ++ printk(KERN_ERR "dwc_otg_hcd_irq: %u completions.\n", g_dwc_otg_hcd_irq_count); ++#endif + return IRQ_RETVAL(retval); +} + @@ -59105,9 +59449,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.2.2 +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2012-07-02 13:42:16.244337170 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2012-07-15 20:29:19.192085654 +0200 @@ -0,0 +1,732 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $ @@ -59841,9 +60185,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.2.2 +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_pcd.c ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2012-07-02 13:42:16.241337110 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd.c +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2012-07-15 20:29:19.076083471 +0200 @@ -0,0 +1,2067 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $ @@ -61912,9 +62256,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.2.21-boot +} + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_pcd.h ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2012-07-02 13:42:16.240337089 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd.h +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2012-07-15 20:29:19.046082944 +0200 @@ -0,0 +1,216 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $ @@ -62132,9 +62476,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.2.21-boot +extern void do_test_mode(void *data); +#endif +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2012-07-02 13:42:16.244337170 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2012-07-15 20:29:19.179085409 +0200 @@ -0,0 +1,333 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $ @@ -62469,9 +62813,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.2.21-b +#endif /* __DWC_PCD_IF_H__ */ + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2012-07-02 13:42:16.242337130 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2012-07-15 20:29:19.078083509 +0200 @@ -0,0 +1,4077 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $ @@ -66550,9 +66894,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.2.21 +} + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2012-07-02 13:42:16.243337150 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2012-07-15 20:29:19.092083771 +0200 @@ -0,0 +1,1288 @@ + /* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $ @@ -67842,9 +68186,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.2.2 +EXPORT_SYMBOL(usb_gadget_unregister_driver); + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_regs.h ---- linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2012-07-02 13:42:16.241337110 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_regs.h +--- linux-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2012-07-15 20:29:19.077083490 +0200 @@ -0,0 +1,2237 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $ @@ -70083,10 +70427,10 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.2.21-boo +} pcgcctl_data_t; + +#endif -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/Makefile linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/Makefile ---- linux-3.2.21/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/Makefile 2012-07-02 13:42:16.240337089 +0200 -@@ -0,0 +1,80 @@ +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/Makefile linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/Makefile +--- linux-3.2.23/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/Makefile 2012-07-15 20:29:19.058083099 +0200 +@@ -0,0 +1,85 @@ +# +# Makefile for DWC_otg Highspeed USB controller driver +# @@ -70104,9 +70448,14 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/Makefile linux-3.2.21-bootc-5b0 + +# Use one of the following flags to compile the software in host-only or +# device-only mode. -+#CPPFLAGS += -DDWC_HOST_ONLY ++ifeq ($(CONFIG_USB_GADGET_DWCOTG),) ++CPPFLAGS += -DDWC_HOST_ONLY ++endif +#CPPFLAGS += -DDWC_DEVICE_ONLY + ++# Use this flag to reduce SOF interrupt service overhead ++CPPFLAGS += -DSOF_FIX ++ +CPPFLAGS += -Dlinux -DDWC_HS_ELECT_TST +#CGG: CPPFLAGS += -DDWC_EN_ISOC +CPPFLAGS += -I$(obj)/../dwc_common_port @@ -70167,9 +70516,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/Makefile linux-3.2.21-bootc-5b0 + rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions + +endif -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm ---- linux-3.2.21/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2012-07-02 13:42:16.242337130 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm +--- linux-3.2.23/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2012-07-15 20:29:19.079083527 +0200 @@ -0,0 +1,337 @@ +package dwc_otg_test; + @@ -70508,9 +70857,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-3.2. +); + +1; -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/test/Makefile linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/test/Makefile ---- linux-3.2.21/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/test/Makefile 2012-07-02 13:42:16.242337130 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/test/Makefile linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/test/Makefile +--- linux-3.2.23/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/test/Makefile 2012-07-15 20:29:19.079083527 +0200 @@ -0,0 +1,16 @@ + +PERL=/usr/bin/perl @@ -70528,9 +70877,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/test/Makefile linux-3.2.21-boot + else echo "=======> $$test, FAILED" ; \ + fi \ + done -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/test/test_mod_param.pl ---- linux-3.2.21/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2012-07-02 13:42:16.242337130 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/test/test_mod_param.pl +--- linux-3.2.23/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2012-07-15 20:29:19.079083527 +0200 @@ -0,0 +1,133 @@ +#!/usr/bin/perl -w +# @@ -70665,9 +71014,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-3. + +test_main(); +0; -diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/test/test_sysfs.pl ---- linux-3.2.21/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2012-07-02 13:42:16.242337130 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/test/test_sysfs.pl +--- linux-3.2.23/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2012-07-15 20:29:19.079083527 +0200 @@ -0,0 +1,193 @@ +#!/usr/bin/perl -w +# @@ -70862,9 +71211,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-3.2.21 + +test_main(); +0; -diff -Naur linux-3.2.21/drivers/usb/host/Kconfig linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/Kconfig ---- linux-3.2.21/drivers/usb/host/Kconfig 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/Kconfig 2012-07-02 13:42:16.238337047 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/Kconfig linux-rpi-bootc-3.2.23/drivers/usb/host/Kconfig +--- linux-3.2.23/drivers/usb/host/Kconfig 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/Kconfig 2012-07-15 20:29:18.995081945 +0200 @@ -556,6 +556,19 @@ To compile this driver a module, choose M here: the module will be called "hwa-hc". @@ -70885,9 +71234,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/Kconfig linux-3.2.21-bootc-5b0ccb0/driv config USB_IMX21_HCD tristate "i.MX21 HCD support" depends on USB && ARM && ARCH_MXC -diff -Naur linux-3.2.21/drivers/usb/host/Makefile linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/Makefile ---- linux-3.2.21/drivers/usb/host/Makefile 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/host/Makefile 2012-07-02 13:42:16.231336905 +0200 +diff -Naur linux-3.2.23/drivers/usb/host/Makefile linux-rpi-bootc-3.2.23/drivers/usb/host/Makefile +--- linux-3.2.23/drivers/usb/host/Makefile 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/usb/host/Makefile 2012-07-15 20:29:18.988081815 +0200 @@ -33,6 +33,8 @@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o @@ -70897,9 +71246,9 @@ diff -Naur linux-3.2.21/drivers/usb/host/Makefile linux-3.2.21-bootc-5b0ccb0/dri obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o -diff -Naur linux-3.2.21/drivers/usb/Makefile linux-3.2.21-bootc-5b0ccb0/drivers/usb/Makefile ---- linux-3.2.21/drivers/usb/Makefile 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/usb/Makefile 2012-07-02 13:42:16.218336638 +0200 +diff -Naur linux-3.2.23/drivers/usb/Makefile linux-rpi-bootc-3.2.23/drivers/usb/Makefile +--- linux-3.2.23/drivers/usb/Makefile 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/usb/Makefile 2012-07-15 20:29:18.536073310 +0200 @@ -23,6 +23,7 @@ obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ @@ -70908,9 +71257,9 @@ diff -Naur linux-3.2.21/drivers/usb/Makefile linux-3.2.21-bootc-5b0ccb0/drivers/ obj-$(CONFIG_USB_IMX21_HCD) += host/ obj-$(CONFIG_USB_FSL_MPH_DR_OF) += host/ -diff -Naur linux-3.2.21/drivers/video/bcm2708_fb.c linux-3.2.21-bootc-5b0ccb0/drivers/video/bcm2708_fb.c ---- linux-3.2.21/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/video/bcm2708_fb.c 2012-07-02 13:42:15.878329692 +0200 +diff -Naur linux-3.2.23/drivers/video/bcm2708_fb.c linux-rpi-bootc-3.2.23/drivers/video/bcm2708_fb.c +--- linux-3.2.23/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/video/bcm2708_fb.c 2012-07-15 20:29:07.886872929 +0200 @@ -0,0 +1,487 @@ +/* + * linux/drivers/video/bcm2708_fb.c @@ -70932,6 +71281,7 @@ diff -Naur linux-3.2.21/drivers/video/bcm2708_fb.c linux-3.2.21-bootc-5b0ccb0/dr +#include +#include +#include ++#include +#include +#include +#include @@ -71135,7 +71485,6 @@ diff -Naur linux-3.2.21/drivers/video/bcm2708_fb.c linux-3.2.21-bootc-5b0ccb0/dr + /* inform vc about new framebuffer */ + bcm_mailbox_write(MBOX_CHAN_FB, fb->dma); + -+ /* TODO: replace fb driver with vchiq version */ + /* wait for response */ + bcm_mailbox_read(MBOX_CHAN_FB, &val); + @@ -71189,23 +71538,23 @@ diff -Naur linux-3.2.21/drivers/video/bcm2708_fb.c linux-3.2.21-bootc-5b0ccb0/dr + struct bcm2708_fb *fb = to_bcm2708(info); + + /*pr_info("BCM2708FB: setcolreg %d:(%02x,%02x,%02x,%02x) %x\n", regno, red, green, blue, transp, fb->fb.fix.visual);*/ -+ if (regno < 16) ++ if (fb->fb.var.bits_per_pixel <= 8) { ++ if (regno < 256) { ++ /* blue [0:4], green [5:10], red [11:15] */ ++ fb->info->cmap[regno] = ((red >> (16-5)) & 0x1f) << 11 | ++ ((green >> (16-6)) & 0x3f) << 5 | ++ ((blue >> (16-5)) & 0x1f) << 0; ++ } ++ /* Hack: we need to tell GPU the palette has changed, but currently bcm2708_fb_set_par takes noticable time when called for every (256) colour */ ++ /* So just call it for what looks like the last colour in a list for now. */ ++ if (regno == 15 || regno == 255) ++ bcm2708_fb_set_par(info); ++ } else if (regno < 16) { + fb->cmap[regno] = convert_bitfield(transp, &fb->fb.var.transp) | + convert_bitfield(blue, &fb->fb.var.blue) | + convert_bitfield(green, &fb->fb.var.green) | + convert_bitfield(red, &fb->fb.var.red); -+ -+ if (regno < 256) { -+ /* blue [0:4], green [5:10], red [11:15] */ -+ fb->info->cmap[regno] = ((red >> (16-5)) & 0x1f) << 11 | -+ ((green >> (16-6)) & 0x3f) << 5 | -+ ((blue >> (16-5)) & 0x1f) << 0; + } -+ /* Hack: we need to tell GPU the palette has changed, but currently bcm2708_fb_set_par takes noticable time when called for every (256) colour */ -+ /* So just call it for what looks like the last colour in a list for now. */ -+ if (regno == 15 || regno == 255) -+ bcm2708_fb_set_par(info); -+ + return regno > 255; +} + @@ -71399,9 +71748,9 @@ diff -Naur linux-3.2.21/drivers/video/bcm2708_fb.c linux-3.2.21-bootc-5b0ccb0/dr +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.2.21/drivers/video/Kconfig linux-3.2.21-bootc-5b0ccb0/drivers/video/Kconfig ---- linux-3.2.21/drivers/video/Kconfig 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/video/Kconfig 2012-07-02 13:42:15.876329650 +0200 +diff -Naur linux-3.2.23/drivers/video/Kconfig linux-rpi-bootc-3.2.23/drivers/video/Kconfig +--- linux-3.2.23/drivers/video/Kconfig 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/video/Kconfig 2012-07-15 20:29:07.824871765 +0200 @@ -312,6 +312,20 @@ help Support the Permedia2 FIFO disconnect feature. @@ -71423,9 +71772,9 @@ diff -Naur linux-3.2.21/drivers/video/Kconfig linux-3.2.21-bootc-5b0ccb0/drivers config FB_ARMCLCD tristate "ARM PrimeCell PL110 support" depends on FB && ARM && ARM_AMBA -diff -Naur linux-3.2.21/drivers/video/logo/logo_linux_clut224.ppm linux-3.2.21-bootc-5b0ccb0/drivers/video/logo/logo_linux_clut224.ppm ---- linux-3.2.21/drivers/video/logo/logo_linux_clut224.ppm 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/video/logo/logo_linux_clut224.ppm 2012-07-02 13:42:15.869329508 +0200 +diff -Naur linux-3.2.23/drivers/video/logo/logo_linux_clut224.ppm linux-rpi-bootc-3.2.23/drivers/video/logo/logo_linux_clut224.ppm +--- linux-3.2.23/drivers/video/logo/logo_linux_clut224.ppm 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/video/logo/logo_linux_clut224.ppm 2012-07-15 20:29:05.160821635 +0200 @@ -1,1604 +1,883 @@ P3 -# Standard 224-color Linux logo @@ -73912,9 +74261,9 @@ diff -Naur linux-3.2.21/drivers/video/logo/logo_linux_clut224.ppm linux-3.2.21-b +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 -diff -Naur linux-3.2.21/drivers/video/Makefile linux-3.2.21-bootc-5b0ccb0/drivers/video/Makefile ---- linux-3.2.21/drivers/video/Makefile 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/video/Makefile 2012-07-02 13:42:15.845329017 +0200 +diff -Naur linux-3.2.23/drivers/video/Makefile linux-rpi-bootc-3.2.23/drivers/video/Makefile +--- linux-3.2.23/drivers/video/Makefile 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/video/Makefile 2012-07-15 20:29:03.534791038 +0200 @@ -96,6 +96,7 @@ obj-$(CONFIG_FB_PVR2) += pvr2fb.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o @@ -73923,9 +74272,9 @@ diff -Naur linux-3.2.21/drivers/video/Makefile linux-3.2.21-bootc-5b0ccb0/driver obj-$(CONFIG_FB_68328) += 68328fb.o obj-$(CONFIG_FB_GBE) += gbefb.o obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o -diff -Naur linux-3.2.21/drivers/watchdog/bcm2708_wdog.c linux-3.2.21-bootc-5b0ccb0/drivers/watchdog/bcm2708_wdog.c ---- linux-3.2.21/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/watchdog/bcm2708_wdog.c 2012-07-02 13:42:17.501362857 +0200 +diff -Naur linux-3.2.23/drivers/watchdog/bcm2708_wdog.c linux-rpi-bootc-3.2.23/drivers/watchdog/bcm2708_wdog.c +--- linux-3.2.23/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/drivers/watchdog/bcm2708_wdog.c 2012-07-15 20:29:50.389672677 +0200 @@ -0,0 +1,385 @@ +/* + * Broadcom BCM2708 watchdog driver. @@ -74312,9 +74661,9 @@ diff -Naur linux-3.2.21/drivers/watchdog/bcm2708_wdog.c linux-3.2.21-bootc-5b0cc +MODULE_ALIAS_MISCDEV(TEMP_MINOR); +MODULE_LICENSE("GPL"); + -diff -Naur linux-3.2.21/drivers/watchdog/Kconfig linux-3.2.21-bootc-5b0ccb0/drivers/watchdog/Kconfig ---- linux-3.2.21/drivers/watchdog/Kconfig 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/watchdog/Kconfig 2012-07-02 13:42:17.496362753 +0200 +diff -Naur linux-3.2.23/drivers/watchdog/Kconfig linux-rpi-bootc-3.2.23/drivers/watchdog/Kconfig +--- linux-3.2.23/drivers/watchdog/Kconfig 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/watchdog/Kconfig 2012-07-15 20:29:50.364672206 +0200 @@ -343,6 +343,12 @@ To compile this driver as a module, choose M here: the module will be called imx2_wdt. @@ -74328,9 +74677,9 @@ diff -Naur linux-3.2.21/drivers/watchdog/Kconfig linux-3.2.21-bootc-5b0ccb0/driv # AVR32 Architecture config AT32AP700X_WDT -diff -Naur linux-3.2.21/drivers/watchdog/Makefile linux-3.2.21-bootc-5b0ccb0/drivers/watchdog/Makefile ---- linux-3.2.21/drivers/watchdog/Makefile 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/drivers/watchdog/Makefile 2012-07-02 13:42:17.492362673 +0200 +diff -Naur linux-3.2.23/drivers/watchdog/Makefile linux-rpi-bootc-3.2.23/drivers/watchdog/Makefile +--- linux-3.2.23/drivers/watchdog/Makefile 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/drivers/watchdog/Makefile 2012-07-15 20:29:50.262670287 +0200 @@ -53,6 +53,7 @@ obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o @@ -74339,9 +74688,9 @@ diff -Naur linux-3.2.21/drivers/watchdog/Makefile linux-3.2.21-bootc-5b0ccb0/dri # AVR32 Architecture obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o -diff -Naur linux-3.2.21/include/linux/mmc/sdhci.h linux-3.2.21-bootc-5b0ccb0/include/linux/mmc/sdhci.h ---- linux-3.2.21/include/linux/mmc/sdhci.h 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/include/linux/mmc/sdhci.h 2012-07-02 13:42:15.364319187 +0200 +diff -Naur linux-3.2.23/include/linux/mmc/sdhci.h linux-rpi-bootc-3.2.23/include/linux/mmc/sdhci.h +--- linux-3.2.23/include/linux/mmc/sdhci.h 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/include/linux/mmc/sdhci.h 2012-07-15 20:28:57.500677501 +0200 @@ -121,6 +121,7 @@ #define SDHCI_AUTO_CMD23 (1<<7) /* Auto CMD23 support */ #define SDHCI_PV_ENABLED (1<<8) /* Preset value enabled */ @@ -74358,9 +74707,9 @@ diff -Naur linux-3.2.21/include/linux/mmc/sdhci.h linux-3.2.21-bootc-5b0ccb0/inc struct mmc_data *data; /* Current data request */ unsigned int data_early:1; /* Data finished before cmd */ -diff -Naur linux-3.2.21/sound/arm/bcm2835.c linux-3.2.21-bootc-5b0ccb0/sound/arm/bcm2835.c ---- linux-3.2.21/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/sound/arm/bcm2835.c 2012-07-02 13:42:12.543261541 +0200 +diff -Naur linux-3.2.23/sound/arm/bcm2835.c linux-rpi-bootc-3.2.23/sound/arm/bcm2835.c +--- linux-3.2.23/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/sound/arm/bcm2835.c 2012-07-15 20:28:25.381073128 +0200 @@ -0,0 +1,424 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -74786,9 +75135,9 @@ diff -Naur linux-3.2.21/sound/arm/bcm2835.c linux-3.2.21-bootc-5b0ccb0/sound/arm +MODULE_DESCRIPTION("Alsa driver for BCM2835 chip"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm2835_alsa"); -diff -Naur linux-3.2.21/sound/arm/bcm2835-ctl.c linux-3.2.21-bootc-5b0ccb0/sound/arm/bcm2835-ctl.c ---- linux-3.2.21/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/sound/arm/bcm2835-ctl.c 2012-07-02 13:42:12.543261541 +0200 +diff -Naur linux-3.2.23/sound/arm/bcm2835-ctl.c linux-rpi-bootc-3.2.23/sound/arm/bcm2835-ctl.c +--- linux-3.2.23/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/sound/arm/bcm2835-ctl.c 2012-07-15 20:28:25.380073109 +0200 @@ -0,0 +1,172 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -74962,9 +75311,9 @@ diff -Naur linux-3.2.21/sound/arm/bcm2835-ctl.c linux-3.2.21-bootc-5b0ccb0/sound + } + return 0; +} -diff -Naur linux-3.2.21/sound/arm/bcm2835.h linux-3.2.21-bootc-5b0ccb0/sound/arm/bcm2835.h ---- linux-3.2.21/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/sound/arm/bcm2835.h 2012-07-02 13:42:12.544261562 +0200 +diff -Naur linux-3.2.23/sound/arm/bcm2835.h linux-rpi-bootc-3.2.23/sound/arm/bcm2835.h +--- linux-3.2.23/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/sound/arm/bcm2835.h 2012-07-15 20:28:25.381073128 +0200 @@ -0,0 +1,242 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -75208,9 +75557,9 @@ diff -Naur linux-3.2.21/sound/arm/bcm2835.h linux-3.2.21-bootc-5b0ccb0/sound/arm +void bcm2835_audio_flush_playback_buffers(bcm2835_alsa_stream_t * alsa_stream); + +#endif /* __SOUND_ARM_BCM2835_H */ -diff -Naur linux-3.2.21/sound/arm/bcm2835-pcm.c linux-3.2.21-bootc-5b0ccb0/sound/arm/bcm2835-pcm.c ---- linux-3.2.21/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/sound/arm/bcm2835-pcm.c 2012-07-02 13:42:12.543261541 +0200 +diff -Naur linux-3.2.23/sound/arm/bcm2835-pcm.c linux-rpi-bootc-3.2.23/sound/arm/bcm2835-pcm.c +--- linux-3.2.23/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/sound/arm/bcm2835-pcm.c 2012-07-15 20:28:25.380073109 +0200 @@ -0,0 +1,400 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -75612,9 +75961,9 @@ diff -Naur linux-3.2.21/sound/arm/bcm2835-pcm.c linux-3.2.21-bootc-5b0ccb0/sound + + return 0; +} -diff -Naur linux-3.2.21/sound/arm/bcm2835-vchiq.c linux-3.2.21-bootc-5b0ccb0/sound/arm/bcm2835-vchiq.c ---- linux-3.2.21/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/sound/arm/bcm2835-vchiq.c 2012-07-02 13:42:12.544261562 +0200 +diff -Naur linux-3.2.23/sound/arm/bcm2835-vchiq.c linux-rpi-bootc-3.2.23/sound/arm/bcm2835-vchiq.c +--- linux-3.2.23/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/sound/arm/bcm2835-vchiq.c 2012-07-15 20:28:25.381073128 +0200 @@ -0,0 +1,818 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -76434,9 +76783,9 @@ diff -Naur linux-3.2.21/sound/arm/bcm2835-vchiq.c linux-3.2.21-bootc-5b0ccb0/sou + atomic_sub(count, &alsa_stream->retrieved); + return count; +} -diff -Naur linux-3.2.21/sound/arm/Kconfig linux-3.2.21-bootc-5b0ccb0/sound/arm/Kconfig ---- linux-3.2.21/sound/arm/Kconfig 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/sound/arm/Kconfig 2012-07-02 13:42:12.544261562 +0200 +diff -Naur linux-3.2.23/sound/arm/Kconfig linux-rpi-bootc-3.2.23/sound/arm/Kconfig +--- linux-3.2.23/sound/arm/Kconfig 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/sound/arm/Kconfig 2012-07-15 20:28:25.381073128 +0200 @@ -39,5 +39,12 @@ Say Y or M if you want to support any AC97 codec attached to the PXA2xx AC97 interface. @@ -76450,9 +76799,9 @@ diff -Naur linux-3.2.21/sound/arm/Kconfig linux-3.2.21-bootc-5b0ccb0/sound/arm/K + endif # SND_ARM -diff -Naur linux-3.2.21/sound/arm/Makefile linux-3.2.21-bootc-5b0ccb0/sound/arm/Makefile ---- linux-3.2.21/sound/arm/Makefile 2012-06-20 00:18:30.000000000 +0200 -+++ linux-3.2.21-bootc-5b0ccb0/sound/arm/Makefile 2012-07-02 13:42:12.543261541 +0200 +diff -Naur linux-3.2.23/sound/arm/Makefile linux-rpi-bootc-3.2.23/sound/arm/Makefile +--- linux-3.2.23/sound/arm/Makefile 2012-07-12 05:32:21.000000000 +0200 ++++ linux-rpi-bootc-3.2.23/sound/arm/Makefile 2012-07-15 20:28:25.380073109 +0200 @@ -14,3 +14,9 @@ obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o @@ -76463,9 +76812,9 @@ diff -Naur linux-3.2.21/sound/arm/Makefile linux-3.2.21-bootc-5b0ccb0/sound/arm/ + +EXTRA_CFLAGS += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000 + -diff -Naur linux-3.2.21/sound/arm/vc_vchi_audioserv_defs.h linux-3.2.21-bootc-5b0ccb0/sound/arm/vc_vchi_audioserv_defs.h ---- linux-3.2.21/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.21-bootc-5b0ccb0/sound/arm/vc_vchi_audioserv_defs.h 2012-07-02 13:42:12.544261562 +0200 +diff -Naur linux-3.2.23/sound/arm/vc_vchi_audioserv_defs.h linux-rpi-bootc-3.2.23/sound/arm/vc_vchi_audioserv_defs.h +--- linux-3.2.23/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-bootc-3.2.23/sound/arm/vc_vchi_audioserv_defs.h 2012-07-15 20:28:25.381073128 +0200 @@ -0,0 +1,112 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. diff --git a/packages/linux/patches/linux-3.2.22-901_broken_bluetooth.patch b/packages/linux/patches/linux-3.2.23-901_broken_bluetooth.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-901_broken_bluetooth.patch rename to packages/linux/patches/linux-3.2.23-901_broken_bluetooth.patch diff --git a/packages/linux/patches/linux-3.2.22-920_add_rtl8168.patch b/packages/linux/patches/linux-3.2.23-920_add_rtl8168.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-920_add_rtl8168.patch rename to packages/linux/patches/linux-3.2.23-920_add_rtl8168.patch diff --git a/packages/linux/patches/linux-3.2.22-990-xc5000_add_support_for_get_if_frequency.patch b/packages/linux/patches/linux-3.2.23-990-xc5000_add_support_for_get_if_frequency.patch similarity index 100% rename from packages/linux/patches/linux-3.2.22-990-xc5000_add_support_for_get_if_frequency.patch rename to packages/linux/patches/linux-3.2.23-990-xc5000_add_support_for_get_if_frequency.patch