Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a20502d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents f6161aa1 c3117ede

arch/arm/boot/dts/armada-370-mirabox.dts

+11 −0
Original line number Diff line number Diff line
@@ -70,5 +70,16 @@ 
		usb@d0051000 {

			status = "okay";

		};



		i2c@d0011000 {

			status = "okay";

			clock-frequency = <100000>;

			pca9505: pca9505@25 {

				compatible = "nxp,pca9505";

				gpio-controller;

				#gpio-cells = <2>;

				reg = <0x25>;

			};

		};

	};

};

arch/arm/boot/dts/dove.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -50,6 +50,11 @@ 
			#clock-cells = <1>;

		};



		thermal: thermal@d001c {

			compatible = "marvell,dove-thermal";

			reg = <0xd001c 0x0c>, <0xd005c 0x08>;

		};



		uart0: serial@12000 {

			compatible = "ns16550a";

			reg = <0x12000 0x100>;

arch/arm/boot/dts/kirkwood-6282.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -49,6 +49,12 @@ 
			};

		};



		thermal@10078 {

			compatible = "marvell,kirkwood-thermal";

			reg = <0x10078 0x4>;

			status = "okay";

		};



		i2c@11100 {

			compatible = "marvell,mv64xxx-i2c";

			reg = <0x11100 0x20>;

arch/arm/configs/dove_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ CONFIG_I2C_MV64XXX=y 
CONFIG_SPI=y

CONFIG_SPI_ORION=y

# CONFIG_HWMON is not set

CONFIG_THERMAL=y

CONFIG_DOVE_THERMAL=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_ROOT_HUB_TT=y

arch/arm/configs/kirkwood_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ CONFIG_SPI=y 
CONFIG_SPI_ORION=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

CONFIG_THERMAL=y

CONFIG_KIRKWOOD_THERMAL=y

CONFIG_WATCHDOG=y

CONFIG_ORION_WATCHDOG=y

CONFIG_HID_DRAGONRISE=y