ARM: am335x: Add phyCORE AM335x R2 support
Subsystems (3)
PATCH v7 1/1 ARM: am335x: Add phyCORE AM335x R2 support
From: Niel Fourie <[email protected]>
Support for Phytech phyCORE AM335x R2 SOM (PCL060) on the Phytec phyBOARD-Wega AM335x.
CPU : AM335X-GP rev 2.1 Model: Phytec AM335x phyBOARD-WEGA DRAM: 256 MiB NAND: 256 MiB MMC: OMAP SD/MMC: 0 eth0: ethernet at 4a100000
Working:
- Eth0
- i2C
- MMC/SD
- NAND
- UART
- USB (host)
Device trees were taken from Linux mainline:
commit 37624b58542f ("Linux 5.1-rc7")
---
Notes:
Notes:
Changes for v7:
- commands dhcp, ping added by default
- dm-pre-reloc added for i2c0
- console changed to ttyO0 and other nit picks fix
Changes for v6:
- RAM initialisation reworked to detect available memory
- Remove memory section from am335x-wega-rdk-u-boot.dtsi
Changes for v5:
- Revert proposed moving of sections to am33xx-u-boot.dtsi
- Remove redundant/incorrect lines from am33xx-u-boot.dtsi
- Add missing changelog
Changes for v4:
- Propose abstracting common sections to am33xx-u-boot.dtsi
- Remove dead Falcon mode code
- Remove non-DM I2C support for TPS65910 I2C
Changes for v3:
- Added kernel revision of upstream Linux dtsi files
- Place TARGET_PHYCORE_AM335X_R2 alphabetically in Kconfig
- Rework TPS65910 I2C init code
- Remove non-DM USB board macros
- Minor tweaks
Changes for v2:
- Remove formatting changes to upstream Linux dtsi files
- Remove incorrectly added MACH_TYPE
- Rename board from phycore_pcl060 to phycore_am335x_r2
- Implement selecting memory size from device tree
- Remove non-DM Ethernet board code
- General clean-up
arch/arm/dts/Makefile | 3 +- arch/arm/dts/am335x-phycore-som.dtsi | 322 +++++++++++++++++++++ arch/arm/dts/am335x-wega-rdk-u-boot.dtsi | 31 ++ arch/arm/dts/am335x-wega-rdk.dts | 23 ++ arch/arm/dts/am335x-wega.dtsi | 230 +++++++++++++++ arch/arm/mach-omap2/Kconfig | 1 + arch/arm/mach-omap2/am33xx/Kconfig | 7 + board/phytec/phycore_am335x_r2/Kconfig | 15 + board/phytec/phycore_am335x_r2/MAINTAINERS | 7 + board/phytec/phycore_am335x_r2/Makefile | 11 + board/phytec/phycore_am335x_r2/board.c | 260 +++++++++++++++++ board/phytec/phycore_am335x_r2/board.h | 24 ++ board/phytec/phycore_am335x_r2/mux.c | 117 ++++++++ configs/phycore-am335x-r2-wega_defconfig | 81 ++++++ include/configs/phycore_am335x_r2.h | 130 +++++++++ 15 files changed, 1261 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/am335x-phycore-som.dtsi create mode 100644 arch/arm/dts/am335x-wega-rdk-u-boot.dtsi create mode 100644 arch/arm/dts/am335x-wega-rdk.dts create mode 100644 arch/arm/dts/am335x-wega.dtsi create mode 100644 board/phytec/phycore_am335x_r2/Kconfig create mode 100644 board/phytec/phycore_am335x_r2/MAINTAINERS create mode 100644 board/phytec/phycore_am335x_r2/Makefile create mode 100644 board/phytec/phycore_am335x_r2/board.c create mode 100644 board/phytec/phycore_am335x_r2/board.h create mode 100644 board/phytec/phycore_am335x_r2/mux.c create mode 100644 configs/phycore-am335x-r2-wega_defconfig create mode 100644 include/configs/phycore_am335x_r2.h
arch/arm/dts/Makefile +2 -1
@@ -287,7 +287,8 @@ dtb-$(CONFIG_AM33XX) += \ am335x-chiliboard.dtb \ am335x-sl50.dtb \ am335x-base0033.dtb \ - am335x-guardian.dtb + am335x-guardian.dtb \ + am335x-wega-rdk.dtb dtb-$(CONFIG_AM43XX) += am437x-gp-evm.dtb am437x-sk-evm.dtb \ am43x-epos-evm.dtb \ am437x-idk-evm.dtb \
arch/arm/dts/am335x-phycore-som.dtsi new file +322 -0
322 lines not on this page · raw message
arch/arm/dts/am335x-wega-rdk-u-boot.dtsi new file +31 -0
@@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2019 DENX Software Engineering GmbH + */ + +/ { + chosen { + #address-cells = <1>; + #size-cells = <1>; + + bootargs = "console=ttyO0,115200 earlyprintk"; + stdout-path = &uart0; + }; + + ocp { + u-boot,dm-pre-reloc; + }; +}; + +&i2c0 { + u-boot,dm-pre-reloc; +}; + +&uart0 { + u-boot,dm-pre-reloc; +}; + +&mmc1 { + u-boot,dm-pre-reloc; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; +};
arch/arm/dts/am335x-wega-rdk.dts new file +23 -0
@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2015 Phytec Messtechnik GmbH + * Author: Teresa Remmet <[email protected]> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/dts-v1/; + +#include "am335x-phycore-som.dtsi" +#include "am335x-wega.dtsi" + +/* SoM */ +&i2c_eeprom { + status = "okay"; +}; + +&i2c_rtc { + status = "okay"; +};
arch/arm/dts/am335x-wega.dtsi new file +230 -0
230 lines not on this page · raw message
arch/arm/mach-omap2/Kconfig +1 -0
@@ -186,6 +186,7 @@ source "board/ti/am43xx/Kconfig" source "board/ti/am335x/Kconfig" source "board/compulab/cm_t335/Kconfig" source "board/compulab/cm_t43/Kconfig" +source "board/phytec/phycore_am335x_r2/Kconfig" config SPL_LDSCRIPT default "arch/arm/mach-omap2/u-boot-spl.lds"
arch/arm/mach-omap2/am33xx/Kconfig +7 -0
@@ -177,6 +177,13 @@ config TARGET_PEPPER select DM_SERIAL imply CMD_DM +config TARGET_PHYCORE_AM335X_R2 + bool "Support phyCORE AM335X R2" + select DM + select DM_GPIO + select DM_SERIAL + imply CMD_DM + config TARGET_PXM2 bool "Support pxm2" select BOARD_LATE_INIT
board/phytec/phycore_am335x_r2/Kconfig new file +15 -0
@@ -0,0 +1,15 @@ +if TARGET_PHYCORE_AM335X_R2 + +config SYS_BOARD + default "phycore_am335x_r2" + +config SYS_VENDOR + default "phytec" + +config SYS_SOC + default "am33xx" + +config SYS_CONFIG_NAME + default "phycore_am335x_r2" + +endif
board/phytec/phycore_am335x_r2/MAINTAINERS new file +7 -0
@@ -0,0 +1,7 @@ +phyCORE AM335x R2 WEGA BOARD +M: Niel Fourie <[email protected]> +M: Parthiban Nallathambi <[email protected]> +S: Maintained +F: board/phytec/phycore_am335x_r2 +F: include/configs/phycore_am335x_r2.h +F: configs/phycore-am335x-r2-wega_defconfig
board/phytec/phycore_am335x_r2/Makefile new file +11 -0
@@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Makefile +# +# Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ + +ifdef CONFIG_SPL_BUILD +obj-y += mux.o +endif + +obj-y += board.o
board/phytec/phycore_am335x_r2/board.c new file +260 -0
260 lines not on this page · raw message
board/phytec/phycore_am335x_r2/board.h new file +24 -0
@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* board.h +* +* Phytec phyCORE-AM335x (PCL060 / PCM060) boards information header +* +* Copyright (C) 2013 Lars Poeschel, Lemonage Software GmbH +* Copyright (C) 2019 DENX Software Engineering GmbH +*/ + +#ifndef _BOARD_H_ +#define _BOARD_H_ + +/* +* We have three pin mux functions that must exist. We must be able to enable +* uart0, for initial output and i2c0 to access the PMIC. We then have a main +* pinmux function that can be overridden to enable all other pinmux that +* is required on the board. +*/ +void enable_uart0_pin_mux (void ); +void enable_i2c0_pin_mux (void ); +void enable_board_pin_mux (void ); +void enable_cbmux_pin_mux (void ); +#endif
board/phytec/phycore_am335x_r2/mux.c new file +117 -0
117 lines not on this page · raw message
configs/phycore-am335x-r2-wega_defconfig new file +81 -0
81 lines not on this page · raw message
include/configs/phycore_am335x_r2.h new file +130 -0
130 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v7 1/1 ARM: am335x: Add phyCORE AM335x R2 support
Quoted 28 lines · Parthiban Nallathambi
From: Niel Fourie <[email protected]>
Support for Phytech phyCORE AM335x R2 SOM (PCL060) on the Phytec phyBOARD-Wega AM335x.
CPU : AM335X-GP rev 2.1 Model: Phytec AM335x phyBOARD-WEGA DRAM: 256 MiB NAND: 256 MiB MMC: OMAP SD/MMC: 0 eth0: ethernet at 4a100000Working:
- Eth0
- i2C
- MMC/SD
- NAND
- UART
- USB (host)Device trees were taken from Linux mainline:
commit37624b58542f("Linux 5.1-rc7")Signed-off-by Niel Fourie <[email protected]>Signed-off-by Parthiban Nallathambi <[email protected]>Reviewed-by Heiko Schocher <[email protected]>Reviewed-by Tom Rini <[email protected]>Tested-by Marek Vasut <[email protected]>
[...]
board/phytec/phycore_am335x_r2/board.c line 198
Quoted 11 lines
board/phytec/phycore_am335x_r2/board.c new file +11
-0+static void scale_vcores_generic (int freq) +{ +int sil_rev, mpu_vdd; + +/* +* We use a TPS65910 PMIC. For all MPU frequencies we support we use a +* CORE voltage of 1.10V. For MPU voltage we need to switch based on +* the frequency we are running at. +*/ +if (power_tps65910_init (0 )) +return ;
Did you verify that this does not silently fail ?
board/phytec/phycore_am335x_r2/board.c line 212
Quoted 13 lines
board/phytec/phycore_am335x_r2/board.c new file +13
-0+/* +* Depending on MPU clock and PG we will need a different +* VDD to drive at that speed. +*/ + sil_rev =readl (&cdev->deviceid) >>28 ; + mpu_vdd =am335x_get_tps65910_mpu_vdd (sil_rev, freq); + +/* Tell the TPS65910 to use i2c */ +tps65910_set_i2c_control (); + +/* First update MPU voltage. */ +if (tps65910_voltage_update (MPU , mpu_vdd)) +return ;
And the other ones here too ? Because if they do, the CPU will suffer undervolt and will be unstable, at least the models faster than 600 MHz.
Quoted 4 lines
board/phytec/phycore_am335x_r2/board.c new file +4
-0+/* Second, update the CORE voltage. */ +if (tps65910_voltage_update (CORE ,TPS65910_OP_REG_SEL_1_1_0 )) +return ; +}
[...]
Signature · 2 lines
Best regards, Marek Vasut
PATCH v7 1/1 ARM: am335x: Add phyCORE AM335x R2 support
In reply to Parthiban NallathambiQuoted 20 lines · Parthiban Nallathambi
From: Niel Fourie <[email protected]>
Support for Phytech phyCORE AM335x R2 SOM (PCL060) on the Phytec phyBOARD-Wega AM335x.
CPU : AM335X-GP rev 2.1 Model: Phytec AM335x phyBOARD-WEGA DRAM: 256 MiB NAND: 256 MiB MMC: OMAP SD/MMC: 0 eth0: ethernet at 4a100000Working:
- Eth0
- i2C
- MMC/SD
- NAND
- UART
- USB (host)
Quoted 8 lines
Device trees were taken from Linux mainline:
commit37624b58542f("Linux 5.1-rc7")Signed-off-by Niel Fourie <[email protected]>Signed-off-by Parthiban Nallathambi <[email protected]>Reviewed-by Heiko Schocher <[email protected]>Reviewed-by Tom Rini <[email protected]>Tested-by Marek Vasut <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190714/079532a4/attachment.sig>