diff options
| author | Olof Johansson <olof@lixom.net> | 2016-12-07 12:34:30 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-12-07 12:34:30 -0800 |
| commit | dd1551b65023dbe98d1bc77e36000e7aa795e8c7 (patch) | |
| tree | 0647339533ddcddc231e8f9cc104494343d34e03 /arch/arm | |
| parent | 3c10608aafa3014466deee7e9a6b8b977de1a304 (diff) | |
| parent | e4ce904d6289f2a72affd2a0f0a44da6e5d0cce4 (diff) | |
| download | blackbird-op-linux-dd1551b65023dbe98d1bc77e36000e7aa795e8c7.tar.gz blackbird-op-linux-dd1551b65023dbe98d1bc77e36000e7aa795e8c7.zip | |
Merge tag 'davinci-for-v4.10/dt-4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt
- Add device tree nodes for pin pull-up/pull-down
bias control on DA850.
- Enable high speed support on DA850 MMC/SD
* tag 'davinci-for-v4.10/dt-4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: dts: da850: enable high speed for mmc
ARM: dts: da850: Add node for pullup/pulldown pinconf
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/da850.dtsi | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi index 4070619d823b..104155d12c2f 100644 --- a/arch/arm/boot/dts/da850.dtsi +++ b/arch/arm/boot/dts/da850.dtsi @@ -317,6 +317,8 @@ mmc0: mmc@40000 { compatible = "ti,da830-mmc"; reg = <0x40000 0x1000>; + cap-sd-highspeed; + cap-mmc-highspeed; interrupts = <16>; dmas = <&edma0 16 0>, <&edma0 17 0>; dma-names = "rx", "tx"; @@ -325,6 +327,8 @@ mmc1: mmc@21b000 { compatible = "ti,da830-mmc"; reg = <0x21b000 0x1000>; + cap-sd-highspeed; + cap-mmc-highspeed; interrupts = <72>; dmas = <&edma1 28 0>, <&edma1 29 0>; dma-names = "rx", "tx"; @@ -435,6 +439,11 @@ ti,davinci-gpio-unbanked = <0>; status = "disabled"; }; + pinconf: pin-controller@22c00c { + compatible = "ti,da850-pupd"; + reg = <0x22c00c 0x8>; + status = "disabled"; + }; mcasp0: mcasp@100000 { compatible = "ti,da830-mcasp-audio"; |
