kernel: Fix for upstream network deadlock

See: raspberrypi/firmware#481 kernel: bcm2835-gpiomem: Fix for ARCH_BCM2835 builds See: raspberrypi/linux#1154 kernel: BCM270X_DT: Add at86rf233 overlay See: raspberrypi/linux#1151 kernel: BCM270X_DT: Make mmc overlay compatible with current firmware firmware: arm_loader: Support DT commands in included files See: raspberrypi/firmware#414 firmware: di_adv: Need up align up height to at least 4 See: https://discourse.osmc.tv/t/problems-with-divx5-videos-after-september-update/8499/7 firmware: Allow loading of tuning data from a memory block
Hexxeh · Oct 10, 2015 · b05bcd5 · b05bcd5
1 parent cad980c
commit b05bcd5
Show file tree

Hide file tree

Showing 59 changed files with 21 additions and 5 deletions.
diff --git a/fixup.dat b/fixup.dat
diff --git a/fixup_cd.dat b/fixup_cd.dat
diff --git a/fixup_db.dat b/fixup_db.dat
diff --git a/fixup_x.dat b/fixup_x.dat
diff --git a/git_hash b/git_hash
@@ -1 +1 @@
-0b439214b09e3f80413c19b7e0a407c34a79411c
+74328c7da3924f856cb986509e505b414939060d
diff --git a/kernel.img b/kernel.img
diff --git a/kernel7.img b/kernel7.img
diff --git a/modules/4.1.10+/kernel/drivers/char/broadcom/bcm2835-gpiomem.ko b/modules/4.1.10+/kernel/drivers/char/broadcom/bcm2835-gpiomem.ko
diff --git a/modules/4.1.10-v7+/kernel/drivers/char/broadcom/bcm2835-gpiomem.ko b/modules/4.1.10-v7+/kernel/drivers/char/broadcom/bcm2835-gpiomem.ko
diff --git a/overlays/README b/overlays/README
@@ -69,13 +69,14 @@ DT parameters:
 
 Parameters always have default values, although in some cases (e.g. "w1-gpio")
 it is necessary to provided multiple overlays in order to get the desired
-behaviour. See the list of overlays below for a description of the parameters and their defaults.
+behaviour. See the list of overlays below for a description of the parameters
+and their defaults.
 
 The Overlay and Parameter Reference
 ===================================
 
-N.B. When editing this file, please preserve the indentation levels to make it simple to parse
-programmatically. NO HARD TABS.
+N.B. When editing this file, please preserve the indentation levels to make it
+simple to parse programmatically. NO HARD TABS.
 
 
 Name:   <The base DTB>
@@ -149,7 +150,7 @@ Name:   ads7846
 Info:   ADS7846 Touch controller
 Load:   dtoverlay=ads7846,<param>=<val>
 Params: cs                       SPI bus Chip Select (default 1)
-        speed                    SPI bus speed (default 2Mhz, max 3.25MHz)
+        speed                    SPI bus speed (default 2MHz, max 3.25MHz)
         penirq                   GPIO used for PENIRQ. REQUIRED
         penirq_pull              Set GPIO pull (default 0=none, 2=pullup)
         swapxy                   Swap x and y axis
@@ -170,6 +171,18 @@ Params: cs                       SPI bus Chip Select (default 1)
         www.kernel.org/doc/Documentation/devicetree/bindings/input/ads7846.txt
 
 
+Name:   at86rf233
+Info:   Configures the Atmel AT86RF233 802.15.4 low-power WPAN transceiver,
+        connected to spi0.0
+Load:   dtoverlay=at86rf233,<param>=<val>
+Params: interrupt                GPIO used for INT (default 23)
+        reset                    GPIO used for Reset (default 24)
+        sleep                    GPIO used for Sleep (default 25)
+        speed                    SPI bus speed in Hz (default 750000)
+        trim                     Fine tuning of the internal capacitance
+                                 arrays (0=+0pF, 15=+4.5pF, default 15)
+
+
 Name:   bmp085_i2c-sensor
 Info:   Configures the BMP085/BMP180 digital barometric pressure and temperature
         sensors from Bosch Sensortec

