From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 25 May 2023 01:45:14 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1q1yAN-00Crg2-Os for lore@lore.pengutronix.de; Thu, 25 May 2023 01:45:14 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q1yAK-000757-Uc for lore@pengutronix.de; Thu, 25 May 2023 01:45:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=zi5q/oVB50dAUJTWn9lztPrire0A90260/siusOMbw0=; b=eloLH3NfV4eTB4I+APKzLdtzYD 6I52dh0D0BFeIZESBGKlxG/ZpL/nSwOzc4UybUuH6E1jghNxRwA+pYItXkSBLPE3j5ul3SOaowagM 9LO97D8C3v6t9rohIdly2gU76jUAOvDhnuNFDqlLW5WvuG4kscozZggmIEo2z9w8g0p0d6fIhccLw sl46VuXyh0w7bYImoLcaJw7xtwYA/B+31ynvTwfFZZQB4wA7emPSw2zEV/+cPZZqTmVJEqjQozKdJ WZDT7RKVhktpFzlyCot6ff4AB1DKPHTa1mrze9nBtDTgwEPVmC0F/g1x68CxaGdywrokRzQgtaWv4 +hfR9JJA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q1y99-00EzRE-26; Wed, 24 May 2023 23:43:59 +0000 Received: from relay5-d.mail.gandi.net ([2001:4b98:dc4:8::225]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q1y8x-00EzKV-2T for barebox@lists.infradead.org; Wed, 24 May 2023 23:43:52 +0000 Received: (Authenticated sender: jmaselbas@zdiv.net) by mail.gandi.net (Postfix) with ESMTPSA id 14C161C0012; Wed, 24 May 2023 23:43:40 +0000 (UTC) From: Jules Maselbas To: barebox@lists.infradead.org Cc: Jules Maselbas Date: Thu, 25 May 2023 01:43:26 +0200 Message-Id: <20230524234328.82741-12-jmaselbas@zdiv.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524234328.82741-1-jmaselbas@zdiv.net> References: <20230524234328.82741-1-jmaselbas@zdiv.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230524_164348_108659_FCD7077F X-CRM114-Status: GOOD ( 17.58 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.9 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 11/13] ARM: boards: sunxi: Add initial support for the pinephone X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) Signed-off-by: Jules Maselbas --- arch/arm/boards/Makefile | 1 + arch/arm/boards/pine64-pinephone/Makefile | 2 + arch/arm/boards/pine64-pinephone/board.c | 0 arch/arm/boards/pine64-pinephone/lowlevel.c | 104 ++++++++++++++++++++ arch/arm/configs/pinephone_defconfig | 12 +++ arch/arm/dts/Makefile | 1 + arch/arm/dts/sun50i-a64-pinephone-1_2.dts | 3 + arch/arm/mach-sunxi/Kconfig | 17 ++++ images/Makefile.sunxi | 9 ++ include/mach/sunxi/init.h | 4 + 10 files changed, 153 insertions(+) create mode 100644 arch/arm/boards/pine64-pinephone/Makefile create mode 100644 arch/arm/boards/pine64-pinephone/board.c create mode 100644 arch/arm/boards/pine64-pinephone/lowlevel.c create mode 100644 arch/arm/configs/pinephone_defconfig create mode 100644 arch/arm/dts/sun50i-a64-pinephone-1_2.dts diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index b204c257f6..f4796f5374 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -96,6 +96,7 @@ obj-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += phytec-som-imx6/ obj-$(CONFIG_MACH_PHYTEC_PHYCORE_IMX7) += phytec-phycore-imx7/ obj-$(CONFIG_MACH_PHYTEC_PHYCORE_STM32MP1) += phytec-phycore-stm32mp1/ obj-$(CONFIG_MACH_PHYTEC_SOM_IMX8MQ) += phytec-som-imx8mq/ +obj-$(CONFIG_MACH_PINE64_PINEPHONE) += pine64-pinephone/ obj-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += plathome-openblocks-ax3/ obj-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_A6) += plathome-openblocks-a6/ obj-$(CONFIG_MACH_PM9261) += pm9261/ diff --git a/arch/arm/boards/pine64-pinephone/Makefile b/arch/arm/boards/pine64-pinephone/Makefile new file mode 100644 index 0000000000..092c31d6b2 --- /dev/null +++ b/arch/arm/boards/pine64-pinephone/Makefile @@ -0,0 +1,2 @@ +lwl-y += lowlevel.o +obj-y += board.o diff --git a/arch/arm/boards/pine64-pinephone/board.c b/arch/arm/boards/pine64-pinephone/board.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/arch/arm/boards/pine64-pinephone/lowlevel.c b/arch/arm/boards/pine64-pinephone/lowlevel.c new file mode 100644 index 0000000000..262d194864 --- /dev/null +++ b/arch/arm/boards/pine64-pinephone/lowlevel.c @@ -0,0 +1,104 @@ +// SPDX-License-Identifier: GPL-2.0+ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef DEBUG +static void debug_led_rgb(int rgb) +{ + void __iomem *piobase = SUN50I_PIO_BASE_ADDR; + uint32_t clr, set = 0; + int r = rgb & 0xff0000; + int g = rgb & 0x00ff00; + int b = rgb & 0x0000ff; + + clr = (1 << 19) | (1 << 18) | (1 << 20); + set |= r ? 1 << 19 : 0; + set |= g ? 1 << 18 : 0; + set |= b ? 1 << 20 : 0; + + clrsetbits_le32(piobase + PIO_PD_DATA, clr, set); +} + +static void debug_led_init(void) +{ + void __iomem *ccubase = SUN50I_CCU_BASE_ADDR; + void __iomem *piobase = SUN50I_PIO_BASE_ADDR; + + /* PIO clock enable */ + setbits_le32(ccubase + CCU_BUS_CLK_GATE2, BIT(5)); + /* LED set output */ + clrsetbits_le32(piobase + PIO_PD_CFG2, 0x000fff00, 0x00011100); +} +#else +static void debug_led_rgb(int rgb) {} +static void debug_led_init(void) {} +#endif + +SUN50I_A64_ENTRY_FUNCTION(start_pine64_pinephone, r0, r1, r2) +{ + extern char __dtb_z_sun50i_a64_pinephone_1_2_start[]; + void *fdt; + u32 size; + + sunxi_switch_to_aarch64(.text_head_soc_header2, SUN50I_A64_RVBAR_IOMAP); + + debug_led_init(); + debug_led_rgb(0xffff00); + + sun50i_cpu_lowlevel_init(); + sun50i_uart_setup(); + + relocate_to_current_adr(); + setup_c(); + + /* Skip SDRAM initialization if we run from it */ + if (get_pc() < SUN50I_DRAM_ADDR) { + size = sun50i_a64_lpddr3_dram_init(); + if (size == 0) { + puts_ll("FAIL: dram init\r\n"); + goto reset; + } + puthex_ll(size); + putc_ll('\r'); putc_ll('\n'); + } + + puts_ll("now booting\r\n"); + fdt = __dtb_z_sun50i_a64_pinephone_1_2_start + get_runtime_offset(); + barebox_arm_entry(SUN50I_DRAM_ADDR, SZ_1G, fdt); + +reset: + debug_led_rgb(0xff0000); + sun50i_cpu_lowlevel_reset(); +} + +SUN50I_A64_ENTRY_FUNCTION(start_pine64_pinephone_xload, r0, r1, r2) +{ + + sunxi_egon_header(.text_head_soc_header0); + sunxi_switch_to_aarch64(.text_head_soc_header1, SUN50I_A64_RVBAR_IOMAP); + + debug_led_init(); + debug_led_rgb(0xff0000); + + sun50i_cpu_lowlevel_init(); + sun50i_uart_setup(); + debug_led_rgb(0xffff00); + + relocate_to_current_adr(); + setup_c(); + + sun50i_a64_lpddr3_dram_init(); + + debug_led_rgb(0xff0000); + + sun50i_cpu_lowlevel_reset(); +} diff --git a/arch/arm/configs/pinephone_defconfig b/arch/arm/configs/pinephone_defconfig new file mode 100644 index 0000000000..a77cd4ba0b --- /dev/null +++ b/arch/arm/configs/pinephone_defconfig @@ -0,0 +1,12 @@ +CONFIG_ARCH_SUNXI=y +CONFIG_64BIT=y +CONFIG_MACH_PINE64_PINEPHONE=y +CONFIG_MACH_PINE64_PINE64=y +CONFIG_DEBUG_LL=y +CONFIG_DRIVER_SERIAL_NS16550=y +CONFIG_MCI=y +CONFIG_MCI_SUNXI_SMHC=y +CONFIG_CMD_DMESG=y +CONFIG_MCI_STARTUP=y +CONFIG_FS_FAT=y +CONFIG_IMAGE_COMPRESSION_XZKERN=y \ No newline at end of file diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 220e1617e3..e989f399c2 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -81,6 +81,7 @@ lwl-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += imx6q-phytec-phycard.dtb.o \ lwl-$(CONFIG_MACH_PHYTEC_PHYCORE_IMX7) += imx7d-phyboard-zeta.dtb.o lwl-$(CONFIG_MACH_PHYTEC_PHYCORE_STM32MP1) += stm32mp157c-phycore-stm32mp1-3.dtb.o lwl-$(CONFIG_MACH_PHYTEC_SOM_IMX8MQ) += imx8mq-phytec-phycore-som.dtb.o +lwl-$(CONFIG_MACH_PINE64_PINEPHONE) += sun50i-a64-pinephone-1_2.dtb.o lwl-$(CONFIG_MACH_PINE64_QUARTZ64) += rk3566-quartz64-a.dtb.o lwl-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += armada-xp-openblocks-ax3-4-bb.dtb.o lwl-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_A6) += kirkwood-openblocks_a6-bb.dtb.o diff --git a/arch/arm/dts/sun50i-a64-pinephone-1_2.dts b/arch/arm/dts/sun50i-a64-pinephone-1_2.dts new file mode 100644 index 0000000000..ac6fba1b91 --- /dev/null +++ b/arch/arm/dts/sun50i-a64-pinephone-1_2.dts @@ -0,0 +1,3 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 61a5ae9ae2..9975ceb471 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -1,7 +1,24 @@ if ARCH_SUNXI +config ARCH_SUN50I_A64 + bool + select CPU_V8 + select CPU_SUPPORTS_64BIT_KERNEL + select CLOCKSOURCE_ARM_ARCHITECTED_TIMER + select PINCTRL_SUN50I_A64 + select HAS_DEBUG_LL + select PBL_RELOCATABLE + select PBL_FULLY_PIC + help + Allwiner A64 (sun50iw1) SoC + config SUNXI_DEBUG_LL_UART_BASE hex default 0x01c28000 +config MACH_PINE64_PINEPHONE + bool "Allwinner A64 based Pine64 PinePhone" + select ARCH_SUN50I_A64 + select ARM_USE_COMPRESSED_DTB + endif diff --git a/images/Makefile.sunxi b/images/Makefile.sunxi index 778d6f9bdf..070b1bf00d 100644 --- a/images/Makefile.sunxi +++ b/images/Makefile.sunxi @@ -11,3 +11,12 @@ $(obj)/%.egonimg: $(obj)/% FORCE $(call if_changed,egon_image) # ---------------------------------------------------------------------- + +pblb-$(CONFIG_MACH_PINE64_PINEPHONE) += start_pine64_pinephone_xload +MAX_PBL_IMAGE_SIZE_start_pine64_pinephone_xload = 0x8000 +FILE_barebox-pine64-pinephone_xload.img = start_pine64_pinephone_xload.pblb.egonimg +image-$(CONFIG_MACH_PINE64_PINEPHONE) += barebox-pine64-pinephone_xload.img + +pblb-$(CONFIG_MACH_PINE64_PINEPHONE) += start_pine64_pinephone +FILE_barebox-pine64-pinephone.img = start_pine64_pinephone.pblb +image-$(CONFIG_MACH_PINE64_PINEPHONE) += barebox-pine64-pinephone.img diff --git a/include/mach/sunxi/init.h b/include/mach/sunxi/init.h index 626b459533..e30986d998 100644 --- a/include/mach/sunxi/init.h +++ b/include/mach/sunxi/init.h @@ -11,4 +11,8 @@ void sun50i_uart_setup(void); unsigned long sun50i_a64_ddr3_dram_init(void); unsigned long sun50i_a64_lpddr3_dram_init(void); +void sun50i_cpu_lowlevel_init(void); + +void sun50i_cpu_lowlevel_reset(void); + #endif -- 2.40.1