ARM: sunxi: Add basic support for Allwinner A31 (sun6i)
Subsystems (3)
v2 cover ARM: sunxi: Add basic support for Allwinner A31 (sun6i)
Hi everyone,
This is v2 of the A31 support series. This series add basic (UART and MMC) support for Allwinner's A31 SoC. The patches, excluding the first one, were cherry-picked from u-boot-sunxi. Due to the difference between u-boot mainline and u-boot-sunxi, some patches were rearranged or squashed to better fit the current state of u-boot, and not introduce any build breaks. It follows Ian's initial merge method of sun7i support: introducing various components first, then enabling them in the last commit. I tried to keep the commits separate, thus retaining the original author and Signed-off-bys.
Patch 1 updates the current UART pinmuxing code to use macros for pull-up values. This is for existing platforms, but is included as it would conflict with patch 7.
Patch 2 adds a wrapper around "func(USB, usb, 0)" in BOOT_TARGET_DEVICES to deal with breakage when USB support is not enabled.
Patch 3 adds memory addresses for some hardware blocks new in sun6i.
Patch 4 adds support for the new PRCM (power reset and clock management) block, which also contains PLL bias voltage control.
Patch 5 adds support for the clock module. This patch is a bunch of different sun6i related patches on the clock code, from when sun6i support was introduced to u-boot-sunxi, up to its current form. This is done to avoid various conflicts and needlessly introducing then removing macros.
Patch 6 adds mmc support on sun6i.
Patch 7 adds uart0 pin macros.
Patch 8 adds uart0 muxing on sun6i.
Patch 9 enables sun6i support.
Patch 10 adds a defconfig for the Colombus board, which is an A31 evaluation board.
Changes since v1:
- Added macros for sun6i uart pinmuxes (patch 7)
- Use gpio macros when muxing uarts (patch 1, 8)
- Clarify what is enabled in PRCM (patch 4)
- Dropped old comments in commit message from Hans (patch 4)
- Use setbits helpers in PRCM code (patch 4)
- Drop SPL code block from clock code (patch 5)
- Make mmc code use fifo in register structure definition, and add reserved area to adjust for sun6i's different fifo address (patch 6)
- Rewrite patch 9 commit message to reflect what is supported
- Split out Colombus board defconfig into separate patch (patch 10)
Cheers
ChenYu
Chen-Yu Tsai (5):
ARM: sunxi: Use macro values for setting UART GPIO pull-ups
ARM: sunxi: Fix build break when CONFIG_USB_EHCI is not defined
ARM: sun6i: Add clock support
ARM: sun6i: Define UART0 pins for A31
ARM: sun6i: Add Colombus board defconfig
Hans de Goede (1):
ARM: sunxi-mmc: Add mmc support for sun6i / A31
Maxime Ripard (2):
ARM: sun6i: Setup the A31 UART0 muxing
ARM: sunxi: Add basic A31 support
Oliver Schinagl (2):
ARM: sun6i: Add base address for the new controllers in A31
ARM: sun6i: Add support for the power reset control module found on
the A31
arch/arm/Kconfig | 3 + arch/arm/cpu/armv7/sunxi/Makefile | 2 + arch/arm/cpu/armv7/sunxi/board.c | 10 +- arch/arm/cpu/armv7/sunxi/clock_sun6i.c | 70 ++++++++ arch/arm/cpu/armv7/sunxi/cpu_info.c | 2 + arch/arm/cpu/armv7/sunxi/prcm.c | 33 ++++ arch/arm/include/asm/arch-sunxi/clock.h | 4 + arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 205 ++++++++++++++++++++++ arch/arm/include/asm/arch-sunxi/cpu.h | 9 + arch/arm/include/asm/arch-sunxi/gpio.h | 3 + arch/arm/include/asm/arch-sunxi/mmc.h | 5 +- arch/arm/include/asm/arch-sunxi/prcm.h | 238 ++++++++++++++++++++++++++ board/sunxi/Kconfig | 10 +- configs/Colombus_defconfig | 4 + drivers/mmc/sunxi_mmc.c | 11 +- include/configs/sun6i.h | 26 +++ include/configs/sunxi-common.h | 8 +- 17 files changed, 633 insertions(+), 10 deletions(-) create mode 100644 arch/arm/cpu/armv7/sunxi/clock_sun6i.c create mode 100644 arch/arm/cpu/armv7/sunxi/prcm.c create mode 100644 arch/arm/include/asm/arch-sunxi/clock_sun6i.h create mode 100644 arch/arm/include/asm/arch-sunxi/prcm.h create mode 100644 configs/Colombus_defconfig create mode 100644 include/configs/sun6i.h
Signature · 1 line
2.1.0
PATCH v2 1/10 ARM: sunxi: Use macro values for setting UART GPIO pull-ups
We have already defined macros for pull-up/down values in the GPIO header. Use them instead of magic numbers when configuring the UART pins.
--- arch/arm/cpu/armv7/sunxi/board.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/cpu/armv7/sunxi/board.c +3 -3
@@ -53,15 +53,15 @@ int gpio_init(void)#if CONFIG_CONS_INDEX ==1 && (defined(CONFIG_SUN4I ) || defined(CONFIG_SUN7I ))sunxi_gpio_set_cfgpin (SUNXI_GPB (22 ),SUN4I_GPB22_UART0_TX );sunxi_gpio_set_cfgpin (SUNXI_GPB (23 ),SUN4I_GPB23_UART0_RX ); -sunxi_gpio_set_pull (SUNXI_GPB (23 ),1 ); +sunxi_gpio_set_pull (SUNXI_GPB (23 ),SUNXI_GPIO_PULL_UP );#elif CONFIG_CONS_INDEX ==1 && defined(CONFIG_SUN5I )sunxi_gpio_set_cfgpin (SUNXI_GPB (19 ),SUN5I_GPB19_UART0_TX );sunxi_gpio_set_cfgpin (SUNXI_GPB (20 ),SUN5I_GPB20_UART0_RX ); -sunxi_gpio_set_pull (SUNXI_GPB (20 ),1 ); +sunxi_gpio_set_pull (SUNXI_GPB (20 ),SUNXI_GPIO_PULL_UP );#elif CONFIG_CONS_INDEX ==2 && defined(CONFIG_SUN5I )sunxi_gpio_set_cfgpin (SUNXI_GPG (3 ),SUN5I_GPG3_UART1_TX );sunxi_gpio_set_cfgpin (SUNXI_GPG (4 ),SUN5I_GPG4_UART1_RX ); -sunxi_gpio_set_pull (SUNXI_GPG (4 ),1 ); +sunxi_gpio_set_pull (SUNXI_GPG (4 ),SUNXI_GPIO_PULL_UP );#else #error Unsupported console port number. Please fix pin mux settings in board.c#endif
Signature · 1 line
2.1.0
PATCH v2 1/10 ARM: sunxi: Use macro values for setting UART GPIO pull-ups
Quoted 5 lines · Chen-Yu Tsai
We have already defined macros for pull-up/down values in the GPIO header. Use them instead of magic numbers when configuring the UART pins.
Signed-off-by Chen-Yu Tsai <[email protected]>
PATCH v2 2/10 ARM: sunxi: Fix build break when CONFIG_USB_EHCI is not defined
In reply to Chen-Yu TsaiBOOT_TARGET_DEVICES includes USB unconditionally. This breaks when CONFIG_CMD_USB is not defined. Use a secondary macro to conditionally include it when CONFIG_EHCI is enabled, as we do for CONFIG_AHCI.
--- include/configs/sunxi-common.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
include/configs/sunxi-common.h +7 -1
@@ -233,10 +233,16 @@#define BOOT_TARGET_DEVICES_SCSI (func)#endif +#ifdef CONFIG_USB_EHCI +#define BOOT_TARGET_DEVICES_USB (func) func(USB, usb, 0) +#else +#define BOOT_TARGET_DEVICES_USB (func) +#endif +#define BOOT_TARGET_DEVICES (func) \ func(MMC, mmc, 0) \ BOOT_TARGET_DEVICES_SCSI(func) \ - func(USB, usb, 0) \ + BOOT_TARGET_DEVICES_USB(func) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na)
Signature · 1 line
2.1.0
PATCH v2 3/10 ARM: sun6i: Add base address for the new controllers in A31
In reply to Chen-Yu TsaiFrom: Oliver Schinagl <[email protected]>
A31 has several new and changed memory address. This patch adds them.
--- arch/arm/include/asm/arch-sunxi/cpu.h | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm/include/asm/arch-sunxi/cpu.h +9 -0
@@ -95,6 +95,11 @@#define SUNXI_MALI400_BASE 0x01c40000#define SUNXI_GMAC_BASE 0x01c50000 +#define SUNXI_DRAM_COM_BASE 0x01c62000 +#define SUNXI_DRAM_CTL_BASE 0x01c63000 +#define SUNXI_DRAM_PHY_CH1_BASE 0x01c65000 +#define SUNXI_DRAM_PHY_CH2_BASE 0x01c66000 +/* module sram */ #define SUNXI_SRAM_C_BASE 0x01d00000
@@ -105,6 +110,10 @@#define SUNXI_MP_BASE 0x01e80000#define SUNXI_AVG_BASE 0x01ea0000 +#define SUNXI_PRCM_BASE 0x01f01400 +#define SUNXI_R_PIO_BASE 0x01f02c00 +#define SUNXI_P2WI_BASE 0x01f03400 +/* CoreSight Debug Module */ #define SUNXI_CSDM_BASE 0x3f500000
Signature · 1 line
2.1.0
PATCH v2 4/10 ARM: sun6i: Add support for the power reset control module found on the A31
In reply to Chen-Yu TsaiFrom: Oliver Schinagl <[email protected]>
The A31 has a new module called PRCM, or Power, Reset Control Module. This module controls clocks and resets for RTC block modules, and also PLL biasing in the main clock module.
This patch adds the register definitions, and also enables the clocks and resets for the RTC block PIO (pin controller) and P2WI (push-pull 2 wire interface) which is used to talk to the PMIC.
[wens at csie.org: rephrase commit message to explain what the hardware
supports and what we actually enable]
--- arch/arm/cpu/armv7/sunxi/Makefile | 1 + arch/arm/cpu/armv7/sunxi/prcm.c | 33 +++++ arch/arm/include/asm/arch-sunxi/prcm.h | 238 +++++++++++++++++++++++++++++++++ 3 files changed, 272 insertions(+) create mode 100644 arch/arm/cpu/armv7/sunxi/prcm.c create mode 100644 arch/arm/include/asm/arch-sunxi/prcm.h
arch/arm/cpu/armv7/sunxi/Makefile +1 -0
@@ -11,6 +11,7 @@ obj-y += timer.o obj-y += board.o obj-y += clock.o obj-y += pinmux.o +obj-$(CONFIG_SUN6I) += prcm.o obj-$(CONFIG_SUN4I) += clock_sun4i.o obj-$(CONFIG_SUN5I) += clock_sun4i.o obj-$(CONFIG_SUN7I) += clock_sun4i.o
arch/arm/cpu/armv7/sunxi/prcm.c new file +33 -0
@@ -0,0 +1,33 @@ +/* +* Sunxi A31 Power Management Unit +* +* (C) Copyright 2013 Oliver Schinagl <[email protected]> +* http://linux-sunxi.org +* +* Based on sun6i sources and earlier U-Boot Allwinner A10 SPL work +* +* (C) Copyright 2006-2013 +* Allwinner Technology Co., Ltd. <www.allwinnertech.com> +* Berg Xing <[email protected]> +* Tom Cubie <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#include <common.h> +#include <errno.h> +#include <asm/io.h> +#include <asm/arch/cpu.h> +#include <asm/arch/prcm.h> +#include <asm/arch/sys_proto.h> + +void prcm_init_apb0 (void ) +{ +struct sunxi_prcm_reg *prcm = + (struct sunxi_prcm_reg *)SUNXI_PRCM_BASE ; + +setbits_le32 (&prcm->apb0_gate,PRCM_APB0_GATE_P2WI | +PRCM_APB0_GATE_PIO ); +setbits_le32 (&prcm->apb0_reset,PRCM_APB0_RESET_P2WI | +PRCM_APB0_RESET_PIO ); +}
arch/arm/include/asm/arch-sunxi/prcm.h new file +238 -0
238 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH v2 4/10 ARM: sun6i: Add support for the power reset control module found on the A31
Quoted 10 lines · Chen-Yu Tsai
From: Oliver Schinagl <[email protected]>
The A31 has a new module called PRCM, or Power, Reset Control Module. This module controls clocks and resets for RTC block modules, and also PLL biasing in the main clock module.
This patch adds the register definitions, and also enables the clocks and resets for the RTC block PIO (pin controller) and P2WI (push-pull 2 wire interface) which is used to talk to the PMIC.
Quoted 7 lines
Signed-off-by Oliver Schinagl <[email protected]>Signed-off-by Hans de Goede <[email protected]>[wens at csie.org: spacing fixes reported by checkpatch.pl][wens at csie.org: Use setbits helper in PRCM init function][wens at csie.org: rephrase commit message to explain what the hardware
supports and what we actually enable]Signed-off-by Chen-Yu Tsai <[email protected]>
PATCH v2 5/10 ARM: sun6i: Add clock support
In reply to Chen-Yu TsaiThis patch adds the basic clocks support for the Allwinner A31 (sun6i) processor. This code will not been compiled until the build is hooked up in a later patch. It has been split out to keep the patches manageable.
This includes changes from the following commits from u-boot-sunxi:
a92051b ARM: sunxi: Add sun6i clock controller structure
1f72c6f ARM: sun6i: Setup the UART0 clocks
5f2e712 ARM: sunxi: Enable pll6 by default on all models
2be2f2a ARM: sunxi-mmc: Add mmc support for sun6i / A31
12e1633 ARM: sun6i: Add initial clock setup for SPL
1a9c9c6 ARM: sunxi: Split clock code into common, sun4i and sun6i code 0b194ee ARM: sun6i: Properly setup the PLL LDO in clock_init_safe b54c626 sunxi: avoid sr32 for APB1 clock setup.
68fe29c sunxi: remove magic numbers from clock_get_pll{5,6}
c89867d sunxi: clocks: clock_get_pll5 prototype and coding style 501ab1e ARM: sunxi: Fix sun6i PLL6 settings
37f669b ARM: sunxi: Fix macro names for mmc and uart reset offsets 61de1e6 ARM: sunxi: Correct comment for MBUS1 register in sun6i clock definitions
--- arch/arm/cpu/armv7/sunxi/Makefile | 1 + arch/arm/cpu/armv7/sunxi/clock_sun6i.c | 70 +++++++++ arch/arm/include/asm/arch-sunxi/clock.h | 4 + arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 205 ++++++++++++++++++++++++++ 4 files changed, 280 insertions(+) create mode 100644 arch/arm/cpu/armv7/sunxi/clock_sun6i.c create mode 100644 arch/arm/include/asm/arch-sunxi/clock_sun6i.h
arch/arm/cpu/armv7/sunxi/Makefile +1 -0
@@ -14,6 +14,7 @@ obj-y += pinmux.o obj-$(CONFIG_SUN6I) += prcm.o obj-$(CONFIG_SUN4I) += clock_sun4i.o obj-$(CONFIG_SUN5I) += clock_sun4i.o +obj-$(CONFIG_SUN6I) += clock_sun6i.o obj-$(CONFIG_SUN7I) += clock_sun4i.o ifndef CONFIG_SPL_BUILD
arch/arm/cpu/armv7/sunxi/clock_sun6i.c new file +70 -0
70 lines not on this page · raw message
arch/arm/include/asm/arch-sunxi/clock.h +4 -0
@@ -15,7 +15,11 @@#define CLK_GATE_CLOSE 0x0/* clock control module regs definition */ +#ifdef CONFIG_SUN6I +#include <asm/arch/clock_sun6i.h> +#else #include <asm/arch/clock_sun4i.h> +#endif #ifndef __ASSEMBLY__int clock_init (void );
arch/arm/include/asm/arch-sunxi/clock_sun6i.h new file +205 -0
205 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH v2 5/10 ARM: sun6i: Add clock support
Quoted 20 lines · Chen-Yu Tsai
This patch adds the basic clocks support for the Allwinner A31 (sun6i) processor. This code will not been compiled until the build is hooked up in a later patch. It has been split out to keep the patches manageable.
This includes changes from the following commits from u-boot-sunxi:
a92051b ARM: sunxi: Add sun6i clock controller structure
1f72c6f ARM: sun6i: Setup the UART0 clocks
5f2e712 ARM: sunxi: Enable pll6 by default on all models
2be2f2a ARM: sunxi-mmc: Add mmc support for sun6i / A31
12e1633 ARM: sun6i: Add initial clock setup for SPL
1a9c9c6 ARM: sunxi: Split clock code into common, sun4i and sun6i code 0b194ee ARM: sun6i: Properly setup the PLL LDO inclock_init_safeb54c626 sunxi: avoid sr32 for APB1 clock setup.
68fe29c sunxi: remove magic numbers from clock_get_pll{5,6}
c89867d sunxi: clocks:clock_get_pll5prototype and coding style 501ab1e ARM: sunxi: Fix sun6i PLL6 settings
37f669b ARM: sunxi: Fix macro names for mmc and uart reset offsets 61de1e6 ARM: sunxi: Correct comment for MBUS1 register in sun6i clock definitions
Quoted 7 lines
Signed-off-by Maxime Ripard <[email protected]>Signed-off-by Ian Campbell <[email protected]>Signed-off-by Hans de Goede <[email protected]>[wens at csie.org: styling fixes reported by checkpatch.pl][wens at csie.org: drop unsupported SPL code block and unused gpio.h header]Signed-off-by Chen-Yu Tsai <[email protected]>Cc Tom Cubie <[email protected]>
(my contributions to what became this patch were minor enough that I think this doesn't constitute a double dealing self-ack, if that might have been a problem)
PATCH v2 6/10 ARM: sunxi-mmc: Add mmc support for sun6i / A31
In reply to Chen-Yu TsaiFrom: Hans de Goede <[email protected]>
The mmc hardware on sun6i has an extra reset control that needs to be de-asserted prior to usage. Also the FIFO address is different.
[wens at csie.org: use setbits_le32 for reset control, drop obsolete changes,
rewrite different FIFO address handling, add commit message]
--- arch/arm/include/asm/arch-sunxi/mmc.h | 5 ++++- drivers/mmc/sunxi_mmc.c | 11 +++++++---- 2 files changed, 11 insertions(+), 5 deletions(-)
arch/arm/include/asm/arch-sunxi/mmc.h +4 -1
@@ -43,7 +43,10 @@ struct sunxi_mmc {u32 chda;/* 0x90 */ u32 cbda;/* 0x94 */ u32 res1[26 ]; -u32 fifo;/* 0x100 FIFO access address */ +#if defined(CONFIG_SUN6I ) +u32 res2[64 ]; +#endif +u32 fifo;/* 0x100 (0x200 on sun6i) FIFO access address */ };#define SUNXI_MMC_CLK_POWERSAVE (0x1 << 17)
drivers/mmc/sunxi_mmc.c +7 -4
@@ -19,7 +19,6 @@struct sunxi_mmc_host {unsigned mmc_no;uint32_t *mclkreg; -unsigned database;unsigned fatal_err;unsigned mod_clk;struct sunxi_mmc *reg;
@@ -57,7 +56,6 @@ static int mmc_resource_init(int sdc_no)printf ("Wrong mmc number %d\n" , sdc_no);return -1 ; } - mmchost->database = (unsigned int )mmchost->reg +0x100 ; mmchost->mmc_no = sdc_no;return 0 ;
@@ -75,6 +73,11 @@ static int mmc_clk_io_on(int sdc_no)/* config ahb clock */ setbits_le32 (&ccm->ahb_gate0,1 <<AHB_GATE_OFFSET_MMC (sdc_no)); +#if defined(CONFIG_SUN6I ) +/* unassert reset */ +setbits_le32 (&ccm->ahb_reset0_cfg,1 <<AHB_RESET_OFFSET_MMC (sdc_no)); +#endif +/* config mod clock */ pll_clk =clock_get_pll6 ();/* should be close to 100 MHz but no more, so round up */
@@ -194,9 +197,9 @@ static int mmc_trans_data_by_cpu(struct mmc *mmc, struct mmc_data *data) }if (reading) - buff[i] =readl (mmchost->database); + buff[i] =readl (&mmchost->reg->fifo);else -writel (buff[i], mmchost->database); +writel (buff[i], &mmchost->reg->fifo); }return 0 ;
Signature · 1 line
2.1.0
PATCH v2 6/10 ARM: sunxi-mmc: Add mmc support for sun6i / A31
Quoted 9 lines · Chen-Yu Tsai
From: Hans de Goede <[email protected]>
The mmc hardware on sun6i has an extra reset control that needs to be de-asserted prior to usage. Also the FIFO address is different.
Signed-off-by Hans de Goede <[email protected]>[wens at csie.org: use
setbits_le32for reset control, drop obsolete changes,
rewrite different FIFO address handling, add commit message]Signed-off-by Chen-Yu Tsai <[email protected]>
Pantelis, unless you object I'd like to eventually take this into u-boot-sunxi.git#next and merge for v2015.04.
Quoted 65 lines
--- arch/arm/include/asm/arch-sunxi/mmc.h | 5 ++++- drivers/mmc/sunxi_mmc.c | 11 +++++++---- 2 files changed, 11 insertions(+), 5 deletions(-)arch/arm/include/asm/arch-sunxi/mmc.h +4
-1@@ -43,7 +43,10 @@ struct sunxi_mmc {u32 chda;/* 0x90 */ u32 cbda;/* 0x94 */ u32 res1[26 ]; -u32 fifo;/* 0x100 FIFO access address */ +#if defined(CONFIG_SUN6I ) +u32 res2[64 ]; +#endif +u32 fifo;/* 0x100 (0x200 on sun6i) FIFO access address */ };#define SUNXI_MMC_CLK_POWERSAVE (0x1 << 17)drivers/mmc/sunxi_mmc.c +7
-4@@ -19,7 +19,6 @@struct sunxi_mmc_host {unsigned mmc_no;uint32_t *mclkreg; -unsigned database;unsigned fatal_err;unsigned mod_clk;struct sunxi_mmc *reg;@@ -57,7 +56,6 @@ static int mmc_resource_init(int sdc_no)printf ("Wrong mmc number %d\n" , sdc_no);return -1 ; } - mmchost->database = (unsigned int )mmchost->reg +0x100 ; mmchost->mmc_no = sdc_no;return 0 ;@@ -75,6 +73,11 @@ static int mmc_clk_io_on(int sdc_no)/* config ahb clock */ setbits_le32 (&ccm->ahb_gate0,1 <<AHB_GATE_OFFSET_MMC (sdc_no)); +#if defined(CONFIG_SUN6I ) +/* unassert reset */ +setbits_le32 (&ccm->ahb_reset0_cfg,1 <<AHB_RESET_OFFSET_MMC (sdc_no)); +#endif +/* config mod clock */ pll_clk =clock_get_pll6 ();/* should be close to 100 MHz but no more, so round up */ @@ -194,9 +197,9 @@ static int mmc_trans_data_by_cpu(struct mmc *mmc, struct mmc_data *data) }if (reading) - buff[i] =readl (mmchost->database); + buff[i] =readl (&mmchost->reg->fifo);else -writel (buff[i], mmchost->database); +writel (buff[i], &mmchost->reg->fifo); }return 0 ;
PATCH v2 6/10 ARM: sunxi-mmc: Add mmc support for sun6i / A31
Hi Ian,
Quoted 13 lines · Ian Campbell
Quoted 9 lines · Chen-Yu Tsai
From: Hans de Goede <[email protected]>
The mmc hardware on sun6i has an extra reset control that needs to be de-asserted prior to usage. Also the FIFO address is different.
Signed-off-by Hans de Goede <[email protected]>[wens at csie.org: use
setbits_le32for reset control, drop obsolete changes,
rewrite different FIFO address handling, add commit message]Signed-off-by Chen-Yu Tsai <[email protected]>
Quoted 5 lines
Acked-by Ian Campbell <[email protected]>Pantelis, unless you object I'd like to eventually take this into u-boot-sunxi.git#next and merge for v2015.04.
Be my guest.
[holly misplaced emails due to change of mailer batman]
? Pantelis
PATCH v2 7/10 ARM: sun6i: Define UART0 pins for A31
In reply to Chen-Yu TsaiUART0 is the default debug/console UART on the A31.
--- arch/arm/include/asm/arch-sunxi/gpio.h | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/include/asm/arch-sunxi/gpio.h +3 -0
@@ -132,6 +132,9 @@ enum sunxi_gpio_number {#define SUN4I_GPH22_SDC1 5 +#define SUN6I_GPH20_UART0_TX 2 +#define SUN6I_GPH21_UART0_RX 2 +#define SUN4I_GPI4_SDC3 2/* GPIO pin pull-up/down config */
Signature · 1 line
2.1.0
PATCH v2 7/10 ARM: sun6i: Define UART0 pins for A31
Quoted 3 lines · Chen-Yu Tsai
UART0 is the default debug/console UART on the A31.
Signed-off-by Chen-Yu Tsai <[email protected]>
PATCH v2 8/10 ARM: sun6i: Setup the A31 UART0 muxing
In reply to Chen-Yu TsaiFrom: Maxime Ripard <[email protected]>
--- arch/arm/cpu/armv7/sunxi/board.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/cpu/armv7/sunxi/board.c +4 -0
@@ -58,6 +58,10 @@ int gpio_init(void)sunxi_gpio_set_cfgpin (SUNXI_GPB (19 ),SUN5I_GPB19_UART0_TX );sunxi_gpio_set_cfgpin (SUNXI_GPB (20 ),SUN5I_GPB20_UART0_RX );sunxi_gpio_set_pull (SUNXI_GPB (20 ),SUNXI_GPIO_PULL_UP ); +#elif CONFIG_CONS_INDEX ==1 && defined(CONFIG_SUN6I ) +sunxi_gpio_set_cfgpin (SUNXI_GPH (20 ),SUN6I_GPH20_UART0_TX ); +sunxi_gpio_set_cfgpin (SUNXI_GPH (21 ),SUN6I_GPH21_UART0_RX ); +sunxi_gpio_set_pull (SUNXI_GPH (21 ),SUNXI_GPIO_PULL_UP );#elif CONFIG_CONS_INDEX ==2 && defined(CONFIG_SUN5I )sunxi_gpio_set_cfgpin (SUNXI_GPG (3 ),SUN5I_GPG3_UART1_TX );sunxi_gpio_set_cfgpin (SUNXI_GPG (4 ),SUN5I_GPG4_UART1_RX );
Signature · 1 line
2.1.0
PATCH v2 8/10 ARM: sun6i: Setup the A31 UART0 muxing
Quoted 8 lines · Chen-Yu Tsai
From: Maxime Ripard <[email protected]>
Signed-off-by Maxime Ripard <[email protected]>Signed-off-by Hans de Goede <[email protected]>[wens at csie.org: commit message was "ARM: sunxi: Setup the A31 UART0 muxing"][wens at csie.org: reorder #ifs by SUN?I][wens at csie.org: replace magic numbers with GPIO definitions]Signed-off-by Chen-Yu Tsai <[email protected]>
PATCH v2 9/10 ARM: sunxi: Add basic A31 support
In reply to Chen-Yu TsaiFrom: Maxime Ripard <[email protected]>
Add a new sun6i machine that supports UART and MMC.
[wens at csie.org: use SPDX labels, adapt to Kconfig system, drop ifdef
around mmc and smp code, drop MACH_TYPE]
--- arch/arm/Kconfig | 3 +++ arch/arm/cpu/armv7/sunxi/cpu_info.c | 2 ++ board/sunxi/Kconfig | 10 +++++++++- include/configs/sun6i.h | 26 ++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 include/configs/sun6i.h
arch/arm/Kconfig +3 -0
@@ -439,6 +439,9 @@ config TARGET_SUN4I config TARGET_SUN5I bool "Support sun5i" +config TARGET_SUN6I + bool "Support sun6i" + config TARGET_SUN7I bool "Support sun7i"
arch/arm/cpu/armv7/sunxi/cpu_info.c +2 -0
@@ -23,6 +23,8 @@ int print_cpuinfo(void)case 7 :puts ("CPU: Allwinner A10s (SUN5I)\n" );break ; default: puts("CPU: Allwinner A1X (SUN5I)\n"); } +#elif defined CONFIG_SUN6I +puts ("CPU: Allwinner A31 (SUN6I)\n" );#elif defined CONFIG_SUN7Iputs ("CPU: Allwinner A20 (SUN7I)\n" );#else
board/sunxi/Kconfig +9 -1
@@ -14,6 +14,14 @@ config SYS_CONFIG_NAME endif +if TARGET_SUN6I + +config SYS_CONFIG_NAME + string + default "sun6i" + +endif + if TARGET_SUN7I config SYS_CONFIG_NAME
@@ -22,7 +30,7 @@ config SYS_CONFIG_NAME endif -if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN7I +if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN6I || TARGET_SUN7I config SYS_CPU string
include/configs/sun6i.h new file +26 -0
@@ -0,0 +1,26 @@ +/* +* (C) Copyright 2012-2013 Henrik Nordstrom <[email protected]> +* (C) Copyright 2013 Luke Kenneth Casson Leighton <[email protected]> +* (C) Copyright 2013 Maxime Ripard <[email protected]> +* +* Configuration settings for the Allwinner A31 (sun6i) CPU +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* +* A31 specific configuration +*/ +#define CONFIG_SUN6I /* sun6i SoC generation */ + +#define CONFIG_SYS_PROMPT "sun6i# " + +/* +* Include common sunxi configuration where most the settings are +*/ +#include <configs/sunxi-common.h> + +#endif /* __CONFIG_H */
Signature · 1 line
2.1.0
PATCH v2 9/10 ARM: sunxi: Add basic A31 support
Quoted 9 lines · Chen-Yu Tsai
From: Maxime Ripard <[email protected]>
Add a new sun6i machine that supports UART and MMC.
Signed-off-by Maxime Ripard <[email protected]>Signed-off-by Hans de Goede <[email protected]>[wens at csie.org: use SPDX labels, adapt to
Kconfigsystem, drop ifdef
around mmc and smp code, dropMACH_TYPE]Signed-off-by Chen-Yu Tsai <[email protected]>
PATCH v2 10/10 ARM: sun6i: Add Colombus board defconfig
In reply to Chen-Yu TsaiThe Colombus board is an A31 evaluation board from WITS Technology.
--- configs/Colombus_defconfig | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 configs/Colombus_defconfig
configs/Colombus_defconfig new file +4 -0
@@ -0,0 +1,4 @@ +CONFIG_SYS_EXTRA_OPTIONS="COLOMBUS" +CONFIG_ARM=y +CONFIG_TARGET_SUN6I=y +CONFIG_FDTFILE="sun6i-a31-colombus.dtb"
Signature · 1 line
2.1.0
PATCH v2 10/10 ARM: sun6i: Add Colombus board defconfig
Quoted 15 lines · Chen-Yu Tsai
The Colombus board is an A31 evaluation board from WITS Technology.
Signed-off-by Chen-Yu Tsai <[email protected]>--- configs/Colombus_defconfig | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 configs/Colombus_defconfigconfigs/Colombus_defconfig new file +0
-0
configs/Colombus_defconfig line 1
Quoted 1 line
configs/Colombus_defconfig new file +1
-0@@ -0,0 +1,4 @@ +CONFIG_SYS_EXTRA_OPTIONS="COLOMBUS"
Does this do anything other than define an unused #define?
Ah, I suppose eventually it will cause the inclusion of a suitable dram file. Really ought to start moving things out of SYS_EXTRA though, but I don't think you need to shave that yakk just to get this patch in, so:
PATCH v2 10/10 ARM: sun6i: Add Colombus board defconfig
Quoted 20 lines · Ian Campbell
Quoted 15 lines · Chen-Yu Tsai
The Colombus board is an A31 evaluation board from WITS Technology.
Signed-off-by Chen-Yu Tsai <[email protected]>--- configs/Colombus_defconfig | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 configs/Colombus_defconfigconfigs/Colombus_defconfig new file +0
-0configs/Colombus_defconfig line 1
Quoted 1 line
configs/Colombus_defconfig new file +1
-0@@ -0,0 +1,4 @@ +CONFIG_SYS_EXTRA_OPTIONS="COLOMBUS"Does this do anything other than define an unused #define?
Quoted 5 lines
Ah, I suppose eventually it will cause the inclusion of a suitable dram file. Really ought to start moving things out of
SYS_EXTRAthough, but I don't think you need to shave that yakk just to get this patch in, so:Acked-by Ian Campbell <[email protected]>
Although I've just noticed that lacks a board/sunxi/MAINTAINERS entry.
I think there is no need to resend the whole series, just this one patch. With this minor tweak I think it's time add this to u-boot-sunxi#next.
Ian.
PATCH v2 10/10 ARM: sun6i: Add Colombus board defconfig
Quoted 25 lines · Ian Campbell
Quoted 24 lines · Ian Campbell
Quoted 15 lines · Chen-Yu Tsai
The Colombus board is an A31 evaluation board from WITS Technology.
Signed-off-by Chen-Yu Tsai <[email protected]>--- configs/Colombus_defconfig | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 configs/Colombus_defconfigconfigs/Colombus_defconfig new file +0
-0configs/Colombus_defconfig line 1
Quoted 1 line
configs/Colombus_defconfig new file +1
-0@@ -0,0 +1,4 @@ +CONFIG_SYS_EXTRA_OPTIONS="COLOMBUS"Does this do anything other than define an unused #define?
Ah, I suppose eventually it will cause the inclusion of a suitable dram file. Really ought to start moving things out of
SYS_EXTRAthough, but I don't think you need to shave that yakk just to get this patch in, so:
Quoted 7 lines
Quoted 1 line
Acked-by Ian Campbell <[email protected]>Although I've just noticed that lacks a board/sunxi/MAINTAINERS entry.
I think there is no need to resend the whole series, just this one patch. With this minor tweak I think it's time add this to u-boot-sunxi#next.
Actually I don't have this board. I think Maxime has one. Not sure if anyone else does. It was kind of a placeholder for all A31 boards.
I suppose you could just drop this patch. I can send another one for the A31 Hummingbird, which I do have and can maintain.
ChenYu
PATCH v2 10/10 ARM: sun6i: Add Colombus board defconfig
Quoted 34 lines · Chen-Yu Tsai
Quoted 25 lines · Ian Campbell
Quoted 24 lines · Ian Campbell
Quoted 15 lines · Chen-Yu Tsai
The Colombus board is an A31 evaluation board from WITS Technology.
Signed-off-by Chen-Yu Tsai <[email protected]>--- configs/Colombus_defconfig | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 configs/Colombus_defconfigconfigs/Colombus_defconfig new file +0
-0configs/Colombus_defconfig line 1
Quoted 1 line
configs/Colombus_defconfig new file +1
-0@@ -0,0 +1,4 @@ +CONFIG_SYS_EXTRA_OPTIONS="COLOMBUS"Does this do anything other than define an unused #define?
Ah, I suppose eventually it will cause the inclusion of a suitable dram file. Really ought to start moving things out of
SYS_EXTRAthough, but I don't think you need to shave that yakk just to get this patch in, so:Quoted 7 lines
Quoted 1 line
Acked-by Ian Campbell <[email protected]>Although I've just noticed that lacks a board/sunxi/MAINTAINERS entry.
I think there is no need to resend the whole series, just this one patch. With this minor tweak I think it's time add this to u-boot-sunxi#next.
Quoted 5 lines
Actually I don't have this board. I think Maxime has one. Not sure if anyone else does. It was kind of a placeholder for all A31 boards.
I suppose you could just drop this patch. I can send another one for the A31 Hummingbird, which I do have and can maintain.
Unless Maxime agrees to having his name in the MAINTAINERS file I think that would be best, actually if he does agree I see no reason not to have both ;-)
Ian.
PATCH v2 10/10 ARM: sun6i: Add Colombus board defconfig
Quoted 9 lines · Ian Campbell
Quoted 5 lines
Actually I don't have this board. I think Maxime has one. Not sure if anyone else does. It was kind of a placeholder for all A31 boards.
I suppose you could just drop this patch. I can send another one for the A31 Hummingbird, which I do have and can maintain.
Unless Maxime agrees to having his name in the
MAINTAINERSfile I think that would be best, actually if he does agree I see no reason not to have both ;-)
That's something I could live with :)
Maxime
Signature · 10 lines
Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140928/cfb76cc3/attachment.pgp>
PATCH v2 10/10 ARM: sun6i: Add Colombus board defconfig
In reply to Ian CampbellHi Ian,
Quoted 25 lines · Ian Campbell
Quoted 24 lines · Ian Campbell
Quoted 15 lines · Chen-Yu Tsai
The Colombus board is an A31 evaluation board from WITS Technology.
Signed-off-by Chen-Yu Tsai <[email protected]>--- configs/Colombus_defconfig | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 configs/Colombus_defconfigconfigs/Colombus_defconfig new file +0
-0configs/Colombus_defconfig line 1
Quoted 1 line
configs/Colombus_defconfig new file +1
-0@@ -0,0 +1,4 @@ +CONFIG_SYS_EXTRA_OPTIONS="COLOMBUS"Does this do anything other than define an unused #define?
Ah, I suppose eventually it will cause the inclusion of a suitable dram file. Really ought to start moving things out of
SYS_EXTRAthough, but I don't think you need to shave that yakk just to get this patch in, so:
Quoted 7 lines
Quoted 1 line
Acked-by Ian Campbell <[email protected]>Although I've just noticed that lacks a board/sunxi/MAINTAINERS entry.
I think there is no need to resend the whole series, just this one patch. With this minor tweak I think it's time add this to u-boot-sunxi#next.
Before you do that, note that I've just added 2 patches there, which I would like to get into v2014.10. Specifically I'm hoping that I can get some positive testing feedback on the bananapi gmac patch I've send (off-list), and I believe we really should try to get the bananapi fix into v2014.10, and if we're going todo a pull-req for v2014.10, we might as well include the 2 patches I've just added to next. Do you agree ?
Still feel free to merge the sun6i series into next, I can just cherry pick the 3 patches in question directly into master when I'm ready to send the pull-req.
Regards,
Hans
[U-Boot] [linux-sunxi] Re: [PATCH v2 10/10] ARM: sun6i: Add Colombus board defconfig
Quoted 36 lines · Hans de Goede
Hi Ian,
Quoted 25 lines · Ian Campbell
Quoted 24 lines · Ian Campbell
Quoted 15 lines · Chen-Yu Tsai
The Colombus board is an A31 evaluation board from WITS Technology.
Signed-off-by Chen-Yu Tsai <[email protected]>--- configs/Colombus_defconfig | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 configs/Colombus_defconfigconfigs/Colombus_defconfig new file +0
-0configs/Colombus_defconfig line 1
Quoted 1 line
configs/Colombus_defconfig new file +1
-0@@ -0,0 +1,4 @@ +CONFIG_SYS_EXTRA_OPTIONS="COLOMBUS"Does this do anything other than define an unused #define?
Ah, I suppose eventually it will cause the inclusion of a suitable dram file. Really ought to start moving things out of
SYS_EXTRAthough, but I don't think you need to shave that yakk just to get this patch in, so:Quoted 7 lines
Quoted 1 line
Acked-by Ian Campbell <[email protected]>Although I've just noticed that lacks a board/sunxi/MAINTAINERS entry.
I think there is no need to resend the whole series, just this one patch. With this minor tweak I think it's time add this to u-boot-sunxi#next.
Quoted 6 lines
Before you do that, note that I've just added 2 patches there, which I would like to get into v2014.10. Specifically I'm hoping that I can get some positive testing feedback on the bananapi gmac patch I've send (off-list), and I believe we really should try to get the bananapi fix into v2014.10, and if we're going todo a pull-req for v2014.10, we might as well include the 2 patches I've just added to next. Do you agree ?
You mean these two?
sun7i: Add support for Olimex A20-OLinuXino-LIME2
mmc: sunxi: add SDHC support for sun6i/sun7i/sun8i
The latter seems like a feature to me, or at least the changelog doesn't give any rationale why it should go in now rather than waiting for the next merge window (i.e. why it's a bugfix, what the upside is to justify its inclusion now). How much testing has it had and what are the potential downsides?
WRT the new board (and new boards generally), I'm in two minds. On the one hand they are pretty low risk (can't regress anything else, at least not in this case), on the other we are 6 weeks past the close of the merge window and 2 from the release date, so we are pretty far along. Where do we draw the line?
The gmac fix is a clear bug fix and once it is properly posted publicly I will ack and then I agree it should go in.
Quoted 3 lines
Still feel free to merge the sun6i series into next, I can just cherry pick the 3 patches in question directly into master when I'm ready to send the pull-req.
Ack, that's what I expected to happen.
Ian.
[U-Boot] [linux-sunxi] Re: [PATCH v2 10/10] ARM: sun6i: Add Colombus board defconfig
Quoted 10 lines · Ian Campbell
You mean these two?
sun7i: Add support for Olimex A20-OLinuXino-LIME2
mmc: sunxi: add SDHC support for sun6i/sun7i/sun8iThe latter seems like a feature to me, or at least the changelog doesn't give any rationale why it should go in now rather than waiting for the next merge window (i.e. why it's a bugfix, what the upside is to justify its inclusion now). How much testing has it had and what are the potential downsides?
Quoted 5 lines
WRT the new board (and new boards generally), I'm in two minds. On the one hand they are pretty low risk (can't regress anything else, at least not in this case), on the other we are 6 weeks past the close of the merge window and 2 from the release date, so we are pretty far along. Where do we draw the line?
FWIW, the Lime2 is very new, I had no expectations it would make it into 2014.10 - although I'd not complain if it does!
Seems unlikely the dts will make it into 3.17 either, so there's probably no rush.
Anyone needing either can pick up the patches themselves until next release.
[U-Boot] [linux-sunxi] Re: [PATCH v2 10/10] ARM: sun6i: Add Colombus board defconfig
In reply to Ian CampbellHi,
Quoted 44 lines · Ian Campbell
Quoted 36 lines · Hans de Goede
Hi Ian,
Quoted 25 lines · Ian Campbell
Quoted 24 lines · Ian Campbell
Quoted 15 lines · Chen-Yu Tsai
The Colombus board is an A31 evaluation board from WITS Technology.
Signed-off-by Chen-Yu Tsai <[email protected]>--- configs/Colombus_defconfig | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 configs/Colombus_defconfigconfigs/Colombus_defconfig new file +0
-0configs/Colombus_defconfig line 1
Quoted 1 line
configs/Colombus_defconfig new file +1
-0@@ -0,0 +1,4 @@ +CONFIG_SYS_EXTRA_OPTIONS="COLOMBUS"Does this do anything other than define an unused #define?
Ah, I suppose eventually it will cause the inclusion of a suitable dram file. Really ought to start moving things out of
SYS_EXTRAthough, but I don't think you need to shave that yakk just to get this patch in, so:Quoted 7 lines
Quoted 1 line
Acked-by Ian Campbell <[email protected]>Although I've just noticed that lacks a board/sunxi/MAINTAINERS entry.
I think there is no need to resend the whole series, just this one patch. With this minor tweak I think it's time add this to u-boot-sunxi#next.
Quoted 6 lines
Before you do that, note that I've just added 2 patches there, which I would like to get into v2014.10. Specifically I'm hoping that I can get some positive testing feedback on the bananapi gmac patch I've send (off-list), and I believe we really should try to get the bananapi fix into v2014.10, and if we're going todo a pull-req for v2014.10, we might as well include the 2 patches I've just added to next. Do you agree ?
Quoted 3 lines
You mean these two?
sun7i: Add support for Olimex A20-OLinuXino-LIME2
mmc: sunxi: add SDHC support for sun6i/sun7i/sun8i
Yes.
Quoted 5 lines
The latter seems like a feature to me, or at least the changelog doesn't give any rationale why it should go in now rather than waiting for the next merge window (i.e. why it's a bugfix, what the upside is to justify its inclusion now). How much testing has it had and what are the potential downsides?
AFAIK the downside is that High Capacity cards will not work without it.
Looking at the code if this bit is set, then for some commands drivers/mmc/mmc.c or-s in OCR_HCS into the mmc cmdarg, so I guess you're right that this may cause some undesirable side effects, so lets delay this one.
Quoted 5 lines
WRT the new board (and new boards generally), I'm in two minds. On the one hand they are pretty low risk (can't regress anything else, at least not in this case), on the other we are 6 weeks past the close of the merge window and 2 from the release date, so we are pretty far along. Where do we draw the line?
Normally I would not include new boards at this moment in the cycle, but since we need to do a pull-req for the gmac anyways I thought it would be nice to have it included, esp. since many distros only spin things like sdcard boot images once, so if we do not include it now, many distros will not get it for a significant amount of time.
Either way let me know how you want to proceed, if you think we should not include this, then I'll send a pull-req with only the gmac fix.
Quoted 2 lines
The gmac fix is a clear bug fix and once it is properly posted publicly I will ack and then I agree it should go in.
I was hoping for Stephen to get around to testing it today, and then I wanted to send it out with his Tested-by. I'll just go and send it as is for now.
Quoted 5 lines
Quoted 3 lines
Still feel free to merge the sun6i series into next, I can just cherry pick the 3 patches in question directly into master when I'm ready to send the pull-req.
Ack, that's what I expected to happen.
Regards,
Hans
[U-Boot] [linux-sunxi] Re: [PATCH v2 10/10] ARM: sun6i: Add Colombus board defconfig
Quoted 22 lines · Hans de Goede
Quoted 9 lines · Ian Campbell
Quoted 6 lines · Hans de Goede
Before you do that, note that I've just added 2 patches there, which I would like to get into v2014.10. Specifically I'm hoping that I can get some positive testing feedback on the bananapi gmac patch I've send (off-list), and I believe we really should try to get the bananapi fix into v2014.10, and if we're going todo a pull-req for v2014.10, we might as well include the 2 patches I've just added to next. Do you agree ?
Quoted 3 lines
You mean these two?
sun7i: Add support for Olimex A20-OLinuXino-LIME2
mmc: sunxi: add SDHC support for sun6i/sun7i/sun8iYes.
Quoted 5 lines
The latter seems like a feature to me, or at least the changelog doesn't give any rationale why it should go in now rather than waiting for the next merge window (i.e. why it's a bugfix, what the upside is to justify its inclusion now). How much testing has it had and what are the potential downsides?
Quoted 6 lines
AFAIK the downside is that High Capacity cards will not work without it.
Looking at the code if this bit is set, then for some commands
drivers/mmc/mmc.cor-s inOCR_HCSinto the mmc cmdarg, so I guess you're right that this may cause some undesirable side effects, so lets delay this one.
OK.
Quoted 11 lines
Quoted 5 lines
WRT the new board (and new boards generally), I'm in two minds. On the one hand they are pretty low risk (can't regress anything else, at least not in this case), on the other we are 6 weeks past the close of the merge window and 2 from the release date, so we are pretty far along. Where do we draw the line?
Normally I would not include new boards at this moment in the cycle, but since we need to do a pull-req for the gmac anyways I thought it would be nice to have it included, esp. since many distros only spin things like sdcard boot images once, so if we do not include it now, many distros will not get it for a significant amount of time.
There's always Just One More Board(tm) ;-)
Quoted 2 lines
Either way let me know how you want to proceed, if you think we should not include this, then I'll send a pull-req with only the gmac fix.
As I say I'm in two minds. I'm not really sure what the u-boot norm is on this, I was hoping someone might chime in (although it's not been very long and the thread topic doesn't exactly scream for attention). Maybe run it by Albert/Tom and see how they feel about such things in general?
Where run it by might be two alternate PRs? Or a PR structured so the new board can trivially be dropped?
Quoted 5 lines
Quoted 2 lines
The gmac fix is a clear bug fix and once it is properly posted publicly I will ack and then I agree it should go in.
I was hoping for Stephen to get around to testing it today, and then I wanted to send it out with his Tested-by. I'll just go and send it as is for now.
s/Stephen/Karsten/?
Ian.
[U-Boot] [linux-sunxi] Re: [PATCH v2 10/10] ARM: sun6i: Add Colombus board defconfig
Hi,
Quoted 38 lines · Ian Campbell
Quoted 22 lines · Hans de Goede
Quoted 9 lines · Ian Campbell
Quoted 6 lines · Hans de Goede
Before you do that, note that I've just added 2 patches there, which I would like to get into v2014.10. Specifically I'm hoping that I can get some positive testing feedback on the bananapi gmac patch I've send (off-list), and I believe we really should try to get the bananapi fix into v2014.10, and if we're going todo a pull-req for v2014.10, we might as well include the 2 patches I've just added to next. Do you agree ?
Quoted 3 lines
You mean these two?
sun7i: Add support for Olimex A20-OLinuXino-LIME2
mmc: sunxi: add SDHC support for sun6i/sun7i/sun8iYes.
Quoted 5 lines
The latter seems like a feature to me, or at least the changelog doesn't give any rationale why it should go in now rather than waiting for the next merge window (i.e. why it's a bugfix, what the upside is to justify its inclusion now). How much testing has it had and what are the potential downsides?
Quoted 6 lines
AFAIK the downside is that High Capacity cards will not work without it.
Looking at the code if this bit is set, then for some commands
drivers/mmc/mmc.cor-s inOCR_HCSinto the mmc cmdarg, so I guess you're right that this may cause some undesirable side effects, so lets delay this one.OK.
Quoted 6 lines
Quoted 5 lines
WRT the new board (and new boards generally), I'm in two minds. On the one hand they are pretty low risk (can't regress anything else, at least not in this case), on the other we are 6 weeks past the close of the merge window and 2 from the release date, so we are pretty far along. Where do we draw the line?
Quoted 7 lines
Quoted 5 lines
Normally I would not include new boards at this moment in the cycle, but since we need to do a pull-req for the gmac anyways I thought it would be nice to have it included, esp. since many distros only spin things like sdcard boot images once, so if we do not include it now, many distros will not get it for a significant amount of time.
There's always Just One More Board(tm) ;-)
Right, so lets just drop the board and I'll do a pull-req with only the bananapi gmac fix, can I have your Reviewed-by for that one please?
Quoted 12 lines
Quoted 2 lines
Either way let me know how you want to proceed, if you think we should not include this, then I'll send a pull-req with only the gmac fix.
As I say I'm in two minds. I'm not really sure what the u-boot norm is on this, I was hoping someone might chime in (although it's not been very long and the thread topic doesn't exactly scream for attention). Maybe run it by Albert/Tom and see how they feel about such things in general?
Where run it by might be two alternate PRs? Or a PR structured so the new board can trivially be dropped?
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
The gmac fix is a clear bug fix and once it is properly posted publicly I will ack and then I agree it should go in.
I was hoping for Stephen to get around to testing it today, and then I wanted to send it out with his Tested-by. I'll just go and send it as is for now.
s/Stephen/Karsten/?
Yes, my bad.
Regards,
Hans
[U-Boot] [linux-sunxi] Re: [PATCH v2 10/10] ARM: sun6i: Add Colombus board defconfig
Quoted 4 lines · Hans de Goede
Right, so lets just drop the board and I'll do a pull-req with only the
bananapi gmac fix, can I have your Reviewed-by for that one please?
Done.