diff options
| author | Neil Armstrong <narmstrong@baylibre.com> | 2020-04-20 15:44:41 +0200 |
|---|---|---|
| committer | Neil Armstrong <narmstrong@baylibre.com> | 2020-04-28 10:23:10 +0200 |
| commit | 3a7d6a9c8f90cf260c7fe4abf921028c8775233b (patch) | |
| tree | 2db49f1a4d656d02379d2bb4b86bc0c202c970e5 /arch/arm/dts/meson-sm1-sei610.dts | |
| parent | df42f321390411285dac3df603f6eb583d593481 (diff) | |
arm64: dts: meson: sync dt and bindings from v5.7-rc1
Sync the device tree and dt-bindings from Linux v5.7-rc1 8f3d9f354286
("Linux 5.7-rc1").
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Diffstat (limited to 'arch/arm/dts/meson-sm1-sei610.dts')
| -rw-r--r-- | arch/arm/dts/meson-sm1-sei610.dts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/dts/meson-sm1-sei610.dts b/arch/arm/dts/meson-sm1-sei610.dts index a8bb3fa9fec..dfb2438851c 100644 --- a/arch/arm/dts/meson-sm1-sei610.dts +++ b/arch/arm/dts/meson-sm1-sei610.dts @@ -518,7 +518,7 @@ /* eMMC */ &sd_emmc_c { status = "okay"; - pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; + pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>; pinctrl-1 = <&emmc_clk_gate_pins>; pinctrl-names = "default", "clk-gate"; @@ -593,6 +593,7 @@ compatible = "brcm,bcm43438-bt"; interrupt-parent = <&gpio_intc>; interrupts = <95 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "host-wakeup"; shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; max-speed = <2000000>; clocks = <&wifi32k>; |