Skip to content

Commit

Permalink
KERNEL: v1.1.0 update
Browse files Browse the repository at this point in the history
Change-Id: Ia101a03a91e041a5d124fcd4898993f1d15faee6
Signed-off-by: Romuald JEANNE <romuald.jeanne@st.com>
  • Loading branch information
RJESTM authored and BernardPuel committed Sep 27, 2019
1 parent 1aa85c3 commit c335500
Show file tree
Hide file tree
Showing 82 changed files with 25,981 additions and 26,349 deletions.
9 changes: 9 additions & 0 deletions recipes-kernel/linux/linux-stm32mp-archiver.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#
# Archiver Configuration
#
SRC_URI_append = " file://README.HOW_TO.txt "

inherit archiver
ARCHIVER_MODE[src] = "original"

inherit archiver_stm32mp_clean
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
From 747a93a65dc5e3761539c365a272186f0b7fca08 Mon Sep 17 00:00:00 2001
From: Lionel VITTE <lionel.vitte@st.com>
Date: Thu, 11 Jul 2019 14:11:59 +0200
Subject: [PATCH 01/30] ARM stm32mp1 r2 MACHINE

---
arch/arm/mach-integrator/integrator_cp.c | 2 --
arch/arm/mach-stm32/Kconfig | 5 +----
arch/arm/mach-versatile/versatile_dt.c | 4 ----
3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 772a7cf..976ded5 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -80,8 +80,6 @@ static unsigned int mmc_status(struct device *dev)
static struct mmci_platform_data mmc_data = {
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
.status = mmc_status,
- .gpio_wp = -1,
- .gpio_cd = -1,
};

static u64 notrace intcp_read_sched_clock(void)
diff --git a/arch/arm/mach-stm32/Kconfig b/arch/arm/mach-stm32/Kconfig
index 713c068..651bdf4 100644
--- a/arch/arm/mach-stm32/Kconfig
+++ b/arch/arm/mach-stm32/Kconfig
@@ -4,6 +4,7 @@ menuconfig ARCH_STM32
select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7
select ARM_GIC if ARCH_MULTI_V7
select ARM_PSCI if ARCH_MULTI_V7
+ select ARM_AMBA
select ARCH_HAS_RESET_CONTROLLER
select CLKSRC_STM32
select PINCTRL
@@ -18,22 +19,18 @@ if ARM_SINGLE_ARMV7M

config MACH_STM32F429
bool "STMicroelectronics STM32F429"
- select ARM_AMBA
default y

config MACH_STM32F469
bool "STMicroelectronics STM32F469"
- select ARM_AMBA
default y

config MACH_STM32F746
bool "STMicroelectronics STM32F746"
- select ARM_AMBA
default y

config MACH_STM32F769
bool "STMicroelectronics STM32F769"
- select ARM_AMBA
default y

config MACH_STM32H743
diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c
index 3c8d39c..e9d6068 100644
--- a/arch/arm/mach-versatile/versatile_dt.c
+++ b/arch/arm/mach-versatile/versatile_dt.c
@@ -89,15 +89,11 @@ unsigned int mmc_status(struct device *dev)
static struct mmci_platform_data mmc0_plat_data = {
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
.status = mmc_status,
- .gpio_wp = -1,
- .gpio_cd = -1,
};

static struct mmci_platform_data mmc1_plat_data = {
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
.status = mmc_status,
- .gpio_wp = -1,
- .gpio_cd = -1,
};

/*
--
2.7.4

Loading

0 comments on commit c335500

Please sign in to comment.