1
0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00

arm: add support for SoC s5p4418 (cpu) / nanopi2 board

Changes in relation to FriendlyARM's U-Boot nanopi2-v2016.01:
- SPL not supported yet --> no spl-dir in arch/arm/cpu/armv7/s5p4418/.
  Appropriate line in Makefile removed.
- cpu.c: '#include <cpu_func.h>' added.
- arch/arm/cpu/armv7/s5p4418/u-boot.lds removed, is not required
  anylonger.
- "obj-$(CONFIG_ARCH_NEXELL) += s5p-common/" added to
  arch/arm/cpu/armv7/Makefile since s5p-common/pwm.c is used instead
  of drivers/pwm/pwm-nexell.c.
- s5p4418.dtsi: '#include "../../../include/generated/autoconf.h"'
  removed, is not necessary, error at out-of-tree building.
  '#ifdef CONFIG_CPU_NXP4330'-blocks (2x) removed. Some minor changes
  regarding mmc. 'u-boot,dm-pre-reloc' added to dp0 because of added
  DM_VIDEO support.
- board/s5p4418/ renamed to board/friendlyarm/
- All s5p4418-boards except nanopi2 removed because there is no
  possibility to test the other boards.
- Kconfig: Changes to have a structure like mach-bcm283x (RaspberryPi),
  e.g. "config ..." entries moved from/to other Kconfig.
- "CONFIG_" removed from several s5p4418/nanopi2 specific defines
  because the appropriate values do not need to be configurable.
- nanopi2/board.c: All getenv(), getenv_ulong(), setenv() and saveenv()
  renamed to env_get(), env_get_ulong(), env_set() and env_save(),
  respectively. MACH_TYPE_S5P4418 is not defined anymore, therefore
  appropriate code removed (not necessary for DT-kernels).
- nanopi2/onewire.c: All crc8() renamed to crc8_ow() because crc8() is
  already defined in lib/crc8.c (with different parameters).
- dts: "nexell,s5pxx18-i2c" used instead of "i2c-gpio", i2c0 and
  i2c1 added. gmac-, ehci- and dwc2otg-entries removed because the
  appropriate functionality is not supported yet. New mmc-property
  "mmcboost" added.
  s5p4418-pinctrl.dtsi: gmac-entries removed, mmc- and i2c-entries
  added.
- '#ifdef CONFIG...' changed to 'if (IS_ENABLED(CONFIG...))' where
  possible (and similar).

Signed-off-by: Stefan Bosch <stefan_b@posteo.net>
This commit is contained in:
Stefan Bosch
2020-07-10 19:07:37 +02:00
committed by Tom Rini
parent e1e96ba6a2
commit d1611086e0
18 changed files with 2421 additions and 0 deletions

View File

@@ -42,3 +42,5 @@ obj-$(CONFIG_RMOBILE) += rmobile/
obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/
obj-$(CONFIG_ARCH_SUNXI) += sunxi/
obj-$(CONFIG_VF610) += vf610/
obj-$(CONFIG_ARCH_S5P4418) += s5p4418/
obj-$(CONFIG_ARCH_NEXELL) += s5p-common/

View File

@@ -0,0 +1,6 @@
# SPDX-License-Identifier: GPL-2.0+
#
# (C) Copyright 2016 Nexell
# Hyunseok, Jung <hsjung@nexell.co.kr>
obj-y += cpu.o

View File

