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

Commit 12a08707 authored by Alex Shi's avatar Alex Shi
Browse files

Merge tag 'v4.4.3' into linux-linaro-lsk-v4.4 

 This is the 4.4.3 stable release
parents 34f6d2c9 2134d97a

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -10289,9 +10289,11 @@ S: Maintained 
F:	drivers/net/ethernet/dlink/sundance.c



SUPERH

M:	Yoshinori Sato <ysato@users.sourceforge.jp>

M:	Rich Felker <dalias@libc.org>

L:	linux-sh@vger.kernel.org

Q:	http://patchwork.kernel.org/project/linux-sh/list/

S:	Orphan

S:	Maintained

F:	Documentation/sh/

F:	arch/sh/

F:	drivers/sh/

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 1

SUBLEVEL = 3

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/boot/dts/armada-388-gp.dts

+0 −10
Original line number Diff line number Diff line
@@ -303,16 +303,6 @@ 
		gpio = <&expander0 4 GPIO_ACTIVE_HIGH>;

	};



	reg_usb2_1_vbus: v5-vbus1 {

		compatible = "regulator-fixed";

		regulator-name = "v5.0-vbus1";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		enable-active-high;

		regulator-always-on;

		gpio = <&expander0 4 GPIO_ACTIVE_HIGH>;

	};



	reg_sata0: pwr-sata0 {

		compatible = "regulator-fixed";

		regulator-name = "pwr_en_sata0";

arch/arm/boot/dts/at91-sama5d4_xplained.dts

+7 −1
Original line number Diff line number Diff line
@@ -86,10 +86,12 @@ 
			macb0: ethernet@f8020000 {

				phy-mode = "rmii";

				status = "okay";

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_macb0_rmii &pinctrl_macb0_phy_irq>;



				phy0: ethernet-phy@1 {

					interrupt-parent = <&pioE>;

					interrupts = <1 IRQ_TYPE_EDGE_FALLING>;

					interrupts = <1 IRQ_TYPE_LEVEL_LOW>;

					reg = <1>;

				};

			};
@@ -152,6 +154,10 @@ 
						atmel,pins =

							<AT91_PIOE 8 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;

					};

					pinctrl_macb0_phy_irq: macb0_phy_irq_0 {

						atmel,pins =

							<AT91_PIOE 1 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;

					};

				};

			};

		};

arch/arm/boot/dts/at91-sama5d4ek.dts

+11 −0
Original line number Diff line number Diff line
@@ -160,8 +160,15 @@ 
			};



			macb0: ethernet@f8020000 {

				pinctrl-0 = <&pinctrl_macb0_rmii &pinctrl_macb0_phy_irq>;

				phy-mode = "rmii";

				status = "okay";



				ethernet-phy@1 {

					reg = <0x1>;

					interrupt-parent = <&pioE>;

					interrupts = <1 IRQ_TYPE_LEVEL_LOW>;

				};

			};



			mmc1: mmc@fc000000 {
@@ -193,6 +200,10 @@ 


			pinctrl@fc06a000 {

				board {

					pinctrl_macb0_phy_irq: macb0_phy_irq {

						atmel,pins =

							<AT91_PIOE 1 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

					};

					pinctrl_mmc0_cd: mmc0_cd {

						atmel,pins =

							<AT91_PIOE 5 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;