Commit 85ef6b26 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-dt-4.3-3' of git://git.infradead.org/linux-mvebu into next/dt 

mvebu dt changes for v4.3 (part #3)

- device tree part of the Dove PMU series
- converting a new orion5x based platform to dt: Linkstation Mini

* tag 'mvebu-dt-4.3-3' of git://git.infradead.org/linux-mvebu

:
  ARM: dts: Convert Linkstation Mini to Device Tree
  ARM: dt: dove: add GPU power domain description
  ARM: dt: dove: add video decoder power domain description
  ARM: dt: dove: wire up RTC interrupt
  ARM: dt: Add PMU node, making PMU child devices childs of this node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents eb2b5084 15979aee

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -478,6 +478,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \ 
	orion5x-lacie-d2-network.dtb \

	orion5x-lacie-ethernet-disk-mini-v2.dtb \

	orion5x-linkstation-lswtgl.dtb \

	orion5x-lswsgl.dtb \

	orion5x-maxtor-shared-storage-2.dtb \

	orion5x-rd88f5182-nas.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += \

arch/arm/boot/dts/dove.dtsi

+318 −286
Original line number Diff line number Diff line
@@ -419,22 +419,50 @@ 
				status = "disabled";

			};



			thermal: thermal-diode@d001c {

			pmu: power-management@d0000 {

				compatible = "marvell,dove-pmu", "simple-bus";

				reg = <0xd0000 0x8000>, <0xd8000 0x8000>;

				ranges = <0x00000000 0x000d0000 0x8000

					  0x00008000 0x000d8000 0x8000>;

				interrupts = <33>;

				interrupt-controller;

				#address-cells = <1>;

				#size-cells = <1>;

				#interrupt-cells = <1>;

				#reset-cells = <1>;



				domains {

					vpu_domain: vpu-domain {

						#power-domain-cells = <0>;

						marvell,pmu_pwr_mask = <0x00000008>;

						marvell,pmu_iso_mask = <0x00000001>;

						resets = <&pmu 16>;

					};



					gpu_domain: gpu-domain {

						#power-domain-cells = <0>;

						marvell,pmu_pwr_mask = <0x00000004>;

						marvell,pmu_iso_mask = <0x00000002>;

						resets = <&pmu 18>;

					};

				};



				thermal: thermal-diode@001c {

					compatible = "marvell,dove-thermal";

				reg = <0xd001c 0x0c>, <0xd005c 0x08>;

					reg = <0x001c 0x0c>, <0x005c 0x08>;

				};



			gate_clk: clock-gating-ctrl@d0038 {

				gate_clk: clock-gating-ctrl@0038 {

					compatible = "marvell,dove-gating-clock";

				reg = <0xd0038 0x4>;

					reg = <0x0038 0x4>;

					clocks = <&core_clk 0>;

					#clock-cells = <1>;

				};



			pinctrl: pin-ctrl@d0200 {

				pinctrl: pin-ctrl@0200 {

					compatible = "marvell,dove-pinctrl";

				reg = <0xd0200 0x14>,

				      <0xd0440 0x04>;

					reg = <0x0200 0x14>,

					      <0x0440 0x04>;

					clocks = <&gate_clk 22>;



					pmx_gpio_0: pmx-gpio-0 {
@@ -675,37 +703,41 @@ 
					};

				};



			core_clk: core-clocks@d0214 {

				core_clk: core-clocks@0214 {

					compatible = "marvell,dove-core-clock";

				reg = <0xd0214 0x4>;

					reg = <0x0214 0x4>;

					#clock-cells = <1>;

				};



			gpio0: gpio-ctrl@d0400 {

				gpio0: gpio-ctrl@0400 {

					compatible = "marvell,orion-gpio";

					#gpio-cells = <2>;

					gpio-controller;

				reg = <0xd0400 0x20>;

					reg = <0x0400 0x20>;

					ngpios = <32>;

					interrupt-controller;

					#interrupt-cells = <2>;

					interrupt-parent = <&intc>;

					interrupts = <12>, <13>, <14>, <60>;

				};



			gpio1: gpio-ctrl@d0420 {

				gpio1: gpio-ctrl@0420 {

					compatible = "marvell,orion-gpio";

					#gpio-cells = <2>;

					gpio-controller;

				reg = <0xd0420 0x20>;

					reg = <0x0420 0x20>;

					ngpios = <32>;

					interrupt-controller;

					#interrupt-cells = <2>;

					interrupt-parent = <&intc>;

					interrupts = <61>;

				};



			rtc: real-time-clock@d8500 {

				rtc: real-time-clock@8500 {

					compatible = "marvell,orion-rtc";

				reg = <0xd8500 0x20>;

					reg = <0x8500 0x20>;

					interrupts = <5>;

				};

			};



			gconf: global-config@e802c {

arch/arm/boot/dts/orion5x-lswsgl.dts

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

 * Copyright (C) 2015 Benjamin Cama <benoar@dolka.fr>

 * Copyright (C) 2014 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

 * Based on the board file arch/arm/mach-orion5x/lsmini-setup.c,

 * Copyright (C) 2008 Alexey Kopytko <alexey@kopytko.ru>

 *

 * 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 file 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 file 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 , 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 <dt-bindings/input/input.h>

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

#include "orion5x-mv88f5182.dtsi"



/ {

	model = "Buffalo Linkstation Mini (LS-WSGL)";

	compatible = "buffalo,lswsgl", "marvell,orion5x-88f5182", "marvell,orion5x";



	memory {

		reg = <0x00000000 0x8000000>; /* 128 MB */

	};



	chosen {

		bootargs = "console=ttyS0,115200 earlyprintk";

		linux,stdout-path = &uart0;

	};



	soc {

		ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>,

			 <MBUS_ID(0x09, 0x00) 0 0xf2200000 0x800>,

			 <MBUS_ID(0x01, 0x0f) 0 0xf4000000 0x40000>;

	};



	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-0 = <&pmx_buttons>;

		pinctrl-names = "default";

		#address-cells = <1>;

		#size-cells = <0>;

		func {

			label = "Function Button";

			linux,code = <KEY_OPTION>;

			gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;

		};



		power {

			label = "Power-on Switch";

			linux,input-type = <5>; /* EV_SW */

			linux,code = <KEY_RESERVED>; /* LSMINI_SW_POWER */

			gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;

		};



		autopower {

			label = "Power-auto Switch";

			linux,input-type = <5>; /* EV_SW */

			linux,code = <KEY_ESC>; /* LSMINI_SW_AUTOPOWER */

			gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;

		};

	};



	gpio-leds {

		compatible = "gpio-leds";

		pinctrl-0 = <&pmx_led_alarm &pmx_led_info &pmx_led_func

			     &pmx_led_power>;

		pinctrl-names = "default";



		alarm {

			label = "lswsgl:alarm:red";

			gpio = <&gpio0 2 GPIO_ACTIVE_LOW>;

		};



		info {

			label = "lswsgl:info:amber";

			gpio = <&gpio0 3 GPIO_ACTIVE_LOW>;

		};



		func {

			label = "lswsgl:func:blue:top";

			gpio = <&gpio0 9 GPIO_ACTIVE_LOW>;

		};



		power {

			label = "lswsgl:power:blue:bottom";

			gpio = <&gpio0 14 GPIO_ACTIVE_LOW>;

			default-state = "on";

		};

	};



	restart_poweroff {

		compatible = "restart-poweroff";

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;

		pinctrl-0 = <&pmx_sata0_power &pmx_sata1_power &pmx_usb_power>;

		pinctrl-names = "default";



		sata0_power: regulator@0 {

			compatible = "regulator-fixed";

			reg = <0>;

			regulator-name = "SATA0 Power";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			regulator-always-on;

			regulator-boot-on;

			gpio = <&gpio0 1 GPIO_ACTIVE_HIGH>;

		};



		sata1_power: regulator@1 {

			compatible = "regulator-fixed";

			reg = <1>;

			regulator-name = "SATA1 Power";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			regulator-always-on;

			regulator-boot-on;

			gpio = <&gpio0 19 GPIO_ACTIVE_HIGH>;

		};



		usb_power: regulator@2 {

			compatible = "regulator-fixed";

			reg = <2>;

			regulator-name = "USB Power";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			regulator-always-on;

			regulator-boot-on;

			gpio = <&gpio0 16 GPIO_ACTIVE_HIGH>;

		};

	};

};



&devbus_bootcs {

	status = "okay";



	devbus,keep-config;



	flash@0 {

		compatible = "cfi-flash";

		reg = <0 0x40000>;

		bank-width = <1>;

		#address-cells = <1>;

		#size-cells = <1>;



		partition@0 {

			label = "Full256Kb";

			reg = <0 0x40000>;

			read-only;

		};

	};

};



&mdio {

	status = "okay";



	ethphy: ethernet-phy {

		reg = <8>;

	};

};



&ehci0 {

	status = "okay";

};



&eth {

	status = "okay";



	ethernet-port@0 {

		phy-handle = <&ethphy>;

	};

};



&i2c {

	status = "okay";

	clock-frequency = <100000>;

	#address-cells = <1>;



	rtc@32 {

		compatible = "ricoh,rs5c372a";

		reg = <0x32>;

	};

};



&pinctrl {

	pmx_buttons: pmx-buttons {

		marvell,pins = "mpp15", "mpp17", "mpp18";

		marvell,function = "gpio";

	};



	pmx_led_alarm: pmx-leds {

		marvell,pins = "mpp2";

		marvell,function = "gpio";

	};



	pmx_led_info: pmx-leds {

		marvell,pins = "mpp3";

		marvell,function = "gpio";

	};



	pmx_led_func: pmx-leds {

		marvell,pins = "mpp9";

		marvell,function = "gpio";

	};



	pmx_led_power: pmx-leds {

		marvell,pins = "mpp14";

		marvell,function = "gpio";

	};



	pmx_sata0_power: pmx-sata0-power {

		marvell,pins = "mpp1";

		marvell,function = "gpio";

	};



	pmx_sata1_power: pmx-sata1-power {

		marvell,pins = "mpp19";

		marvell,function = "gpio";

	};



	pmx_usb_power: pmx-usb-power {

		marvell,pins = "mpp16";

		marvell,function = "gpio";

	};

};



&sata {

	status = "okay";

	nr-ports = <2>;

};



&uart0 {

	status = "okay";

};

arch/arm/mach-orion5x/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -78,11 +78,11 @@ config MACH_LINKSTATION_LSCHL 
	  Buffalo Linkstation Live v3 (LS-CHL) platform.



config MACH_LINKSTATION_MINI

	bool "Buffalo Linkstation Mini"

	select I2C_BOARDINFO

	bool "Buffalo Linkstation Mini (Flattened Device Tree)"

	select ARCH_ORION5X_DT

	help

	  Say 'Y' here if you want your kernel to support the

	  Buffalo Linkstation Mini platform.

	  Buffalo Linkstation Mini (LS-WSGL) platform.



config MACH_LINKSTATION_LS_HGL

	bool "Buffalo Linkstation LS-HGL"

arch/arm/mach-orion5x/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ obj-$(CONFIG_MACH_RD88F5182) += rd88f5182-setup.o 
obj-$(CONFIG_MACH_KUROBOX_PRO)	+= kurobox_pro-setup.o

obj-$(CONFIG_MACH_TERASTATION_PRO2)	+= terastation_pro2-setup.o

obj-$(CONFIG_MACH_LINKSTATION_PRO) += kurobox_pro-setup.o

obj-$(CONFIG_MACH_LINKSTATION_MINI) += lsmini-setup.o

obj-$(CONFIG_MACH_LINKSTATION_LS_HGL) += ls_hgl-setup.o

obj-$(CONFIG_MACH_DNS323)	+= dns323-setup.o

obj-$(CONFIG_MACH_TS209)	+= ts209-setup.o tsx09-common.o