diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-07-18 11:36:53 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-07-18 11:36:53 +0200 |
| commit | 1ed7d32763857fbdc8e406352404538e41050d22 (patch) | |
| tree | f97c5d8f548141bf7cdec0a9d7f22adb61da6efc /arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | |
| parent | 660da7c9228f685b2ebe664f9fd69aaddcc420b5 (diff) | |
| parent | 27aac20574110abfd594175a668dc58b23b2b14a (diff) | |
| download | talos-obmc-linux-1ed7d32763857fbdc8e406352404538e41050d22.tar.gz talos-obmc-linux-1ed7d32763857fbdc8e406352404538e41050d22.zip | |
Merge branch 'x86/boot' into x86/mm, to pick up interacting changes
The SME patches we are about to apply add some E820 logic, so merge in
pending E820 code changes first, to have a single code base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts')
| -rw-r--r-- | arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts index 4a27eb9102cd..2acb89a87d41 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts @@ -305,7 +305,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; + pinctrl-0 = <&mmc0_pins_a>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
