diff options
| author | Olof Johansson <olof@lixom.net> | 2017-12-03 19:39:40 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-12-03 19:39:40 -0800 |
| commit | ee4c54d0912713f69da51bca922735846fac25a8 (patch) | |
| tree | f104d4891f39cd2f769458121d2d7ae4044a711e /arch/arm/boot/dts/omap3-igep0020-common.dtsi | |
| parent | 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (diff) | |
| parent | 81faa5566864e97a5578c4e08c07edf04239abcc (diff) | |
| download | linux-ee4c54d0912713f69da51bca922735846fac25a8.tar.gz linux-ee4c54d0912713f69da51bca922735846fac25a8.tar.bz2 linux-ee4c54d0912713f69da51bca922735846fac25a8.zip | |
Merge branch 'fixes' into for-next
* fixes: (27 commits)
firmware: arm_scpi: Revert updates made during v4.15 merge window
arm: dts: marvell: Add missing #phy-cells to usb-nop-xceiv
arm64: dts: sort vendor subdirectories in Makefile alphabetically
MAINTAINERS: exclude other Socionext SoC DT files from ARM/UNIPHIER entry
arm64: dts: uniphier: remove unnecessary interrupt-parent
arm64: dts: uniphier: correct on-board device IRQ number for PXs3
optee: fix invalid of_node_put() in optee_driver_init()
Revert "ARM: dts: imx53: add srtc node"
ARM: dts: vf610-zii-dev-rev-c: Fix the I2C EEPROM address
ARM: dts: am437x-cm-t43: Correct the dmas property of spi0
ARM: dts: am4372: Correct the interrupts_properties of McASP
ARM: dts: logicpd-somlv: Fix wl127x pinmux
ARM: dts: logicpd-som-lv: Fix gpmc addresses for NAND and enet
ARM: dts: Fix omap4 hang with GPS connected to USB by using wakeupgen
ARM: OMAP2+: Missing error code in omap_device_build()
ARM: AM33xx: PRM: Remove am33xx_pwrdm_read_prev_pwrst function
ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context
ARM: dts: NSP: Fix PPI interrupt types
ARM: dts: NSP: Disable AHCI controller for HR NSP boards
ARM: dts: r8a779x: Add '#reset-cells' in cpg-mssr
...
Diffstat (limited to 'arch/arm/boot/dts/omap3-igep0020-common.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/omap3-igep0020-common.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3-igep0020-common.dtsi b/arch/arm/boot/dts/omap3-igep0020-common.dtsi index 667f96245729..ecbec23af49f 100644 --- a/arch/arm/boot/dts/omap3-igep0020-common.dtsi +++ b/arch/arm/boot/dts/omap3-igep0020-common.dtsi @@ -58,6 +58,7 @@ compatible = "usb-nop-xceiv"; reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>; /* gpio_24 */ vcc-supply = <&hsusb1_power>; + #phy-cells = <0>; }; tfp410: encoder { |