On 15:27-20230731, Roger Quadros wrote:
> Sync all am642-evm/am642-sk related DT files
> with Linux v6.5-rc1.
>
> - drop timer1 in favor of main_timer0 in am64-main.dtsi.
> Need to delete clock & power domain properties of
> main_timer1 in -r5.dts else won't boot.
As we discussed in IRC, we should document the rationale
> - drop cpsw3g custom DT property 'mac_efuse' and custom
> DT node cpsw-phy-sel as driver picks these from standard
> property/node.
>
> Signed-off-by: Roger Quadros <rog...@kernel.org>
> ---
[...]
> diff --git a/arch/arm/dts/k3-am642-r5-evm.dts
> b/arch/arm/dts/k3-am642-r5-evm.dts
> index b49064181a..fd9e9a6489 100644
> --- a/arch/arm/dts/k3-am642-r5-evm.dts
> +++ b/arch/arm/dts/k3-am642-r5-evm.dts
Same with the evm and sk dts files.
> @@ -13,12 +13,17 @@
> / {
> chosen {
> stdout-path = "serial2:115200n8";
> - tick-timer = &timer1;
> };
>
> aliases {
> remoteproc0 = &sysctrler;
> remoteproc1 = &a53_0;
> + serial1 = &main_uart1;
> + serial2 = &main_uart0;
> + i2c0 = &main_i2c0;
> + mmc0 = &sdhci0;
> + mmc1 = &sdhci1;
> + ethernet0 = &cpsw_port1;
Why do we need any of these?
> };
>
> memory@80000000 {
We dont need this either.
> @@ -210,6 +215,13 @@
> AM64X_IOPAD(0x0144, PIN_OUTPUT, 4) /* (Y11)
> PRG1_PRU1_GPO15.RGMII2_TX_CTL */
> >;
> };
> +
> + main_i2c0_pins_default: main-i2c0-default-pins {
> + pinctrl-single,pins = <
> + AM64X_IOPAD(0x0260, PIN_INPUT_PULLUP, 0) /* (A18)
> I2C0_SCL */
> + AM64X_IOPAD(0x0264, PIN_INPUT_PULLUP, 0) /* (B18)
> I2C0_SDA */
> + >;
> + };
we should drop all the pinmuxes - they come in from board.dts.
> };
>
> &dmsc {
> @@ -227,6 +239,7 @@
> /delete-property/ clock-names;
> pinctrl-names = "default";
> pinctrl-0 = <&main_uart0_pins_default>;
> + current-speed = <115200>;
> status = "okay";
> };
>
> @@ -267,6 +280,10 @@
>
> /* EEPROM might be read before SYSFW is available */
> &main_i2c0 {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&main_i2c0_pins_default>;
> + clock-frequency = <400000>;
> /delete-property/ power-domains;
> };
We should be inheriting stuff from board.dts.
>
> @@ -282,4 +299,11 @@
> pinctrl-0 = <&main_usb0_pins_default>;
> };
>
> +&main_timer0 {
> + /delete-property/ clocks;
> + /delete-property/ assigned-clocks;
> + /delete-property/ assigned-clock-parents;
> + /delete-property/ power-domains;
This needs documentation.
> +};
> +
> #include "k3-am642-evm-u-boot.dtsi"
> diff --git a/arch/arm/dts/k3-am642-r5-sk.dts b/arch/arm/dts/k3-am642-r5-sk.dts
> index 32d4c31728..5487973e6e 100644
> --- a/arch/arm/dts/k3-am642-r5-sk.dts
> +++ b/arch/arm/dts/k3-am642-r5-sk.dts
> @@ -15,12 +15,17 @@
> / {
> chosen {
> stdout-path = "serial2:115200n8";
> - tick-timer = &timer1;
> };
>
> aliases {
> remoteproc0 = &sysctrler;
> remoteproc1 = &a53_0;
> + serial1 = &main_uart1;
> + serial2 = &main_uart0;
> + i2c0 = &main_i2c0;
> + mmc1 = &sdhci1;
> + ethernet0 = &cpsw_port1;
> + ethernet1 = &cpsw_port2;
> };
>
> memory@80000000 {
> @@ -178,6 +183,13 @@
> AM64X_IOPAD(0x0144, PIN_OUTPUT, 4) /* (Y11)
> PRG1_PRU1_GPO15.RGMII2_TX_CTL */
> >;
> };
> +
> + main_i2c0_pins_default: main-i2c0-default-pins {
> + pinctrl-single,pins = <
> + AM64X_IOPAD(0x0260, PIN_INPUT_PULLUP, 0) /* (A18)
> I2C0_SCL */
> + AM64X_IOPAD(0x0264, PIN_INPUT_PULLUP, 0) /* (B18)
> I2C0_SDA */
> + >;
> + };
> };
>
> &dmsc {
> @@ -189,12 +201,22 @@
> ti,secure-host;
> };
>
> +/* EEPROM might be read before SYSFW is available */
> +&main_i2c0 {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&main_i2c0_pins_default>;
> + clock-frequency = <400000>;
> + /delete-property/ power-domains;
> +};
> +
> &main_uart0 {
> /delete-property/ power-domains;
> /delete-property/ clocks;
> /delete-property/ clock-names;
> pinctrl-names = "default";
> pinctrl-0 = <&main_uart0_pins_default>;
> + current-speed = <115200>;
> status = "okay";
> };
>
> @@ -264,4 +286,11 @@
> };
> };
>
> +&main_timer0 {
> + /delete-property/ clocks;
> + /delete-property/ assigned-clocks;
> + /delete-property/ assigned-clock-parents;
> + /delete-property/ power-domains;
> +};
> +
> #include "k3-am642-sk-u-boot.dtsi"
Move the u-boot.dtsi include to the very top after board.dts is
included. - Same with the evm dts.
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5
849D 1736 249D
