Unverified Commit 5be374d0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'socfpga_dts_updates_for_v6.3_part2' of... 

Merge tag 'socfpga_dts_updates_for_v6.3_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/dt

SoCFPGA dts updates for v6.3, part 2
- Add support for the enclustra PE1 board that is based on Arria10

* tag 'socfpga_dts_updates_for_v6.3_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: dts: socfpga: Add enclustra PE1 devicetree
  dt-bindings: altera: Add enclustra mercury PE1

Link: https://lore.kernel.org/r/20230216160910.509065-1-dinguyen@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 18b68c69 2d050f06

Documentation/devicetree/bindings/arm/altera.yaml

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ properties: 
      - description: Mercury+ AA1 boards

        items:

          - enum:

              - enclustra,mercury-pe1

              - google,chameleon-v3

          - const: enclustra,mercury-aa1

          - const: altr,socfpga-arria10

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1187,6 +1187,7 @@ dtb-$(CONFIG_ARCH_S5PV210) += \ 
dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += \

	socfpga_arria5_socdk.dtb \

	socfpga_arria10_chameleonv3.dtb \

	socfpga_arria10_mercury_pe1.dtb \

	socfpga_arria10_socdk_nand.dtb \

	socfpga_arria10_socdk_qspi.dtb \

	socfpga_arria10_socdk_sdmmc.dtb \

arch/arm/boot/dts/socfpga_arria10_mercury_pe1.dts

0 → 100644
+55 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright 2023 Steffen Trumtrar <kernel@pengutronix.de>

 */

/dts-v1/;

#include "socfpga_arria10_mercury_aa1.dtsi"



/ {

	model = "Enclustra Mercury+ PE1";

	compatible = "enclustra,mercury-pe1", "enclustra,mercury-aa1",

		     "altr,socfpga-arria10", "altr,socfpga";



	aliases {

		ethernet0 = &gmac0;

		serial0 = &uart0;

		serial1 = &uart1;

	};

};



&gmac0 {

	status = "okay";

};



&gpio0 {

	status = "okay";

};



&gpio1 {

	status = "okay";

};



&gpio2 {

	status = "okay";

};



&i2c1 {

	status = "okay";

};



&mmc {

	status = "okay";

};



&uart0 {

	status = "okay";

};



&uart1 {

	status = "okay";

};



&usb0 {

	status = "okay";

	dr_mode = "host";

};