@@ -0,0 +1,121 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2016 Nexell
* Hyunseok, Jung <hsjung@nexell.co.kr>
*/
#include <common.h>
#include <command.h>
#include <asm/system.h>
#include <asm/cache.h>
#include <asm/sections.h>
#include <asm/io.h>
#include <asm/arch/nexell.h>
#include <asm/arch/clk.h>
#include <asm/arch/reset.h>
#include <asm/arch/tieoff.h>
#include <cpu_func.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
#ifndef CONFIG_ARCH_CPU_INIT
#error must be define the macro "CONFIG_ARCH_CPU_INIT"
#endif
void s_init(void)
{
}
static void cpu_soc_init(void)
{
/*
* NOTE> ALIVE Power Gate must enable for Alive register access.
* must be clear wfi jump address
*/
writel(1, ALIVEPWRGATEREG);
writel(0xFFFFFFFF, SCR_ARM_SECOND_BOOT);
/* write 0xf0 on alive scratchpad reg for boot success check */
writel(readl(SCR_SIGNAGURE_READ) | 0xF0, (SCR_SIGNAGURE_SET));
/* set l2 cache tieoff */
nx_tieoff_set(NX_TIEOFF_CORTEXA9MP_TOP_QUADL2C_L2RET1N_0, 1);
nx_tieoff_set(NX_TIEOFF_CORTEXA9MP_TOP_QUADL2C_L2RET1N_1, 1);
}
#ifdef CONFIG_PL011_SERIAL
static void serial_device_init(void)
{
char dev[10];
int id;
sprintf(dev, "nx-uart.%d", CONFIG_CONS_INDEX);
id = RESET_ID_UART0 + CONFIG_CONS_INDEX;
struct clk *clk = clk_get((const char *)dev);
/* reset control: Low active ___|--- */
nx_rstcon_setrst(id, RSTCON_ASSERT);
udelay(10);
nx_rstcon_setrst(id, RSTCON_NEGATE);
udelay(10);
/* set clock */
clk_disable(clk);
clk_set_rate(clk, CONFIG_PL011_CLOCK);
clk_enable(clk);
}
#endif
int arch_cpu_init(void)
{
flush_dcache_all();
cpu_soc_init();
clk_init();
if (IS_ENABLED(CONFIG_PL011_SERIAL))
serial_device_init();
return 0;
}
#if defined(CONFIG_DISPLAY_CPUINFO)
int print_cpuinfo(void)
{
return 0;
}
#endif
void reset_cpu(ulong ignored)
{
void *clkpwr_reg = (void *)PHY_BASEADDR_CLKPWR;
const u32 sw_rst_enb_bitpos = 3;
const u32 sw_rst_enb_mask = 1 << sw_rst_enb_bitpos;
const u32 sw_rst_bitpos = 12;
const u32 sw_rst_mask = 1 << sw_rst_bitpos;
int pwrcont = 0x224;
int pwrmode = 0x228;
u32 read_value;
read_value = readl((void *)(clkpwr_reg + pwrcont));
read_value &= ~sw_rst_enb_mask;
read_value |= 1 << sw_rst_enb_bitpos;
writel(read_value, (void *)(clkpwr_reg + pwrcont));
writel(sw_rst_mask, (void *)(clkpwr_reg + pwrmode));
}
void enable_caches(void)
{
/* Enable D-cache. I-cache is already enabled in start.S */
dcache_enable();
}
#if defined(CONFIG_ARCH_MISC_INIT)
int arch_misc_init(void)
{
return 0;
}
#endif /* CONFIG_ARCH_MISC_INIT */

View File

@@ -147,6 +147,9 @@ dtb-$(CONFIG_ROCKCHIP_RV1108) += \
rv1108-elgin-r1.dtb \
rv1108-evb.dtb
dtb-$(CONFIG_ARCH_S5P4418) += \
s5p4418-nanopi2.dtb
dtb-$(CONFIG_ARCH_MESON) += \
meson-gxbb-nanopi-k2.dtb \
meson-gxbb-odroidc2.dtb \

View File

