diff options
author | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-02-21 16:37:55 +0100 |
---|---|---|
committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-02-21 16:37:55 +0100 |
commit | df4ed283e18f3dfe9f42f0012b12cb0af57bcdbb (patch) | |
tree | 40ad4b148e24c47d319bbbd23bbfc4af75a36e94 /meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch | |
parent | d40e55dbb362c455f0ee863b23c21ac2628cf3f8 (diff) | |
parent | 47aa65ba73e1b29459171de24fb0ee0040cbb39c (diff) |
Merge remote-tracking branch 'agl/next'
* agl/next:
meta-agl-bsp: Add CONFIG_LSM workaround for 5.1+ kernels
meta-agl-profile-cluster-qt5: disable qtbase patches
zeus updates for dragonboard-410c
meta-security: activates dbus-cynagora
recipes-graphics/wayland/weston: Expose weston_output_damage()
meta-agl-profile-core: tweak udisks2 configuration for AGL
meta-agl-bsp/meta-arago: update weston bbappend
[RCAR] Update rcar driver weston 7 bsp 3.21.0
[RCAR] Update rcar driver weston 7 bsp 3.21.0
[RCAR] Split ADSP path for ulcb and ulcb-kf
Fix nss-localuser post install
meta-agl-bsp: meta-raspberrypi: handle zeus upgrade
meta-agl-profile-core: add patch for systemd-udevd SECLABEL crash
meta-security: disable dbus-cynara patches
meta-agl-bsp: handle ptest-runner upgrade
meta-agl-distro: Add inc file for next branch over-rides
meta-agl-distro: BBMASK problematic upstream meta-security bbappend
meta-agl-distro: prefer linux-yocto 4.19 LTS kernel
meta-agl-profile-graphical-qt5: enable qt5location services
meta-agl-profile-core: update most recipe
meta-agl-profile-core: update neardal recipe
Update base local.conf.sample
meta-agl-profile-graphical: don't always build agl-compositor
meta-agl-profile-graphical: update weston and weston-init
meta-agl-profile-graphical: update wayland-ivi-extension for weston 7.0.0
meta-agl-distro: add polkit to DISTRO_FEATURES
meta-agl-profile-core: update fontconfig bbappend
meta-agl-profile-core: switch to udisks2
meta-security: handle systemd upgrade
meta-agl-profile-graphical-qt5: handle qtwayland upgrade
meta-agl-profile-core: handle freetype upgrade
meta-agl-bsp meta-agl-profile-core: upgrade to opencv 4.x
meta-agl-profile-core: update rtl-sdr recipe for zeus
meta-security meta-app-framework: handle xmlsec1 upgrade
meta-agl-profile-graphical: upgrade to gstreamer 1.16
meta-agl-profile-core: remove libmicrohttpd backport
meta-agl-profile-core: remove backported curl and nghttp2 recipes
meta-agl-profile-core: remove libnfc recipe
meta-agl-profile-core: remove connman backport
meta-agl-profile-graphical: remove weston 5.0.0 patches
meta-agl-profile-core: remove old glibc patch
meta-agl-bsp/meta-intel: remove linux-firmware_git.bbappend
meta-agl-bsp: remove weston and wayland-protocols backports
meta-app-framework: remove libzip recipe
meta-security: remove keyutils recipe
Declare layer compatibility with zeus
Change-Id: Ie8ee1e37958279e7cf2d503c54ffacb46ba0c31c
Diffstat (limited to 'meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch')
-rw-r--r-- | meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch deleted file mode 100644 index d9de5c425..000000000 --- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 1f42758fe69648340cfae6cae98e667b88923cf6 Mon Sep 17 00:00:00 2001 -From: Matthias Brugger <mbrugger@suse.com> -Date: Wed, 10 Jul 2019 13:24:36 +0200 -Subject: [PATCH 6/7] mmc: bcm2835_sdhci: Add support for bcm2711 device - -The bcm2711 has two emmc controller. The difference is the clocks -they use. Add support for the second emmc contoller. - -Signed-off-by: Matthias Brugger <mbrugger@suse.com> -Signed-off-by: Andrei Gherzan <andrei@balena.io> -Upstream-status: Pending ---- - drivers/mmc/bcm2835_sdhci.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c -index 08bddd410e..e68dec3be7 100644 ---- a/drivers/mmc/bcm2835_sdhci.c -+++ b/drivers/mmc/bcm2835_sdhci.c -@@ -178,12 +178,13 @@ static int bcm2835_sdhci_probe(struct udevice *dev) - fdt_addr_t base; - int emmc_freq; - int ret; -+ int clock_id = (int)dev_get_driver_data(dev); - - base = devfdt_get_addr(dev); - if (base == FDT_ADDR_T_NONE) - return -EINVAL; - -- ret = bcm2835_get_mmc_clock(BCM2835_MBOX_CLOCK_ID_EMMC); -+ ret = bcm2835_get_mmc_clock(clock_id); - if (ret < 0) { - debug("%s: Failed to set MMC clock (err=%d)\n", __func__, ret); - return ret; -@@ -228,7 +229,14 @@ static int bcm2835_sdhci_probe(struct udevice *dev) - } - - static const struct udevice_id bcm2835_sdhci_match[] = { -- { .compatible = "brcm,bcm2835-sdhci" }, -+ { -+ .compatible = "brcm,bcm2835-sdhci", -+ .data = BCM2835_MBOX_CLOCK_ID_EMMC -+ }, -+ { -+ .compatible = "brcm,bcm2711-emmc2", -+ .data = BCM2835_MBOX_CLOCK_ID_EMMC2 -+ }, - { /* sentinel */ } - }; - --- -2.22.0 - |