Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code »

Commit 25bcda837ac0aaed8fe5706f3e10ba2e76633bbd

Authored by Jisheng Zhang
Committed by Greg Kroah-Hartman
1 parent 4cb194fd5a

ARM: dts: berlin: add broken-cd and set bus width for eMMC in Marvell DMP DT 

commit 5adba7c2daaecccf377e7ed5a2996caedd5384f1 upstream.

There's no card detection for the eMMC, so this patch adds the missing
broken-cd property. This patch also sets bus width as 8 to add
MMC_CAP_8_BIT_DATA in the Host capabilities.

Fixes: 3047086dfd56 ("ARM: dts: berlin: enable SD card reader and eMMC for the BG2Q DMP")
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 2 additions and 0 deletions Inline Diff

arch/arm/boot/dts/berlin2q-marvell-dmp.dts
Diff comments   View file @ 25bcda8
1 /* 1 /*
2 * Copyright (C) 2014 Antoine Ténart <antoine.tenart@free-electrons.com> 2 * Copyright (C) 2014 Antoine Ténart <antoine.tenart@free-electrons.com>
3 * 3 *
4 * This file is licensed under the terms of the GNU General Public 4 * This file is licensed under the terms of the GNU General Public
5 * License version 2. This program is licensed "as is" without any 5 * License version 2. This program is licensed "as is" without any
6 * warranty of any kind, whether express or implied. 6 * warranty of any kind, whether express or implied.
7 */ 7 */
8 8
9 /dts-v1/; 9 /dts-v1/;
10 #include "berlin2q.dtsi" 10 #include "berlin2q.dtsi"
11 11
12 / { 12 / {
13 model = "Marvell BG2-Q DMP"; 13 model = "Marvell BG2-Q DMP";
14 compatible = "marvell,berlin2q-dmp", "marvell,berlin2q", "marvell,berlin"; 14 compatible = "marvell,berlin2q-dmp", "marvell,berlin2q", "marvell,berlin";
15 15
16 memory { 16 memory {
17 device_type = "memory"; 17 device_type = "memory";
18 reg = <0x00000000 0x80000000>; 18 reg = <0x00000000 0x80000000>;
19 }; 19 };
20 20
21 choosen { 21 choosen {
22 bootargs = "console=ttyS0,115200 earlyprintk"; 22 bootargs = "console=ttyS0,115200 earlyprintk";
23 }; 23 };
24 }; 24 };
25 25
26 &sdhci1 { 26 &sdhci1 {
27 broken-cd; 27 broken-cd;
28 sdhci,wp-inverted; 28 sdhci,wp-inverted;
29 status = "okay"; 29 status = "okay";
30 }; 30 };
31 31
32 &sdhci2 { 32 &sdhci2 {
33 broken-cd;
34 bus-width = <8>;
33 non-removable; 35 non-removable;
34 status = "okay"; 36 status = "okay";
35 }; 37 };
36 38
37 &i2c0 { 39 &i2c0 {
38 status = "okay"; 40 status = "okay";
39 }; 41 };
40 42
41 &i2c2 { 43 &i2c2 {
42 status = "okay"; 44 status = "okay";
43 }; 45 };
44 46
45 &uart0 { 47 &uart0 {
46 status = "okay"; 48 status = "okay";
47 }; 49 };
48 50
49 &eth0 { 51 &eth0 {
50 status = "okay"; 52 status = "okay";
51 }; 53 };
52 54