Unverified Commit 7dbb1b0b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt-5.20-1' of... 

Merge tag 'mvebu-dt-5.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/dt

mvebu dt for 5.20 (part 1)

Enable LED to link/activity on turris-omnia (Armada 385 based)

* tag 'mvebu-dt-5.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  ARM: dts: turris-omnia: enable LED controller node
  ARM: dts: turris-omnia: configure LED[0] pin function to link/activity

Link: https://lore.kernel.org/r/87lespqn28.fsf@BL-laptop


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2c071ce5 40624346

arch/arm/boot/dts/armada-385-turris-omnia.dts

+4 −6
Original line number Diff line number Diff line
@@ -191,15 +191,13 @@ led-controller@2b { 
				reg = <0x2b>;

				#address-cells = <1>;

				#size-cells = <0>;

				status = "okay";



				/*

				 * LEDs are controlled by MCU (STM32F0) at

				 * address 0x2b.

				 *

				 * The driver does not support HW control mode

				 * for the LEDs yet. Disable the LEDs for now.

				 *

				 * Also LED functions are not stable yet:

				 * LED functions are not stable yet:

				 * - there are 3 LEDs connected via MCU to PCIe

				 *   ports. One of these ports supports mSATA.

				 *   There is no mSATA nor PCIe function.
@@ -210,7 +208,6 @@ led-controller@2b { 
				 *   B. Again there is no such function defined.

				 *   For now we use LED_FUNCTION_INDICATOR

				 */

				status = "disabled";



				multi-led@0 {

					reg = <0x0>;
@@ -397,7 +394,8 @@ &mdio { 
	phy1: ethernet-phy@1 {

		compatible = "ethernet-phy-ieee802.3-c22";

		reg = <1>;

		marvell,reg-init = <3 18 0 0x4985>;

		marvell,reg-init = <3 18 0 0x4985>,

				   <3 16 0xfff0 0x0001>;



		/* irq is connected to &pcawan pin 7 */

	};