linux: bsp-41x: move SDHI items to proper places

Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

5 files changed, 36 insertions, 13 deletions

diff --git a/projects/linux/bsp-41x-non-target.yaml b/projects/linux/bsp-41x-non-target.yaml
index 6f941a2..cd21d5a 100644
--- a/projects/linux/bsp-41x-non-target.yaml
+++ b/projects/linux/bsp-41x-non-target.yaml
@@ -479,3 +479,8 @@ bsp41x:
  - 4758823478413eb435082d313d76d1ea9b697c7c # spi: sh-msiof: Set 2 clock delay for R-Car H3 Ver.3.0 only (No access to H3 ES3.0 for testing)
  - e42aa80c7e7bddd365bc76932e941925455ec78b # spi: sh-msiof: Add SPI master transmission workaround (workaround patch)
  - 8b3f561667480fc420d0d986e93f69ad91343ab3 # arm64: dts: r8a77990-ebisu: Enable eMMC of SDHI3 (my docs say eMMC on Ebisu is 1.8V only. No need to add 3.3V)
+ - 529a313898163de75f90ad57fd5e889a0d823ed2 # arm64: dts: renesas: r8a7795-es1-h3ulcb: disable eMMC (What "silicon bug"? HS400 is already disabled in the driver)
+ - 2d239cde49875ea6d1c7fd2da7a4457586642fc8 # mmc: renesas_sdhi: fix reset function (torvalds: 183edc060e6969a3afe83f663b534f6324fb7e3a # mmc: renesas_sdhi: clear TAPEN when resetting, too)
+ - 7c60e60416465fe072938224874e19e1f93d00ee # mmc: renesas_sdhi: fix selection of manual correction (Why exactly can't we use the version register?)
+ - 5359fccbc8e279e6f88f328eabd3566483cf4ac2 # mmc: tmio: fix bus width after reset_work (torvalds: 0a446288aa9f28ab00a31b8b51fdb005953f9f99 # mmc: tmio: restore bus width when resetting)
+ - 2cabdef72b5cc5734f5229fa8d731b2669ed3b26 # mmc: renesas_sdhi: Add PIO mode support (really needed? looks like a working around DMA problems of very early Gen3)
diff --git a/projects/linux/bsp-41x-upport-request.yaml b/projects/linux/bsp-41x-upport-request.yaml
index 8359e2f..56f2540 100644
--- a/projects/linux/bsp-41x-upport-request.yaml
+++ b/projects/linux/bsp-41x-upport-request.yaml
@@ -51,11 +51,9 @@ bsp41x:
  - 08c5882b168a32ff551a4651701e29e20f7ccf6e # arm64: dts: renesas: Add r8a7796-m3ulcb-2x4g-kf.dts
  - 29fa601ee03ed86a59173861f164eba241e82251 # arm64: dts: renesas: eagle: Add x1 clock
  - a3826fa21d29121056f80bf639a3d9c819ee4f8a # arm64: dts: renesas: r8a779x: add IMP nodes
- - 529a313898163de75f90ad57fd5e889a0d823ed2 # arm64: dts: renesas: r8a7795-es1-h3ulcb: disable eMMC
  - 0d76c65cba4f7e3d2c1148bfc73c2e752114d82a # Add MOST support for r8a77965
  - 3a861276aaafb2bcf4137dbe7570c06bc721218f # arm64: dts: renesas: v3hsk: Add GEther PHY GPIO reset pin support
  - 297419f7b2362056733607e45b8ecfe79adc3d4a # arm64: dts: renesas: r8a77970-v3msk: Fix memory size
- - 0237478dc67b71ff92082e06323c015631098b71 # arm64: dts: r8a77980-v3hsk: Enable onboard eMMC
  - 3bf5e06b0acd1a3017acb2efe042a937f39c3e6b # arm64: dts: renesas: r8a77980: add max9286
  - d13c75fe7cca41d0e7be14ab503383274d878b9e # regulator: add MAX2008X camera protector
  - 836e84d18310ae121977be35a0f8a6648d53aefe # arm64: dts: renesas: ulcb-kf: deselect GP5_9 interrupt
@@ -74,7 +72,6 @@ bsp41x:
  - a0a5a6298588963d2aba64d57d160cf5d670530d # arch: arm64: dts: renesas: Updated dts for renesas generic-uio
  - 0b2d1db721500404a81996364146a659cfa9dea5 # arm64: dts: r8a779a0-falcon: Enabled IPMMU MMC
  - e941fd79e9c2f78279b332405f987ebdefef5f2f # arm64: dts: renesas: r8a779a0: Enable IPMMU support for eMMC by default on R-Car V3U
- - a91a23d1d738335d5a92af0e2a18b1ddbcf3d602 # mmc: renesas_sdhi: Fix SDnCKCR setting in 4TAP SoC
  - 50bcd99d989763eae90c3316ef649cec018dd4fb # crypto: ccree - change DOUT_LAST_IND bit value
  - f31eae5ae5f363cebc36249e00e96eb4651695fb # crypto: ccree - change AES condition in SKP readiv
  - c6028ee94a8cbbb50f0dfc4e10ff4cfd705e9886 # arm64: dts: renesas: Update IPMMU ID for VIN devices
@@ -116,14 +113,6 @@ bsp41x:
  - 3ea6921b6637026d47540aa449a20cb91a3649b3 # arm64: dts: renesas: r8a779a0: Describe custom name for generic-uio devices
  - 62946fcc698656e836908e940fcf1b0f8eecf8a7 # arm64: dts: renesas: r8a779a0: Describe interrupt controller to IMP distributer
  - 5c199537152789cba639f3c481561aee28de30c3 # arm64: dts: r8a779a0-falcon: Add reserved memory for CMA
- - c2ca1ccb83afd7c790ae361c720d257e050483f2 # mmc: core: Issue power off notification in mmc_remove()
- - 2d239cde49875ea6d1c7fd2da7a4457586642fc8 # mmc: renesas_sdhi: fix reset function
- - 5d60e36aaa96fa39d1a524cc4ff373c0f36616e0 # mmc: renesas_sdhi: reset calibration register
- - 7c60e60416465fe072938224874e19e1f93d00ee # mmc: renesas_sdhi: fix selection of manual correction
- - 5359fccbc8e279e6f88f328eabd3566483cf4ac2 # mmc: tmio: fix bus width after reset_work
- - 73405fef502d43737be9a50d29935bee133fe7ab # mmc: renesas_sdhi: Add internal DMA transfer end
- - 20e5623df1aaa74301675122b910f063cdcabe7e # mmc: tmio: Add internal DMA transfer end
- - 2cabdef72b5cc5734f5229fa8d731b2669ed3b26 # mmc: renesas_sdhi: Add PIO mode support
  - 0cab5ed55bd3fca91252e4a257a062fa19046cda # arm64: dts: renesas: r8a779a0: Add ISP devices for generic-uio
  - 8eec419b387b1b0f7172b741c357cb5d9368bea4 # arm64: dts: renesas: r8a779a0: Update power domain for ISP nodes
  - aa698a511be6d72946eae23d7fe30ffb13b1cd2c # arm64: dts: renesas: r8a779a0: Add IPMMU nodes
diff --git a/projects/linux/core/bsp41x_clk_renesas.yaml b/projects/linux/core/bsp41x_clk_renesas.yaml
index 4411cc5..02e8a6f 100644
--- a/projects/linux/core/bsp41x_clk_renesas.yaml
+++ b/projects/linux/core/bsp41x_clk_renesas.yaml
@@ -4,8 +4,6 @@ key: 1641c746-661f-11eb-94be-d3d0dd2f1615
 status: New
 
 bsp41x:
- - 7a967a750a3409554d72d9bc3842722e86703125 # clk: Add support parent clock in set_phase
- - 5e0b119a284593bbe5966da6049e2b5272830954 # clk: rcar-gen3: Add set_phase to set SDnCKCR in HS400
  - 226e92814ca5b8ea1ce789869cee131c9bc2a819 # clk: renesas: rcar-gen3: Add support ZG clock divider for R8A77990
  - 97a8cbaabb27ab9b53c345798e87ff5de155cf94 # clk: renesas: rcar-gen3: Fix revision of R8A7796 for applying SD_SKIP_FIRST
  - 5a2c795936b78619f1f83ff89846efe7e63be2b3 # clk: renesas: rcar-gen3: Fix SCCG/Clean peripheral clocks definition
diff --git a/projects/linux/io/SDHI-refactor-SDHn.yaml b/projects/linux/io/SDHI-refactor-SDHn.yaml
index ebffbf8..e9dbe0f 100644
--- a/projects/linux/io/SDHI-refactor-SDHn.yaml
+++ b/projects/linux/io/SDHI-refactor-SDHn.yaml
@@ -4,6 +4,11 @@ key: 008d3362-4055-11eb-9620-cb34de96bb07
 status: New
 assignee: Wolfram
 
+bsp41x:
+ - 7a967a750a3409554d72d9bc3842722e86703125 # clk: Add support parent clock in set_phase
+ - 5e0b119a284593bbe5966da6049e2b5272830954 # clk: rcar-gen3: Add set_phase to set SDnCKCR in HS400
+ - a91a23d1d738335d5a92af0e2a18b1ddbcf3d602 # mmc: renesas_sdhi: Fix SDnCKCR setting in 4TAP SoC
+
 upstream:
 
 comments:
diff --git a/projects/linux/io/SDHI-upport-BSP-fixes.yaml b/projects/linux/io/SDHI-upport-BSP-fixes.yaml
new file mode 100644
index 0000000..3027d9a
--- /dev/null
+++ b/projects/linux/io/SDHI-upport-BSP-fixes.yaml
@@ -0,0 +1,26 @@
+title: SDHI; upport BSP patches
+team: IO
+key: fe6714da-a9b4-11eb-a028-6bbd20fa8e8a
+status: New
+assignee: Wolfram
+
+bsp41x:
+ - 0237478dc67b71ff92082e06323c015631098b71 # arm64: dts: r8a77980-v3hsk: Enable onboard eMMC
+ - c2ca1ccb83afd7c790ae361c720d257e050483f2 # mmc: core: Issue power off notification in mmc_remove()
+ - 5d60e36aaa96fa39d1a524cc4ff373c0f36616e0 # mmc: renesas_sdhi: reset calibration register
+ - 73405fef502d43737be9a50d29935bee133fe7ab # mmc: renesas_sdhi: Add internal DMA transfer end
+ - 20e5623df1aaa74301675122b910f063cdcabe7e # mmc: tmio: Add internal DMA transfer end
+
+upstream:
+
+comments:
+ - 0237478dc67b71ff92082e06323c015631098b71
+   - do we have V3H hardware in Magnus lab?
+ - c2ca1ccb83afd7c790ae361c720d257e050483f2
+   - https://patchwork.kernel.org/project/linux-mmc/patch/1605005330-7178-1-git-send-email-yoshihiro.shimoda.uh@renesas.com/
+ - 5d60e36aaa96fa39d1a524cc4ff373c0f36616e0
+   - before calling 'renesas_sdhi_adjust_hs400_mode_disable()', change the if to 'if (gen3)'?
+ - 73405fef502d43737be9a50d29935bee133fe7ab
+   - Only for H3/M3-W ES1.0, but why does mainline work?
+ - 20e5623df1aaa74301675122b910f063cdcabe7e
+   - Why does mainline work without it?