UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mvebu DT changes for v3.10 

- mvebu: gpio expander for the Mirabox
  - kirkwood: thermal sensor
  - dove: thermal sensor
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQEcBAABAgAGBQJRPxPFAAoJEAi3KVZQDZAerhUH/2d5RLm2nV0qNiIoFfxL9M85
 8hGwLjP44X0HNJIJJQyghn79nfwLY+aGGIoAwmQNNDPe7aO9qq3MXvZnu0JcOTfB
 e0j8ypQqiOsDMHTmzd5Gf4DpKeyGLphxWJ6W2M6tBwWfrzJS2N21Fi/8tXT5jOQQ
 ei2nTdYpT8aGLwDLM++xdxGjP02ceMSE1JeLXtxMsuOGSZxtTn1Z8Kz/Up3UI3/B
 EdBEQB8lPoZP/bE+bQPTOSWo4Ep91RkQ1hEp17cTPLzkujda7adL+l+UWo0Z9n5J
 FZ8GFprBNe9/t84JolezyxpPsqcOxjMOxuKtPjVCrepEmCmO7fIsE9ocm8meykE=
 =dQI6
 -----END PGP SIGNATURE-----

Merge tag 'mvebu_dt_for_v3.10' of git://git.infradead.org/users/jcooper/linux into next/dt

From Jason Cooper <jason@lakedaemon.net>:

mvebu DT changes for v3.10

 - mvebu: gpio expander for the Mirabox
 - kirkwood: thermal sensor
 - dove: thermal sensor

* tag 'mvebu_dt_for_v3.10' of git://git.infradead.org/users/jcooper/linux:
  Dove: Thermal: Add DT node and enable in defconfig
  ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
  arm: mvebu: enable gpio expander over i2c on Mirabox platform

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2013-03-15 23:02:39 +01:00
parent f6161aa153 c3117edec5
commit 4a20502de1
5 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/boot/dts/armada-370-mirabox.dts
View File

@ -70,5 +70,16 @@
usb@d0051000 { usb@d0051000 {
status = "okay"; status = "okay";
}; };
i2c@d0011000 {
status = "okay";
clock-frequency = <100000>;
pca9505: pca9505@25 {
compatible = "nxp,pca9505";
gpio-controller;
#gpio-cells = <2>;
reg = <0x25>;
};
};
}; };
}; };

5
arch/arm/boot/dts/dove.dtsi
View File

@ -50,6 +50,11 @@
#clock-cells = <1>; #clock-cells = <1>;
}; };
thermal: thermal@d001c {
compatible = "marvell,dove-thermal";
reg = <0xd001c 0x0c>, <0xd005c 0x08>;
};
uart0: serial@12000 { uart0: serial@12000 {
compatible = "ns16550a"; compatible = "ns16550a";
reg = <0x12000 0x100>; reg = <0x12000 0x100>;

6
arch/arm/boot/dts/kirkwood-6282.dtsi
View File

@ -49,6 +49,12 @@
}; };
}; };
thermal@10078 {
compatible = "marvell,kirkwood-thermal";
reg = <0x10078 0x4>;
status = "okay";
};
i2c@11100 { i2c@11100 {
compatible = "marvell,mv64xxx-i2c"; compatible = "marvell,mv64xxx-i2c";
reg = <0x11100 0x20>; reg = <0x11100 0x20>;

2
arch/arm/configs/dove_defconfig
View File

@ -75,6 +75,8 @@ CONFIG_I2C_MV64XXX=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_SPI_ORION=y CONFIG_SPI_ORION=y
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
CONFIG_THERMAL=y
CONFIG_DOVE_THERMAL=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_ROOT_HUB_TT=y

2
arch/arm/configs/kirkwood_defconfig
View File

@ -119,6 +119,8 @@ CONFIG_SPI=y
CONFIG_SPI_ORION=y CONFIG_SPI_ORION=y
CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SYSFS=y
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
CONFIG_THERMAL=y
CONFIG_KIRKWOOD_THERMAL=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_ORION_WATCHDOG=y CONFIG_ORION_WATCHDOG=y
CONFIG_HID_DRAGONRISE=y CONFIG_HID_DRAGONRISE=y