Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

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

Pull "Amlogic 64-bit DT changes for v4.9, round 2" from Kevin Hilman:

Primarily adding support for newly added drivers

- USB host
- I2C
- SPI flash controller
- PWM
- mailbox, MHU
- pinctrl: add pins for SPI, I2C, SDIO

and then enabling these drivers on various boards.

* tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM64: dts: meson-gxbb-vega-s95: Enable USB Nodes
  ARM64: dts: meson-gxbb-p20x: Enable USB Nodes
  ARM64: dts: meson-gxbb: add USB Nodes
  ARM64: dts: gxbb: add i2c bus
  ARM64: dts: meson-gxbb: add I2C nodes
  ARM64: dts: meson-gxbb: add pins for I2C
  ARM64: dts: meson-gxbb: Add SPIFC node
  ARM64: dts: meson-gxbb: add the SDIO pins
  ARM64: dts: amlogic: add spi nor pins
  ARM64: dts: meson-gxbb: use the new GXBB DWMAC glue driver
  ARM64: dts: meson-gxbb: Add Meson GXBB PWM Controller nodes
  ARM64: dts: meson-gxbb: Add Meson MHU Node
  ARM64: dts: amlogic: enable ethernet on all Tronsmart Vega S95 devices
parents 53570cbc e1e4a1a4

arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts

+6 −0
Original line number Diff line number Diff line
@@ -92,3 +92,9 @@ 
	pinctrl-0 = <&remote_input_ao_pins>;

	pinctrl-names = "default";

};



&i2c_A {

	status = "okay";

	pinctrl-0 = <&i2c_a_pins>;

	pinctrl-names = "default";

};

arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts

+6 −0
Original line number Diff line number Diff line
@@ -50,3 +50,9 @@ 
	compatible = "amlogic,p200", "amlogic,meson-gxbb";

	model = "Amlogic Meson GXBB P200 Development Board";

};



&i2c_B {

	status = "okay";

	pinctrl-0 = <&i2c_b_pins>;

	pinctrl-names = "default";

};

arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi

+30 −0
Original line number Diff line number Diff line
@@ -57,6 +57,19 @@ 
		device_type = "memory";

		reg = <0x0 0x0 0x0 0x40000000>;

	};



	usb_pwr: regulator-usb-pwrs {

		compatible = "regulator-fixed";



		regulator-name = "USB_PWR";



		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;



		/* signal name in schematic: USB_PWR_EN */

		gpio = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};

};



/* This UART is brought out to the DB9 connector */
@@ -77,3 +90,20 @@ 
	pinctrl-0 = <&remote_input_ao_pins>;

	pinctrl-names = "default";

};



&usb0_phy {

	status = "okay";

	phy-supply = <&usb_pwr>;

};



&usb1_phy {

	status = "okay";

};



&usb0 {

	status = "okay";

};



&usb1 {

	status = "okay";

};

arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi

+36 −0
Original line number Diff line number Diff line
@@ -52,6 +52,19 @@ 
	chosen {

		stdout-path = "serial0:115200n8";

	};



	usb_vbus: regulator-usb0-vbus {

		compatible = "regulator-fixed";



		regulator-name = "USB0_VBUS";



		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;



		gpio = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



};



&uart_AO {
@@ -66,3 +79,26 @@ 
	pinctrl-0 = <&remote_input_ao_pins>;

	pinctrl-names = "default";

};



&ethmac {

	status = "okay";

	pinctrl-0 = <&eth_pins>;

	pinctrl-names = "default";

};



&usb0_phy {

	status = "okay";

	phy-supply = <&usb_vbus>;

};



&usb1_phy {

	status = "okay";

};



&usb0 {

	status = "okay";

};



&usb1 {

	status = "okay";

};

arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi

