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

Commit 56fe27be authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sti-dt-fixes-for-v4.8-rcs' of... 

Merge tag 'sti-dt-fixes-for-v4.8-rcs' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into fixes

Pull "Handle STiH410 interconnect clock required for EHCI/OHCI and SDHCI" from Patrice Chotard:

With the introduction of critical-clock support in v4.8, our developers'
default configuration is to run with 'clk_ignore_unused' removed.  This
patch-set ensures they can achieve successful boot when a) booting from
an SD Card and when b) booting using USB->Eth adaptors for NFS booting.

* tag 'sti-dt-fixes-for-v4.8-rcs' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
  ARM: dts: STiH407-family: Provide interconnect clock for consumption in ST SDHCI
  ARM: dts: STiH410: Handle interconnect clock required by EHCI/OHCI (USB)
parents d31449a5 78567f13

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

+6 −4
Original line number Diff line number Diff line
@@ -550,8 +550,9 @@ 
			interrupt-names = "mmcirq";

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_mmc0>;

			clock-names = "mmc";

			clocks = <&clk_s_c0_flexgen CLK_MMC_0>;

			clock-names = "mmc", "icn";

			clocks = <&clk_s_c0_flexgen CLK_MMC_0>,

				 <&clk_s_c0_flexgen CLK_RX_ICN_HVA>;

			bus-width = <8>;

			non-removable;

		};
@@ -565,8 +566,9 @@ 
			interrupt-names = "mmcirq";

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_sd1>;

			clock-names = "mmc";

			clocks = <&clk_s_c0_flexgen CLK_MMC_1>;

			clock-names = "mmc", "icn";

			clocks = <&clk_s_c0_flexgen CLK_MMC_1>,

				 <&clk_s_c0_flexgen CLK_RX_ICN_HVA>;

			resets = <&softreset STIH407_MMC1_SOFTRESET>;

			bus-width = <4>;

		};

arch/arm/boot/dts/stih410.dtsi

+8 −4
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ 
			compatible = "st,st-ohci-300x";

			reg = <0x9a03c00 0x100>;

			interrupts = <GIC_SPI 180 IRQ_TYPE_NONE>;

			clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;

			clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,

				 <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;

			resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>,

				 <&softreset STIH407_USB2_PORT0_SOFTRESET>;

			reset-names = "power", "softreset";
@@ -57,7 +58,8 @@ 
			interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_usb0>;

			clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;

			clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,

				 <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;

			resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>,

				 <&softreset STIH407_USB2_PORT0_SOFTRESET>;

			reset-names = "power", "softreset";
@@ -71,7 +73,8 @@ 
			compatible = "st,st-ohci-300x";

			reg = <0x9a83c00 0x100>;

			interrupts = <GIC_SPI 181 IRQ_TYPE_NONE>;

			clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;

			clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,

				 <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;

			resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>,

				 <&softreset STIH407_USB2_PORT1_SOFTRESET>;

			reset-names = "power", "softreset";
@@ -87,7 +90,8 @@ 
			interrupts = <GIC_SPI 153 IRQ_TYPE_NONE>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_usb1>;

			clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;

			clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,

				 <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;

			resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>,

				 <&softreset STIH407_USB2_PORT1_SOFTRESET>;

			reset-names = "power", "softreset";