diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-06 16:25:00 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-06 16:25:00 +0200 |
| commit | 3cb06b30e4959abb43617a14e19b00aba89ffb07 (patch) | |
| tree | 7f213404861862298e3d879396513fb256e500ac /arch/arm/boot/dts/stih410.dtsi | |
| parent | f85e64b540711fdbed61f17ee88c533756a5bc9d (diff) | |
| parent | cae010a1b663a779fdbfbf625839bc07dad16428 (diff) | |
Merge tag 'sti-dt-for-v4.4-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti into next/dt
Merge "STi DT changes for v4.4, round 1" from Maxime Coquelin:
Highlights:
-----------
- Add multiple pinctrl configurations to STiH407
- Enable devices using pins only at board level
- Add HW RNG device nodes to STiH407 family
- Fix MMC0 clock configuration on STiH418
- Fix interrupt related bindings on STiH407
* tag 'sti-dt-for-v4.4-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti:
ARM: STi: STiH407: Enable the 2 HW Random Number Generators for STiH4{07, 10}
ARM: DT: STi: STiH418: Fix mmc0 clock configuration
ARM: STi: DT: STiH407: Rename incorrect interrupt related binding
ARM: STi: STiH407: Add spi default pinctrl groups.
ARM: DT: STiH407: Add RMII pinctrl support
ARM: DT: STiH407: Add pinconfig for IRB UHF and IRB TX
ARM: DT: STiH407: Add SD pinctrl config for mmc0 controller
ARM: DT: STiH407: Add systrace pin configuration
ARM: DT: STiH407: Add NAND flash controller pin configuration
ARM: DT: STiH407: Add SPI FSM (NOR Flash) Controller pin config
ARM: DT: STiH407: Add serial3 pinctrl configuration
ARM: DT: STiH407: Add SPI 3 wire and 4 wire pinctrl configs
ARM: STi: DT: STiH407: Add i2c3 alternate pin configs
ARM: STi: DT: STiH407: Add a cec0 pin definition
ARM: dts: stih410: Enable USB2.0 and related PHY nodes at board level
ARM: dts: stih407/410: Tidy up display nodes
ARM: dts: stih407: Enable PWM nodes only board level
Diffstat (limited to 'arch/arm/boot/dts/stih410.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/stih410.dtsi | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi index 8c6e61a27234..18ed1ad10d32 100644 --- a/arch/arm/boot/dts/stih410.dtsi +++ b/arch/arm/boot/dts/stih410.dtsi @@ -22,6 +22,8 @@ resets = <&softreset STIH407_PICOPHY_SOFTRESET>, <&picophyreset STIH407_PICOPHY0_RESET>; reset-names = "global", "port"; + + status = "disabled"; }; usb2_picophy2: phy3 { @@ -31,6 +33,8 @@ resets = <&softreset STIH407_PICOPHY_SOFTRESET>, <&picophyreset STIH407_PICOPHY1_RESET>; reset-names = "global", "port"; + + status = "disabled"; }; ohci0: usb@9a03c00 { @@ -43,6 +47,8 @@ reset-names = "power", "softreset"; phys = <&usb2_picophy1>; phy-names = "usb"; + + status = "disabled"; }; ehci0: usb@9a03e00 { @@ -57,6 +63,8 @@ reset-names = "power", "softreset"; phys = <&usb2_picophy1>; phy-names = "usb"; + + status = "disabled"; }; ohci1: usb@9a83c00 { @@ -69,6 +77,8 @@ reset-names = "power", "softreset"; phys = <&usb2_picophy2>; phy-names = "usb"; + + status = "disabled"; }; ehci1: usb@9a83e00 { @@ -83,19 +93,8 @@ reset-names = "power", "softreset"; phys = <&usb2_picophy2>; phy-names = "usb"; - }; - - /* Display */ - vtg_main: sti-vtg-main@8d02800 { - compatible = "st,vtg"; - reg = <0x8d02800 0x200>; - interrupts = <GIC_SPI 108 IRQ_TYPE_NONE>; - }; - vtg_aux: sti-vtg-aux@8d00200 { - compatible = "st,vtg"; - reg = <0x8d00200 0x100>; - interrupts = <GIC_SPI 109 IRQ_TYPE_NONE>; + status = "disabled"; }; sti-display-subsystem { |