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

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

Merge tag 'sti-dt-for-v4.17-round1' of... 

Merge tag 'sti-dt-for-v4.17-round1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/dt

Pull "STi dts update" from Patrice Chotard:

Fix all DT dtc warnings when building with W=1
For most of implicated node, the addition of a fake reg property
fixes these warnings.
For others nodes, their location in device tree
have been updated.

* tag 'sti-dt-for-v4.17-round1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
  ARM: dts: STi: Remove unused clk_ext2f_a9 clock
  ARM: dts: STi: Update clocks node location
  ARM: dts: STi: Update sound related nodes location
  ARM: dts: STi: Add fake reg property for usb2_picophyX nodes
  ARM: dts: STi: Add fake reg for restart, powerdown and picophy/softreset
  ARM: dts: STi: Add fake reg property for remote processors
  ARM: dts: STi: Add fake reg property for irq-syscfg
  ARM: dts: STi: Add fake reg property for miphy28lp_phy
  ARM: dts: STi: Add fake reg property for sti-display-subsystem
  ARM: dts: STi: Move leds node outside soc node
  ARM: dts: STi: Fix bindings notation
parents d6bdd009 0e04ce02

arch/arm/boot/dts/stih407-b2120.dts

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
		linux,stdout-path = &sbc_serial0;

	};



	memory {

	memory@40000000 {

		device_type = "memory";

		reg = <0x40000000 0x80000000>;

	};

arch/arm/boot/dts/stih407-clock.dtsi

+41 −51
Original line number Diff line number Diff line
@@ -7,11 +7,6 @@ 
 */

#include <dt-bindings/clock/stih407-clks.h>

/ {

	clocks {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



	/*

	 * Fixed 30MHz oscillator inputs to SoC

	 */
@@ -21,18 +16,17 @@ 
		clock-frequency = <30000000>;

	};



		/*

		 * ARM Peripheral clock for timers

		 */

		arm_periph_clk: clk-m-a9-periphs {

	clk_tmdsout_hdmi: clk-tmdsout-hdmi {

		#clock-cells = <0>;

			compatible = "fixed-factor-clock";



			clocks = <&clk_m_a9>;

			clock-div = <2>;

			clock-mult = <1>;

		compatible = "fixed-clock";

		clock-frequency = <0>;

	};



	clocks {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		/*

		 * A9 PLL.

		 */
@@ -62,32 +56,19 @@ 
				 <&clockgen_a9_pll 0>,

				 <&clk_s_c0_flexgen 13>,

				 <&clk_m_a9_ext2f_div2>;

		};





			/*

			 * ARM Peripheral clock for timers

			 */

		clk_m_a9_ext2f_div2: clk-m-a9-ext2f-div2s {

			arm_periph_clk: clk-m-a9-periphs {

				#clock-cells = <0>;

				compatible = "fixed-factor-clock";



			clocks = <&clk_s_c0_flexgen 13>;



			clock-output-names = "clk-m-a9-ext2f-div2";



				clocks = <&clk_m_a9>;

				clock-div = <2>;

				clock-mult = <1>;

			};



		/*

		 * Bootloader initialized system infrastructure clock for

		 * serial devices.

		 */

		clk_ext2f_a9: clockgen-c0@13 {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <200000000>;

			clock-output-names = "clk-s-icn-reg-0";

		};



		clockgen-a@90ff000 {
@@ -204,6 +185,21 @@ 
						 <CLK_EXT2F_A9>,

						 <CLK_ICN_LMI>,

						 <CLK_ICN_SBC>;



				/*

				 * ARM Peripheral clock for timers

				 */

				clk_m_a9_ext2f_div2: clk-m-a9-ext2f-div2s {

					#clock-cells = <0>;

					compatible = "fixed-factor-clock";



					clocks = <&clk_s_c0_flexgen 13>;



					clock-output-names = "clk-m-a9-ext2f-div2";



					clock-div = <2>;

					clock-mult = <1>;

				};

			};

		};
@@ -254,13 +250,7 @@ 
					     "clk-s-d2-fs0-ch3";

		};



		clk_tmdsout_hdmi: clk-tmdsout-hdmi {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <0>;

		};



		clockgen-d2@x9106000 {

		clockgen-d2@9106000 {

			compatible = "st,clkgen-c32";

			reg = <0x9106000 0x1000>;

arch/arm/boot/dts/stih407-family.dtsi

+26 −16
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
		clocks = <&arm_periph_clk>;

	};



	l2: cache-controller {

	l2: cache-controller@8762000 {

		compatible = "arm,pl310-cache";

		reg = <0x08762000 0x1000>;

		arm,data-latency = <3 3 3>;
@@ -125,24 +125,28 @@ 
		ranges;

		compatible = "simple-bus";



		restart {

		restart: restart-controller@0 {

			compatible = "st,stih407-restart";

			reg = <0 0>;

			st,syscfg = <&syscfg_sbc_reg>;

			status = "okay";

		};



		powerdown: powerdown-controller {

		powerdown: powerdown-controller@0 {

			compatible = "st,stih407-powerdown";

			reg = <0 0>;

			#reset-cells = <1>;

		};



		softreset: softreset-controller {

		softreset: softreset-controller@0 {

			compatible = "st,stih407-softreset";

			reg = <0 0>;

			#reset-cells = <1>;

		};



		picophyreset: picophyreset-controller {

		picophyreset: picophyreset-controller@0 {

			compatible = "st,stih407-picophyreset";

			reg = <0 0>;

			#reset-cells = <1>;

		};
@@ -174,6 +178,13 @@ 
		syscfg_core: core-syscfg@92b0000 {

			compatible = "st,stih407-core-syscfg", "syscon";

			reg = <0x92b0000 0x1000>;



			sti_sasg_codec: sti-sasg-codec {

				compatible = "st,stih407-sas-codec";

				#sound-dai-cells = <1>;

				status = "disabled";

				st,syscfg = <&syscfg_core>;

			};

		};



		syscfg_lpm: lpm-syscfg@94b5100 {
@@ -181,8 +192,9 @@ 
			reg = <0x94b5100 0x1000>;

		};



		irq-syscfg {

		irq-syscfg@0 {

			compatible    = "st,stih407-irq-syscfg";

			reg = <0 0>;

			st,syscfg     = <&syscfg_core>;

			st,irq-device = <ST_IRQ_SYSCFG_PMU_0>,

					<ST_IRQ_SYSCFG_PMU_1>;
@@ -380,8 +392,9 @@ 
			status = "disabled";

		};



		usb2_picophy0: phy1 {

		usb2_picophy0: phy1@0 {

			compatible = "st,stih407-usb2-phy";

			reg = <0 0>;

			#phy-cells = <0>;

			st,syscfg = <&syscfg_core 0x100 0xf4>;

			resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
@@ -389,12 +402,13 @@ 
			reset-names = "global", "port";

		};



		miphy28lp_phy: miphy28lp@9b22000 {

		miphy28lp_phy: miphy28lp@0 {

			compatible = "st,miphy28lp-phy";

			st,syscfg = <&syscfg_core>;

			#address-cells	= <1>;

			#size-cells	= <1>;

			ranges;

			reg = <0 0>;



			phy_port0: port@9b22000 {

				reg = <0x9b22000 0xff>,
@@ -805,6 +819,7 @@ 


		st231_gp0: st231-gp0@0 {

			compatible	= "st,st231-rproc";

			reg		= <0 0>;

			memory-region	= <&gp0_reserved>;

			resets		= <&softreset STIH407_ST231_GP0_SOFTRESET>;

			reset-names	= "sw_reset";
@@ -818,6 +833,7 @@ 


		st231_delta: st231-delta@0 {

			compatible	= "st,st231-rproc";

			reg		= <0 0>;

			memory-region	= <&delta_reserved>;

			resets		= <&softreset STIH407_ST231_DMU_SOFTRESET>;

			reset-names	= "sw_reset";
@@ -885,13 +901,6 @@ 
			status = "disabled";

		};



		sti_sasg_codec: sti-sasg-codec {

			compatible = "st,stih407-sas-codec";

			#sound-dai-cells = <1>;

			status = "disabled";

			st,syscfg = <&syscfg_core>;

		};



		sti_uni_player0: sti-uni-player@8d80000 {

			compatible = "st,stih407-uni-player-hdmi";

			#sound-dai-cells = <0>;
@@ -980,8 +989,9 @@ 
			status = "disabled";

		};



		delta0 {

		delta0@0 {

			compatible = "st,st-delta";

			reg = <0 0>;

			clock-names = "delta",

				      "delta-st231",

				      "delta-flash-promip";

arch/arm/boot/dts/stih407-pinctrl.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
	};



	soc {

		pin-controller-sbc {

		pin-controller-sbc@961f080 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "st,stih407-sbc-pinctrl";
@@ -369,7 +369,7 @@ 
			};

		};



		pin-controller-front0 {

		pin-controller-front0@920f080 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "st,stih407-front-pinctrl";
@@ -929,7 +929,7 @@ 
			};

		};



		pin-controller-front1 {

		pin-controller-front1@921f080 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "st,stih407-front-pinctrl";
@@ -962,7 +962,7 @@ 
			};

		};



		pin-controller-rear {

		pin-controller-rear@922f080 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "st,stih407-rear-pinctrl";
@@ -1157,7 +1157,7 @@ 
			};

		};



		pin-controller-flash {

		pin-controller-flash@923f080 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "st,stih407-flash-pinctrl";

arch/arm/boot/dts/stih407.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -11,11 +11,11 @@ 
#include <dt-bindings/gpio/gpio.h>

/ {

	soc {

		sti-display-subsystem {

		sti-display-subsystem@0 {

			compatible = "st,sti-display-subsystem";

			#address-cells = <1>;

			#size-cells = <1>;



			reg = <0 0>;

			assigned-clocks	= <&clk_s_d2_quadfs 0>,

					  <&clk_s_d2_quadfs 1>,

					  <&clk_s_c0_pll1 0>,