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

Commit 4fb92c60 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'amlogic-dt64' of... 

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

Amlogic DT 64-bit changes for v4.8
- add pinctrl driver and pins for several devices
- add reset driver

* tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic

:
  ARM64: dts: amlogic: Enable Reset Controller on GXBB-based platforms
  ARM64: dts: amlogic: gxbb: add ethernet
  ARM64: dts: amlogic: gxbb: pinctrl: add/update UART
  ARM64: dts: amlogic: add pins for EMMC, SD
  ARM64: dts: amlogic: Enable pin controller on GXBB-based platforms
  documentation: Add compatibles for Amlogic Meson GXBB pin controllers
  ARM64: dts: amlogic: Add hiu and periphs buses

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ffd8a5ed 6d1a5c93

Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,8 @@ Required properties for the root node: 
		      "amlogic,meson8b-cbus-pinctrl"

		      "amlogic,meson8b-cbus-pinctrl"

		      "amlogic,meson8-aobus-pinctrl"

		      "amlogic,meson8-aobus-pinctrl"

		      "amlogic,meson8b-aobus-pinctrl"

		      "amlogic,meson8b-aobus-pinctrl"

		      "amlogic,meson-gxbb-periphs-pinctrl"

		      "amlogic,meson-gxbb-aobus-pinctrl"

 - reg: address and size of registers controlling irq functionality

 - reg: address and size of registers controlling irq functionality





=== GPIO sub-nodes ===

=== GPIO sub-nodes ===

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

+20 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ 
/dts-v1/;

/dts-v1/;





#include "meson-gxbb.dtsi"

#include "meson-gxbb.dtsi"

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





/ {

/ {

	compatible = "hardkernel,odroid-c2", "amlogic,meson-gxbb";

	compatible = "hardkernel,odroid-c2", "amlogic,meson-gxbb";
@@ -62,8 +63,27 @@ 
		device_type = "memory";

		device_type = "memory";

		reg = <0x0 0x0 0x0 0x80000000>;

		reg = <0x0 0x0 0x0 0x80000000>;

	};

	};



	leds {

		compatible = "gpio-leds";

		blue {

			label = "c2:blue:alive";

			gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "heartbeat";

			default-state = "off";

		};

	};

};

};





&uart_AO {

&uart_AO {

	status = "okay";

	status = "okay";

	pinctrl-0 = <&uart_ao_a_pins>;

	pinctrl-names = "default";

};

};



&ethmac {

	status = "okay";

	pinctrl-0 = <&eth_pins>;

	pinctrl-names = "default";

};

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -62,4 +62,13 @@ 
/* This UART is brought out to the DB9 connector */

/* This UART is brought out to the DB9 connector */

&uart_AO {

&uart_AO {

	status = "okay";

	status = "okay";

	pinctrl-0 = <&uart_ao_a_pins>;

	pinctrl-names = "default";

};

};



&ethmac {

	status = "okay";

	pinctrl-0 = <&eth_pins>;

	pinctrl-names = "default";

};

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -56,4 +56,7 @@ 




&uart_AO {

&uart_AO {

	status = "okay";

	status = "okay";

	pinctrl-0 = <&uart_ao_a_pins>;

	pinctrl-names = "default";



};
 
};

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

+158 −1
Original line number Original line Diff line number Diff line
@@ -43,6 +43,8 @@ 
#include <dt-bindings/gpio/gpio.h>

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

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

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

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

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

#include <dt-bindings/gpio/meson-gxbb-gpio.h>

#include <dt-bindings/reset/amlogic,meson-gxbb-reset.h>





