Commit 27f98f3e authored by Andrew Davis's avatar Andrew Davis Committed by Vignesh Raghavendra
Browse files

arm64: dts: ti: k3-am64: Only set UART baud for used ports 



As the binding for "current-speed" states, this should only be used
when the baud rate of an attached device cannot be detected. This is
the case for our attached on-board USB-to-UART converter used for
early kernel console. For all other unconnected/disabled ports this
can be configured in userspace later, DT is not the place for device
configuration, especially when there are already standard ways to
set serial baud in userspace.

Remove setting baud for all disabled serial ports and move setting
it for the couple enabled ports down into the board files.

Signed-off-by: default avatarAndrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20230601184933.358731-1-afd@ti.com


Signed-off-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
parent 0ec1a48d

arch/arm64/boot/dts/ti/k3-am64-main.dtsi

+0 −7
Original line number Diff line number Diff line
@@ -377,7 +377,6 @@ main_uart0: serial@2800000 { 
		reg = <0x00 0x02800000 0x00 0x100>;

		interrupts = <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>;

		clock-frequency = <48000000>;

		current-speed = <115200>;

		power-domains = <&k3_pds 146 TI_SCI_PD_EXCLUSIVE>;

		clocks = <&k3_clks 146 0>;

		clock-names = "fclk";
@@ -389,7 +388,6 @@ main_uart1: serial@2810000 { 
		reg = <0x00 0x02810000 0x00 0x100>;

		interrupts = <GIC_SPI 179 IRQ_TYPE_LEVEL_HIGH>;

		clock-frequency = <48000000>;

		current-speed = <115200>;

		power-domains = <&k3_pds 152 TI_SCI_PD_EXCLUSIVE>;

		clocks = <&k3_clks 152 0>;

		clock-names = "fclk";
@@ -401,7 +399,6 @@ main_uart2: serial@2820000 { 
		reg = <0x00 0x02820000 0x00 0x100>;

		interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>;

		clock-frequency = <48000000>;

		current-speed = <115200>;

		power-domains = <&k3_pds 153 TI_SCI_PD_EXCLUSIVE>;

		clocks = <&k3_clks 153 0>;

		clock-names = "fclk";
@@ -413,7 +410,6 @@ main_uart3: serial@2830000 { 
		reg = <0x00 0x02830000 0x00 0x100>;

		interrupts = <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>;

		clock-frequency = <48000000>;

		current-speed = <115200>;

		power-domains = <&k3_pds 154 TI_SCI_PD_EXCLUSIVE>;

		clocks = <&k3_clks 154 0>;

		clock-names = "fclk";
@@ -425,7 +421,6 @@ main_uart4: serial@2840000 { 
		reg = <0x00 0x02840000 0x00 0x100>;

		interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>;

		clock-frequency = <48000000>;

		current-speed = <115200>;

		power-domains = <&k3_pds 155 TI_SCI_PD_EXCLUSIVE>;

		clocks = <&k3_clks 155 0>;

		clock-names = "fclk";
@@ -437,7 +432,6 @@ main_uart5: serial@2850000 { 
		reg = <0x00 0x02850000 0x00 0x100>;

		interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>;

		clock-frequency = <48000000>;

		current-speed = <115200>;

		power-domains = <&k3_pds 156 TI_SCI_PD_EXCLUSIVE>;

		clocks = <&k3_clks 156 0>;

		clock-names = "fclk";
@@ -449,7 +443,6 @@ main_uart6: serial@2860000 { 
		reg = <0x00 0x02860000 0x00 0x100>;

		interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;

		clock-frequency = <48000000>;

		current-speed = <115200>;

		power-domains = <&k3_pds 158 TI_SCI_PD_EXCLUSIVE>;

		clocks = <&k3_clks 158 0>;

		clock-names = "fclk";

arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ mcu_uart0: serial@4a00000 { 
		compatible = "ti,am64-uart", "ti,am654-uart";

		reg = <0x00 0x04a00000 0x00 0x100>;

		interrupts = <GIC_SPI 185 IRQ_TYPE_LEVEL_HIGH>;

		current-speed = <115200>;

		power-domains = <&k3_pds 149 TI_SCI_PD_EXCLUSIVE>;

		clocks = <&k3_clks 149 0>;

		clock-names = "fclk";
@@ -66,7 +65,6 @@ mcu_uart1: serial@4a10000 { 
		compatible = "ti,am64-uart", "ti,am654-uart";

		reg = <0x00 0x04a10000 0x00 0x100>;

		interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;

		current-speed = <115200>;

		power-domains = <&k3_pds 160 TI_SCI_PD_EXCLUSIVE>;

		clocks = <&k3_clks 160 0>;

		clock-names = "fclk";

arch/arm64/boot/dts/ti/k3-am642-evm.dts

+1 −0
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ &main_uart0 { 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&main_uart0_pins_default>;

	current-speed = <115200>;

};



/* main_uart1 is reserved for firmware usage */

arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts

+2 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ &main_uart0 { 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&main_uart0_pins_default>;

	current-speed = <115200>;

};



&main_uart1 {
@@ -258,6 +259,7 @@ &main_uart1 { 
	pinctrl-names = "default";

	pinctrl-0 = <&main_uart1_pins_default>;

	uart-has-rtscts;

	current-speed = <115200>;

};



&sdhci1 {

arch/arm64/boot/dts/ti/k3-am642-sk.dts

+1 −0
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ &main_uart0 { 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&main_uart0_pins_default>;

	current-speed = <115200>;

};



&main_uart1 {