mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-31 10:31:33 -04:00
Merge tag 'omap-for-v7.2/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/dt
ARM: dts: OMAP updates for v7.2 Minor DTS fixes & updates * tag 'omap-for-v7.2/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap: ARM: dts: dm8168-evm: Set stdout-path to uart3 arch: arm: dts: cpcap-mapphone: Add audio-codec jack detection interrupts arch: arm: dts: cpcap-mapphone: Set VAUDIO regulator always-on ARM: dts: ti/omap: omap4-epson-embt2ws: fix typo in iio device property ARM: dts: am335x-sl50: Fix audio bitclock and frame master endpoint Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
@@ -558,8 +558,8 @@ cpu_endpoint: endpoint {
|
||||
remote-endpoint = <&codec_endpoint>;
|
||||
|
||||
dai-format = "dsp_b";
|
||||
bitclock-master = <&codec_port>;
|
||||
frame-master = <&codec_port>;
|
||||
bitclock-master = <&codec_endpoint>;
|
||||
frame-master = <&codec_endpoint>;
|
||||
bitclock-inversion;
|
||||
clocks = <&audio_mclk>;
|
||||
};
|
||||
|
||||
@@ -8,6 +8,10 @@ / {
|
||||
model = "DM8168 EVM";
|
||||
compatible = "ti,dm8168-evm", "ti,dm8168", "ti,dm816";
|
||||
|
||||
chosen {
|
||||
stdout-path = &uart3;
|
||||
};
|
||||
|
||||
memory@80000000 {
|
||||
device_type = "memory";
|
||||
reg = <0x80000000 0x40000000 /* 1 GB */
|
||||
|
||||
@@ -69,6 +69,8 @@ cpcap_regulators: regulators {
|
||||
|
||||
cpcap_audio: audio-codec {
|
||||
#sound-dai-cells = <1>;
|
||||
interrupts-extended = <&cpcap 9 0>, <&cpcap 10 0>;
|
||||
interrupt-names = "hs", "mb2";
|
||||
|
||||
port@0 {
|
||||
cpcap_audio_codec0: endpoint {
|
||||
@@ -267,6 +269,8 @@ vaudio: VAUDIO {
|
||||
regulator-min-microvolt = <2775000>;
|
||||
regulator-max-microvolt = <2775000>;
|
||||
regulator-enable-ramp-delay = <1000>;
|
||||
regulator-initial-mode = <0x00>; /* NORMAL */
|
||||
regulator-allowed-modes = <0x00>, <0x40>; /* ON, LOW_PWR */
|
||||
regulator-initial-mode = <0x00>; /* ON */
|
||||
regulator-always-on;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -351,7 +351,7 @@ mpu9150h: imu@68 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&mpu9150h_pins>;
|
||||
interrupt-parent = <&gpio2>;
|
||||
interrupt = <19 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupts = <19 IRQ_TYPE_LEVEL_HIGH>;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -413,7 +413,7 @@ mpu9150: imu@68 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&mpu9150_pins>;
|
||||
interrupt-parent = <&gpio2>;
|
||||
interrupt = <7 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupts = <7 IRQ_TYPE_LEVEL_HIGH>;
|
||||
vddio-supply = <&cb_v18>;
|
||||
vdd-supply = <&cb_v33>;
|
||||
invensense,level-shifter;
|
||||
|
||||
Reference in New Issue
Block a user