Skip to contentSkip to conversation

ARM: am335x: Add phyCORE AM335x R2 support

PATCH Superseded Niel Fourie 2 participants 3 messages Apr 25, 2019 – May 2, 2019

Subsystems (3)

v2 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ARM: am335x: Add phyCORE AM335x R2 support

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)

---
 arch/arm/dts/Makefile                      |   3 +-
 arch/arm/dts/am335x-phycore-som.dtsi       | 322 +++++++++++++++++++++
 arch/arm/dts/am335x-wega-rdk-u-boot.dtsi   |  40 +++
 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     | 262 +++++++++++++++++
 board/phytec/phycore_am335x_r2/board.h     |  24 ++
 board/phytec/phycore_am335x_r2/mux.c       | 117 ++++++++
 configs/phycore-am335x-r2-wega_defconfig   |  79 +++++
 include/configs/phycore_am335x_r2.h        | 138 +++++++++
 15 files changed, 1278 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
index 5fe998914a..0a876997ed 100644
@@ -253,7 +253,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 +40 -0
new file mode 100644
index 0000000000..b7678e98ff
@@ -0,0 +1,40 @@
+// 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-spl;
+		u-boot,dm-pre-reloc;
+	};
+
+	memory at 80000000 {
+		u-boot,dm-spl;
+		u-boot,dm-pre-reloc;
+	};
+};
+
+&scm {
+	u-boot,dm-spl;
+	u-boot,dm-pre-reloc;
+};
+
+&uart0 {
+	u-boot,dm-spl;
+	u-boot,dm-pre-reloc;
+};
+
+&mmc1 {
+	u-boot,dm-spl;
+	u-boot,dm-pre-reloc;
+	cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
+};
arch/arm/dts/am335x-wega-rdk.dts new file +23 -0
new file mode 100644
index 0000000000..fe50f3041a
@@ -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
index d29f1ca0b5..3fa9dc89b8 100644
@@ -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
index 500df1aa11..d6b0ea2246 100644
@@ -156,6 +156,13 @@ config TARGET_ETAMIN
 	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_PCM051
 	bool "Support pcm051"
 	select DM
board/phytec/phycore_am335x_r2/Kconfig new file +15 -0
new file mode 100644
index 0000000000..77055e043c
@@ -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
new file mode 100644
index 0000000000..e56f30fdc0
@@ -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
new file mode 100644
index 0000000000..ff6f8b4221
@@ -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 +262 -0

262 lines not on this page · raw message

board/phytec/phycore_am335x_r2/board.h new file +24 -0
new file mode 100644
index 0000000000..68c3d56aa5
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * board.h
+ *
+ * Phytec phyCORE-AM335x (pcl060) 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 +79 -0

79 lines not on this page · raw message

include/configs/phycore_am335x_r2.h new file +138 -0

138 lines not on this page · raw message

Signature · 1 line
2.17.2
#1 lore raw

PATCH v2 1/1 ARM: am335x: Add phyCORE AM335x R2 support

Quoted 10 lines · Niel Fourie

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
Quoted 7 lines

Working:
- Eth0
- i2C
- MMC/SD
- NAND
- UART
- USB (host)

The Linux commit from which the DTs came is missing.

[...]

Quoted 5 lines
arch/arm/mach-omap2/am33xx/Kconfig +0 -0
index 500df1aa11..d6b0ea2246 100644

arch/arm/mach-omap2/am33xx/Kconfig config TARGET_ETAMIN · line 165

Quoted 10 lines
arch/arm/mach-omap2/am33xx/Kconfig +7 -0
@@ -156,6 +156,13 @@ config TARGET_ETAMIN
 	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
+

Keep the list sorted alphabetically please. (PHY... is below PCM...)

board/phytec/phycore_am335x_r2/Kconfig line 1

Quoted 10 lines
arch/arm/mach-omap2/am33xx/Kconfig +0 -0
 config TARGET_PCM051
 	bool "Support pcm051"
 	select DM
board/phytec/phycore_am335x_r2/Kconfig new file +1 -0
new file mode 100644
index 0000000000..77055e043c
@@ -0,0 +1,15 @@
+if TARGET_PHYCORE_AM335X_R2

Just curious , was there ever AM335x_R1 ? Why do we use the _R2 suffix here ?

[...]

Quoted 6 lines
board/phytec/phycore_am335x_r2/board.c new file +0 -0
new file mode 100644
index 0000000000..ece9edcfbd
@@ -0,0 +1,262 @@

[...]

board/phytec/phycore_am335x_r2/board.c line 143