diff --git a/overlays/at86rf233-overlay.dtb b/overlays/at86rf233-overlay.dtb
diff --git a/overlays/mmc-overlay.dtb b/overlays/mmc-overlay.dtb
diff --git a/start.elf b/start.elf
diff --git a/start_cd.elf b/start_cd.elf
diff --git a/start_db.elf b/start_db.elf
diff --git a/start_x.elf b/start_x.elf
diff --git a/vc/hardfp/opt/vc/bin/mmal_vc_diag b/vc/hardfp/opt/vc/bin/mmal_vc_diag
diff --git a/vc/hardfp/opt/vc/bin/raspistill b/vc/hardfp/opt/vc/bin/raspistill
diff --git a/vc/hardfp/opt/vc/bin/raspivid b/vc/hardfp/opt/vc/bin/raspivid
diff --git a/vc/hardfp/opt/vc/bin/raspividyuv b/vc/hardfp/opt/vc/bin/raspividyuv
diff --git a/vc/hardfp/opt/vc/bin/raspiyuv b/vc/hardfp/opt/vc/bin/raspiyuv
diff --git a/vc/hardfp/opt/vc/lib/libEGL_static.a b/vc/hardfp/opt/vc/lib/libEGL_static.a
diff --git a/vc/hardfp/opt/vc/lib/libGLESv2_static.a b/vc/hardfp/opt/vc/lib/libGLESv2_static.a
diff --git a/vc/hardfp/opt/vc/lib/libdebug_sym_static.a b/vc/hardfp/opt/vc/lib/libdebug_sym_static.a
diff --git a/vc/hardfp/opt/vc/lib/libkhrn_client.a b/vc/hardfp/opt/vc/lib/libkhrn_client.a
diff --git a/vc/hardfp/opt/vc/lib/libkhrn_static.a b/vc/hardfp/opt/vc/lib/libkhrn_static.a
diff --git a/vc/hardfp/opt/vc/lib/libmmal.so b/vc/hardfp/opt/vc/lib/libmmal.so
diff --git a/vc/hardfp/opt/vc/lib/libmmal_components.so b/vc/hardfp/opt/vc/lib/libmmal_components.so
diff --git a/vc/hardfp/opt/vc/lib/libmmal_core.so b/vc/hardfp/opt/vc/lib/libmmal_core.so
diff --git a/vc/hardfp/opt/vc/lib/libmmal_util.so b/vc/hardfp/opt/vc/lib/libmmal_util.so
diff --git a/vc/hardfp/opt/vc/lib/libmmal_vc_client.so b/vc/hardfp/opt/vc/lib/libmmal_vc_client.so
diff --git a/vc/hardfp/opt/vc/lib/libopenmaxil.so b/vc/hardfp/opt/vc/lib/libopenmaxil.so
diff --git a/vc/hardfp/opt/vc/lib/libvcfiled_check.a b/vc/hardfp/opt/vc/lib/libvcfiled_check.a
diff --git a/vc/hardfp/opt/vc/lib/libvchostif.a b/vc/hardfp/opt/vc/lib/libvchostif.a
diff --git a/vc/hardfp/opt/vc/lib/libvcilcs.a b/vc/hardfp/opt/vc/lib/libvcilcs.a
diff --git a/vc/hardfp/opt/vc/lib/libvmcs_rpc_client.a b/vc/hardfp/opt/vc/lib/libvmcs_rpc_client.a
diff --git a/vc/sdk/opt/vc/include/IL/OMX_Index.h b/vc/sdk/opt/vc/include/IL/OMX_Index.h
@@ -520,6 +520,7 @@ typedef enum OMX_INDEXTYPE {
     OMX_IndexParamCameraClockingMode,                         /**< reference: OMX_PARAM_CAMERACLOCKINGMODETYPE */
     OMX_IndexParamCameraRxConfig,                             /**< reference: OMX_PARAM_CAMERARXCONFIG_TYPE */
     OMX_IndexParamCameraRxTiming,                             /**< reference: OMX_PARAM_CAMERARXTIMING_TYPE */
+    OMX_IndexParamDynamicParameterConfig,                     /**< reference: OMX_PARAM_U32TYPE */
     OMX_IndexMax = 0x7FFFFFFF
 } OMX_INDEXTYPE;
 

