diff options
| author | Bryan Wu <pengw@nvidia.com> | 2014-05-27 17:34:53 -0700 |
|---|---|---|
| committer | Winnie Hsu <whsu@nvidia.com> | 2015-01-07 18:07:48 -0800 |
| commit | 80266b4b2f34e561c75b350252214ca20cf591fa (patch) | |
| tree | 4359fc87b8af44b4d1bc761d4ddb72cd92f1b62c /arch | |
| parent | 2876729cec07fafe00564c9d52562f0e17175d8c (diff) | |
AR0261: validate with V4L2 for Jetson TK1
Change-Id: I1c00d571e294ccf1c4d795bb90e71defd3395293
Signed-off-by: Bryan Wu <pengw@nvidia.com>
Reviewed-on: http://git-master/r/591333
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
(cherry picked from commit b87d110ddc52048944862fb8bf019922333b1dd5)
Reviewed-on: http://git-master/r/665999
Reviewed-by: Winnie Hsu <whsu@nvidia.com>
Tested-by: Winnie Hsu <whsu@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/tegra124-platforms/tegra124-jetson_tk1-pmic-pm375-0000-c00-00.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-ardbeg-sensors.c | 42 |
2 files changed, 42 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/tegra124-platforms/tegra124-jetson_tk1-pmic-pm375-0000-c00-00.dtsi b/arch/arm/boot/dts/tegra124-platforms/tegra124-jetson_tk1-pmic-pm375-0000-c00-00.dtsi index 7f79631e544d..57e147e5fba0 100644 --- a/arch/arm/boot/dts/tegra124-platforms/tegra124-jetson_tk1-pmic-pm375-0000-c00-00.dtsi +++ b/arch/arm/boot/dts/tegra124-platforms/tegra124-jetson_tk1-pmic-pm375-0000-c00-00.dtsi @@ -400,11 +400,6 @@ }; c3 { regulator-consumer-supply = "vana"; - regulator-consumer-device = "2-0010"; - }; - c4 { - regulator-consumer-supply = "vana"; - regulator-consumer-device = "2-000c"; }; c5 { regulator-consumer-supply = "vana"; @@ -424,7 +419,6 @@ }; c2 { regulator-consumer-supply = "vdig"; - regulator-consumer-device = "2-0010"; }; c3 { regulator-consumer-supply = "vdig"; diff --git a/arch/arm/mach-tegra/board-ardbeg-sensors.c b/arch/arm/mach-tegra/board-ardbeg-sensors.c index b8ea94d1c086..d89c2e1970f4 100644 --- a/arch/arm/mach-tegra/board-ardbeg-sensors.c +++ b/arch/arm/mach-tegra/board-ardbeg-sensors.c @@ -260,6 +260,45 @@ static struct platform_device ardbeg_imx135_soc_camera_device = { }; #endif +#if IS_ENABLED(CONFIG_SOC_CAMERA_AR0261) +static int ardbeg_ar0261_power(struct device *dev, int enable) +{ + return 0; +} + +struct ar0261_platform_data ardbeg_ar0261_data; + +static struct i2c_board_info ardbeg_ar0261_camera_i2c_device = { + I2C_BOARD_INFO("ar0261_v4l2", 0x36), + .platform_data = &ardbeg_ar0261_data, +}; + +static struct tegra_camera_platform_data ardbeg_ar0261_camera_platform_data = { + .flip_v = 0, + .flip_h = 0, + .port = TEGRA_CAMERA_PORT_CSI_C, + .lanes = 1, + .continuous_clk = 0, +}; + +static struct soc_camera_link ar0261_iclink = { + .bus_id = 1, /* This must match the .id of tegra_vi01_device */ + .board_info = &ardbeg_ar0261_camera_i2c_device, + .module_name = "ar0261_v4l2", + .i2c_adapter_id = 2, + .power = ardbeg_ar0261_power, + .priv = &ardbeg_ar0261_camera_platform_data, +}; + +static struct platform_device ardbeg_ar0261_soc_camera_device = { + .name = "soc-camera-pdrv", + .id = 1, + .dev = { + .platform_data = &ar0261_iclink, + }, +}; +#endif + static struct regulator *ardbeg_vcmvdd; static int ardbeg_get_extra_regulators(void) @@ -1283,6 +1322,9 @@ static int ardbeg_camera_init(void) platform_device_register(&ardbeg_imx135_soc_camera_device); #endif +#if IS_ENABLED(CONFIG_SOC_CAMERA_AR0261) + platform_device_register(&ardbeg_ar0261_soc_camera_device); +#endif return 0; } |