diff options
author | Andrew Lunn <andrew@lunn.ch> | 2013-02-06 01:35:27 -0500 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-03-12 07:33:22 -0400 |
commit | c3117edec5f92cce39f2d220c62f76675397af8d (patch) | |
tree | f285a8994003e6117ce0e936eec7a295d3940efc /arch | |
parent | 590c96b178c5a01360f4138674aaa031c7a56278 (diff) |
Dove: Thermal: Add DT node and enable in defconfig
Add a device tree node to instantiate the dove thermal driver.
Enable the driver and the thermal framework in dove_defconfig.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/dove.dtsi | 5 | ||||
-rw-r--r-- | arch/arm/configs/dove_defconfig | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 67dbe20868a2..0056214935f4 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi | |||
@@ -50,6 +50,11 @@ | |||
50 | #clock-cells = <1>; | 50 | #clock-cells = <1>; |
51 | }; | 51 | }; |
52 | 52 | ||
53 | thermal: thermal@d001c { | ||
54 | compatible = "marvell,dove-thermal"; | ||
55 | reg = <0xd001c 0x0c>, <0xd005c 0x08>; | ||
56 | }; | ||
57 | |||
53 | uart0: serial@12000 { | 58 | uart0: serial@12000 { |
54 | compatible = "ns16550a"; | 59 | compatible = "ns16550a"; |
55 | reg = <0x12000 0x100>; | 60 | reg = <0x12000 0x100>; |
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig index 3fe8dae8d32d..4364eff5b01e 100644 --- a/arch/arm/configs/dove_defconfig +++ b/arch/arm/configs/dove_defconfig | |||
@@ -75,6 +75,8 @@ CONFIG_I2C_MV64XXX=y | |||
75 | CONFIG_SPI=y | 75 | CONFIG_SPI=y |
76 | CONFIG_SPI_ORION=y | 76 | CONFIG_SPI_ORION=y |
77 | # CONFIG_HWMON is not set | 77 | # CONFIG_HWMON is not set |
78 | CONFIG_THERMAL=y | ||
79 | CONFIG_DOVE_THERMAL=y | ||
78 | CONFIG_USB=y | 80 | CONFIG_USB=y |
79 | CONFIG_USB_EHCI_HCD=y | 81 | CONFIG_USB_EHCI_HCD=y |
80 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 82 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |