Commit 1964babb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-dt-2' of... 

Merge tag 'amlogic-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt

Merge "Amlogic 32-bit DT changes for v4.13 (round 2)" from Kevin Hilman:

- greatly expands DT clock support for meson8b

* tag 'amlogic-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: (22 commits)
  ARM: dts: meson: use the real ethernet clock on Meson8 and Meson8b
  ARM: dts: meson8b: add the SCU device node
  ARM: dts: meson: add USB support on Meson8 and Meson8b
  ARM: dts: meson: add the hardware random number generator
  ARM: dts: meson8: add reserved memory zones
  ARM: dts: meson: add the SAR ADC
  ARM: dts: meson8: add the pins for the SDIO controller
  ARM: dts: meson8: add the PWM_E and PWM_F pins
  ARM: dts: meson: use GIC_SPI and IRQ_TYPE_EDGE_RISING macros
  ARM: dts: meson: use C preprocessor friendly include syntax
  ARM: dts: meson8: fix the IR receiver pins
  clk: meson8b: export the ethernet gate clock
  clk: meson8b: export the USB clocks
  clk: meson8b: export the gate clock for the HW random number generator
  clk: meson8b: export the SDIO clock
  clk: meson8b: export the SAR ADC clocks
  clk: meson-gxbb: un-export the CPU clock
  clk: meson-gxbb: expose UART clocks
  clk: meson-gxbb: expose SPICC gate
  clk: meson-gxbb: expose spdif master clock
  ...
parents 30e3224e f28d4bdb

arch/arm/boot/dts/meson.dtsi

+64 −11
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 
 *     OTHER DEALINGS IN THE SOFTWARE.

 */



#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

/include/ "skeleton.dtsi"



/ {
@@ -78,45 +80,72 @@ 
			#size-cells = <1>;

			ranges = <0x0 0xc1100000 0x200000>;



			hwrng: rng@8100 {

				compatible = "amlogic,meson-rng";

				reg = <0x8100 0x8>;

			};



			uart_A: serial@84c0 {

				compatible = "amlogic,meson-uart";

				reg = <0x84c0 0x18>;

				interrupts = <0 26 1>;

				interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};



			uart_B: serial@84dc {

				compatible = "amlogic,meson-uart";

				reg = <0x84dc 0x18>;

				interrupts = <0 75 1>;

				interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};



			i2c_A: i2c@8500 {

				compatible = "amlogic,meson6-i2c";

				reg = <0x8500 0x20>;

				interrupts = <0 21 1>;

				interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>;

				#address-cells = <1>;

				#size-cells = <0>;

				status = "disabled";

			};



			saradc: adc@8680 {

				compatible = "amlogic,meson-saradc";

				reg = <0x8680 0x34>;

				#io-channel-cells = <1>;

				interrupts = <GIC_SPI 73 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};



			uart_C: serial@8700 {

				compatible = "amlogic,meson-uart";

				reg = <0x8700 0x18>;

				interrupts = <0 93 1>;

				interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};



			i2c_B: i2c@87c0 {

				compatible = "amlogic,meson6-i2c";

				reg = <0x87c0 0x20>;

				interrupts = <0 128 1>;

				interrupts = <GIC_SPI 128 IRQ_TYPE_EDGE_RISING>;

				#address-cells = <1>;

				#size-cells = <0>;

				status = "disabled";

			};



			usb0_phy: phy@8800 {

				compatible = "amlogic,meson-mx-usb2-phy";

				#phy-cells = <0>;

				reg = <0x8800 0x20>;

				status = "disabled";

			};



			usb1_phy: phy@8820 {

				compatible = "amlogic,meson-mx-usb2-phy";

				#phy-cells = <0>;

				reg = <0x8820 0x20>;

				status = "disabled";

			};



			spifc: spi@8c80 {

				compatible = "amlogic,meson6-spifc";

				reg = <0x8c80 0x80>;
@@ -128,13 +157,13 @@ 
			wdt: watchdog@9900 {

				compatible = "amlogic,meson6-wdt";

				reg = <0x9900 0x8>;

				interrupts = <0 0 1>;

				interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>;

			};



			timer@9940 {

				compatible = "amlogic,meson6-timer";

				reg = <0x9940 0x18>;

				interrupts = <0 10 1>;

				interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE_RISING>;

			};

		};
@@ -148,32 +177,56 @@ 
			ir_receiver: ir-receiver@480 {

				compatible= "amlogic,meson6-ir";

				reg = <0x480 0x20>;

				interrupts = <0 15 1>;

				interrupts = <GIC_SPI 15 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};



			uart_AO: serial@4c0 {

				compatible = "amlogic,meson-uart";

				reg = <0x4c0 0x18>;

				interrupts = <0 90 1>;

				interrupts = <GIC_SPI 90 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};



			i2c_AO: i2c@500 {

				compatible = "amlogic,meson6-i2c";

				reg = <0x500 0x20>;

				interrupts = <0 92 1>;

				interrupts = <GIC_SPI 92 IRQ_TYPE_EDGE_RISING>;

				#address-cells = <1>;

				#size-cells = <0>;

				status = "disabled";

			};

		};



		usb0: usb@c9040000 {

			compatible = "snps,dwc2";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0xc9040000 0x40000>;

			interrupts = <GIC_SPI 30 IRQ_TYPE_EDGE_RISING>;

			phys = <&usb0_phy>;

			phy-names = "usb2-phy";

			dr_mode = "host";

			status = "disabled";

		};



		usb1: usb@c90c0000 {

			compatible = "snps,dwc2";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0xc90c0000 0x40000>;

			interrupts = <GIC_SPI 31 IRQ_TYPE_EDGE_RISING>;

			phys = <&usb1_phy>;

			phy-names = "usb2-phy";

			dr_mode = "host";

			status = "disabled";

		};



		ethmac: ethernet@c9410000 {

			compatible = "amlogic,meson6-dwmac", "snps,dwmac";

			reg = <0xc9410000 0x10000

			       0xc1108108 0x4>;

			interrupts = <0 8 1>;

			interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "macirq";

			status = "disabled";

		};

arch/arm/boot/dts/meson6-atv1200.dts

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
 */



/dts-v1/;

/include/ "meson6.dtsi"

#include "meson6.dtsi"



/ {

	model = "Geniatech ATV1200";

arch/arm/boot/dts/meson6.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
 *     OTHER DEALINGS IN THE SOFTWARE.

 */



/include/ "meson.dtsi"

#include "meson.dtsi"



/ {

	model = "Amlogic Meson6 SoC";

arch/arm/boot/dts/meson8.dtsi

+116 −8
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 


#include <dt-bindings/clock/meson8b-clkc.h>

#include <dt-bindings/gpio/meson8-gpio.h>

/include/ "meson.dtsi"

#include "meson.dtsi"



/ {

	model = "Amlogic Meson8 SoC";
@@ -83,6 +83,38 @@ 
			reg = <0x203>;

		};

	};



	reserved-memory {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		/* 2 MiB reserved for Hardware ROM Firmware? */

		hwrom@0 {

			reg = <0x0 0x200000>;

			no-map;

		};



		/*

		 * 1 MiB reserved for the "ARM Power Firmware": this is ARM

		 * code which is responsible for system suspend. It loads a

		 * piece of ARC code ("arc_power" in the vendor u-boot tree)

		 * into SRAM, executes that and shuts down the (last) ARM core.

		 * The arc_power firmware then checks various wakeup sources

		 * (IR remote receiver, HDMI CEC, WIFI and Bluetooth wakeup or

		 * simply the power key) and re-starts the ARM core once it

		 * detects a wakeup request.

		 */

		power-firmware@4f00000 {

			reg = <0x4f00000 0x100000>;

			no-map;

		};

	};



	scu@c4300000 {

		compatible = "arm,cortex-a9-scu";

		reg = <0xc4300000 0x100>;

	};

}; /* end of / */



&aobus {
@@ -116,6 +148,20 @@ 
				function = "i2c_mst_ao";

			};

		};



		ir_recv_pins: remote {

			mux {

				groups = "remote_input";

				function = "remote";

			};

		};



		pwm_f_ao_pins: pwm-f-ao {

			mux {

				groups = "pwm_f_ao";

				function = "pwm_f_ao";

			};

		};

	};

};
@@ -144,17 +190,34 @@ 
			gpio-ranges = <&pinctrl_cbus 0 0 120>;

		};



		spi_nor_pins: nor {

		sd_a_pins: sd-a {

			mux {

				groups = "nor_d", "nor_q", "nor_c", "nor_cs";

				function = "nor";

				groups = "sd_d0_a", "sd_d1_a", "sd_d2_a",

					"sd_d3_a", "sd_clk_a", "sd_cmd_a";

				function = "sd_a";

			};

		};



		ir_recv_pins: remote {

		sd_b_pins: sd-b {

			mux {

				groups = "remote_input";

				function = "remote";

				groups = "sd_d0_b", "sd_d1_b", "sd_d2_b",

					"sd_d3_b", "sd_clk_b", "sd_cmd_b";

				function = "sd_b";

			};

		};



		sd_c_pins: sd-c {

			mux {

				groups = "sd_d0_c", "sd_d1_c", "sd_d2_c",

					"sd_d3_c", "sd_clk_c", "sd_cmd_c";

				function = "sd_c";

			};

		};



		spi_nor_pins: nor {

			mux {

				groups = "nor_d", "nor_q", "nor_c", "nor_cs";

				function = "nor";

			};

		};
@@ -168,14 +231,27 @@ 
				function = "ethernet";

			};

		};



		pwm_e_pins: pwm-e {

			mux {

				groups = "pwm_e";

				function = "pwm_e";

			};

		};

	};

};



&ethmac {

	clocks = <&clkc CLKID_CLK81>;

	clocks = <&clkc CLKID_ETH>;

	clock-names = "stmmaceth";

};



&hwrng {

	compatible = "amlogic,meson8-rng", "amlogic,meson-rng";

	clocks = <&clkc CLKID_RNG0>;

	clock-names = "core";

};



&i2c_AO {

	clocks = <&clkc CLKID_CLK81>;

};
@@ -194,6 +270,14 @@ 
	arm,filter-ranges = <0x100000 0xc0000000>;

};



&saradc {

	compatible = "amlogic,meson8-saradc", "amlogic,meson-saradc";

	clocks = <&clkc CLKID_XTAL>,

		<&clkc CLKID_SAR_ADC>,

		<&clkc CLKID_SANA>;

	clock-names = "clkin", "core", "sana";

};



&spifc {

	clocks = <&clkc CLKID_CLK81>;

};
@@ -213,3 +297,27 @@ 
&uart_C {

	clocks = <&clkc CLKID_CLK81>;

};



&usb0 {

	compatible = "amlogic,meson8-usb", "snps,dwc2";

	clocks = <&clkc CLKID_USB0_DDR_BRIDGE>;

	clock-names = "otg";

};



&usb1 {

	compatible = "amlogic,meson8-usb", "snps,dwc2";

	clocks = <&clkc CLKID_USB1_DDR_BRIDGE>;

	clock-names = "otg";

};



&usb0_phy {

	compatible = "amlogic,meson8-usb2-phy", "amlogic,meson-mx-usb2-phy";

	clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB0>;

	clock-names = "usb_general", "usb";

};



&usb1_phy {

	compatible = "amlogic,meson8-usb2-phy", "amlogic,meson-mx-usb2-phy";

	clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB1>;

	clock-names = "usb_general", "usb";

};

arch/arm/boot/dts/meson8b.dtsi

+50 −0
Original line number Diff line number Diff line
@@ -82,6 +82,11 @@ 
			reg = <0x203>;

		};

	};



	scu@c4300000 {

		compatible = "arm,cortex-a5-scu";

		reg = <0xc4300000 0x100>;

	};

}; /* end of / */



&aobus {
@@ -171,12 +176,31 @@ 
	};

};



&ethmac {

	clocks = <&clkc CLKID_ETH>;

	clock-names = "stmmaceth";

};



&hwrng {

	compatible = "amlogic,meson8b-rng", "amlogic,meson-rng";

	clocks = <&clkc CLKID_RNG0>;

	clock-names = "core";

};



&L2 {

	arm,data-latency = <3 3 3>;

	arm,tag-latency = <2 2 2>;

	arm,filter-ranges = <0x100000 0xc0000000>;

};



&saradc {

	compatible = "amlogic,meson8b-saradc", "amlogic,meson-saradc";

	clocks = <&clkc CLKID_XTAL>,

		<&clkc CLKID_SAR_ADC>,

		<&clkc CLKID_SANA>;

	clock-names = "clkin", "core", "sana";

};



&uart_AO {

	clocks = <&clkc CLKID_CLK81>;

};
@@ -192,3 +216,29 @@ 
&uart_C {

	clocks = <&clkc CLKID_CLK81>;

};



&usb0 {

	compatible = "amlogic,meson8b-usb", "snps,dwc2";

	clocks = <&clkc CLKID_USB0_DDR_BRIDGE>;

	clock-names = "otg";

};



&usb1 {

	compatible = "amlogic,meson8b-usb", "snps,dwc2";

	clocks = <&clkc CLKID_USB1_DDR_BRIDGE>;

	clock-names = "otg";

};



&usb0_phy {

	compatible = "amlogic,meson8b-usb2-phy", "amlogic,meson-mx-usb2-phy";

	clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB0>;

	clock-names = "usb_general", "usb";

	resets = <&reset RESET_USB_OTG>;

};



&usb1_phy {

	compatible = "amlogic,meson8b-usb2-phy", "amlogic,meson-mx-usb2-phy";

	clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB1>;

	clock-names = "usb_general", "usb";

	resets = <&reset RESET_USB_OTG>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE