Commit 18aab73f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'aspeed-for-4.7-dts' of https://github.com/shenki/linux into next/dt 

Merge "aspeed devicetree for 4.7" from Joel Stanley:

This device trees for a pair of Aspeed BMC SoCs and the boards that
they sit in.

* tag 'aspeed-for-4.7-dts' of https://github.com/shenki/linux:
  arm/dst: Add Aspeed ast2500 device tree
  arm/dts: Add Aspeed ast2400 device tree
  doc/devicetree: Add Aspeed and Tyan to vendor-prefixes
parents e3cef9bb 02440622

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ arm ARM Ltd. 
armadeus	ARMadeus Systems SARL

armadeus	ARMadeus Systems SARL

artesyn	Artesyn Embedded Technologies Inc.

artesyn	Artesyn Embedded Technologies Inc.

asahi-kasei	Asahi Kasei Corp.

asahi-kasei	Asahi Kasei Corp.

aspeed	ASPEED Technology Inc.

atlas	Atlas Scientific LLC

atlas	Atlas Scientific LLC

atmel	Atmel Corporation

atmel	Atmel Corporation

auo	AU Optronics Corporation

auo	AU Optronics Corporation
@@ -253,6 +254,7 @@ tplink TP-LINK Technologies Co., Ltd. 
tronfy	Tronfy

tronfy	Tronfy

tronsmart	Tronsmart

tronsmart	Tronsmart

truly	Truly Semiconductors Limited

truly	Truly Semiconductors Limited

tyan	Tyan Computer Corporation

upisemi	uPI Semiconductor Corp.

upisemi	uPI Semiconductor Corp.

urt	United Radiant Technology Corporation

urt	United Radiant Technology Corporation

usi	Universal Scientific Industrial Co., Ltd.

usi	Universal Scientific Industrial Co., Ltd.

arch/arm/boot/dts/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -888,6 +888,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ 
	mt8127-moose.dtb \

	mt8127-moose.dtb \

	mt8135-evbp1.dtb

	mt8135-evbp1.dtb

dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb

dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb

dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb \

	aspeed-ast2500-evb.dtb

endif

endif





dtstree		:= $(srctree)/$(src)

dtstree		:= $(srctree)/$(src)

arch/arm/boot/dts/aspeed-ast2500-evb.dts

0 → 100644
+25 −0
Original line number Original line Diff line number Diff line 
/dts-v1/;



#include "aspeed-g5.dtsi"



/ {

	model = "AST2500 EVB";

	compatible = "aspeed,ast2500";



	aliases {

		serial4 = &uart5;

	};



	chosen {

		stdout-path = &uart5;

		bootargs = "console=ttyS4,115200 earlyprintk";

	};



	memory {

		reg = <0x80000000 0x20000000>;

	};

};



&uart5 {

	status = "okay";

};

arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts

0 → 100644
+25 −0
Original line number Original line Diff line number Diff line 
/dts-v1/;



#include "aspeed-g4.dtsi"



/ {

	model = "Palmetto BMC";

	compatible = "tyan,palmetto-bmc", "aspeed,ast2400";



	aliases {

		serial4 = &uart5;

	};



	chosen {

		stdout-path = &uart5;

		bootargs = "console=ttyS4,38400 earlyprintk";

	};



	memory {

		reg = <0x40000000 0x10000000>;

	};

};



&uart5 {

	status = "okay";

};

arch/arm/boot/dts/aspeed-g4.dtsi

0 → 100644
+161 −0
Original line number Original line Diff line number Diff line 
#include "skeleton.dtsi"



/ {

	model = "Aspeed BMC";

	compatible = "aspeed,ast2400";

	#address-cells = <1>;

	#size-cells = <1>;

	interrupt-parent = <&vic>;



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu@0 {

			compatible = "arm,arm926ej-s";

			device_type = "cpu";

			reg = <0>;

		};

	};



	clocks {

		clk_clkin: clk_clkin {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <48000000>;

		};



	};



	ahb {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		vic: interrupt-controller@1e6c0080 {

			compatible = "aspeed,ast2400-vic";

			interrupt-controller;

			#interrupt-cells = <1>;

			valid-sources = <0xffffffff 0x0007ffff>;

			reg = <0x1e6c0080 0x80>;

		};



		apb {

			compatible = "simple-bus";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;



			clk_hpll: clk_hpll@1e6e2070 {

				#clock-cells = <0>;

				compatible = "aspeed,g4-hpll-clock";

				reg = <0x1e6e2070 0x4>;

				clocks = <&clk_clkin>;

			};



			clk_apb: clk_apb@1e6e2008 {

				#clock-cells = <0>;

				compatible = "aspeed,g4-apb-clock";

				reg = <0x1e6e2008 0x4>;

				clocks = <&clk_hpll>;

			};



			clk_uart: clk_uart@1e6e2008 {

				#clock-cells = <0>;

				compatible = "aspeed,uart-clock";

				reg = <0x1e6e202c 0x4>;

			};



			sram@1e720000 {

				compatible = "mmio-sram";

				reg = <0x1e720000 0x8000>;	// 32K

			};



			timer: timer@1e782000 {

				compatible = "aspeed,ast2400-timer";

				reg = <0x1e782000 0x90>;

				// The moxart_timer driver registers only one

				// interrupt and assumes it's for timer 1

				//interrupts = <16 17 18 35 36 37 38 39>;

				interrupts = <16>;

				clocks = <&clk_apb>;

			};



			wdt1: wdt@1e785000 {

				compatible = "aspeed,wdt";

				reg = <0x1e785000 0x1c>;

				interrupts = <27>;

			};



			wdt2: wdt@1e785020 {

				compatible = "aspeed,wdt";

				reg = <0x1e785020 0x1c>;

				interrupts = <27>;

				clocks = <&clk_apb>;

				status = "disabled";

			};



			uart1: serial@1e783000 {

				compatible = "ns16550a";

				reg = <0x1e783000 0x1000>;

				reg-shift = <2>;

				interrupts = <9>;

				clocks = <&clk_uart>;

				no-loopback-test;

				status = "disabled";

			};



			uart2: serial@1e78d000 {

				compatible = "ns16550a";

				reg = <0x1e78d000 0x1000>;

				reg-shift = <2>;

				interrupts = <32>;

				clocks = <&clk_uart>;

				no-loopback-test;

				status = "disabled";

			};



			uart3: serial@1e78e000 {

				compatible = "ns16550a";

				reg = <0x1e78e000 0x1000>;

				reg-shift = <2>;

				interrupts = <33>;

				clocks = <&clk_uart>;

				no-loopback-test;

				status = "disabled";

			};



			uart4: serial@1e78f000 {

				compatible = "ns16550a";

				reg = <0x1e78f000 0x1000>;

				reg-shift = <2>;

				interrupts = <34>;

				clocks = <&clk_uart>;

				no-loopback-test;

				status = "disabled";

			};



			uart5: serial@1e784000 {

				compatible = "ns16550a";

				reg = <0x1e784000 0x1000>;

				reg-shift = <2>;

				interrupts = <10>;

				clocks = <&clk_uart>;

				current-speed = <38400>;

				no-loopback-test;

				status = "disabled";

			};



			uart6: serial@1e787000 {

				compatible = "ns16550a";

				reg = <0x1e787000 0x1000>;

				reg-shift = <2>;

				interrupts = <10>;

				clocks = <&clk_uart>;

				no-loopback-test;

				status = "disabled";

			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE