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

Commit a4a1fb15 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sti-dt-for-4.10-round2' of... 

Merge tag 'sti-dt-for-4.10-round2' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/dt

STi dts update:

Change sound card name for B2120
Enable sound card for B2260
Remove stih415-clks.h
Identify critical clocks for STiH407
Fix typo in stih407-pinctrl.dtsi

* tag 'sti-dt-for-4.10-round2' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti

:
  ARM: dts: STiHxxx-b2120: change sound card name
  ARM: dts: STiH410-B2260: enable sound card
  ARM: dts: remove stih415-clks.h
  ARM: dts: stih407-clocks: Identify critical clocks
  ARM: dts: STiH407: DT fix s/interrupts-names/interrupt-names/

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0d28c600 64783ea7

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

+10 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
				clocks = <&clk_sysin>;



				clock-output-names = "clk-s-a0-pll-ofd-0";

				clock-critical = <0>; /* clk-s-a0-pll-ofd-0 */

			};



			clk_s_a0_flexgen: clk-s-a0-flexgen {
@@ -112,6 +113,7 @@ 
					 <&clk_sysin>;



				clock-output-names = "clk-ic-lmi0";

				clock-critical = <CLK_IC_LMI0>;

			};

		};
@@ -126,6 +128,7 @@ 
					     "clk-s-c0-fs0-ch1",

					     "clk-s-c0-fs0-ch2",

					     "clk-s-c0-fs0-ch3";

			clock-critical = <0>; /* clk-s-c0-fs0-ch0 */

		};



		clk_s_c0: clockgen-c@09103000 {
@@ -139,6 +142,7 @@ 
				clocks = <&clk_sysin>;



				clock-output-names = "clk-s-c0-pll0-odf-0";

				clock-critical = <0>; /* clk-s-c0-pll0-odf-0 */

			};



			clk_s_c0_pll1: clk-s-c0-pll1 {
@@ -194,6 +198,12 @@ 
						     "clk-main-disp",

						     "clk-aux-disp",

						     "clk-compo-dvp";

				clock-critical = <CLK_PROC_STFE>,

						 <CLK_ICN_CPU>,

						 <CLK_TX_ICN_DMU>,

						 <CLK_EXT2F_A9>,

						 <CLK_ICN_LMI>,

						 <CLK_ICN_SBC>;

			};

		};

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

+1 −1
Original line number Diff line number Diff line
@@ -1157,7 +1157,7 @@ 
			reg = <0x0923f080 0x4>;

			reg-names = "irqmux";

			interrupts = <GIC_SPI 192 IRQ_TYPE_NONE>;

			interrupts-names = "irqmux";

			interrupt-names = "irqmux";

			ranges = <0 0x09230000 0x3000>;



			pio40: gpio@09230000 {

arch/arm/boot/dts/stih410-b2260.dts

+22 −0
Original line number Diff line number Diff line
@@ -165,6 +165,9 @@ 
			status = "okay";

		};



		sti_uni_player0: sti-uni-player@8d80000 {

			status = "okay";

		};

		/* SSC11 to HDMI */

		hdmiddc: i2c@9541000 {

			/* HDMI V1.3a supports Standard mode only */
@@ -174,6 +177,25 @@ 
			status = "okay";

		};



		sound {

			compatible = "simple-audio-card";

			simple-audio-card,name = "STI-B2260";

			status = "okay";



			simple-audio-card,dai-link@0 {

				/* DAC */

				format = "i2s";

				mclk-fs = <128>;

				cpu {

					sound-dai = <&sti_uni_player0>;

				};



				codec {

					sound-dai = <&sti_hdmi>;

				};

			};

		};



		miphy28lp_phy: miphy28lp@9b22000 {



			phy_port1: port@9b2a000 {

arch/arm/boot/dts/stihxxx-b2120.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ 


		sound {

			compatible = "simple-audio-card";

			simple-audio-card,name = "sti audio card";

			simple-audio-card,name = "STI-B2120";

			status = "okay";



			simple-audio-card,dai-link@0 {

include/dt-bindings/clock/stih415-clks.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
/*

 * This header provides constants clk index STMicroelectronics

 * STiH415 SoC.

 */

#ifndef _CLK_STIH415

#define _CLK_STIH415



/* CLOCKGEN A0 */

#define CLK_ICN_REG		0

#define CLK_ETH1_PHY		4



/* CLOCKGEN A1 */

#define CLK_ICN_IF_2		0

#define CLK_GMAC0_PHY		3



#endif