Commit 8f4edb9e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'for-v4.0-rc/meson-dts' of https://github.com/carlocaione/linux-meson into next/dt 

Pull "meson DTS changes" from Carlo Caione:

- New DTS for MINIX NEO-X8
- Add DTS support for SPIFC, Ethernet controller and pinctrl

* tag 'for-v4.0-rc/meson-dts' of https://github.com/carlocaione/linux-meson:
  ARM: dts: meson: add DTS file for MINIX NEO-X8
  ARM: dts: meson8: add pinctrl node
  ARM: dts: meson: enable Ethernet controller
  ARM: dts: meson: add node for SPIFC
parents 998b4ca7 b3e67c91

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -199,6 +199,8 @@ dtb-$(CONFIG_ARCH_LPC32XX) += \ 
	ea3250.dtb phy3250.dtb

dtb-$(CONFIG_MACH_MESON6) += \

	meson6-atv1200.dtb

dtb-$(CONFIG_MACH_MESON8) += \

	meson8-minix-neo-x8.dtb

dtb-$(CONFIG_ARCH_MMP) += \

	pxa168-aspenite.dtb \

	pxa910-dkb.dtb \

arch/arm/boot/dts/meson.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -150,5 +150,25 @@ ir_receiver: ir-receiver@c8100480 { 
			interrupts = <0 15 1>;

			status = "disabled";

		};



		spifc: spi@c1108c80 {

			compatible = "amlogic,meson6-spifc";

			reg = <0xc1108c80 0x80>;

			#address-cells = <1>;

			#size-cells = <0>;

			clocks = <&clk81>;

			status = "disabled";

		};



		ethmac: ethernet@c9410000 {

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

			reg = <0xc9410000 0x10000

			       0xc1108108 0x4>;

			interrupts = <0 8 1>;

			interrupt-names = "macirq";

			clocks = <&clk81>;

			clock-names = "stmmaceth";

			status = "disabled";

		};

	};

}; /* end of / */

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

+4 −0
Original line number Diff line number Diff line
@@ -64,3 +64,7 @@ memory { 
&uart_AO {

	status = "okay";

};



&ethmac {

	status = "okay";

};

arch/arm/boot/dts/meson8-minix-neo-x8.dts

0 → 100644
+128 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2014 Beniamino Galvani <b.galvani@gmail.com>

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPL or the X11 license, at your option. Note that this dual

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This library is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This library is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */



/dts-v1/;

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

#include "meson8.dtsi"



/ {

	model = "MINIX NEO-X8";

	compatible = "minix,neo-x8", "amlogic,meson8";



	aliases {

		serial0 = &uart_AO;

	};



	memory {

		reg = <0x40000000 0x80000000>;

	};



	gpio-leds {

		compatible = "gpio-leds";



		blue {

			label = "x8:blue:power";

			gpios = <&gpio_ao GPIO_TEST_N GPIO_ACTIVE_HIGH>;

		};

	};

};



&uart_AO {

	status = "okay";

	pinctrl-0 = <&uart_ao_a_pins>;

	pinctrl-names = "default";

};



&i2c_AO {

	status = "okay";

	pinctrl-0 = <&i2c_ao_pins>;

	pinctrl-names = "default";



	pmic@32 {

		compatible = "ricoh,rn5t618";

		reg = <0x32>;



		regulators {

		};

	};



	rtc@51 {

		compatible = "nxp,pcf8563";

		reg = <0x51>;

	};

};



&spifc {

	status = "okay";

	pinctrl-0 = <&spi_nor_pins>;

	pinctrl-names = "default";



	spi-flash@0 {

		compatible = "mxicy,mx25l1606e";

		#address-cells = <1>;

		#size-cells = <1>;

		reg = <0>;

		spi-max-frequency = <30000000>;



		partition@0 {

			label = "boot";

			reg = <0x0 0x100000>;

		};



		partition@100000 {

			label = "env";

			reg = <0x100000 0x10000>;

		};

	};

};



&ir_receiver {

	status = "okay";

	pinctrl-0 = <&ir_recv_pins>;

	pinctrl-names = "default";

};



&ethmac {

	status = "okay";

	pinctrl-0 = <&eth_pins>;

	pnictrl-names = "default";

};

arch/arm/boot/dts/meson8.dtsi

+68 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
 *     OTHER DEALINGS IN THE SOFTWARE.

 */



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

/include/ "meson.dtsi"



/ {
@@ -89,4 +90,71 @@ clk81: clk@0 { 
		compatible = "fixed-clock";

		clock-frequency = <141666666>;

	};



	pinctrl: pinctrl@c1109880 {

		compatible = "amlogic,meson8-pinctrl";

		reg = <0xc1109880 0x10>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		gpio: banks@c11080b0 {

			reg = <0xc11080b0 0x28>,

			      <0xc11080e8 0x18>,

			      <0xc1108120 0x18>,

			      <0xc1108030 0x30>;

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

			gpio-controller;

			#gpio-cells = <2>;

		};



		gpio_ao: ao-bank@c1108030 {

			reg = <0xc8100014 0x4>,

			      <0xc810002c 0x4>,

			      <0xc8100024 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";

			};

		};



		i2c_ao_pins: i2c_mst_ao {

			mux {

				groups = "i2c_mst_sck_ao", "i2c_mst_sda_ao";

				function = "i2c_mst_ao";

			};

		};



		spi_nor_pins: nor {

			mux {

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

				function = "nor";

			};

		};



		ir_recv_pins: remote {

			mux {

				groups = "remote_input";

				function = "remote";

			};

		};



		eth_pins: ethernet {

			mux {

				groups = "eth_tx_clk_50m", "eth_tx_en",

					 "eth_txd1", "eth_txd0",

					 "eth_rx_clk_in", "eth_rx_dv",

					 "eth_rxd1", "eth_rxd0", "eth_mdio",

					 "eth_mdc";

				function = "ethernet";

			};

		};

	};



}; /* end of / */