diff options
| author | Ingo Molnar | 2018-01-30 15:08:27 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2018-01-30 15:08:27 +0100 |
| commit | 7e86548e2cc8d308cb75439480f428137151b0de (patch) | |
| tree | fa3bcdedb64f4642a21080bc2b4ddc69ce2b2285 /arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | |
| parent | x86/speculation: Simplify indirect_branch_prediction_barrier() (diff) | |
| parent | Linux 4.15 (diff) | |
| download | kernel-qcow2-linux-7e86548e2cc8d308cb75439480f428137151b0de.tar.gz kernel-qcow2-linux-7e86548e2cc8d308cb75439480f428137151b0de.tar.xz kernel-qcow2-linux-7e86548e2cc8d308cb75439480f428137151b0de.zip | |
Merge tag 'v4.15' into x86/pti, to be able to merge dependent changes
Time has come to switch PTI development over to a v4.15 base - we'll still
try to make sure that all PTI fixes backport cleanly to v4.14 and earlier.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts')
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts index 470f72bb863c..a5e9b955d5ed 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts @@ -216,7 +216,7 @@ /* eMMC */ &sd_emmc_c { status = "okay"; - pinctrl-0 = <&emmc_pins>; + pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; pinctrl-names = "default"; bus-width = <8>; |