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

Commit 138f2c35 authored by Alex Shi's avatar Alex Shi
Browse files

Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4 

Conflicts:
	drivers/base/power/opp/core.c
parents 2bf79551 1a1a512b

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 8

SUBLEVEL = 9

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/boot/dts/am43x-epos-evm.dts

+5 −0
Original line number Diff line number Diff line
@@ -792,3 +792,8 @@ 
	tx-num-evt = <32>;

	rx-num-evt = <32>;

};



&synctimer_32kclk {

	assigned-clocks = <&mux_synctimer32k_ck>;

	assigned-clock-parents = <&clkdiv32k_ick>;

};

arch/arm/boot/dts/armada-375.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ 
			};



			sata@a0000 {

				compatible = "marvell,orion-sata";

				compatible = "marvell,armada-370-sata";

				reg = <0xa0000 0x5000>;

				interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&gateclk 14>, <&gateclk 20>;

arch/arm/boot/dts/armada-385-linksys.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
			};



			/* USB part of the eSATA/USB 2.0 port */

			usb@50000 {

			usb@58000 {

				status = "okay";

			};

arch/arm/boot/dts/pxa3xx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
			reg = <0x43100000 90>;

			interrupts = <45>;

			clocks = <&clks CLK_NAND>;

			dmas = <&pdma 97>;

			dmas = <&pdma 97 3>;

			dma-names = "data";

			#address-cells = <1>;

			#size-cells = <1>;