Commit 9fae6bc0 authored by Jason Cooper's avatar Jason Cooper Committed by Greg Kroah-Hartman

ARM: kirkwood: of_serial: fix clock gating by removing clock-frequency

commit 93fff4ce upstream.

When DT support for kirkwood was first introduced, there was no clock
infrastructure.  As a result, we had to manually pass the
clock-frequency to the driver from the device node.

Unfortunately, on kirkwood, with minimal config or all module configs,
clock-frequency breaks booting because of_serial doesn't consume the
gate_clk when clock-frequency is defined.

The end result on kirkwood is that runit gets gated, and then the boot
fails when the kernel tries to write to the serial port.

Fix the issue by removing the clock-frequency parameter from all
kirkwood dts files.

Booted on dreamplug without earlyprintk and successfully logged in via
ttyS0.
Reported-by: default avatarSimon Baatz <gmbnomis@gmail.com>
Tested-by: default avatarSimon Baatz <gmbnomis@gmail.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f64d7275
......@@ -42,12 +42,10 @@ orange-usb {
ocp@f1000000 {
serial@12000 {
clock-frequency = <166666667>;
status = "okay";
};
serial@12100 {
clock-frequency = <166666667>;
status = "okay";
};
};
......
......@@ -50,7 +50,6 @@ lm75: lm75@48 {
};
};
serial@12000 {
clock-frequency = <200000000>;
status = "okay";
};
};
......
......@@ -37,7 +37,6 @@ pmx_led_orange: pmx-led-orange {
};
};
serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};
......
......@@ -38,7 +38,6 @@ pmx_led_wifi_ap: pmx-led-wifi-ap {
};
};
serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};
......
......@@ -73,7 +73,6 @@ pmx_led_orange: pmx-led_orange {
};
};
serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};
......
......@@ -51,7 +51,6 @@ pmx_button_usb_copy: pmx-button-usb-copy {
};
};
serial@12000 {
clock-frequency = <200000000>;
status = "okay";
};
......
......@@ -78,7 +78,6 @@ lm63: lm63@4c {
};
};
serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};
......
......@@ -115,7 +115,6 @@ lm63: lm63@4c {
};
serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};
......
......@@ -34,7 +34,6 @@ pmx_i2c_gpio_scl: pmx-gpio-scl {
};
serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};
......
......@@ -13,7 +13,6 @@ memory {
ocp@f1000000 {
serial@12000 {
clock-frequency = <166666667>;
status = "okay";
};
};
......
......@@ -13,7 +13,6 @@ memory {
ocp@f1000000 {
serial@12000 {
clock-frequency = <200000000>;
status = "okay";
};
};
......
......@@ -91,7 +91,6 @@ eeprom@57 {
};
serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};
......
......@@ -23,7 +23,6 @@ pmx_ns2_sata1: pmx-ns2-sata1 {
};
serial@12000 {
clock-frequency = <166666667>;
status = "okay";
};
......
......@@ -18,7 +18,6 @@ chosen {
ocp@f1000000 {
serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};
......
......@@ -18,12 +18,10 @@ chosen {
ocp@f1000000 {
serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};
serial@12100 {
clock-frequency = <200000000>;
status = "ok";
};
......
......@@ -17,7 +17,6 @@ chosen {
ocp@f1000000 {
serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};
......
......@@ -59,7 +59,6 @@ serial@12000 {
reg-shift = <2>;
interrupts = <33>;
clocks = <&gate_clk 7>;
/* set clock-frequency in board dts */
status = "disabled";
};
......@@ -69,7 +68,6 @@ serial@12100 {
reg-shift = <2>;
interrupts = <34>;
clocks = <&gate_clk 7>;
/* set clock-frequency in board dts */
status = "disabled";
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment