mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-27 04:54:41 +08:00
DaVinci device tree updates to enable
Video display on DA850 along with some whitespace clean-up. Also, enables sound and ADC support on Lego EV3. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJY0hYtAAoJEGFBu2jqvgRNJzoQAIUrXYqHYaD+ZuvVrtUfK0b2 IG4bd9gQ09s+jVOPdhtiT+FGwTWXFTBValLAABWyjP9YV0SL6JNR0Kn6lXjZk3BD Kprctk/EpphdmKurSEFRERulws7VOtagx88qUZqDPjootMbUGxFU7yYXzUoD1o/U VmQfV0jpNuLZ5abRld7Qyar5Oh6w1r58YQtbHNT82Dwkk1NfXNEEL+9WJA6Eqx8L nQBv4Yep8KuTw5PN3nWIYWQfVuKkRbdSHvnuuaCB0sxQLCQLOLtPhFlf2f9fsBaO enxfZcKzRuH21E0aRGjQKrtoWGiZqNOoZb2nPYjcEmtgcBeoZJPtp4A9U9AEOUyO GM9RfiWeszfcgQ9Yi6TiXqFJBVON61LAhe5IGYWGyOHsgzAFRTDqSmQ9aYL0vGzy Z49OYTHsA22YeSHtXoFRZD9owJAouHL3dIdw97FB4gC9DeqM04+8a8nkFhg14URW 1NlaocDxFUO351OgVS+9W5P1GtvN0mYekMlk2VkS1UQihwBg2Q30RKU4Hvf2EnkH c3B2DMWAO/lQHSQWxdpdrTzZdIdjjCSe07JoIC1A+8cWg5NOV4AncM+gAwxHRlOu Sfbyb9dEa+0cFlz/3QGiALbmht2T/4TQFI3kkrwvU3lTFp0CZ/QCn5VpL4uBzOKH 4xZ3qSUCItMDS8xgsjp7 =DFR4 -----END PGP SIGNATURE----- Merge tag 'davinci-for-v4.12/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt Pull "DaVinci DT updates for v4.12" from Sekhar Nori: DaVinci device tree updates to enable Video display on DA850 along with some whitespace clean-up. Also, enables sound and ADC support on Lego EV3. * tag 'davinci-for-v4.12/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: dts: da850-evm: add the output port to the vpif node ARM: dts: da850-evm: add IO expander node on UI card ARM: dts: da850: add vpif video display pins ARM: dts: da850-evm: fix whitespace errors ARM: da850-lego-ev3: Add device tree node for sound ARM: da850-lego-ev3: Add device tree node for A/DC
This commit is contained in:
Arnd Bergmann
commit
2c5ad9764e
@ -9,6 +9,7 @@
|
||||
*/
|
||||
/dts-v1/;
|
||||
#include "da850.dtsi"
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
|
||||
/ {
|
||||
compatible = "ti,da850-evm", "ti,da850";
|
||||
@ -78,7 +79,10 @@
|
||||
DRVDD-supply = <&vbat>;
|
||||
DVDD-supply = <&vbat>;
|
||||
};
|
||||
|
||||
tca6416: gpio@20 {
|
||||
compatible = "ti,tca6416";
|
||||
reg = <0x20>;
|
||||
};
|
||||
};
|
||||
wdt: wdt@21000 {
|
||||
status = "okay";
|
||||
@ -293,20 +297,27 @@
|
||||
|
||||
&vpif {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&vpif_capture_pins>;
|
||||
pinctrl-0 = <&vpif_capture_pins>, <&vpif_display_pins>;
|
||||
status = "okay";
|
||||
|
||||
/* VPIF capture port */
|
||||
port {
|
||||
vpif_ch0: endpoint@0 {
|
||||
reg = <0>;
|
||||
bus-width = <8>;
|
||||
port@0 {
|
||||
vpif_input_ch0: endpoint@0 {
|
||||
reg = <0>;
|
||||
bus-width = <8>;
|
||||
};
|
||||
|
||||
vpif_ch1: endpoint@1 {
|
||||
reg = <1>;
|
||||
bus-width = <8>;
|
||||
data-shift = <8>;
|
||||
vpif_input_ch1: endpoint@1 {
|
||||
reg = <1>;
|
||||
bus-width = <8>;
|
||||
data-shift = <8>;
|
||||
};
|
||||
};
|
||||
|
||||
/* VPIF display port */
|
||||
port@1 {
|
||||
vpif_output_ch0: endpoint {
|
||||
bus-width = <8>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -123,6 +123,14 @@
|
||||
pinctrl-0 = <&system_power_pin>;
|
||||
};
|
||||
|
||||
sound {
|
||||
compatible = "pwm-beeper";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&ehrpwm0b_pins>;
|
||||
pwms = <&ehrpwm0 1 1000000 0>;
|
||||
amp-supply = <&>;
|
||||
};
|
||||
|
||||
/*
|
||||
* This is a 5V current limiting regulator that is shared by USB,
|
||||
* the sensor (input) ports, the motor (output) ports and the A/DC.
|
||||
@ -139,6 +147,31 @@
|
||||
enable-active-high;
|
||||
regulator-boot-on;
|
||||
};
|
||||
|
||||
/*
|
||||
* This is a simple voltage divider on VCC5V to provide a 2.5V
|
||||
* reference signal to the ADC.
|
||||
*/
|
||||
adc_ref: regulator2 {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "adc ref";
|
||||
regulator-min-microvolt = <2500000>;
|
||||
regulator-max-microvolt = <2500000>;
|
||||
regulator-boot-on;
|
||||
vin-supply = <&vcc5v>;
|
||||
};
|
||||
|
||||
/*
|
||||
* This is the amplifier for the speaker.
|
||||
*/
|
||||
amp: regulator3 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&_pins>;
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "amp";
|
||||
gpio = <&gpio 111 GPIO_ACTIVE_HIGH>;
|
||||
enable-active-high;
|
||||
};
|
||||
};
|
||||
|
||||
&pmx_core {
|
||||
@ -195,6 +228,13 @@
|
||||
0x4c 0x00008000 0x0000f000
|
||||
>;
|
||||
};
|
||||
|
||||
amp_pins: pinmux_amp_pins {
|
||||
pinctrl-single,bits = <
|
||||
/* GP6[15] */
|
||||
0x34 0x00000008 0x0000000f
|
||||
>;
|
||||
};
|
||||
};
|
||||
|
||||
&pinconf {
|
||||
@ -293,6 +333,18 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
adc: adc@3 {
|
||||
compatible = "ti,ads7957";
|
||||
reg = <3>;
|
||||
#io-channel-cells = <1>;
|
||||
spi-max-frequency = <10000000>;
|
||||
vref-supply = <&adc_ref>;
|
||||
};
|
||||
};
|
||||
|
||||
&ehrpwm0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&gpio {
|
||||
|
||||
@ -216,8 +216,21 @@
|
||||
0x3c 0x11111111 0xffffffff
|
||||
/* VP_DIN[8..9] */
|
||||
0x40 0x00000011 0x000000ff
|
||||
/* VP_CLKIN3, VP_CLKIN2 */
|
||||
0x4c 0x00010100 0x000f0f00
|
||||
>;
|
||||
};
|
||||
vpif_display_pins: vpif_display_pins {
|
||||
pinctrl-single,bits = <
|
||||
/* VP_DOUT[2..7] */
|
||||
0x40 0x11111100 0xffffff00
|
||||
/* VP_DOUT[10..15,0..1] */
|
||||
0x44 0x11111111 0xffffffff
|
||||
/* VP_DOUT[8..9] */
|
||||
0x48 0x00000011 0x000000ff
|
||||
/*
|
||||
* VP_CLKOUT3, VP_CLKIN3,
|
||||
* VP_CLKOUT2, VP_CLKIN2
|
||||
*/
|
||||
0x4c 0x00111100 0x00ffff00
|
||||
>;
|
||||
};
|
||||
};
|
||||
@ -345,7 +358,13 @@
|
||||
status = "disabled";
|
||||
|
||||
/* VPIF capture port */
|
||||
port {
|
||||
port@0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
};
|
||||
|
||||
/* VPIF display port */
|
||||
port@1 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user