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 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
omap4-duovero.dtsi
diff --git
a/arch/arm/boot/dts/omap4-duovero.dtsi
b/arch/arm/boot/dts/omap4-duovero.dtsi
index
f2a94fa
..
ec0bd97
100644
(file)
--- a/
arch/arm/boot/dts/omap4-duovero.dtsi
+++ b/
arch/arm/boot/dts/omap4-duovero.dtsi
@@
-12,7
+12,7
@@
model = "Gumstix Duovero";
compatible = "gumstix,omap4-duovero", "ti,omap4430", "ti,omap4";
model = "Gumstix Duovero";
compatible = "gumstix,omap4-duovero", "ti,omap4430", "ti,omap4";
- memory {
+ memory
@80000000
{
device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */
};
device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */
};
@@
-177,6
+177,7
@@
twl6040: twl@4b {
compatible = "ti,twl6040";
twl6040: twl@4b {
compatible = "ti,twl6040";
+ #clock-cells = <0>;
reg = <0x4b>;
interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_2N cascaded to gic */
ti,audpwron-gpio = <&gpio6 0 GPIO_ACTIVE_HIGH>; /* gpio_160 */
reg = <0x4b>;
interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_2N cascaded to gic */
ti,audpwron-gpio = <&gpio6 0 GPIO_ACTIVE_HIGH>; /* gpio_160 */
@@
-207,6
+208,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";
};