diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 14:34:03 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 14:37:17 +0100 |
| commit | a5494aed0d94a2e6b12be963d28b57cfffe0f9e9 (patch) | |
| tree | 3a3e9996fcd896ccb3261290af9d6aa880eb075d /arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | |
| parent | b295477e0026b92cceba642b111a3efd569d3cc5 (diff) | |
| parent | 9d59b708500fcb62d28e15b8c6333be620984d8b (diff) | |
Merge tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt
Pull "Amlogic 64-bit platforms: DT updates for v4.15" from Kevin Hilman:
- new SoC support: A113D
- new boards: Tronsmart Vega S96, Khadas vim2
- reserved memory fixups
- gpio-names cleanups
- MMC cleanups, enable high-speed modes
- misc cleanups
* tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
arm64: dts: meson-axg: add initial A113D SoC DT support
dt-bindings: arm: amlogic: Add Meson AXG binding
ARM64: dts: meson-gx: remove unnecessary uart compatible
ARM64: dts: meson-gx: remove unnecessary clocks properties
ARM64: dts: meson-gxl: Add alternate ARM Trusted Firmware reserved memory zone
ARM64: dts: meson-gxm: enable HS400 on the vim2
ARM64: dts: meson-gxbb-nexbox-a95x: Enable USB Nodes
dt-bindings: arm: amlogic: Add Tronsmart Vega S96 binding
ARM64: dts: meson-gxm: Add Vega S96 board
ARM64: dts: meson-gxm: Add support for Khadas VIM2
ARM64: dts: meson-gxl: Take eMMC data strobe out of eMMC pins
ARM64: dts: meson-gxl: adjust libretech-cc gpio-line-names
ARM64: dts: meson-gxl: adjust kvim gpio-line-names
ARM64: dts: meson-gxbb: adjust odroid-c2 gpio-line-names
ARM64: dts: meson-gxbb: adjust nanopi-k2 gpio-line-names
ARM64: dts: meson-gx: adjust gpio-ranges for TEST_N
ARM64: dts: meson-gx: remove gpio offset
ARM: dts: meson8: remove gpio offset
ARM64: dts: meson-gxl-libretech-cc: enable internal phy leds
ARM64: dts: meson-gxl-libretech-cc: enable saradc
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts')
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts index 38dfdde5c147..818954b1d57f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts @@ -88,6 +88,18 @@ }; }; + usb_pwr: regulator-usb-pwrs { + compatible = "regulator-fixed"; + + regulator-name = "USB_PWR"; + + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + + gpio = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + vddio_card: gpio-regulator { compatible = "regulator-gpio"; @@ -272,7 +284,7 @@ /* eMMC */ &sd_emmc_c { status = "okay"; - pinctrl-0 = <&emmc_pins>; + pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; pinctrl-1 = <&emmc_clk_gate_pins>; pinctrl-names = "default", "clk-gate"; @@ -294,3 +306,20 @@ pinctrl-0 = <&uart_ao_a_pins>; pinctrl-names = "default"; }; + +&usb0_phy { + status = "okay"; + phy-supply = <&usb_pwr>; +}; + +&usb1_phy { + status = "okay"; +}; + +&usb0 { + status = "okay"; +}; + +&usb1 { + status = "okay"; +}; |