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

Commit b83132f7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-fixes' of... 

Merge tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into fixes

First fixes for 4.5. Only DT changes:
- sama5d4: error in DBGU index
- addition of phy properties in several boards
- at91sam9n12ek fix a panel compatible string

* tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91

:
  ARM: dts: at91: sama5d4 xplained: fix phy0 IRQ type
  ARM: dts: at91: sama5d4 xplained: properly mux phy interrupt
  ARM: dts: at91: sama5d4ek: add phy address and IRQ for macb0
  ARM: dts: at91: sama5d2 xplained: add phy address and IRQ for macb0
  ARM: dts: at91: at91sam9n12ek: fix panel compatible string
  ARM: dts: at91: sama5d4: fix instance id of DBGU

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 43acf831 e873cc02

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

+11 −1
Original line number Diff line number Diff line
@@ -114,9 +114,15 @@ 


			macb0: ethernet@f8008000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_macb0_default>;

				pinctrl-0 = <&pinctrl_macb0_default &pinctrl_macb0_phy_irq>;

				phy-mode = "rmii";

				status = "okay";



				ethernet-phy@1 {

					reg = <0x1>;

					interrupt-parent = <&pioA>;

					interrupts = <73 IRQ_TYPE_LEVEL_LOW>;

				};

			};



			pdmic@f8018000 {
@@ -300,6 +306,10 @@ 
					bias-disable;

				};



				pinctrl_macb0_phy_irq: macb0_phy_irq {

					pinmux = <PIN_PC9__GPIO>;

				};



				pinctrl_pdmic_default: pdmic_default {

					pinmux = <PIN_PB26__PDMIC_DAT>,

						<PIN_PB27__PDMIC_CLK>;

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>;

arch/arm/boot/dts/at91sam9n12ek.dts

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



	panel: panel {

		compatible = "qd,qd43003c0-40", "simple-panel";

		compatible = "qiaodian,qd43003c0-40", "simple-panel";

		backlight = <&backlight>;

		power-supply = <&panel_reg>;

		#address-cells = <1>;

arch/arm/boot/dts/sama5d4.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1342,7 +1342,7 @@ 
			dbgu: serial@fc069000 {

				compatible = "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";

				reg = <0xfc069000 0x200>;

				interrupts = <2 IRQ_TYPE_LEVEL_HIGH 7>;

				interrupts = <45 IRQ_TYPE_LEVEL_HIGH 7>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_dbgu>;

				clocks = <&dbgu_clk>;