diff options
| author | Jitendra Kumar <jitendrak@nvidia.com> | 2014-12-17 12:15:03 +0530 |
|---|---|---|
| committer | Matthew Pedro <mapedro@nvidia.com> | 2014-12-31 18:30:46 -0800 |
| commit | 21b1a6009bb0e9d9510eab7e6e27a0999bf742f4 (patch) | |
| tree | 594ce3dd966ea2cf62082d20f09b8842f103e38a /arch | |
| parent | 6c235706a1eca1fe64b476e6368cb432051aa94d (diff) | |
tegra: jetson: Add support for flash module.
Bug 200062768
Change-Id: I18211dfd4735c868a03bbc62d7f9cea4d0d1af05
Signed-off-by: Jitendra Kumar <jitendrak@nvidia.com>
Reviewed-on: http://git-master/r/662717
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
Diffstat (limited to 'arch')
3 files changed, 41 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/tegra124-platforms/tegra124-jetson_tk1-fixed-pm375-0000-c00-00.dtsi b/arch/arm/boot/dts/tegra124-platforms/tegra124-jetson_tk1-fixed-pm375-0000-c00-00.dtsi index 3415f28a1145..2a4a1b344554 100644 --- a/arch/arm/boot/dts/tegra124-platforms/tegra124-jetson_tk1-fixed-pm375-0000-c00-00.dtsi +++ b/arch/arm/boot/dts/tegra124-platforms/tegra124-jetson_tk1-fixed-pm375-0000-c00-00.dtsi @@ -345,26 +345,22 @@ regulator-consumer-device = "0-0077"; }; c21 { - regulator-consumer-supply = "vi2c"; - regulator-consumer-device = "2-0030"; - }; - c22 { regulator-consumer-supply = "avdd_pll_utmip"; regulator-consumer-device = "tegra-udc.0"; }; - c23 { + c22 { regulator-consumer-supply = "avdd_pll_utmip"; regulator-consumer-device = "tegra-ehci.0"; }; - c24 { + c23 { regulator-consumer-supply = "avdd_pll_utmip"; regulator-consumer-device = "tegra-ehci.1"; }; - c25 { + c24 { regulator-consumer-supply = "avdd_pll_utmip"; regulator-consumer-device = "tegra-ehci.2"; }; - c26 { + c25 { regulator-consumer-supply = "avdd_pll_utmip"; regulator-consumer-device = "tegra-xhci"; }; 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 f413a45b5f6c..7f79631e544d 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 @@ -318,6 +318,10 @@ regulator-consumer-supply = "vif"; regulator-consumer-device = "2-0018"; }; + c9 { + regulator-consumer-supply = "vi2c"; + regulator-consumer-device = "2-0030"; + }; }; }; diff --git a/arch/arm/boot/dts/tegra124-platforms/tegra124-pm359-camera-a00.dtsi b/arch/arm/boot/dts/tegra124-platforms/tegra124-pm359-camera-a00.dtsi index d911161e020a..566180d4cdab 100644 --- a/arch/arm/boot/dts/tegra124-platforms/tegra124-pm359-camera-a00.dtsi +++ b/arch/arm/boot/dts/tegra124-platforms/tegra124-pm359-camera-a00.dtsi @@ -39,6 +39,10 @@ profile = <&dw9718_1>; platformdata = "ardbeg_dw9718_pdata"; }; + flash { + profile = <&as3648_1>; + platformdata = "ardbeg_as3648_pdata"; + }; }; module2: module2@modules { compatible = "sensor,front"; @@ -140,6 +144,35 @@ CAMERA_END >; }; + as3648_1: as3648@2_0030 { + index = <6>; + chipname = "pcl_AS3648"; + type = "flash"; + guid = "l_NVCAM0"; + position = <0>; + bustype = "i2c"; + busnum = <2>; + addr = <0x30>; + datalen = <1>; + pinmuxgrp = <0xFFFF>; + gpios = <3>; + regulators = "vi2c", "vin"; + drivername = "as3648"; + detect = <0x0001 0x0000 0x00F0 0x00b0>; + devid = <0x3648>; + poweron = < + CAMERA_REGULATOR_ON(1) + CAMERA_REGULATOR_ON(0) + CAMERA_WAITUS(1000) + CAMERA_END + >; + poweroff = < + CAMERA_REGULATOR_OFF(0) + CAMERA_REGULATOR_OFF(1) + CAMERA_WAITUS(10) + CAMERA_END + >; + }; ar0261_1: ar0261@2_0036 { index = <3>; chipname = "pcl_AR0261"; |