diff options
| author | Hai Nguyen Pham <hai.pham.ud@renesas.com> | 2018-12-13 15:08:46 +0700 |
|---|---|---|
| committer | Ryo Kataoka <ryo.kataoka.wt@renesas.com> | 2018-12-17 17:13:34 +0900 |
| commit | a5266d298124874c2c06b8b13d073f6ecc2ee355 (patch) | |
| tree | 5643d6e7add5f1bc6e894257e225f2522b6dfde9 | |
| parent | 251716a66e2c55b849c1b287f46f0a8dee78da05 (diff) | |
| download | renesas-bsp-v4.14.75-ltsi/rcar-3.9.2.tar.gz | |
iommu/ipmmu-vmsa: Correct whitelist devices assignmentrcar-3.9.2v4.14.75-ltsi/rcar-3.9.2
This patch corrects whitelist devices assignment, in particular:
- Remove unavailable USB-DMAC ch2/3 devices on r8a7796 (R-Car M3) whitelist
- Add missing USB2.0 Host ch1 device on r8a77965 (R-Car M3N) whitelist
- Fix typo for Audio DMAC ch26 device
Signed-off-by: Hai Nguyen Pham <hai.pham.ud@renesas.com>
| -rw-r--r-- | drivers/iommu/ipmmu-vmsa-whitelist.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/iommu/ipmmu-vmsa-whitelist.h b/drivers/iommu/ipmmu-vmsa-whitelist.h index 8e5368a83ee29..4a846d6991b5b 100644 --- a/drivers/iommu/ipmmu-vmsa-whitelist.h +++ b/drivers/iommu/ipmmu-vmsa-whitelist.h @@ -156,7 +156,7 @@ M_AUDIO_DMAC_20 | M_AUDIO_DMAC_21 | \ M_AUDIO_DMAC_22 | M_AUDIO_DMAC_23 | \ M_AUDIO_DMAC_24 | M_AUDIO_DMAC_25 | \ - M_AUDIO_DMAC_16 | M_AUDIO_DMAC_27 | \ + M_AUDIO_DMAC_26 | M_AUDIO_DMAC_27 | \ M_AUDIO_DMAC_28 | M_AUDIO_DMAC_29 | \ M_AUDIO_DMAC_30 | M_AUDIO_DMAC_31) #define H3_IPMMU_DS0_MASTER (M_SYS_DMAC_0 | M_SYS_DMAC_1 | \ @@ -191,8 +191,7 @@ M_FCPVD_1 | M_FCPVD_2 | M_FCPVD_3) #define M3_IPMMU_HC_MASTER (M_PCIE_0 | M_PCIE_1 | M_USB2H_0 | \ M_USB2H_1 | M_USB_DMAC_0 | M_USB_DMAC_1 | \ - M_USB3H_0 | M_USB3F_0 | M_USB_DMAC_2 | \ - M_USB_DMAC_3) + M_USB3H_0 | M_USB3F_0) #define M3_IPMMU_MP_MASTER (M_AUDIO_DMAC_0 | M_AUDIO_DMAC_1 | \ M_AUDIO_DMAC_2 | M_AUDIO_DMAC_3 | \ M_AUDIO_DMAC_4 | M_AUDIO_DMAC_5 | \ @@ -206,7 +205,7 @@ M_AUDIO_DMAC_20 | M_AUDIO_DMAC_21 | \ M_AUDIO_DMAC_22 | M_AUDIO_DMAC_23 | \ M_AUDIO_DMAC_24 | M_AUDIO_DMAC_25 | \ - M_AUDIO_DMAC_16 | M_AUDIO_DMAC_27 | \ + M_AUDIO_DMAC_26 | M_AUDIO_DMAC_27 | \ M_AUDIO_DMAC_28 | M_AUDIO_DMAC_29 | \ M_AUDIO_DMAC_30 | M_AUDIO_DMAC_31) #define M3_IPMMU_DS0_MASTER (M_SYS_DMAC_0 | M_SYS_DMAC_1 | \ @@ -239,8 +238,8 @@ /* Support masters for r8a77965 */ #define M3N_IPMMU_VI0_MASTER (M_VIN_0_3 | M_VIN_4_7 | M_FCPVD_0 | M_FCPVD_1) #define M3N_IPMMU_HC_MASTER (M_PCIE_0 | M_PCIE_1 | M_SATA | M_USB2H_0 | \ - M_USB_DMAC_0 | M_USB_DMAC_1 | M_USB3H_0 | \ - M_USB3F_0) + M_USB2H_1 | M_USB_DMAC_0 | M_USB_DMAC_1 | \ + M_USB3H_0 | M_USB3F_0) #define M3N_IPMMU_MP_MASTER (M_AUDIO_DMAC_0 | M_AUDIO_DMAC_1 | \ M_AUDIO_DMAC_2 | M_AUDIO_DMAC_3 | \ M_AUDIO_DMAC_4 | M_AUDIO_DMAC_5 | \ @@ -254,7 +253,7 @@ M_AUDIO_DMAC_20 | M_AUDIO_DMAC_21 | \ M_AUDIO_DMAC_22 | M_AUDIO_DMAC_23 | \ M_AUDIO_DMAC_24 | M_AUDIO_DMAC_25 | \ - M_AUDIO_DMAC_16 | M_AUDIO_DMAC_27 | \ + M_AUDIO_DMAC_26 | M_AUDIO_DMAC_27 | \ M_AUDIO_DMAC_28 | M_AUDIO_DMAC_29 | \ M_AUDIO_DMAC_30 | M_AUDIO_DMAC_31) #define M3N_IPMMU_DS0_MASTER (M_SYS_DMAC_0 | M_SYS_DMAC_1 | \ |