Quoted 6 lines
board/phytec/phycore_am335x_r2/board.c new file +6 -0
+void sdram_init(void)
+{
+	int ram_type_index = PHYCORE_R2_MT41K128M16JT_256MB;
+
+	if (fdtdec_setup_mem_size_base())
+		gd->ram_size = SZ_256M;

Nice

board/phytec/phycore_am335x_r2/board.c line 154

Quoted 10 lines
board/phytec/phycore_am335x_r2/board.c new file +10 -0
+	switch (gd->ram_size) {
+	case SZ_1G:
+		ram_type_index = PHYCORE_R2_MT41K512M16HA125IT_1024MB;
+		break;
+	case SZ_512M:
+		ram_type_index = PHYCORE_R2_MT41K256M16TW107IT_512MB;
+		break;
+	case SZ_256M:
+	default:
+		ram_type_index = PHYCORE_R2_MT41K128M16JT_256MB;

Add a missing "break;" here for completeness.

Quoted 31 lines
board/phytec/phycore_am335x_r2/board.c new file +31 -0
+	}
+
+	config_ddr(DDR_CLK_MHZ, &ioregs,
+		   &physom_timings[ram_type_index].ddr3_data,
+		   &ddr3_cmd_ctrl_data,
+		   &physom_timings[ram_type_index].ddr3_emif_reg_data, 0);
+}
+
+const struct dpll_params *get_dpll_mpu_params(void)
+{
+	int ind = get_sys_clk_index();
+	int freq = am335x_get_efuse_mpu_max_freq(cdev);
+
+	switch (freq) {
+	case MPUPLL_M_1000:
+		return &dpll_mpu_opp[ind][5];
+	case MPUPLL_M_800:
+		return &dpll_mpu_opp[ind][4];
+	case MPUPLL_M_720:
+		return &dpll_mpu_opp[ind][3];
+	case MPUPLL_M_600:
+		return &dpll_mpu_opp[ind][2];
+	case MPUPLL_M_500:
+		return &dpll_mpu_opp100;
+	case MPUPLL_M_300:
+		return &dpll_mpu_opp[ind][0];
+	}
+
+	return &dpll_mpu_opp[ind][0];
+}
+

board/phytec/phycore_am335x_r2/board.c line 195

Quoted 10 lines
board/phytec/phycore_am335x_r2/board.c new file +10 -0
+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.
+	 */
+#ifndef CONFIG_DM_I2C

CONFIG_IS_ENABLED(DM_I2C)

Quoted 24 lines
board/phytec/phycore_am335x_r2/board.c new file +24 -0
+	if (i2c_probe(TPS65910_CTRL_I2C_ADDR))
+		return;
+#else
+	if (power_tps65910_init(0))
+		return;
+#endif
+	/*
+	 * 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;
+
+	/* Second, update the CORE voltage. */
+	if (tps65910_voltage_update(CORE, TPS65910_OP_REG_SEL_1_1_0))
+		return;
+}

[...]

Quoted 13 lines
include/configs/phycore_am335x_r2.h new file +7 -0
new file mode 100644
index 0000000000..a512de8838
@@ -0,0 +1,138 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * phycore_am335x_r2.h
+ *
+ * Phytec phyCORE-AM335x R2 (pcl060) boards information header
+ *
+ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/

include/configs/phycore_am335x_r2.h line 17

Quoted 10 lines
include/configs/phycore_am335x_r2.h new file +10 -0
+ * Copyright (C) 2013 Lars Poeschel, Lemonage Software GmbH
+ * Copyright (C) 2019 DENX Software Engineering GmbH
+ */
+
+#ifndef __CONFIG_PHYCORE_AM335x_R2_H
+#define __CONFIG_PHYCORE_AM335x_R2_H
+
+#include <configs/ti_am335x_common.h>
+
+#define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */

Use SZ_128K macro

Quoted 3 lines
include/configs/phycore_am335x_r2.h new file +3 -0
+#define CONFIG_MACH_TYPE		MACH_TYPE_SBC_PHYCORE_AM335X
+#define CONFIG_SYS_MMC_ENV_DEV		0
+#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION	1

[...]

Quoted 1 line

+/* Clock Defines */

s/Defines/Macros/

include/configs/phycore_am335x_r2.h line 87

Quoted 2 lines
include/configs/phycore_am335x_r2.h new file +2 -0
+#define V_OSCK				25000000  /* Clock output from T2 */
+#define V_SCLK				(V_OSCK)

Drop parenthesis around V_OSCK, it's just a value.

[...]

Signature · 2 lines
Best regards,
Marek Vasut
#2 lore raw

PATCH v2 1/1 ARM: am335x: Add phyCORE AM335x R2 support

Hi All,

Thank you Marek for the feedback. I addressed all of your concerns, the most important of is mentioned below:

Quoted 1 line · Marek Vasut

The Linux commit from which the DTs came is missing.

Added

Quoted 2 lines

Keep the list sorted alphabetically please. (PHY... is below PCM...)

Fixed. Sorry, that was as howler.

Quoted 2 lines

Just curious , was there ever AM335x_R1 ? Why do we use the _R2 suffix here ?>

The AM335x (without the R2) was the Phytec pcm051. So I stuck with adding R2 to distinguish the two. (I don't have a pcm051, so I did not want to mess with it.)

Quoted 4 lines
Quoted 1 line

+#ifndef CONFIG_DM_I2C

CONFIG_IS_ENABLED(DM_I2C)

This one is causing some headaches. I can't find any references to CONFIG_SPL_DM_I2C, even though we actually use DM for I2C in the SPL, so that change causes things to break a bit. As an improvement, I changed the code to use #if defined(CONFIG_DM_I2C) instead of #ifndef. We could always simply drop the Non-DM support instead, I guess?

On 4/25/19 12:43 PM, Marek Vasut wrote:> Take a look at

Quoted 4 lines

configs/am335x_evm_defconfig:CONFIG_DM_USB_GADGET=y

Maybe we can at least get rid of some of the hard-coded USB non-DM stuff.

I simply removed the hard-coded USB stuff, as the DM_USB was already enabled and working anyways. DM_USB_GADGET was also enabled. Thanks for the recommendation.

Best regards,
Niel Fourie

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-21 Fax: +49-8142-66989-80  Email: lusus at denx.de