diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-21 13:09:18 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-21 13:09:18 +0200 |
commit | a2ab5fc41533c952706ebdfaa378bb746e535cc1 (patch) | |
tree | 9fb86bb4e9ecb67f7e651d284c2f12c6c5d4378f /arch/arm/boot/dts/omap3-n900.dts | |
parent | a380f2edef65b2447a043251bb3c00a9d2153a8b (diff) | |
parent | 0e708fc602531b8355b5de6ea7c98f09129b223f (diff) | |
download | linux-a2ab5fc41533c952706ebdfaa378bb746e535cc1.tar.gz |
Merge branch 'pm-sleep' into pm-core
Diffstat (limited to 'arch/arm/boot/dts/omap3-n900.dts')
-rw-r--r-- | arch/arm/boot/dts/omap3-n900.dts | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index 26c20e1167b9..4acd32a1c4ef 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -144,15 +144,6 @@ io-channel-names = "temp", "bsi", "vbat"; }; - rear_camera: camera@0 { - compatible = "linux,camera"; - - module { - model = "TCM8341MD"; - sensor = <&cam1>; - }; - }; - pwm9: dmtimer-pwm { compatible = "ti,omap-dmtimer-pwm"; #pwm-cells = <3>; @@ -189,10 +180,8 @@ clock-lanes = <1>; data-lanes = <0>; lane-polarity = <0 0>; - clock-inv = <0>; /* Select strobe = <1> for back camera, <0> for front camera */ strobe = <1>; - crc = <0>; }; }; }; |