projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
omap4-panda-common.dtsi
diff --git
a/arch/arm/boot/dts/omap4-panda-common.dtsi
b/arch/arm/boot/dts/omap4-panda-common.dtsi
index
df2e356
..
1673689
100644
(file)
--- a/
arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/
arch/arm/boot/dts/omap4-panda-common.dtsi
@@
-8,7
+8,7
@@
#include "elpida_ecb240abacn.dtsi"
/ {
#include "elpida_ecb240abacn.dtsi"
/ {
- memory {
+ memory
@80000000
{
device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */
};
device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */
};
@@
-103,7
+103,7
@@
enable-active-high;
};
enable-active-high;
};
- tfp410: encoder
@
0 {
+ tfp410: encoder0 {
compatible = "ti,tfp410";
powerdown-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; /* gpio_0 */
compatible = "ti,tfp410";
powerdown-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; /* gpio_0 */
@@
-114,7
+114,7
@@
port@0 {
reg = <0>;
port@0 {
reg = <0>;
- tfp410_in: endpoint
@0
{
+ tfp410_in: endpoint {
remote-endpoint = <&dpi_out>;
};
};
remote-endpoint = <&dpi_out>;
};
};
@@
-122,14
+122,14
@@
port@1 {
reg = <1>;
port@1 {
reg = <1>;
- tfp410_out: endpoint
@0
{
+ tfp410_out: endpoint {
remote-endpoint = <&dvi_connector_in>;
};
};
};
};
remote-endpoint = <&dvi_connector_in>;
};
};
};
};
- dvi0: connector
@
0 {
+ dvi0: connector0 {
compatible = "dvi-connector";
label = "dvi";
compatible = "dvi-connector";
label = "dvi";
@@
-144,7
+144,7
@@
};
};
};
};
- tpd12s015: encoder
@
1 {
+ tpd12s015: encoder1 {
compatible = "ti,tpd12s015";
gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>, /* 60, CT CP HPD */
compatible = "ti,tpd12s015";
gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>, /* 60, CT CP HPD */
@@
-158,7
+158,7
@@
port@0 {
reg = <0>;
port@0 {
reg = <0>;
- tpd12s015_in: endpoint
@0
{
+ tpd12s015_in: endpoint {
remote-endpoint = <&hdmi_out>;
};
};
remote-endpoint = <&hdmi_out>;
};
};
@@
-166,14
+166,14
@@
port@1 {
reg = <1>;
port@1 {
reg = <1>;
- tpd12s015_out: endpoint
@0
{
+ tpd12s015_out: endpoint {
remote-endpoint = <&hdmi_connector_in>;
};
};
};
};
remote-endpoint = <&hdmi_connector_in>;
};
};
};
};
- hdmi0: connector
@
1 {
+ hdmi0: connector1 {
compatible = "hdmi-connector";
label = "hdmi";
compatible = "hdmi-connector";
label = "hdmi";
@@
-376,6
+376,7
@@
twl6040: twl@4b {
compatible = "ti,twl6040";
twl6040: twl@4b {
compatible = "ti,twl6040";
+ #clock-cells = <0>;
reg = <0x4b>;
pinctrl-names = "default";
reg = <0x4b>;
pinctrl-names = "default";
@@
-445,6
+446,8
@@
pinctrl-names = "default";
pinctrl-0 = <&wl12xx_pins>;
vmmc-supply = <&wl12xx_vmmc>;
pinctrl-names = "default";
pinctrl-0 = <&wl12xx_pins>;
vmmc-supply = <&wl12xx_vmmc>;
+ interrupts-extended = <&wakeupgen GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH
+ &omap4_pmx_core 0x10e>;
non-removable;
bus-width = <4>;
cap-power-off-card;
non-removable;
bus-width = <4>;
cap-power-off-card;
@@
-479,6
+482,10
@@
&mcpdm {
pinctrl-names = "default";
pinctrl-0 = <&mcpdm_pins>;
&mcpdm {
pinctrl-names = "default";
pinctrl-0 = <&mcpdm_pins>;
+
+ clocks = <&twl6040>;
+ clock-names = "pdmclk";
+
status = "okay";
};
status = "okay";
};