diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-20 10:58:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-20 10:58:59 -0400 |
| commit | 41a66072c32978ff3914fd6be88f7592ef64bef7 (patch) | |
| tree | 0f38ef433f0feea3e58f61f8d5397cd9bf065559 /arch/arm/boot/dts/stih410.dtsi | |
| parent | 5465fe0fc3316f7cdda66732a7986f4ebe76d949 (diff) | |
| parent | 7597cdc066313bfd211cca2f9252dfeb41271391 (diff) | |
Merge branch 'efi/urgent' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/stih410.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/stih410.dtsi | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi index 18ed1ad10d32..40318869c733 100644 --- a/arch/arm/boot/dts/stih410.dtsi +++ b/arch/arm/boot/dts/stih410.dtsi | |||
| @@ -41,7 +41,8 @@ | |||
| 41 | compatible = "st,st-ohci-300x"; | 41 | compatible = "st,st-ohci-300x"; |
| 42 | reg = <0x9a03c00 0x100>; | 42 | reg = <0x9a03c00 0x100>; |
| 43 | interrupts = <GIC_SPI 180 IRQ_TYPE_NONE>; | 43 | interrupts = <GIC_SPI 180 IRQ_TYPE_NONE>; |
| 44 | clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>; | 44 | clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>, |
| 45 | <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>; | ||
| 45 | resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>, | 46 | resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>, |
| 46 | <&softreset STIH407_USB2_PORT0_SOFTRESET>; | 47 | <&softreset STIH407_USB2_PORT0_SOFTRESET>; |
| 47 | reset-names = "power", "softreset"; | 48 | reset-names = "power", "softreset"; |
| @@ -57,7 +58,8 @@ | |||
| 57 | interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>; | 58 | interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>; |
| 58 | pinctrl-names = "default"; | 59 | pinctrl-names = "default"; |
| 59 | pinctrl-0 = <&pinctrl_usb0>; | 60 | pinctrl-0 = <&pinctrl_usb0>; |
| 60 | clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>; | 61 | clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>, |
| 62 | <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>; | ||
| 61 | resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>, | 63 | resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>, |
| 62 | <&softreset STIH407_USB2_PORT0_SOFTRESET>; | 64 | <&softreset STIH407_USB2_PORT0_SOFTRESET>; |
| 63 | reset-names = "power", "softreset"; | 65 | reset-names = "power", "softreset"; |
| @@ -71,7 +73,8 @@ | |||
| 71 | compatible = "st,st-ohci-300x"; | 73 | compatible = "st,st-ohci-300x"; |
| 72 | reg = <0x9a83c00 0x100>; | 74 | reg = <0x9a83c00 0x100>; |
| 73 | interrupts = <GIC_SPI 181 IRQ_TYPE_NONE>; | 75 | interrupts = <GIC_SPI 181 IRQ_TYPE_NONE>; |
| 74 | clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>; | 76 | clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>, |
| 77 | <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>; | ||
| 75 | resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>, | 78 | resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>, |
| 76 | <&softreset STIH407_USB2_PORT1_SOFTRESET>; | 79 | <&softreset STIH407_USB2_PORT1_SOFTRESET>; |
| 77 | reset-names = "power", "softreset"; | 80 | reset-names = "power", "softreset"; |
| @@ -87,7 +90,8 @@ | |||
| 87 | interrupts = <GIC_SPI 153 IRQ_TYPE_NONE>; | 90 | interrupts = <GIC_SPI 153 IRQ_TYPE_NONE>; |
| 88 | pinctrl-names = "default"; | 91 | pinctrl-names = "default"; |
| 89 | pinctrl-0 = <&pinctrl_usb1>; | 92 | pinctrl-0 = <&pinctrl_usb1>; |
| 90 | clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>; | 93 | clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>, |
| 94 | <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>; | ||
| 91 | resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>, | 95 | resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>, |
| 92 | <&softreset STIH407_USB2_PORT1_SOFTRESET>; | 96 | <&softreset STIH407_USB2_PORT1_SOFTRESET>; |
| 93 | reset-names = "power", "softreset"; | 97 | reset-names = "power", "softreset"; |