author | Praneeth Bajjuri <praneeth@ti.com> | |
Wed, 12 Feb 2014 22:40:45 +0000 (16:40 -0600) | ||
committer | Praneeth Bajjuri <praneeth@ti.com> | |
Wed, 12 Feb 2014 22:40:45 +0000 (16:40 -0600) |
* 'p-ti-linux-3.8.y-video' of git://git.ti.com/android-sdk/kernel-video:
SERLINK: Add support for ds90ub913aq
DESERLINK: Add support for ds90ub914aq
v4l: ti-vps: vip: code cleanup to remove compiler warnings
v4l: ti-vps: vip: earlycam: added data tag to vip of_device_id
v4l: ti-vps: vpdma: correct write desc mask
HACK: i2c: ov1063x: Set the pixel clock to 96MHz
i2c: ov1063x: Write actual i2c address to 0x300c register
v4l: ti-vps: vip: Get subdevice from device tree
v4l: ti-vps: vip: Make driver compatible to vip2,3
i2c: ov1063x: Select muxes based on the connector
i2c: ov1063x: Configure serializer and deserializer through sensor
i2c: dra7xx: dummy driver for i2c expander
arm: dts: dra7xx: Update VIP2 and VIP3 interrupts
arm: dts: dra7xx: Added pinmux for Vin3a and Vin5a
arm: dts: dra7xx: Added i2c nodes for serdes
Change-Id: I0f6a1c3a9f9cfc3de1068dc6829a03e31625c189
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
SERLINK: Add support for ds90ub913aq
DESERLINK: Add support for ds90ub914aq
v4l: ti-vps: vip: code cleanup to remove compiler warnings
v4l: ti-vps: vip: earlycam: added data tag to vip of_device_id
v4l: ti-vps: vpdma: correct write desc mask
HACK: i2c: ov1063x: Set the pixel clock to 96MHz
i2c: ov1063x: Write actual i2c address to 0x300c register
v4l: ti-vps: vip: Get subdevice from device tree
v4l: ti-vps: vip: Make driver compatible to vip2,3
i2c: ov1063x: Select muxes based on the connector
i2c: ov1063x: Configure serializer and deserializer through sensor
i2c: dra7xx: dummy driver for i2c expander
arm: dts: dra7xx: Update VIP2 and VIP3 interrupts
arm: dts: dra7xx: Added pinmux for Vin3a and Vin5a
arm: dts: dra7xx: Added i2c nodes for serdes
Change-Id: I0f6a1c3a9f9cfc3de1068dc6829a03e31625c189
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
1 | 2 | |||
---|---|---|---|---|
arch/arm/boot/dts/dra7-evm.dts | patch | | diff1 | | diff2 | | blob | history |
arch/arm/boot/dts/dra7.dtsi | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/boot/dts/dra7-evm.dts
index b0da57f9bc6e52c59a07159ec7ee03549ba6d1a3,400e00a65498fbf96014453a001ae351c54855b5..bd0140818315656691b1b0aa9eb456ed0b4b8c44
&mcasp8_pins
&vout1_pins
&vout3_pins
- &vin1a_pins
&usb_pins
&irq_pins
+ &bt_uart3_pins
+ &wl_pins
+ &wlirq_pins
+ &radio_pins
>;
atl_pins: pinmux_atl_pins {
diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge