Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
3.8: add missing camera patch, fix usage of reset cape
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
- Loading branch information
Showing
2 changed files
with
70 additions
and
0 deletions.
There are no files selected for viewing
36 changes: 36 additions & 0 deletions
36
patches/camera/0004-cssp_camera-increase-delays-make-sensor-detection-wo.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| From c189a57274994c6999aace8af2696ce4216d6257 Mon Sep 17 00:00:00 2001 | ||
| From: Koen Kooi <koen@dominion.thruhere.net> | ||
| Date: Thu, 2 May 2013 12:06:12 +0200 | ||
| Subject: [PATCH 4/5] cssp_camera: increase delays make sensor detection work | ||
| better | ||
|
|
||
| Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
| --- | ||
| drivers/media/platform/soc_camera/cssp_camera.c | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/drivers/media/platform/soc_camera/cssp_camera.c b/drivers/media/platform/soc_camera/cssp_camera.c | ||
| index 0bc6a28..0a0cd8f 100644 | ||
| --- a/drivers/media/platform/soc_camera/cssp_camera.c | ||
| +++ b/drivers/media/platform/soc_camera/cssp_camera.c | ||
| @@ -471,7 +471,7 @@ static int configure_camera_sensor(struct cssp_cam_dev *cam) | ||
| /* Enable the clock just for the time of loading the camera driver and disable after that */ | ||
| /* It is going to be be re-enabled later, when camera will be in use */ | ||
| clk_enable(cam->camera_clk); | ||
| - udelay(5); // let the clock stabilize | ||
| + mdelay(50); // let the clock stabilize | ||
|
|
||
| adapter = i2c_get_adapter(((struct soc_camera_link *)(info->platform_data))->i2c_adapter_id); | ||
| if (!adapter) { | ||
| @@ -504,7 +504,7 @@ static int configure_camera_sensor(struct cssp_cam_dev *cam) | ||
| static int start_camera_sensor(struct cssp_cam_dev *cam) | ||
| { | ||
| clk_enable(cam->camera_clk); | ||
| - udelay(5); /* let the clock stabilize */ | ||
| + mdelay(100); /* let the clock stabilize */ | ||
|
|
||
| v4l2_subdev_call(cam->subdev, video, s_stream, 1); | ||
|
|
||
| -- | ||
| 1.8.1.4 | ||
|
|
34 changes: 34 additions & 0 deletions
34
patches/resetctrl/0010-bone-common-dtsi-remove-reset-cape.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| From 7524c8eb69f909c04ef8c95ee87c77adde7a1609 Mon Sep 17 00:00:00 2001 | ||
| From: Koen Kooi <koen@dominion.thruhere.net> | ||
| Date: Thu, 2 May 2013 14:15:13 +0200 | ||
| Subject: [PATCH 10/10] bone-common dtsi: remove reset cape | ||
|
|
||
| Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
| --- | ||
| arch/arm/boot/dts/am335x-bone-common.dtsi | 10 ---------- | ||
| 1 file changed, 10 deletions(-) | ||
|
|
||
| diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi | ||
| index b8eb5b4..2949a03 100644 | ||
| --- a/arch/arm/boot/dts/am335x-bone-common.dtsi | ||
| +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi | ||
| @@ -129,16 +129,6 @@ | ||
| eeprom = <&cape_eeprom3>; | ||
| }; | ||
|
|
||
| - /* Beaglebone black has it soldered on */ | ||
| - slot@4 { | ||
| - ti,cape-override; | ||
| - compatible = "ti,beaglebone-black"; | ||
| - board-name = "BB-BONE-RST2"; | ||
| - version = "00A0"; | ||
| - manufacturer = "Texas Instruments"; | ||
| - part-number = "BB-BONE-RST2"; | ||
| - }; | ||
| - | ||
| /* geiger cape version A0 without an EEPROM */ | ||
| slot@5 { | ||
| ti,cape-override; | ||
| -- | ||
| 1.8.1.4 | ||
|
|