From c02525777378b99ad6b3a2c922b794d33a8abb4d Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 20 May 2019 15:17:40 +0200 Subject: projects: linux: core: Update after v5.2-rc1 Signed-off-by: Geert Uytterhoeven --- .../core/bsp392_arm64_dts_renesas_r8a77965.yaml | 4 ++-- .../bsp392_arm64_dts_renesas_r8a77990-ebisu.yaml | 6 +++--- .../core/bsp392_arm64_dts_renesas_r8a77990.yaml | 2 +- .../bsp392_arm64_dts_renesas_salvator-common.yaml | 4 ++-- projects/linux/core/bsp392_clk_renesas_errata.yaml | 14 +++++++------- .../linux/core/bsp392_clk_renesas_z_z2_clocks.yaml | 10 +++------- projects/linux/core/bsp392_iommu_ipmmu-vmsa.yaml | 4 ++-- .../linux/core/bsp392_pinctrl_sh-pfc_errata.yaml | 22 +++++++++++----------- .../linux/core/bsp392_pinctrl_sh-pfc_r8a77965.yaml | 4 ++-- projects/linux/core/bsp392_soc_renesas.yaml | 2 +- 10 files changed, 34 insertions(+), 38 deletions(-) (limited to 'projects/linux') diff --git a/projects/linux/core/bsp392_arm64_dts_renesas_r8a77965.yaml b/projects/linux/core/bsp392_arm64_dts_renesas_r8a77965.yaml index 6f53468..a730e10 100644 --- a/projects/linux/core/bsp392_arm64_dts_renesas_r8a77965.yaml +++ b/projects/linux/core/bsp392_arm64_dts_renesas_r8a77965.yaml @@ -1,7 +1,7 @@ title: "From bsp392, upport arm64: dts: renesas: r8a77965:" team: Core key: d529a33d-5323-42b8-a53d-fe271b9a6ab9 -status: New +status: Done relationships: @@ -10,7 +10,7 @@ bsp-commits: - a7d53ce95b71dd5a8ffcb1171e5c4cd62edcc993 # arm64: dts: r8a77965: Remove IPMMU-IR node upstream: - - next: 32d622f3290b2a10e3d8edd55cd21caa7384b03e # arm64: dts: renesas: r8a77965: Remove reg-names of display node + - torvalds: 32d622f3290b2a10e3d8edd55cd21caa7384b03e # arm64: dts: renesas: r8a77965: Remove reg-names of display node - torvalds: d8c6557bc93be73ed1abe5b13fa1e46e59da028b # arm64: dts: renesas: r8a77965: Remove non-existent IPMMU-IR comments: diff --git a/projects/linux/core/bsp392_arm64_dts_renesas_r8a77990-ebisu.yaml b/projects/linux/core/bsp392_arm64_dts_renesas_r8a77990-ebisu.yaml index 7654b5c..8f05197 100644 --- a/projects/linux/core/bsp392_arm64_dts_renesas_r8a77990-ebisu.yaml +++ b/projects/linux/core/bsp392_arm64_dts_renesas_r8a77990-ebisu.yaml @@ -20,9 +20,9 @@ bsp-commits: - f0fc4fc5aa859da42f14e6b98cfa52e0e827ae4d # arm64: dts: renesas: r8a77990-ebisu: sort subnodes of root node upstream: + - torvalds: 9130c15829846fae56ea729f42d1894b8413f89b # arm64: dts: renesas: ebisu: Fix adv7482 hexadecimal register address + - torvalds: 1f4c123a98098cce0c172264de7da4fab1ff71b9 # arm64: dts: renesas: r8a77990-ebisu: Add BD9571 PMIC + - torvalds: a8f6110e64422d5c28046e6be7e8adcee929a418 # arm64: dts: renesas: ebisu: Enable VIN5 comments: - - "112e3a322ac0d651ca2bde8f70282f0e349ad245: linux-next:9130c15829846fae56ea729f42d1894b8413f89b" - - "1133675e0d0a18c2211a08eddf75dae93c3d9533: linux-next:1f4c123a98098cce0c172264de7da4fab1ff71b9" - - "27c04d35a98453929ff413c50295d68042aaa1b8: linux-next:a8f6110e64422d5c28046e6be7e8adcee929a418" - "69360bc0b67fda689885bff813c9fb94d4f9e2df: https://patchwork.kernel.org/patch/10692753/" diff --git a/projects/linux/core/bsp392_arm64_dts_renesas_r8a77990.yaml b/projects/linux/core/bsp392_arm64_dts_renesas_r8a77990.yaml index 11f3b08..3d07228 100644 --- a/projects/linux/core/bsp392_arm64_dts_renesas_r8a77990.yaml +++ b/projects/linux/core/bsp392_arm64_dts_renesas_r8a77990.yaml @@ -22,6 +22,6 @@ bsp-commits: upstream: - torvalds: 3b46fa57e350dc4fb72b8e02feb7fb218a3640d1 # arm64: dts: renesas: r8a77990: Add Audio-DMAC and Sound device nodes - torvalds: 5e53dbf4edb4d0d1cc97318139f2c20338f207c8 # arm64: dts: renesas: r8a77990: Fix VIN endpoint numbering + - torvalds: d5d7134fd49e6f5382432b9fcfbf68fa6556b04c # arm64: dts: renesas: r8a77990: Sort i2c nodes within soc node comments: - - "a342b3bb8c309826182c28e445b61c349b7e8367: linux-next:d5d7134fd49e6f5382432b9fcfbf68fa6556b04c" diff --git a/projects/linux/core/bsp392_arm64_dts_renesas_salvator-common.yaml b/projects/linux/core/bsp392_arm64_dts_renesas_salvator-common.yaml index dcdec7c..32a6ac4 100644 --- a/projects/linux/core/bsp392_arm64_dts_renesas_salvator-common.yaml +++ b/projects/linux/core/bsp392_arm64_dts_renesas_salvator-common.yaml @@ -1,7 +1,7 @@ title: "From bsp392, upport arm64: dts: renesas: salvator-common:" team: Core key: 37e082bb-48e3-4d2d-8518-6f4066b30fc7 -status: Active +status: Done assignee: Geert relationships: @@ -10,6 +10,6 @@ bsp-commits: - 64b73913a93e4e6cbbff4176e9b27f6e46dbc26f # arm64: dts: renesas: salvator-common: sort node label upstream: + - torvalds: de8e8daaf7190efd650bf9d6fed12927c660f235 # arm64: dts: renesas: salvator-common: Sort node label comments: - - "64b73913a93e4e6cbbff4176e9b27f6e46dbc26f: linux-next:de8e8daaf7190efd650bf9d6fed12927c660f235" diff --git a/projects/linux/core/bsp392_clk_renesas_errata.yaml b/projects/linux/core/bsp392_clk_renesas_errata.yaml index 9f64658..1521751 100644 --- a/projects/linux/core/bsp392_clk_renesas_errata.yaml +++ b/projects/linux/core/bsp392_clk_renesas_errata.yaml @@ -1,7 +1,7 @@ title: "From bsp392, upport clk: renesas: errata" team: Core key: 67a370b6-df7b-4d7f-ace2-b7470925f38c -status: Active +status: Done assignee: Geert relationships: @@ -15,11 +15,11 @@ bsp-commits: - f1699a5ab267220bebcaa99104c3f3e69f1fa453 # clk: renesas: r8a77{95,965,990}: Correct parent clock of HS-USB upstream: - - next: 8d36fdcce21c1713eacf45380696f8cec3d724bf # clk: renesas: rcar-gen3: Correct parent clock of EHCI/OHCI - - next: b9df2ea2b8d09ad850afe4d4a0403cb23d9e0c02 # clk: renesas: rcar-gen3: Correct parent clock of Audio-DMAC - - next: 3c772f71a552d343a96868ed9a809f9047be94f5 # clk: renesas: rcar-gen3: Correct parent clock of SYS-DMAC - - next: 8d36fdcce21c1713eacf45380696f8cec3d724bf # clk: renesas: rcar-gen3: Correct parent clock of EHCI/OHCI - - next: c2182095c850a02e150613ac026be99ce1c2ff9f # clk: renesas: rcar-gen3: Correct parent clock of HS-USB - - next: c2182095c850a02e150613ac026be99ce1c2ff9f # clk: renesas: rcar-gen3: Correct parent clock of HS-USB + - torvalds: 8d36fdcce21c1713eacf45380696f8cec3d724bf # clk: renesas: rcar-gen3: Correct parent clock of EHCI/OHCI + - torvalds: b9df2ea2b8d09ad850afe4d4a0403cb23d9e0c02 # clk: renesas: rcar-gen3: Correct parent clock of Audio-DMAC + - torvalds: 3c772f71a552d343a96868ed9a809f9047be94f5 # clk: renesas: rcar-gen3: Correct parent clock of SYS-DMAC + - torvalds: 8d36fdcce21c1713eacf45380696f8cec3d724bf # clk: renesas: rcar-gen3: Correct parent clock of EHCI/OHCI + - torvalds: c2182095c850a02e150613ac026be99ce1c2ff9f # clk: renesas: rcar-gen3: Correct parent clock of HS-USB + - torvalds: c2182095c850a02e150613ac026be99ce1c2ff9f # clk: renesas: rcar-gen3: Correct parent clock of HS-USB comments: diff --git a/projects/linux/core/bsp392_clk_renesas_z_z2_clocks.yaml b/projects/linux/core/bsp392_clk_renesas_z_z2_clocks.yaml index f28594d..77f687e 100644 --- a/projects/linux/core/bsp392_clk_renesas_z_z2_clocks.yaml +++ b/projects/linux/core/bsp392_clk_renesas_z_z2_clocks.yaml @@ -19,15 +19,11 @@ bsp-commits: - f6cd0437d6ec3ef4889f7ffb8a5f696c1b05ac2a # clk: renesas: r8a77965: Add division value of z clock upstream: - - next: 10d9ea5100c89afd677a202036e0e34e129a6c52 # clk: renesas: rcar-gen3: Parameterise Z and Z2 clock offset + - torvalds: 10d9ea5100c89afd677a202036e0e34e129a6c52 # clk: renesas: rcar-gen3: Parameterise Z and Z2 clock offset + - torvalds: 20cc05ba04a93f05d6c50789fe35d762a2db4e96 # clk: renesas: rcar-gen3: Parameterise Z and Z2 clock fixed divisor + - torvalds: 787fe096fe42829f3091888835562ffce4d23bff # clk: renesas: r8a77990: Add Z2 clock comments: - "1aa84001f1853bd52ac3d72ca425ce8be1b58640: requested upport with 0ff874dd0f36501e13e30be213c5641db2352237 of BSPv3.6.1" - - "2b12c11844fa5be38078bec552a6c0ede189292e: https://patchwork.kernel.org/patch/10805905/" - "3c32d47c96f6b664576a3e34abb35998e4f17789: This is a local patch file for developers. So we don't need to upport." - "467ae1aa149ba70ef843a0fda2d6fc64328ab111: We need to upport with refactoring." - - "9b10ae593028df22d0565002a696ccf5b9751bb4: https://patchwork.kernel.org/patch/10805917/" - - "aa06410b1a3b130a4b3c09b2de31e47f5f0c4752: https://patchwork.kernel.org/patch/10805917/" - - "abb24ccb7cfaaa0e3ca80ddd715e77a1c6f6e6d0: https://patchwork.kernel.org/patch/10805917/" - - "dd4aba9be2060071c8d3278719dcb748d210d29b: https://patchwork.kernel.org/patch/10805917/" - - "f6cd0437d6ec3ef4889f7ffb8a5f696c1b05ac2a: https://patchwork.kernel.org/patch/10805917/" diff --git a/projects/linux/core/bsp392_iommu_ipmmu-vmsa.yaml b/projects/linux/core/bsp392_iommu_ipmmu-vmsa.yaml index ce40882..ea9f49b 100644 --- a/projects/linux/core/bsp392_iommu_ipmmu-vmsa.yaml +++ b/projects/linux/core/bsp392_iommu_ipmmu-vmsa.yaml @@ -18,7 +18,7 @@ upstream: comments: - "29cc0ed66fdc3b89a997055621ac59bada16802a: Proposing 'N': Because the current definition is not used now" - - "554c1d4a98e53179e837c4def6a5d25a6a352334: Alternative solution: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=82923" + - "554c1d4a98e53179e837c4def6a5d25a6a352334: Alternative solution: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=109605" - "65a249b57fd970db7eb140625d0558960f43e1eb: Proposing 'N': This is related to MMP code." - "b07bbaefbec2ad6fd0f91641532ece4104823c91: Need rework for IMUCTR and IMTTBCR (mismatch between commit log and the code?)" - - "f6cde6705ebeb23d54162812d01b06e5a29288f8: Alternative solution: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=82923" + - "f6cde6705ebeb23d54162812d01b06e5a29288f8: Alternative solution: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=109605" diff --git a/projects/linux/core/bsp392_pinctrl_sh-pfc_errata.yaml b/projects/linux/core/bsp392_pinctrl_sh-pfc_errata.yaml index eae51c8..4b7ab2b 100644 --- a/projects/linux/core/bsp392_pinctrl_sh-pfc_errata.yaml +++ b/projects/linux/core/bsp392_pinctrl_sh-pfc_errata.yaml @@ -1,7 +1,7 @@ title: "From bsp392, upport pinctrl: sh-pfc: errata" team: Core key: c2b5fb5f-8a05-46bd-ab4b-3684d59f4b56 -status: Active +status: Done assignee: Geert relationships: @@ -22,19 +22,19 @@ bsp-commits: - fc2b3301fc1938a6cd3a7a35d9d42e88bcd7a72f # pinctrl: sh-pfc: r8a77990: Fix MOD_SEL0 bit16 when using NFALE and NFRB_N upstream: - - next: e87882eb9be10b2b9e28156922c2a47d877f5db4 # pinctrl: sh-pfc: r8a77990: Fix MOD_SEL1 bit30 when using SSI_SCK2 and SSI_WS2 - - next: 5671f8e0270ad5e33e3088e5f0fa71af67129630 # pinctrl: sh-pfc: rcar-gen3: Remove HDMI CEC pins, groups, and functions - - next: 5671f8e0270ad5e33e3088e5f0fa71af67129630 # pinctrl: sh-pfc: rcar-gen3: Remove HDMI CEC pins, groups, and functions - - next: e167d723e1a472d252e5c4baf823b77ce5543b05 # pinctrl: sh-pfc: r8a77990: Fix MOD_SEL1 bit31 when using SIM0_D + - torvalds: e87882eb9be10b2b9e28156922c2a47d877f5db4 # pinctrl: sh-pfc: r8a77990: Fix MOD_SEL1 bit30 when using SSI_SCK2 and SSI_WS2 + - torvalds: 5671f8e0270ad5e33e3088e5f0fa71af67129630 # pinctrl: sh-pfc: rcar-gen3: Remove HDMI CEC pins, groups, and functions + - torvalds: 5671f8e0270ad5e33e3088e5f0fa71af67129630 # pinctrl: sh-pfc: rcar-gen3: Remove HDMI CEC pins, groups, and functions + - torvalds: e167d723e1a472d252e5c4baf823b77ce5543b05 # pinctrl: sh-pfc: r8a77990: Fix MOD_SEL1 bit31 when using SIM0_D - torvalds: 3e3eebeacad79bda8a9664c86c04f5201e86fece # pinctrl: sh-pfc: r8a77990: Fix MOD_SEL bit numbering - torvalds: 5219aa33caec2f7b68eda2b7e4ab8e276f323254 # pinctrl: sh-pfc: r8a77995: Fix MOD_SEL bit numbering - - next: a040f3dec8eb7b11c2fd28762bd4f838da4d166b # pinctrl: sh-pfc: rcar-gen3: Rename SEL_ADG_{A,B,C} to SEL_ADG{A,B,C} - - next: 5671f8e0270ad5e33e3088e5f0fa71af67129630 # pinctrl: sh-pfc: rcar-gen3: Remove HDMI CEC pins, groups, and functions + - torvalds: a040f3dec8eb7b11c2fd28762bd4f838da4d166b # pinctrl: sh-pfc: rcar-gen3: Rename SEL_ADG_{A,B,C} to SEL_ADG{A,B,C} + - torvalds: 5671f8e0270ad5e33e3088e5f0fa71af67129630 # pinctrl: sh-pfc: rcar-gen3: Remove HDMI CEC pins, groups, and functions - torvalds: 699c7d1346fbef69e60ca7647c50bbebc483d1c8 # pinctrl: sh-pfc: r8a77990: Fix MOD_SEL0 bit3 when using TX0 - - next: 5671f8e0270ad5e33e3088e5f0fa71af67129630 # pinctrl: sh-pfc: rcar-gen3: Remove HDMI CEC pins, groups, and functions - - next: 662dc924a05e9dffd62f602c7111d6b7ada8fa88 # pinctrl: sh-pfc: rcar-gen3: Remove CC5_OSCOUT pin - - next: 5671f8e0270ad5e33e3088e5f0fa71af67129630 # pinctrl: sh-pfc: rcar-gen3: Remove HDMI CEC pins, groups, and functions + - torvalds: 5671f8e0270ad5e33e3088e5f0fa71af67129630 # pinctrl: sh-pfc: rcar-gen3: Remove HDMI CEC pins, groups, and functions + - torvalds: 662dc924a05e9dffd62f602c7111d6b7ada8fa88 # pinctrl: sh-pfc: rcar-gen3: Remove CC5_OSCOUT pin + - torvalds: 5671f8e0270ad5e33e3088e5f0fa71af67129630 # pinctrl: sh-pfc: rcar-gen3: Remove HDMI CEC pins, groups, and functions - torvalds: 7219a4b645208734d45b1d30a4c35b6f09a0e9e6 # pinctrl: sh-pfc: r8a77990: Fix MOD_SEL0 bit2 when using RX2, TX2 and SCK2 - - next: 943ff71281c6ce44ca48ea1b08c55f1e63648d00 # pinctrl: sh-pfc: r8a77990: Fix MOD_SEL0 bit16 when using NFALE and NFRB_N + - torvalds: 943ff71281c6ce44ca48ea1b08c55f1e63648d00 # pinctrl: sh-pfc: r8a77990: Fix MOD_SEL0 bit16 when using NFALE and NFRB_N comments: diff --git a/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a77965.yaml b/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a77965.yaml index 48e1751..9a5ca0d 100644 --- a/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a77965.yaml +++ b/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a77965.yaml @@ -1,7 +1,7 @@ title: "From bsp392, upport pinctrl: sh-pfc: r8a77965:" team: Core key: fa157ede-afe5-4c38-8ea8-99902fcb8b71 -status: New +status: Done relationships: @@ -17,6 +17,6 @@ upstream: - torvalds: 79dbbdbeccc6784d5e189710adcca750c03d3bd4 # pinctrl: sh-pfc: r8a77965: Add DRIF pins, groups and functions - torvalds: 729257d674bc2e68bf051af5c7202d882bccafe0 # pinctrl: sh-pfc: r8a77965: Add TMU pins, groups and functions - torvalds: 3a44d6a92e2572c602cfce692ae96d0e95d9c848 # pinctrl: sh-pfc: r8a77965: Add CAN pins, groups and functions + - torvalds: 0a042b355e60269ad30725b5b5ca68fc5371a8df # pinctrl: sh-pfc: r8a77965: Add I2C{0,3,5} pins, groups and functions comments: - - "f65a44e53c524194380b61dfa6a50b87d02f0ea8: https://patchwork.kernel.org/patch/10858051/" diff --git a/projects/linux/core/bsp392_soc_renesas.yaml b/projects/linux/core/bsp392_soc_renesas.yaml index b395063..de23ab5 100644 --- a/projects/linux/core/bsp392_soc_renesas.yaml +++ b/projects/linux/core/bsp392_soc_renesas.yaml @@ -10,7 +10,7 @@ bsp-commits: - 92395ae82f5ba4bec18b7e3dc97177ae0a75da20 # soc: renesas: Identify R-Car M3-W ES1.2 upstream: + - torvalds: 15160f6de0bba712fcea078c5ac7571fe33fcd5d # soc: renesas: Identify R-Car M3-W ES1.3 comments: - - "283346a0e5baf612ffc00b5852bd3f88f23c5b43: linux-next:15160f6de0bba712fcea078c5ac7571fe33fcd5d" - "92395ae82f5ba4bec18b7e3dc97177ae0a75da20: Proposing 'N': Complicates revision matching when using soc_device_match()" -- cgit v1.2.3