+195 −3
Original line number Diff line number Diff line
@@ -151,6 +151,25 @@ 
		#size-cells = <2>;

		ranges;



		usb0_phy: phy@c0000000 {

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

			#phy-cells = <0>;

			reg = <0x0 0xc0000000 0x0 0x20>;

			resets = <&reset RESET_USB_OTG>;

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

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

			status = "disabled";

		};



		usb1_phy: phy@c0000020 {

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

			#phy-cells = <0>;

			reg = <0x0 0xc0000020 0x0 0x20>;

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

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

			status = "disabled";

		};



		cbus: cbus@c1100000 {

			compatible = "simple-bus";

			reg = <0x0 0xc1100000 0x0 0x100000>;
@@ -180,6 +199,27 @@ 
				status = "disabled";

			};



			pwm_ab: pwm@8550 {

				compatible = "amlogic,meson-gxbb-pwm";

				reg = <0x0 0x08550 0x0 0x10>;

				#pwm-cells = <3>;

				status = "disabled";

			};



			pwm_cd: pwm@8650 {

				compatible = "amlogic,meson-gxbb-pwm";

				reg = <0x0 0x08650 0x0 0x10>;

				#pwm-cells = <3>;

				status = "disabled";

			};



			pwm_ef: pwm@86c0 {

				compatible = "amlogic,meson-gxbb-pwm";

				reg = <0x0 0x086c0 0x0 0x10>;

				#pwm-cells = <3>;

				status = "disabled";

			};



			uart_C: serial@8700 {

				compatible = "amlogic,meson-uart";

				reg = <0x0 0x8700 0x0 0x14>;
@@ -193,6 +233,45 @@ 
				reg = <0x0 0x098d0 0x0 0x10>;

				clocks = <&xtal>;

			};



			spifc: spi@8c80 {

				compatible = "amlogic,meson-gxbb-spifc";

				reg = <0x0 0x08c80 0x0 0x80>;

				#address-cells = <1>;

				#size-cells = <0>;

				clocks = <&clkc CLKID_SPI>;

				status = "disabled";

			};



			i2c_A: i2c@8500 {

				compatible = "amlogic,meson-gxbb-i2c";

				reg = <0x0 0x08500 0x0 0x20>;

				interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>;

				clocks = <&clkc CLKID_I2C>;

				#address-cells = <1>;

				#size-cells = <0>;

				status = "disabled";

			};



			i2c_B: i2c@87c0 {

				compatible = "amlogic,meson-gxbb-i2c";

				reg = <0x0 0x087c0 0x0 0x20>;

				interrupts = <GIC_SPI 214 IRQ_TYPE_EDGE_RISING>;

				clocks = <&clkc CLKID_I2C>;

				#address-cells = <1>;

				#size-cells = <0>;

				status = "disabled";

			};



			i2c_C: i2c@87e0 {

				compatible = "amlogic,meson-gxbb-i2c";

				reg = <0x0 0x087e0 0x0 0x20>;

				interrupts = <GIC_SPI 215 IRQ_TYPE_EDGE_RISING>;

				clocks = <&clkc CLKID_I2C>;

				#address-cells = <1>;

				#size-cells = <0>;

				status = "disabled";

			};

		};



		gic: interrupt-controller@c4301000 {
@@ -244,6 +323,14 @@ 
					};

				};



				i2c_ao_pins: i2c_ao {

					mux {

						groups = "i2c_sck_ao",

						       "i2c_sda_ao";

						function = "i2c_ao";

					};

				};



				pwm_ao_a_3_pins: pwm_ao_a_3 {

					mux {

						groups = "pwm_ao_a_3";
@@ -294,6 +381,23 @@ 
				interrupts = <GIC_SPI 196 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};



			pwm_ab_AO: pwm@550 {

				compatible = "amlogic,meson-gxbb-pwm";

				reg = <0x0 0x0550 0x0 0x10>;

				#pwm-cells = <3>;

				status = "disabled";

			};



			i2c_AO: i2c@500 {

				compatible = "amlogic,meson-gxbb-i2c";

				reg = <0x0 0x500 0x0 0x20>;

				interrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>;

				clocks = <&clkc CLKID_AO_I2C>;

				#address-cells = <1>;

				#size-cells = <0>;

				status = "disabled";

			};

		};



		periphs: periphs@c8834000 {
@@ -333,6 +437,16 @@ 
					};

				};



				nor_pins: nor {

					mux {

						groups = "nor_d",

						       "nor_q",

						       "nor_c",

						       "nor_cs";

						function = "nor";

					};

				};



				sdcard_pins: sdcard {

					mux {

						groups = "sdcard_d0",
@@ -345,6 +459,25 @@ 
					};

				};



				sdio_pins: sdio {

					mux {

						groups = "sdio_d0",

						       "sdio_d1",

						       "sdio_d2",

						       "sdio_d3",

						       "sdio_cmd",

						       "sdio_clk";

						function = "sdio";

					};

				};



				sdio_irq_pins: sdio_irq {

					mux {

						groups = "sdio_irq";

						function = "sdio";

					};

				};



				uart_a_pins: uart_a {

					mux {

						groups = "uart_tx_a",
@@ -369,6 +502,30 @@ 
					};

				};



				i2c_a_pins: i2c_a {

					mux {

						groups = "i2c_sck_a",

						       "i2c_sda_a";

						function = "i2c_a";

					};

				};



				i2c_b_pins: i2c_b {

					mux {

						groups = "i2c_sck_b",

						       "i2c_sda_b";

						function = "i2c_b";

					};

				};



				i2c_c_pins: i2c_c {

					mux {

						groups = "i2c_sck_c",

						       "i2c_sda_c";

						function = "i2c_c";

					};

				};



				eth_pins: eth_c {

					mux {

						groups = "eth_mdio",
@@ -452,6 +609,15 @@ 
				#clock-cells = <1>;

				reg = <0x0 0x0 0x0 0x3db>;

			};



			mailbox: mailbox@404 {

				compatible = "amlogic,meson-gxbb-mhu";

				reg = <0 0x404 0 0x4c>;

				interrupts = <0 208 IRQ_TYPE_EDGE_RISING>,

					     <0 209 IRQ_TYPE_EDGE_RISING>,

					     <0 210 IRQ_TYPE_EDGE_RISING>;

				#mbox-cells = <1>;

			};

		};



		apb: apb@d0000000 {
@@ -462,14 +628,40 @@ 
			ranges = <0x0 0x0 0x0 0xd0000000 0x0 0x200000>;

		};



		usb0: usb@c9000000 {

			compatible = "amlogic,meson-gxbb-usb", "snps,dwc2";

			reg = <0x0 0xc9000000 0x0 0x40000>;

			interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clkc CLKID_USB0_DDR_BRIDGE>;

			clock-names = "otg";

			phys = <&usb0_phy>;

			phy-names = "usb2-phy";

			dr_mode = "host";

			status = "disabled";

		};



		usb1: usb@c9100000 {

			compatible = "amlogic,meson-gxbb-usb", "snps,dwc2";

			reg = <0x0 0xc9100000 0x0 0x40000>;

			interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clkc CLKID_USB1_DDR_BRIDGE>;

			clock-names = "otg";

			phys = <&usb1_phy>;

			phy-names = "usb2-phy";

			dr_mode = "host";

			status = "disabled";

		};



		ethmac: ethernet@c9410000 {

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

			compatible = "amlogic,meson-gxbb-dwmac", "snps,dwmac";

			reg = <0x0 0xc9410000 0x0 0x10000

			       0x0 0xc8834540 0x0 0x4>;

			interrupts = <0 8 1>;

			interrupt-names = "macirq";

			clocks = <&clkc CLKID_ETH>;

			clock-names = "stmmaceth";

			clocks = <&clkc CLKID_ETH>,

				 <&clkc CLKID_FCLK_DIV2>,

				 <&clkc CLKID_MPLL2>;

			clock-names = "stmmaceth", "clkin0", "clkin1";

			phy-mode = "rgmii";

			status = "disabled";

		};