projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pm-cpufreq'
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
kirkwood-ns2-common.dtsi
diff --git
a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index e6e5ec4fe6b9e005b9c37ced8fda18f31bb5fbe0..fe6c0246db1ab4749bf453b7e312dbd6ca5667ae 100644
(file)
--- a/
arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/
arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@
-4,10
+4,11
@@
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
};
ocp@f1000000 {
};
ocp@f1000000 {
- pinctrl: pin
ctrl
@10000 {
+ pinctrl: pin
-controller
@10000 {
pmx_ns2_sata0: pmx-ns2-sata0 {
marvell,pins = "mpp21";
marvell,function = "sata0";
pmx_ns2_sata0: pmx-ns2-sata0 {
marvell,pins = "mpp21";
marvell,function = "sata0";
@@
-19,14
+20,10
@@
};
serial@12000 {
};
serial@12000 {
- pinctrl-0 = <&pmx_uart0>;
- pinctrl-names = "default";
status = "okay";
};
spi@10600 {
status = "okay";
};
spi@10600 {
- pinctrl-0 = <&pmx_spi>;
- pinctrl-names = "default";
status = "okay";
flash@0 {
status = "okay";
flash@0 {
@@
-45,8
+42,6
@@
};
i2c@11000 {
};
i2c@11000 {
- pinctrl-0 = <&pmx_twsi0>;
- pinctrl-names = "default";
status = "okay";
eeprom@50 {
status = "okay";
eeprom@50 {