Merge branch 'aspeed/dt-3' into arm/late (375a7bad) · Commits · 戴 / test

arch/arm/boot/dts/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -1269,6 +1269,7 @@ dtb-$(CONFIG_ARCH_MILBEAUT) += milbeaut-m10v-evb.dtb
		dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb
		dtb-$(CONFIG_ARCH_ASPEED) += \
		aspeed-ast2500-evb.dtb \
		aspeed-ast2600-evb.dtb \
		aspeed-bmc-arm-centriq2400-rep.dtb \
		aspeed-bmc-arm-stardragon4800-rep2.dtb \
		aspeed-bmc-facebook-cmm.dtb \

0 → 100644

+80 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-or-later
		// Copyright 2019 IBM Corp.

		/dts-v1/;

		#include "aspeed-g6.dtsi"

		/ {
		model = "AST2600 EVB";
		compatible = "aspeed,ast2600";

		aliases {
		serial4 = &uart5;
		};

		chosen {
		bootargs = "console=ttyS4,115200n8";
		};

		memory@80000000 {
		device_type = "memory";
		reg = <0x80000000 0x80000000>;
		};
		};

		&mdio1 {
		status = "okay";

		ethphy1: ethernet-phy@0 {
		compatible = "ethernet-phy-ieee802.3-c22";
		reg = <0>;
		};
		};

		&mdio2 {
		status = "okay";

		ethphy2: ethernet-phy@0 {
		compatible = "ethernet-phy-ieee802.3-c22";
		reg = <0>;
		};
		};

		&mdio3 {
		status = "okay";

		ethphy3: ethernet-phy@0 {
		compatible = "ethernet-phy-ieee802.3-c22";
		reg = <0>;
		};
		};

		&mac1 {
		status = "okay";

		phy-mode = "rgmii";
		phy-handle = <&ethphy1>;
		};

		&mac2 {
		status = "okay";

		phy-mode = "rgmii";
		phy-handle = <&ethphy2>;
		};

		&mac3 {
		status = "okay";

		phy-mode = "rgmii";
		phy-handle = <&ethphy3>;
		};

		&emmc {
		status = "okay";
		};

		&rtc {
		status = "okay";
		};

0 → 100644

+1154 −0

File added.

Preview size limit exceeded, changes collapsed.

0 → 100644

+261 −0

File added.

Preview size limit exceeded, changes collapsed.

+1 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ obj-$(CONFIG_ARCH_EFM32) += clk-efm32gg.o
		obj-$(CONFIG_COMMON_CLK_FIXED_MMIO) += clk-fixed-mmio.o
		obj-$(CONFIG_COMMON_CLK_GEMINI) += clk-gemini.o
		obj-$(CONFIG_COMMON_CLK_ASPEED) += clk-aspeed.o
		obj-$(CONFIG_MACH_ASPEED_G6) += clk-ast2600.o
		obj-$(CONFIG_ARCH_HIGHBANK) += clk-highbank.o
		obj-$(CONFIG_CLK_HSDK) += clk-hsdk-pll.o
		obj-$(CONFIG_COMMON_CLK_LOCHNAGAR) += clk-lochnagar.o