/ {

/ {

	compatible = "amlogic,meson-gxbb";

	compatible = "amlogic,meson-gxbb";
@@ -129,13 +131,35 @@ 
			#size-cells = <2>;

			#size-cells = <2>;

			ranges = <0x0 0x0 0x0 0xc1100000 0x0 0x100000>;

			ranges = <0x0 0x0 0x0 0xc1100000 0x0 0x100000>;





			reset: reset-controller@4404 {

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

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

				#reset-cells = <1>;

			};



			uart_A: serial@84c0 {

			uart_A: serial@84c0 {

				compatible = "amlogic,meson-uart";

				compatible = "amlogic,meson-uart";

				reg = <0x0 0x084c0 0x0 0x14>;

				reg = <0x0 0x84c0 0x0 0x14>;

				interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;

				clocks = <&xtal>;

				clocks = <&xtal>;

				status = "disabled";

				status = "disabled";

			};

			};



			uart_B: serial@84dc {

				compatible = "amlogic,meson-uart";

				reg = <0x0 0x84dc 0x0 0x14>;

				interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;

				clocks = <&xtal>;

				status = "disabled";

			};



			uart_C: serial@8700 {

				compatible = "amlogic,meson-uart";

				reg = <0x0 0x8700 0x0 0x14>;

				interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;

				clocks = <&xtal>;

				status = "disabled";

			};

		};

		};





		gic: interrupt-controller@c4301000 {

		gic: interrupt-controller@c4301000 {
@@ -158,6 +182,29 @@ 
			#size-cells = <2>;

			#size-cells = <2>;

			ranges = <0x0 0x0 0x0 0xc8100000 0x0 0x100000>;

			ranges = <0x0 0x0 0x0 0xc8100000 0x0 0x100000>;





			pinctrl_aobus: pinctrl@14 {

				compatible = "amlogic,meson-gxbb-aobus-pinctrl";

				#address-cells = <2>;

				#size-cells = <2>;

				ranges;



				gpio_ao: bank@14 {

					reg = <0x0 0x00014 0x0 0x8>,

					      <0x0 0x0002c 0x0 0x4>,

					      <0x0 0x00024 0x0 0x8>;

					reg-names = "mux", "pull", "gpio";

					gpio-controller;

					#gpio-cells = <2>;

				};



				uart_ao_a_pins: uart_ao_a {

					mux {

						groups = "uart_tx_ao_a", "uart_rx_ao_a";

						function = "uart_ao";

					};

				};

			};



			uart_AO: serial@4c0 {

			uart_AO: serial@4c0 {

				compatible = "amlogic,meson-uart";

				compatible = "amlogic,meson-uart";

				reg = <0x0 0x004c0 0x0 0x14>;

				reg = <0x0 0x004c0 0x0 0x14>;
@@ -167,6 +214,104 @@ 
			};

			};

		};

		};





		periphs: periphs@c8834000 {

			compatible = "simple-bus";

			reg = <0x0 0xc8834000 0x0 0x2000>;

			#address-cells = <2>;

			#size-cells = <2>;

			ranges = <0x0 0x0 0x0 0xc8834000 0x0 0x2000>;



			pinctrl_periphs: pinctrl@4b0 {

				compatible = "amlogic,meson-gxbb-periphs-pinctrl";

				#address-cells = <2>;

				#size-cells = <2>;

				ranges;



				gpio: bank@4b0 {

					reg = <0x0 0x004b0 0x0 0x28>,

					      <0x0 0x004e8 0x0 0x14>,

					      <0x0 0x00120 0x0 0x14>,

					      <0x0 0x00430 0x0 0x40>;

					reg-names = "mux", "pull", "pull-enable", "gpio";

					gpio-controller;

					#gpio-cells = <2>;

				};



				emmc_pins: emmc {

					mux {

						groups = "emmc_nand_d07",

						       "emmc_cmd",

						       "emmc_clk";

						function = "emmc";

					};

				};



				sdcard_pins: sdcard {

					mux {

						groups = "sdcard_d0",

						       "sdcard_d1",

						       "sdcard_d2",

						       "sdcard_d3",

						       "sdcard_cmd",

						       "sdcard_clk";

						function = "sdcard";

					};

				};



				uart_a_pins: uart_a {

					mux {

						groups = "uart_tx_a",

						       "uart_rx_a";

						function = "uart_a";

					};

				};



				uart_b_pins: uart_b {

					mux {

						groups = "uart_tx_b",

						       "uart_rx_b";

						function = "uart_b";

					};

				};



				uart_c_pins: uart_c {

					mux {

						groups = "uart_tx_c",

						       "uart_rx_c";

						function = "uart_c";

					};

				};



				eth_pins: eth_c {

					mux {

						groups = "eth_mdio",

						       "eth_mdc",

						       "eth_clk_rx_clk",

						       "eth_rx_dv",

						       "eth_rxd0",

						       "eth_rxd1",

						       "eth_rxd2",

						       "eth_rxd3",

						       "eth_rgmii_tx_clk",

						       "eth_tx_en",

						       "eth_txd0",

						       "eth_txd1",

						       "eth_txd2",

						       "eth_txd3";

						function = "eth";

					};

				};

			};

		};



		hiubus: hiubus@c883c000 {

			compatible = "simple-bus";

			reg = <0x0 0xc883c000 0x0 0x2000>;

			#address-cells = <2>;

			#size-cells = <2>;

			ranges = <0x0 0x0 0x0 0xc883c000 0x0 0x2000>;

		};



		apb: apb@d0000000 {

		apb: apb@d0000000 {

			compatible = "simple-bus";

			compatible = "simple-bus";

			reg = <0x0 0xd0000000 0x0 0x200000>;

			reg = <0x0 0xd0000000 0x0 0x200000>;
@@ -174,5 +319,17 @@ 
			#size-cells = <2>;

			#size-cells = <2>;

			ranges = <0x0 0x0 0x0 0xd0000000 0x0 0x200000>;

			ranges = <0x0 0x0 0x0 0xd0000000 0x0 0x200000>;

		};

		};



		ethmac: ethernet@c9410000 {

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

			reg = <0x0 0xc9410000 0x0 0x10000

			       0x0 0xc8834540 0x0 0x4>;

			interrupts = <0 8 1>;

			interrupt-names = "macirq";

			clocks = <&xtal>;

			clock-names = "stmmaceth";

			phy-mode = "rgmii";

			status = "disabled";

		};

	};

	};

};
 
};