diff --git a/vc/sdk/opt/vc/include/interface/mmal/mmal_parameters_camera.h b/vc/sdk/opt/vc/include/interface/mmal/mmal_parameters_camera.h
@@ -135,6 +135,7 @@ enum {
    MMAL_PARAMETER_CAMERA_CLOCKING_MODE,      /**< Takes a @ref MMAL_PARAMETER_CAMERA_CLOCKING_MODE_T */
    MMAL_PARAMETER_CAMERA_RX_CONFIG,          /**< Takes a @ref MMAL_PARAMETER_CAMERA_RX_CONFIG_T */
    MMAL_PARAMETER_CAMERA_RX_TIMING,          /**< Takes a @ref MMAL_PARAMETER_CAMERA_RX_TIMING_T */
+   MMAL_PARAMETER_DPF_CONFIG,                /**< Takes a @ref MMAL_PARAMETER_UINT32_T */
 };
 
 /** Thumbnail configuration parameter type */

diff --git a/vc/sdk/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Index.h b/vc/sdk/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Index.h
@@ -520,6 +520,7 @@ typedef enum OMX_INDEXTYPE {
     OMX_IndexParamCameraClockingMode,                         /**< reference: OMX_PARAM_CAMERACLOCKINGMODETYPE */
     OMX_IndexParamCameraRxConfig,                             /**< reference: OMX_PARAM_CAMERARXCONFIG_TYPE */
     OMX_IndexParamCameraRxTiming,                             /**< reference: OMX_PARAM_CAMERARXTIMING_TYPE */
+    OMX_IndexParamDynamicParameterConfig,                     /**< reference: OMX_PARAM_U32TYPE */
     OMX_IndexMax = 0x7FFFFFFF
 } OMX_INDEXTYPE;
 

diff --git a/vc/softfp/opt/vc/bin/mmal_vc_diag b/vc/softfp/opt/vc/bin/mmal_vc_diag
diff --git a/vc/softfp/opt/vc/bin/raspistill b/vc/softfp/opt/vc/bin/raspistill
diff --git a/vc/softfp/opt/vc/bin/raspivid b/vc/softfp/opt/vc/bin/raspivid
diff --git a/vc/softfp/opt/vc/bin/raspividyuv b/vc/softfp/opt/vc/bin/raspividyuv
diff --git a/vc/softfp/opt/vc/bin/raspiyuv b/vc/softfp/opt/vc/bin/raspiyuv
diff --git a/vc/softfp/opt/vc/lib/libEGL_static.a b/vc/softfp/opt/vc/lib/libEGL_static.a
diff --git a/vc/softfp/opt/vc/lib/libGLESv2_static.a b/vc/softfp/opt/vc/lib/libGLESv2_static.a
diff --git a/vc/softfp/opt/vc/lib/libdebug_sym_static.a b/vc/softfp/opt/vc/lib/libdebug_sym_static.a
diff --git a/vc/softfp/opt/vc/lib/libkhrn_client.a b/vc/softfp/opt/vc/lib/libkhrn_client.a
diff --git a/vc/softfp/opt/vc/lib/libkhrn_static.a b/vc/softfp/opt/vc/lib/libkhrn_static.a
diff --git a/vc/softfp/opt/vc/lib/libmmal.so b/vc/softfp/opt/vc/lib/libmmal.so
diff --git a/vc/softfp/opt/vc/lib/libmmal_components.so b/vc/softfp/opt/vc/lib/libmmal_components.so
diff --git a/vc/softfp/opt/vc/lib/libmmal_core.so b/vc/softfp/opt/vc/lib/libmmal_core.so
diff --git a/vc/softfp/opt/vc/lib/libmmal_util.so b/vc/softfp/opt/vc/lib/libmmal_util.so
diff --git a/vc/softfp/opt/vc/lib/libmmal_vc_client.so b/vc/softfp/opt/vc/lib/libmmal_vc_client.so
diff --git a/vc/softfp/opt/vc/lib/libopenmaxil.so b/vc/softfp/opt/vc/lib/libopenmaxil.so
diff --git a/vc/softfp/opt/vc/lib/libvcfiled_check.a b/vc/softfp/opt/vc/lib/libvcfiled_check.a
diff --git a/vc/softfp/opt/vc/lib/libvchostif.a b/vc/softfp/opt/vc/lib/libvchostif.a
diff --git a/vc/softfp/opt/vc/lib/libvcilcs.a b/vc/softfp/opt/vc/lib/libvcilcs.a
diff --git a/vc/softfp/opt/vc/lib/libvmcs_rpc_client.a b/vc/softfp/opt/vc/lib/libvmcs_rpc_client.a
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0b439214b09e3f80413c19b7e0a407c34a79411c
		74328c7da3924f856cb986509e505b414939060d