| Message ID | 547479D6.8060503@redhat.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
Hi Tom, On 25 November 2014 at 05:45, Hans de Goede <hdegoede@redhat.com> wrote: > Hi Tom, > > Please pull u-boot-sunxi/master into master, highlights: > > 1) hdmi console (with usb keyboard) support with simplefb support so the > kernel > can use the framebuffer too > 2) GMAC support for sun6i > 3) A couple of small bugfixes > > Note I've done a rebase + forced-push, as things were becoming a bit messy > while merging. > > The following changes since commit 2a82ec77d27ef5f860a107c4b764643a655dceeb: > > Prepare v2015.01-rc2 (2014-11-24 17:08:47 -0500) > > are available in the git repository at: > > http://git.denx.de/u-boot-sunxi.git master > > for you to fetch changes up to b366fb92c3d118f97bb0f01fa9c40d253e70e12c: > > sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set > (2014-11-25 13:38:46 +0100) > > ---------------------------------------------------------------- > Hans de Goede (12): > sun4i: Rename dram_clk_cfg to dram_clk_gate > sunxi: Add video pll clock functions > sunxi: video: Add sun6i support > fdt_support: Add a fdt_setup_simplefb_node helper function > common/lcd: Make lcd_dt_simplefb_configure_node use > fdt_setup_simplefb_node > sunxi: Add usb keyboard Kconfig option > sunxi: ahci: Add a delay after enabling target power > sun6i: Correct Mele M9 Vbus gpio settings > sun6i: Add gmac support for sun6i boards > sun6i: Drop some "unknown magic" from dram init > sun7i: Drop CONFIG_ARMV7_PSCI_NR_CPUS > sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set The u-boot-fdt pull request is pending. I think it might have a slight conflict with this one, so I'll wait until this goes in and then resend the fdt pull request. Regards, Simon
On Tue, Nov 25, 2014 at 10:52:21AM -0700, Simon Glass wrote: > Hi Tom, > > On 25 November 2014 at 05:45, Hans de Goede <hdegoede@redhat.com> wrote: > > Hi Tom, > > > > Please pull u-boot-sunxi/master into master, highlights: > > > > 1) hdmi console (with usb keyboard) support with simplefb support so the > > kernel > > can use the framebuffer too > > 2) GMAC support for sun6i > > 3) A couple of small bugfixes > > > > Note I've done a rebase + forced-push, as things were becoming a bit messy > > while merging. > > > > The following changes since commit 2a82ec77d27ef5f860a107c4b764643a655dceeb: > > > > Prepare v2015.01-rc2 (2014-11-24 17:08:47 -0500) > > > > are available in the git repository at: > > > > http://git.denx.de/u-boot-sunxi.git master > > > > for you to fetch changes up to b366fb92c3d118f97bb0f01fa9c40d253e70e12c: > > > > sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set > > (2014-11-25 13:38:46 +0100) > > > > ---------------------------------------------------------------- > > Hans de Goede (12): > > sun4i: Rename dram_clk_cfg to dram_clk_gate > > sunxi: Add video pll clock functions > > sunxi: video: Add sun6i support > > fdt_support: Add a fdt_setup_simplefb_node helper function > > common/lcd: Make lcd_dt_simplefb_configure_node use > > fdt_setup_simplefb_node > > sunxi: Add usb keyboard Kconfig option > > sunxi: ahci: Add a delay after enabling target power > > sun6i: Correct Mele M9 Vbus gpio settings > > sun6i: Add gmac support for sun6i boards > > sun6i: Drop some "unknown magic" from dram init > > sun7i: Drop CONFIG_ARMV7_PSCI_NR_CPUS > > sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set > > The u-boot-fdt pull request is pending. I think it might have a slight > conflict with this one, so I'll wait until this goes in and then > resend the fdt pull request. I _think_ I resolved the conflict right.
Hi, On 11/25/2014 10:52 PM, Tom Rini wrote: > On Tue, Nov 25, 2014 at 10:52:21AM -0700, Simon Glass wrote: >> Hi Tom, >> >> On 25 November 2014 at 05:45, Hans de Goede <hdegoede@redhat.com> wrote: >>> Hi Tom, >>> >>> Please pull u-boot-sunxi/master into master, highlights: >>> >>> 1) hdmi console (with usb keyboard) support with simplefb support so the >>> kernel >>> can use the framebuffer too >>> 2) GMAC support for sun6i >>> 3) A couple of small bugfixes >>> >>> Note I've done a rebase + forced-push, as things were becoming a bit messy >>> while merging. >>> >>> The following changes since commit 2a82ec77d27ef5f860a107c4b764643a655dceeb: >>> >>> Prepare v2015.01-rc2 (2014-11-24 17:08:47 -0500) >>> >>> are available in the git repository at: >>> >>> http://git.denx.de/u-boot-sunxi.git master >>> >>> for you to fetch changes up to b366fb92c3d118f97bb0f01fa9c40d253e70e12c: >>> >>> sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set >>> (2014-11-25 13:38:46 +0100) >>> >>> ---------------------------------------------------------------- >>> Hans de Goede (12): >>> sun4i: Rename dram_clk_cfg to dram_clk_gate >>> sunxi: Add video pll clock functions >>> sunxi: video: Add sun6i support >>> fdt_support: Add a fdt_setup_simplefb_node helper function >>> common/lcd: Make lcd_dt_simplefb_configure_node use >>> fdt_setup_simplefb_node >>> sunxi: Add usb keyboard Kconfig option >>> sunxi: ahci: Add a delay after enabling target power >>> sun6i: Correct Mele M9 Vbus gpio settings >>> sun6i: Add gmac support for sun6i boards >>> sun6i: Drop some "unknown magic" from dram init >>> sun7i: Drop CONFIG_ARMV7_PSCI_NR_CPUS >>> sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set >> >> The u-boot-fdt pull request is pending. I think it might have a slight >> conflict with this one, so I'll wait until this goes in and then >> resend the fdt pull request. > > I _think_ I resolved the conflict right. Hmm, I'm not seeing any changes if I do a "git remote update" did you perhaps forget to push things ? Thanks & Regards, Hans
On Tue, Nov 25, 2014 at 01:45:10PM +0100, Hans de Goede wrote: > Hi Tom, > > Please pull u-boot-sunxi/master into master, highlights: > > 1) hdmi console (with usb keyboard) support with simplefb support so the kernel > can use the framebuffer too > 2) GMAC support for sun6i > 3) A couple of small bugfixes > > Note I've done a rebase + forced-push, as things were becoming a bit messy > while merging. > > The following changes since commit 2a82ec77d27ef5f860a107c4b764643a655dceeb: > > Prepare v2015.01-rc2 (2014-11-24 17:08:47 -0500) > > are available in the git repository at: > > http://git.denx.de/u-boot-sunxi.git master > > for you to fetch changes up to b366fb92c3d118f97bb0f01fa9c40d253e70e12c: > > sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set (2014-11-25 13:38:46 +0100) > Applied to u-boot/master, thanks!
On Wed, Nov 26, 2014 at 10:20:44AM +0100, Hans de Goede wrote: > Hi, > > On 11/25/2014 10:52 PM, Tom Rini wrote: > >On Tue, Nov 25, 2014 at 10:52:21AM -0700, Simon Glass wrote: > >>Hi Tom, > >> > >>On 25 November 2014 at 05:45, Hans de Goede <hdegoede@redhat.com> wrote: > >>>Hi Tom, > >>> > >>>Please pull u-boot-sunxi/master into master, highlights: > >>> > >>>1) hdmi console (with usb keyboard) support with simplefb support so the > >>>kernel > >>> can use the framebuffer too > >>>2) GMAC support for sun6i > >>>3) A couple of small bugfixes > >>> > >>>Note I've done a rebase + forced-push, as things were becoming a bit messy > >>>while merging. > >>> > >>>The following changes since commit 2a82ec77d27ef5f860a107c4b764643a655dceeb: > >>> > >>> Prepare v2015.01-rc2 (2014-11-24 17:08:47 -0500) > >>> > >>>are available in the git repository at: > >>> > >>> http://git.denx.de/u-boot-sunxi.git master > >>> > >>>for you to fetch changes up to b366fb92c3d118f97bb0f01fa9c40d253e70e12c: > >>> > >>> sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set > >>>(2014-11-25 13:38:46 +0100) > >>> > >>>---------------------------------------------------------------- > >>>Hans de Goede (12): > >>> sun4i: Rename dram_clk_cfg to dram_clk_gate > >>> sunxi: Add video pll clock functions > >>> sunxi: video: Add sun6i support > >>> fdt_support: Add a fdt_setup_simplefb_node helper function > >>> common/lcd: Make lcd_dt_simplefb_configure_node use > >>>fdt_setup_simplefb_node > >>> sunxi: Add usb keyboard Kconfig option > >>> sunxi: ahci: Add a delay after enabling target power > >>> sun6i: Correct Mele M9 Vbus gpio settings > >>> sun6i: Add gmac support for sun6i boards > >>> sun6i: Drop some "unknown magic" from dram init > >>> sun7i: Drop CONFIG_ARMV7_PSCI_NR_CPUS > >>> sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set > >> > >>The u-boot-fdt pull request is pending. I think it might have a slight > >>conflict with this one, so I'll wait until this goes in and then > >>resend the fdt pull request. > > > >I _think_ I resolved the conflict right. > > Hmm, I'm not seeing any changes if I do a "git remote update" did you perhaps > forget to push things ? Ah sorry. To be clear, I was testing things at the time :)
Hi, On 11/26/2014 05:25 PM, Tom Rini wrote: > On Wed, Nov 26, 2014 at 10:20:44AM +0100, Hans de Goede wrote: >> Hi, >> >> On 11/25/2014 10:52 PM, Tom Rini wrote: >>> On Tue, Nov 25, 2014 at 10:52:21AM -0700, Simon Glass wrote: >>>> Hi Tom, >>>> >>>> On 25 November 2014 at 05:45, Hans de Goede <hdegoede@redhat.com> wrote: >>>>> Hi Tom, >>>>> >>>>> Please pull u-boot-sunxi/master into master, highlights: >>>>> >>>>> 1) hdmi console (with usb keyboard) support with simplefb support so the >>>>> kernel >>>>> can use the framebuffer too >>>>> 2) GMAC support for sun6i >>>>> 3) A couple of small bugfixes >>>>> >>>>> Note I've done a rebase + forced-push, as things were becoming a bit messy >>>>> while merging. >>>>> >>>>> The following changes since commit 2a82ec77d27ef5f860a107c4b764643a655dceeb: >>>>> >>>>> Prepare v2015.01-rc2 (2014-11-24 17:08:47 -0500) >>>>> >>>>> are available in the git repository at: >>>>> >>>>> http://git.denx.de/u-boot-sunxi.git master >>>>> >>>>> for you to fetch changes up to b366fb92c3d118f97bb0f01fa9c40d253e70e12c: >>>>> >>>>> sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set >>>>> (2014-11-25 13:38:46 +0100) >>>>> >>>>> ---------------------------------------------------------------- >>>>> Hans de Goede (12): >>>>> sun4i: Rename dram_clk_cfg to dram_clk_gate >>>>> sunxi: Add video pll clock functions >>>>> sunxi: video: Add sun6i support >>>>> fdt_support: Add a fdt_setup_simplefb_node helper function >>>>> common/lcd: Make lcd_dt_simplefb_configure_node use >>>>> fdt_setup_simplefb_node >>>>> sunxi: Add usb keyboard Kconfig option >>>>> sunxi: ahci: Add a delay after enabling target power >>>>> sun6i: Correct Mele M9 Vbus gpio settings >>>>> sun6i: Add gmac support for sun6i boards >>>>> sun6i: Drop some "unknown magic" from dram init >>>>> sun7i: Drop CONFIG_ARMV7_PSCI_NR_CPUS >>>>> sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set >>>> >>>> The u-boot-fdt pull request is pending. I think it might have a slight >>>> conflict with this one, so I'll wait until this goes in and then >>>> resend the fdt pull request. >>> >>> I _think_ I resolved the conflict right. >> >> Hmm, I'm not seeing any changes if I do a "git remote update" did you perhaps >> forget to push things ? > > Ah sorry. To be clear, I was testing things at the time :) Ah, ok. Thanks looks good now (have not tested it yet). Regards, Hans
Hi Tom, Please pull u-boot-sunxi/master into master, highlights: 1) hdmi console (with usb keyboard) support with simplefb support so the kernel can use the framebuffer too 2) GMAC support for sun6i 3) A couple of small bugfixes Note I've done a rebase + forced-push, as things were becoming a bit messy while merging. The following changes since commit 2a82ec77d27ef5f860a107c4b764643a655dceeb: Prepare v2015.01-rc2 (2014-11-24 17:08:47 -0500) are available in the git repository at: http://git.denx.de/u-boot-sunxi.git master for you to fetch changes up to b366fb92c3d118f97bb0f01fa9c40d253e70e12c: sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set (2014-11-25 13:38:46 +0100) ---------------------------------------------------------------- Hans de Goede (12): sun4i: Rename dram_clk_cfg to dram_clk_gate sunxi: Add video pll clock functions sunxi: video: Add sun6i support fdt_support: Add a fdt_setup_simplefb_node helper function common/lcd: Make lcd_dt_simplefb_configure_node use fdt_setup_simplefb_node sunxi: Add usb keyboard Kconfig option sunxi: ahci: Add a delay after enabling target power sun6i: Correct Mele M9 Vbus gpio settings sun6i: Add gmac support for sun6i boards sun6i: Drop some "unknown magic" from dram init sun7i: Drop CONFIG_ARMV7_PSCI_NR_CPUS sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set Luc Verhaegen (2): sunxi: video: Add cfb console driver for sunxi sunxi: video: Add simplefb support arch/arm/cpu/armv7/sunxi/clock_sun4i.c | 27 ++ arch/arm/cpu/armv7/sunxi/clock_sun6i.c | 29 ++ arch/arm/cpu/armv7/sunxi/dram_sun4i.c | 4 +- arch/arm/cpu/armv7/sunxi/dram_sun6i.c | 3 - arch/arm/include/asm/arch-sunxi/clock.h | 2 + arch/arm/include/asm/arch-sunxi/clock_sun4i.h | 47 ++- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 67 +++- arch/arm/include/asm/arch-sunxi/cpu.h | 4 + arch/arm/include/asm/arch-sunxi/display.h | 187 +++++++++++ arch/arm/include/asm/arch-sunxi/gpio.h | 1 + board/sunxi/Kconfig | 15 + board/sunxi/ahci.c | 2 + board/sunxi/board.c | 10 + board/sunxi/gmac.c | 45 +++ common/fdt_support.c | 62 ++++ common/lcd.c | 47 +-- configs/A13-OLinuXinoM_defconfig | 2 + configs/A13-OLinuXino_defconfig | 2 + configs/Colombus_defconfig | 1 + configs/Ippo_q8h_v5_defconfig | 2 + configs/Mele_M9_defconfig | 8 +- drivers/video/Makefile | 1 + drivers/video/sunxi_display.c | 451 ++++++++++++++++++++++++++ include/configs/sun7i.h | 1 - include/configs/sunxi-common.h | 62 ++++ include/fdt_support.h | 3 + 26 files changed, 1032 insertions(+), 53 deletions(-) create mode 100644 arch/arm/include/asm/arch-sunxi/display.h create mode 100644 drivers/video/sunxi_display.c Regards, Hans