Commit b966bb45 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'aspeed-4.15-devicetree' of... 

Merge tag 'aspeed-4.15-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into next/soc

Pull "ASPEED devicetree updates for 4.15" from Joel Stanley:

 - Cleanups of the ASPEED device trees
 - Enable the i2c bus on all platforms
 - Turn VUART on for BMC platforms
 - Bind watchdog two for compatilbiy with shipping u-boot

* tag 'aspeed-4.15-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: dts: aspeed-romulus: Enable VUART
  ARM: dts: aspeed-palmetto: Enable VUART
  ARM: dts: aspeed: Enable watchdog two
  ARM: dts: aspeed: Remove undocumented wdt properties
  ARM: dts: aspeed: Clean up UART nodes
  ARM: dts: aspeed: Correctly order UART nodes
  ARM: dts: aspeed: Add aliases for UARTs
  ARM: dts: aspeed-ast2500: Add I2C devices
  ARM: dts: aspeed-palmetto: Add I2C devices
  ARM: dts: aspeed-romulus: Add I2C devices
  ARM: dts: aspeed: Add I2C buses
  ARM: dts: aspeed: Reorder ADC node
  ARM: dts: aspeed: Move pinctrl subnodes to improve readability
parents 9d2e8198 27b5e338

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

+19 −0
Original line number Diff line number Diff line
@@ -59,3 +59,22 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;

};



&i2c3 {

	status = "okay";



	eeprom@50 {

		compatible = "atmel,24c08";

		reg = <0x50>;

		pagesize = <16>;

	};

};



&i2c7 {

	status = "okay";



	lm75@4d {

		compatible = "national,lm75";

		reg = <0x4d>;

	};

};

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

+52 −4
Original line number Diff line number Diff line
@@ -6,10 +6,6 @@ 
	model = "Palmetto BMC";

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



	aliases {

		serial4 = &uart5;

	};



	chosen {

		stdout-path = &uart5;

		bootargs = "console=ttyS4,115200 earlyprintk";
@@ -61,3 +57,55 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rmii1_default>;

};



&i2c0 {

	status = "okay";



	eeprom@50 {

		compatible = "atmel,24c256";

		reg = <0x50>;

		pagesize = <64>;

	};



	rtc@68 {

		compatible = "dallas,ds3231";

		reg = <0x68>;

	};

};



&i2c1 {

	status = "okay";

};



&i2c2 {

	status = "okay";



	tmp423@4c {

		compatible = "ti,tmp423";

		reg = <0x4c>;

	};

};



&i2c3 {

	status = "okay";

};



&i2c4 {

	status = "okay";

};



&i2c5 {

	status = "okay";

};



&i2c6 {

	status = "okay";

};



&i2c7 {

	status = "okay";

};



&vuart {

	status = "okay";

};

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

+58 −0
Original line number Diff line number Diff line
@@ -79,3 +79,61 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rmii1_default>;

};



&i2c2 {

	status = "okay";

};



&i2c3 {

	status = "okay";

};



&i2c4 {

	status = "okay";

};



&i2c5 {

	status = "okay";

};



&i2c6 {

	/* PCIe slot 1 (x8) */

	status = "okay";

};



&i2c7 {

	/* PCIe slot 2 (x16) */

	status = "okay";

};



&i2c8 {

	/* PCIe slot 3 (x16) */

	status = "okay";

};



&i2c9 {

	/* PCIe slot 4 (x16) */

	status = "okay";

};



&i2c10 {

	/* PCIe slot 5 (x8) */

	status = "okay";

};



&i2c11 {

	status = "okay";



	rtc@32 {

		compatible = "epson,rx8900";

		reg = <0x32>;

	};

};



&i2c12 {

	status = "okay";

};



&vuart {

	status = "okay";

};

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

+1037 −779
Original line number Diff line number Diff line
@@ -7,6 +7,29 @@ 
	#size-cells = <1>;

	interrupt-parent = <&vic>;



	aliases {

		i2c0 = &i2c0;

		i2c1 = &i2c1;

		i2c2 = &i2c2;

		i2c3 = &i2c3;

		i2c4 = &i2c4;

		i2c5 = &i2c5;

		i2c6 = &i2c6;

		i2c7 = &i2c7;

		i2c8 = &i2c8;

		i2c9 = &i2c9;

		i2c10 = &i2c10;

		i2c11 = &i2c11;

		i2c12 = &i2c12;

		i2c13 = &i2c13;

		serial0 = &uart1;

		serial1 = &uart2;

		serial2 = &uart3;

		serial3 = &uart4;

		serial4 = &uart5;

		serial5 = &vuart;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -126,7 +149,354 @@ 


				pinctrl: pinctrl {

					compatible = "aspeed,g4-pinctrl";

				};

			};



			adc: adc@1e6e9000 {

				compatible = "aspeed,ast2400-adc";

				reg = <0x1e6e9000 0xb0>;

				clocks = <&clk_apb>;

				#io-channel-cells = <1>;

				status = "disabled";

			};



			sram@1e720000 {

				compatible = "mmio-sram";

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

			};



			gpio: gpio@1e780000 {

				#gpio-cells = <2>;

				gpio-controller;

				compatible = "aspeed,ast2400-gpio";

				reg = <0x1e780000 0x1000>;

				interrupts = <20>;

				gpio-ranges = <&pinctrl 0 0 220>;

				interrupt-controller;

			};



			timer: timer@1e782000 {

				/* This timer is a Faraday FTTMR010 derivative */

				compatible = "aspeed,ast2400-timer";

				reg = <0x1e782000 0x90>;

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

				clocks = <&clk_apb>;

				clock-names = "PCLK";

			};



			uart1: serial@1e783000 {

				compatible = "ns16550a";

				reg = <0x1e783000 0x20>;

				reg-shift = <2>;

				interrupts = <9>;

				clocks = <&clk_uart>;

				no-loopback-test;

				status = "disabled";

			};



			uart5: serial@1e784000 {

				compatible = "ns16550a";

				reg = <0x1e784000 0x20>;

				reg-shift = <2>;

				interrupts = <10>;

				clocks = <&clk_uart>;

				no-loopback-test;

				status = "disabled";

			};



			wdt1: watchdog@1e785000 {

				compatible = "aspeed,ast2400-wdt";

				reg = <0x1e785000 0x1c>;

			};



			wdt2: watchdog@1e785020 {

				compatible = "aspeed,ast2400-wdt";

				reg = <0x1e785020 0x1c>;

			};



			vuart: serial@1e787000 {

				compatible = "aspeed,ast2400-vuart";

				reg = <0x1e787000 0x40>;

				reg-shift = <2>;

				interrupts = <10>;

				clocks = <&clk_uart>;

				no-loopback-test;

				status = "disabled";

			};



			uart2: serial@1e78d000 {

				compatible = "ns16550a";

				reg = <0x1e78d000 0x20>;

				reg-shift = <2>;

				interrupts = <32>;

				clocks = <&clk_uart>;

				no-loopback-test;

				status = "disabled";

			};



			uart3: serial@1e78e000 {

				compatible = "ns16550a";

				reg = <0x1e78e000 0x20>;

				reg-shift = <2>;

				interrupts = <33>;

				clocks = <&clk_uart>;

				no-loopback-test;

				status = "disabled";

			};



			uart4: serial@1e78f000 {

				compatible = "ns16550a";

				reg = <0x1e78f000 0x20>;

				reg-shift = <2>;

				interrupts = <34>;

				clocks = <&clk_uart>;

				no-loopback-test;

				status = "disabled";

			};



			i2c: i2c@1e78a000 {

				compatible = "simple-bus";

				#address-cells = <1>;

				#size-cells = <1>;

				ranges = <0 0x1e78a000 0x1000>;

			};

		};

	};

};



&i2c {

	i2c_ic: interrupt-controller@0 {

		#interrupt-cells = <1>;

		compatible = "aspeed,ast2400-i2c-ic";

		reg = <0x0 0x40>;

		interrupts = <12>;

		interrupt-controller;

	};



	i2c0: i2c-bus@40 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x40 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";

		clocks = <&clk_apb>;

		bus-frequency = <100000>;

		interrupts = <0>;

		interrupt-parent = <&i2c_ic>;

		status = "disabled";

		/* Does not need pinctrl properties */

	};



	i2c1: i2c-bus@80 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x80 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";

		clocks = <&clk_apb>;

		bus-frequency = <100000>;

		interrupts = <1>;

		interrupt-parent = <&i2c_ic>;

		status = "disabled";

		/* Does not need pinctrl properties */

	};



	i2c2: i2c-bus@c0 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0xc0 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";

		clocks = <&clk_apb>;

		bus-frequency = <100000>;

		interrupts = <2>;

		interrupt-parent = <&i2c_ic>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_i2c3_default>;

		status = "disabled";

	};



	i2c3: i2c-bus@100 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x100 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";

		clocks = <&clk_apb>;

		bus-frequency = <100000>;

		interrupts = <3>;

		interrupt-parent = <&i2c_ic>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_i2c4_default>;

		status = "disabled";

	};



	i2c4: i2c-bus@140 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x140 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";

		clocks = <&clk_apb>;

		bus-frequency = <100000>;

		interrupts = <4>;

		interrupt-parent = <&i2c_ic>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_i2c5_default>;

		status = "disabled";

	};



	i2c5: i2c-bus@180 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x180 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";

		clocks = <&clk_apb>;

		bus-frequency = <100000>;

		interrupts = <5>;

		interrupt-parent = <&i2c_ic>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_i2c6_default>;

		status = "disabled";

	};



	i2c6: i2c-bus@1c0 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x1c0 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";

		clocks = <&clk_apb>;

		bus-frequency = <100000>;

		interrupts = <6>;

		interrupt-parent = <&i2c_ic>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_i2c7_default>;

		status = "disabled";

	};



	i2c7: i2c-bus@300 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x300 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";

		clocks = <&clk_apb>;

		bus-frequency = <100000>;

		interrupts = <7>;

		interrupt-parent = <&i2c_ic>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_i2c8_default>;

		status = "disabled";

	};



	i2c8: i2c-bus@340 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x340 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";

		clocks = <&clk_apb>;

		bus-frequency = <100000>;

		interrupts = <8>;

		interrupt-parent = <&i2c_ic>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_i2c9_default>;

		status = "disabled";

	};



	i2c9: i2c-bus@380 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x380 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";

		clocks = <&clk_apb>;

		bus-frequency = <100000>;

		interrupts = <9>;

		interrupt-parent = <&i2c_ic>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_i2c10_default>;

		status = "disabled";

	};



	i2c10: i2c-bus@3c0 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x3c0 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";

		clocks = <&clk_apb>;

		bus-frequency = <100000>;

		interrupts = <10>;

		interrupt-parent = <&i2c_ic>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_i2c11_default>;

		status = "disabled";

	};



	i2c11: i2c-bus@400 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x400 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";

		clocks = <&clk_apb>;

		bus-frequency = <100000>;

		interrupts = <11>;

		interrupt-parent = <&i2c_ic>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_i2c12_default>;

		status = "disabled";

	};



	i2c12: i2c-bus@440 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x440 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";

		clocks = <&clk_apb>;

		bus-frequency = <100000>;

		interrupts = <12>;

		interrupt-parent = <&i2c_ic>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_i2c13_default>;

		status = "disabled";

	};



	i2c13: i2c-bus@480 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x480 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";

		clocks = <&clk_apb>;

		bus-frequency = <100000>;

		interrupts = <13>;

		interrupt-parent = <&i2c_ic>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_i2c14_default>;

		status = "disabled";

	};

};



&pinctrl {

	pinctrl_acpi_default: acpi_default {

		function = "ACPI";

		groups = "ACPI";
@@ -866,116 +1236,4 @@ 
		function = "WDTRST2";

		groups = "WDTRST2";

	};



				};

			};



			sram@1e720000 {

				compatible = "mmio-sram";

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

			};



			gpio: gpio@1e780000 {

				#gpio-cells = <2>;

				gpio-controller;

				compatible = "aspeed,ast2400-gpio";

				reg = <0x1e780000 0x1000>;

				interrupts = <20>;

				gpio-ranges = <&pinctrl 0 0 220>;

				interrupt-controller;

			};



			timer: timer@1e782000 {

				/* This timer is a Faraday FTTMR010 derivative */

				compatible = "aspeed,ast2400-timer";

				reg = <0x1e782000 0x90>;

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

				clocks = <&clk_apb>;

				clock-names = "PCLK";

			};



			wdt1: wdt@1e785000 {

				compatible = "aspeed,ast2400-wdt";

				reg = <0x1e785000 0x1c>;

				interrupts = <27>;

			};



			wdt2: wdt@1e785020 {

				compatible = "aspeed,ast2400-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";

			};



			adc: adc@1e6e9000 {

				compatible = "aspeed,ast2400-adc";

				reg = <0x1e6e9000 0xb0>;

				clocks = <&clk_apb>;

				#io-channel-cells = <1>;

				status = "disabled";

			};

		};

	};

};

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

+1033 −773

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE