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

Commit 11c3889c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'uniphier-dt64-v4.15' of... 

Merge tag 'uniphier-dt64-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt

Pull "UniPhier ARM64 SoC DT updates for v4.15" from Masahiro Yamada:

- add thermal monitor and thermal zone nodes
- add efuse nodes
- fix W=2 warnings
- add GPIO controller nodes and related properties
- add resets properties

* tag 'uniphier-dt64-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  arm64: dts: uniphier: add resets properties
  arm64: dts: uniphier: add eMMC hardware reset provider node
  arm64: dts: uniphier: add GPIO hog definition
  arm64: dts: uniphier: route on-board device IRQ to GPIO controller
  arm64: dts: uniphier: add GPIO controller nodes
  arm64: dts: uniphier: fix W=2 build warnings
  arm64: dts: uniphier: enable NAND for PXs3 reference board
  arm64: dts: uniphier: add efuse node for LD11, LD20, and PXs3
  arm64: dts: uniphier: add nodes of thermal monitor and thermal zone for LD20
parents add5c42e 76c48e1e

arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts

+10 −1
Original line number Diff line number Diff line
@@ -40,13 +40,22 @@ 
};



&ethsc {

	interrupts = <0 48 4>;

	interrupt-parent = <&gpio>;

	interrupts = <0 8>;

};



&serial0 {

	status = "okay";

};



&gpio {

	xirq0 {

		gpio-hog;

		gpios = <120 0>;

		input;

	};

};



&i2c0 {

	status = "okay";

};

arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi

+64 −1
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)

 */



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



/memreserve/ 0x80000000 0x02000000;



/ {
@@ -49,7 +51,7 @@ 
		};

	};



	cluster0_opp: opp_table {

	cluster0_opp: opp-table {

		compatible = "operating-points-v2";

		opp-shared;
@@ -96,6 +98,11 @@ 
		};

	};



	emmc_pwrseq: emmc-pwrseq {

		compatible = "mmc-pwrseq-emmc";

		reset-gpios = <&gpio 26 GPIO_ACTIVE_LOW>;

	};



	timer {

		compatible = "arm,armv8-timer";

		interrupts = <1 13 4>,
@@ -118,6 +125,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_uart0>;

			clocks = <&peri_clk 0>;

			resets = <&peri_rst 0>;

		};



		serial1: serial@54006900 {
@@ -128,6 +136,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_uart1>;

			clocks = <&peri_clk 1>;

			resets = <&peri_rst 1>;

		};



		serial2: serial@54006a00 {
@@ -138,6 +147,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_uart2>;

			clocks = <&peri_clk 2>;

			resets = <&peri_rst 2>;

		};



		serial3: serial@54006b00 {
@@ -148,6 +158,32 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_uart3>;

			clocks = <&peri_clk 3>;

			resets = <&peri_rst 3>;

		};



		gpio: gpio@55000000 {

			compatible = "socionext,uniphier-gpio";

			reg = <0x55000000 0x200>;

			interrupt-parent = <&aidet>;

			interrupt-controller;

			#interrupt-cells = <2>;

			gpio-controller;

			#gpio-cells = <2>;

			gpio-ranges = <&pinctrl 0 0 0>,

				      <&pinctrl 43 0 0>,

				      <&pinctrl 51 0 0>,

				      <&pinctrl 96 0 0>,

				      <&pinctrl 160 0 0>,

				      <&pinctrl 184 0 0>;

			gpio-ranges-group-names = "gpio_range0",

						  "gpio_range1",

						  "gpio_range2",

						  "gpio_range3",

						  "gpio_range4",

						  "gpio_range5";

			ngpios = <200>;

			socionext,interrupt-ranges = <0 48 16>, <16 154 5>,

						     <21 217 3>;

		};



		adamv@57920000 {
@@ -171,6 +207,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_i2c0>;

			clocks = <&peri_clk 4>;

			resets = <&peri_rst 4>;

			clock-frequency = <100000>;

		};
@@ -184,6 +221,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_i2c1>;

			clocks = <&peri_clk 5>;

			resets = <&peri_rst 5>;

			clock-frequency = <100000>;

		};
@@ -194,6 +232,7 @@ 
			#size-cells = <0>;

			interrupts = <0 43 4>;

			clocks = <&peri_clk 6>;

			resets = <&peri_rst 6>;

			clock-frequency = <400000>;

		};
@@ -207,6 +246,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_i2c3>;

			clocks = <&peri_clk 7>;

			resets = <&peri_rst 7>;

			clock-frequency = <100000>;

		};
@@ -220,6 +260,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_i2c4>;

			clocks = <&peri_clk 8>;

			resets = <&peri_rst 8>;

			clock-frequency = <100000>;

		};
@@ -230,6 +271,7 @@ 
			#size-cells = <0>;

			interrupts = <0 25 4>;

			clocks = <&peri_clk 9>;

			resets = <&peri_rst 9>;

			clock-frequency = <400000>;

		};
@@ -282,9 +324,11 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_emmc>;

			clocks = <&sys_clk 4>;

			resets = <&sys_rst 4>;

			bus-width = <8>;

			mmc-ddr-1_8v;

			mmc-hs200-1_8v;

			mmc-pwrseq = <&emmc_pwrseq>;

			cdns,phy-input-delay-legacy = <4>;

			cdns,phy-input-delay-mmc-highspeed = <2>;

			cdns,phy-input-delay-mmc-ddr = <3>;
@@ -355,6 +399,24 @@ 
			};

		};



		soc-glue@5f900000 {

			compatible = "socionext,uniphier-ld11-soc-glue-debug",

				     "simple-mfd";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x5f900000 0x2000>;



			efuse@100 {

				compatible = "socionext,uniphier-efuse";

				reg = <0x100 0x28>;

			};



			efuse@200 {

				compatible = "socionext,uniphier-efuse";

				reg = <0x200 0x68>;

			};

		};



		aidet: aidet@5fc20000 {

			compatible = "socionext,uniphier-ld11-aidet";

			reg = <0x5fc20000 0x200>;
@@ -400,6 +462,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_nand>;

			clocks = <&sys_clk 2>;

			resets = <&sys_rst 2>;

		};

	};

};

arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts

+10 −1
Original line number Diff line number Diff line
@@ -40,13 +40,22 @@ 
};



&ethsc {

	interrupts = <0 48 4>;

	interrupt-parent = <&gpio>;

	interrupts = <0 8>;

};



&serial0 {

	status = "okay";

};



&gpio {

	xirq0 {

		gpio-hog;

		gpios = <120 0>;

		input;

	};

};



&i2c0 {

	status = "okay";

};

arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi

+103 −2
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ 
 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)

 */



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

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



/memreserve/ 0x80000000 0x02000000;



/ {
@@ -46,6 +49,7 @@ 
			clocks = <&sys_clk 32>;

			enable-method = "psci";

			operating-points-v2 = <&cluster0_opp>;

			#cooling-cells = <2>;

		};



		cpu1: cpu@1 {
@@ -64,6 +68,7 @@ 
			clocks = <&sys_clk 33>;

			enable-method = "psci";

			operating-points-v2 = <&cluster1_opp>;

			#cooling-cells = <2>;

		};



		cpu3: cpu@101 {
@@ -76,7 +81,7 @@ 
		};

	};



	cluster0_opp: opp_table0 {

	cluster0_opp: opp-table0 {

		compatible = "operating-points-v2";

		opp-shared;
@@ -114,7 +119,7 @@ 
		};

	};



	cluster1_opp: opp_table1 {

	cluster1_opp: opp-table1 {

		compatible = "operating-points-v2";

		opp-shared;
@@ -165,6 +170,11 @@ 
		};

	};



	emmc_pwrseq: emmc-pwrseq {

		compatible = "mmc-pwrseq-emmc";

		reset-gpios = <&gpio 26 GPIO_ACTIVE_LOW>;

	};



	timer {

		compatible = "arm,armv8-timer";

		interrupts = <1 13 4>,
@@ -173,6 +183,40 @@ 
			     <1 10 4>;

	};



	thermal-zones {

		cpu-thermal {

			polling-delay-passive = <250>;	/* 250ms */

			polling-delay = <1000>;		/* 1000ms */

			thermal-sensors = <&pvtctl>;



			trips {

				cpu_crit: cpu-crit {

					temperature = <110000>;	/* 110C */

					hysteresis = <2000>;

					type = "critical";

				};

				cpu_alert: cpu-alert {

					temperature = <100000>;	/* 100C */

					hysteresis = <2000>;

					type = "passive";

				};

			};



			cooling-maps {

				map0 {

					trip = <&cpu_alert>;

					cooling-device = <&cpu0

					    THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

				};

				map1 {

					trip = <&cpu_alert>;

					cooling-device = <&cpu2

					    THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

				};

			};

		};

	};



	soc@0 {

		compatible = "simple-bus";

		#address-cells = <1>;
@@ -187,6 +231,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_uart0>;

			clocks = <&peri_clk 0>;

			resets = <&peri_rst 0>;

		};



		serial1: serial@54006900 {
@@ -197,6 +242,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_uart1>;

			clocks = <&peri_clk 1>;

			resets = <&peri_rst 1>;

		};



		serial2: serial@54006a00 {
@@ -207,6 +253,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_uart2>;

			clocks = <&peri_clk 2>;

			resets = <&peri_rst 2>;

		};



		serial3: serial@54006b00 {
@@ -217,6 +264,26 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_uart3>;

			clocks = <&peri_clk 3>;

			resets = <&peri_rst 3>;

		};



		gpio: gpio@55000000 {

			compatible = "socionext,uniphier-gpio";

			reg = <0x55000000 0x200>;

			interrupt-parent = <&aidet>;

			interrupt-controller;

			#interrupt-cells = <2>;

			gpio-controller;

			#gpio-cells = <2>;

			gpio-ranges = <&pinctrl 0 0 0>,

				      <&pinctrl 96 0 0>,

				      <&pinctrl 160 0 0>;

			gpio-ranges-group-names = "gpio_range0",

						  "gpio_range1",

						  "gpio_range2";

			ngpios = <205>;

			socionext,interrupt-ranges = <0 48 16>, <16 154 5>,

						     <21 217 3>;

		};



		adamv@57920000 {
@@ -240,6 +307,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_i2c0>;

			clocks = <&peri_clk 4>;

			resets = <&peri_rst 4>;

			clock-frequency = <100000>;

		};
@@ -253,6 +321,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_i2c1>;

			clocks = <&peri_clk 5>;

			resets = <&peri_rst 5>;

			clock-frequency = <100000>;

		};
@@ -263,6 +332,7 @@ 
			#size-cells = <0>;

			interrupts = <0 43 4>;

			clocks = <&peri_clk 6>;

			resets = <&peri_rst 6>;

			clock-frequency = <400000>;

		};
@@ -276,6 +346,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_i2c3>;

			clocks = <&peri_clk 7>;

			resets = <&peri_rst 7>;

			clock-frequency = <100000>;

		};
@@ -289,6 +360,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_i2c4>;

			clocks = <&peri_clk 8>;

			resets = <&peri_rst 8>;

			clock-frequency = <100000>;

		};
@@ -299,6 +371,7 @@ 
			#size-cells = <0>;

			interrupts = <0 25 4>;

			clocks = <&peri_clk 9>;

			resets = <&peri_rst 9>;

			clock-frequency = <400000>;

		};
@@ -356,9 +429,11 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_emmc>;

			clocks = <&sys_clk 4>;

			resets = <&sys_rst 4>;

			bus-width = <8>;

			mmc-ddr-1_8v;

			mmc-hs200-1_8v;

			mmc-pwrseq = <&emmc_pwrseq>;

			cdns,phy-input-delay-legacy = <4>;

			cdns,phy-input-delay-mmc-highspeed = <2>;

			cdns,phy-input-delay-mmc-ddr = <3>;
@@ -376,6 +451,24 @@ 
			};

		};



		soc-glue@5f900000 {

			compatible = "socionext,uniphier-ld20-soc-glue-debug",

				     "simple-mfd";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x5f900000 0x2000>;



			efuse@100 {

				compatible = "socionext,uniphier-efuse";

				reg = <0x100 0x28>;

			};



			efuse@200 {

				compatible = "socionext,uniphier-efuse";

				reg = <0x200 0x68>;

			};

		};



		aidet: aidet@5fc20000 {

			compatible = "socionext,uniphier-ld20-aidet";

			reg = <0x5fc20000 0x200>;
@@ -410,6 +503,13 @@ 
			watchdog {

				compatible = "socionext,uniphier-wdt";

			};



			pvtctl: pvtctl {

				compatible = "socionext,uniphier-ld20-thermal";

				interrupts = <0 3 4>;

				#thermal-sensor-cells = <0>;

				socionext,tmod-calibration = <0x0f22 0x68ee>;

			};

		};



		nand: nand@68000000 {
@@ -421,6 +521,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_nand>;

			clocks = <&sys_clk 2>;

			resets = <&sys_rst 2>;

		};

	};

};

arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts

+4 −0
Original line number Diff line number Diff line
@@ -60,3 +60,7 @@ 
&i2c3 {

	status = "okay";

};



&nand {

	status = "okay";

};