@@ -0,0 +1,110 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2020 Stefan Bosch <stefan_b@posteo.net>
*
* (C) Copyright 2017 FriendlyElec Computer Tech. Co., Ltd.
* (http://www.friendlyarm.com)
*
* (C) Copyright 2016 Nexell
* Youngbok, Park <park@nexell.co.kr>
*/
/dts-v1/;
#include "s5p4418.dtsi"
/ {
model = "FriendlyElec boards based on Nexell s5p4418";
cpu-model = "S5p4418";
compatible = "friendlyelec,nanopi2",
"nexell,s5p4418";
aliases {
mmc0 = "/mmc@c0069000";
mmc1 = "/mmc@c0062000";
i2c0 = "/i2c@c00a4000";
i2c1 = "/i2c@c00a5000";
i2c2 = "/i2c@c00a6000";
};
mmc0:mmc@c0062000 {
frequency = <50000000>;
drive_dly = <0x0>;
drive_shift = <0x03>;
sample_dly = <0x00>;
sample_shift = <0x02>;
mmcboost = <0>;
status = "okay";
};
mmc2:mmc@c0069000 {
frequency = <50000000>;
drive_dly = <0x0>;
drive_shift = <0x03>;
sample_dly = <0x00>;
sample_shift = <0x02>;
mmcboost = <0>;
status = "okay";
};
/* NanoPi2: Header "CON2", NanoPC-T2: EEPROM (MAC-Addr.) and Audio */
i2c0:i2c@c00a4000 {
status ="okay";
};
/* NanoPi2: Header "CON2" and HDMI, NanoPC-T2: HDMI */
i2c1:i2c@c00a5000 {
status ="okay";
};
/* NanoPi2: LCD interface, NanoPC-T2: LCD, LVDS and MIPI interfaces */
i2c2:i2c@c00a6000 {
status ="okay";
};
dp0:dp@c0102800 {
status = "okay";
module = <0>;
lcd-type = "lvds";
dp-device {
format = <0>; /* 0:VESA, 1:JEIDA */
};
dp-sync {
h_active_len = <1024>;
h_front_porch = <84>;
h_back_porch = <84>;
h_sync_width = <88>;
h_sync_invert = <0>;
v_active_len = <600>;
v_front_porch = <10>;
v_back_porch = <10>;
v_sync_width = <20>;
v_sync_invert = <0>;
};
dp-ctrl {
clk_src_lv0 = <3>;
clk_div_lv0 = <16>;
clk_src_lv1 = <7>;
clk_div_lv1 = <1>;
out_format = <2>;
};
dp-planes {
layer_top {
screen_width = <1024>;
screen_height = <600>;
back_color = <0x0>;
};
layer_1 { /* RGB 1 */
width = <1024>;
height = <600>;
format = <0x06530000>;
pixel_byte = <4>;
};
};
};
};

View File

@@ -0,0 +1,135 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Nexell's s5p6818 SoC pin-mux and pin-config device tree source
*
* (C) Copyright 2020 Stefan Bosch <stefan_b@posteo.net>
*
* Copyright (C) 2016 Nexell Co., Ltd.
* http://www.nexell.co.kr
*
* Nexell's s5p6818 SoC pin-mux and pin-config options are listed as
* device tree nodes in this file.
*/
pinctrl@C0010000 {
/*
* values for "pin-pull":
* pulldown resistor = 0
* pullup = 1
* no pullup/down = 2
*/
/* MMC */
mmc0_clk: mmc0-clk {
pins = "gpioa-29";
pin-function = <1>;
pin-pull = <2>;
pin-strength = <2>;
};
mmc0_cmd: mmc0-cmd {
pins = "gpioa-31";
pin-function = <1>;
pin-pull = <2>;
pin-strength = <1>;
};
mmc0_bus4: mmc0-bus-width4 {
pins = "gpiob-1, gpiob-3, gpiob-5, gpiob-7";
pin-function = <1>;
pin-pull = <2>;
pin-strength = <1>;
};
mmc1_clk: mmc1-clk {
pins = "gpiod-22";
pin-function = <1>;
pin-pull = <2>;
pin-strength = <2>;
};
mmc1_cmd: mmc1-cmd {
pins = "gpiod-23";
pin-function = <1>;
pin-pull = <2>;
pin-strength = <1>;
};
mmc1_bus4: mmc1-bus-width4 {
pins = "gpiod-24, gpiod-25, gpiod-26, gpiod-27";
pin-function = <1>;
pin-pull = <2>;
pin-strength = <1>;
};
mmc2_clk: mmc2-clk {
pins = "gpioc-18";
pin-function = <2>;
pin-pull = <2>;
pin-strength = <2>;
};
mmc2_cmd: mmc2-cmd {
pins = "gpioc-19";
pin-function = <2>;
pin-pull = <2>;
pin-strength = <1>;
};
mmc2_bus4: mmc2-bus-width4 {
pins = "gpioc-20, gpioc-21, gpioc-22, gpioc-23";
pin-function = <2>;
pin-pull = <2>;
pin-strength = <1>;
};
mmc2_bus8: mmc2-bus-width8 {
nexell,pins = "gpioe-21", "gpioe-22", "gpioe-23", "gpioe-24";
pin-function = <2>;
pin-pull = <2>;
pin-strength = <1>;
};
/* I2C */
i2c0_sda:i2c0-sda {
pins = "gpiod-3";
pin-function = <1>;
pin-pull = <2>;
pin-strength = <0>;
};
i2c0_scl:i2c0-scl {
pins = "gpiod-2";
pin-function = <1>;
pin-pull = <2>;
pin-strength = <0>;
};
i2c1_sda:i2c1-sda {
pins = "gpiod-5";
pin-function = <1>;
pin-pull = <2>;
pin-strength = <0>;
};
i2c1_scl:i2c1-scl {
pins = "gpiod-4";
pin-function = <1>;
pin-pull = <2>;
pin-strength = <0>;
};
i2c2_sda:i2c2-sda {
pins = "gpiod-7";
pin-function = <1>;
pin-pull = <2>;
pin-strength = <0>;
};
i2c2_scl:i2c2-scl {
pins = "gpiod-6";
pin-function = <1>;
pin-pull = <2>;
pin-strength = <0>;
};
};

170
arch/arm/dts/s5p4418.dtsi Normal file
View File

@@ -0,0 +1,170 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2020 Stefan Bosch <stefan_b@posteo.net>
*
* (C) Copyright 2016 Nexell
* Youngbok, Park <park@nexell.co.kr>
*
*/
#include "skeleton.dtsi"
/ {
#include "s5p4418-pinctrl.dtsi"
aliases {
mmc0 = &mmc0;
mmc1 = &mmc1;
mmc2 = &mmc2;
gmac = "/ethernet@c0060000";
};
mmc2:mmc@c0069000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "nexell,nexell-dwmmc";
reg = <0xc0069000 0x1000>;
bus-width = <4>;
index = <2>;
max-frequency = <50000000>;
pinctrl-names = "default";
pinctrl-0 = <&mmc2_clk>, <&mmc2_cmd>, <&mmc2_bus4>;
status = "disabled";
};
mmc1:mmc@c0068000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "nexell,nexell-dwmmc";
reg = <0xc0068000 0x1000>;
bus-width = <4>;
index = <1>;
max-frequency = <50000000>;
pinctrl-names = "default";
pinctrl-0 = <&mmc1_clk>, <&mmc1_cmd>, <&mmc1_bus4>;
status = "disabled";
};
mmc0:mmc@c0062000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "nexell,nexell-dwmmc";
reg = <0xc0062000 0x1000>;
bus-width = <4>;
index = <0>;
max-frequency = <50000000>;
pinctrl-names = "default";
pinctrl-0 = <&mmc0_clk>, <&mmc0_cmd>, <&mmc0_bus4>;
status = "disabled";
};
i2c0:i2c@c00a4000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "nexell,s5pxx18-i2c";
reg = <0xc00a4000 0x100>;
clock-frequency = <100000>;
pinctrl-names = "default";
pinctrl-0 = <&i2c0_sda>, <&i2c0_scl>;
status ="disabled";
};
i2c1:i2c@c00a5000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "nexell,s5pxx18-i2c";
reg = <0xc00a5000 0x100>;
clock-frequency = <100000>;
pinctrl-names = "default";
pinctrl-0 = <&i2c1_sda>, <&i2c1_scl>;
status ="disabled";
};
i2c2:i2c@c00a6000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "nexell,s5pxx18-i2c";
reg = <0xc00a6000 0x100>;
clock-frequency = <100000>;
pinctrl-names = "default";
pinctrl-0 = <&i2c2_sda>, <&i2c2_scl>;
status ="disabled";
};
dp0:dp@c0102800 {
compatible = "nexell,nexell-display";
reg = <0xc0102800 0x100>;
index = <0>;
u-boot,dm-pre-reloc;
status = "disabled";
};
dp1:dp@c0102c00 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "nexell,nexell-display";
reg = <0xc0102c00 0x100>;
index = <1>;
status = "disabled";
};
gpio_a:gpio@c001a000 {
compatible = "nexell,nexell-gpio";
reg = <0xc001a000 0x00000010>;
altr,gpio-bank-width = <32>;
gpio-bank-name = "gpio_a";
gpio-controller;
#gpio-cells = <2>;
};
gpio_b:gpio@c001b000 {
compatible = "nexell,nexell-gpio";
reg = <0xc001b000 0x00000010>;
altr,gpio-bank-width = <32>;
gpio-bank-name = "gpio_b";
gpio-controller;
#gpio-cells = <2>;
};
gpio_c:gpio@c001c000 {
compatible = "nexell,nexell-gpio";
reg = <0xc001c000 0x00000010>;
nexell,gpio-bank-width = <32>;
gpio-bank-name = "gpio_c";
gpio-controller;
#gpio-cells = <2>;
};
gpio_d:gpio@c001d000 {
compatible = "nexell,nexell-gpio";
reg = <0xc001d000 0x00000010>;
nexell,gpio-bank-width = <32>;
gpio-bank-name = "gpio_d";
gpio-controller;
#gpio-cells = <2>;
};
gpio_e:gpio@c001e000 {
compatible = "nexell,nexell-gpio";
reg = <0xc001e000 0x00000010>;
nexell,gpio-bank-width = <32>;
gpio-bank-name = "gpio_e";
gpio-controller;
#gpio-cells = <2>;
};
gpio_alv:gpio@c0010800 {
compatible = "nexell,nexell-gpio";
reg = <0xc0010800 0x00000010>;
nexell,gpio-bank-width = <32>;
gpio-bank-name = "gpio_alv";
gpio-controller;
#gpio-cells = <2>;
};
pinctrl@C0010000 {
compatible = "nexell,s5pxx18-pinctrl";
reg = <0xc0010000 0xf000>;
u-boot,dm-pre-reloc;
};
};