OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4cfad55
)
ARM: dts: imx6ul-geam-kit: Remove re-enabled usdhc1
author
Jagan Teki
<jagan@amarulasolutions.com>
Fri, 16 Jun 2017 07:04:37 +0000
(12:34 +0530)
committer
Shawn Guo
<shawnguo@kernel.org>
Sun, 16 Jul 2017 01:42:12 +0000
(09:42 +0800)
usdhc1 is enabled and assigned pinctrl-0 on imx6ul-geam.dtsi
but same thing done on imx6ul-geam-kit.dts, so remove this
re-enabled node from the same.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/imx6ul-geam-kit.dts
patch
|
blob
|
history
diff --git
a/arch/arm/boot/dts/imx6ul-geam-kit.dts
b/arch/arm/boot/dts/imx6ul-geam-kit.dts
index
142e60c
..
40de2d7
100644
(file)
--- a/
arch/arm/boot/dts/imx6ul-geam-kit.dts
+++ b/
arch/arm/boot/dts/imx6ul-geam-kit.dts
@@
-88,12
+88,6
@@
};
};
-&usdhc1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usdhc1>;
- status = "okay";
-};
-
&tsc {
measure-delay-time = <0x1ffff>;
pre-charge-time = <0x1fff>;