From bfaba0a4a693c741ad73c236e89e3a211c3cc10b Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Fri, 22 Mar 2019 13:18:03 +0100 Subject: projects: linux: core: Merge VIN pin control Signed-off-by: Geert Uytterhoeven --- .../core/bsp392_pinctrl_sh-pfc_r8a7795-es1.yaml | 14 ----------- .../linux/core/bsp392_pinctrl_sh-pfc_r8a7795.yaml | 16 ------------- .../linux/core/bsp392_pinctrl_sh-pfc_r8a7796.yaml | 16 ------------- .../linux/core/bsp392_pinctrl_sh-pfc_r8a77965.yaml | 3 --- .../linux/core/bsp392_pinctrl_sh-pfc_r8a77990.yaml | 2 -- projects/linux/core/bsp392_pinctrl_sh-pfc_vin.yaml | 27 ++++++++++++++++++++++ 6 files changed, 27 insertions(+), 51 deletions(-) delete mode 100644 projects/linux/core/bsp392_pinctrl_sh-pfc_r8a7795-es1.yaml delete mode 100644 projects/linux/core/bsp392_pinctrl_sh-pfc_r8a7795.yaml delete mode 100644 projects/linux/core/bsp392_pinctrl_sh-pfc_r8a7796.yaml create mode 100644 projects/linux/core/bsp392_pinctrl_sh-pfc_vin.yaml diff --git a/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a7795-es1.yaml b/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a7795-es1.yaml deleted file mode 100644 index 3fc3604..0000000 --- a/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a7795-es1.yaml +++ /dev/null @@ -1,14 +0,0 @@ -title: "From bsp392, upport pinctrl: sh-pfc: r8a7795-es1:" -team: Core -key: a20c3f98-62a3-4f75-827b-12f86f3ee79e -status: New - -relationships: - -bsp-commits: - - 8cc7bec59b22af32ee8e2e699e1643e95e4ecd5c # pinctrl: sh-pfc: r8a7795-es1: Add VIN pins, groups and functions - -upstream: - -comments: - - "8cc7bec59b22af32ee8e2e699e1643e95e4ecd5c: requested upport with f7cac36f6d7862f93a12cfb8d4d0d9b47f132179 of BSPv3.6.0" diff --git a/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a7795.yaml b/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a7795.yaml deleted file mode 100644 index 45643b4..0000000 --- a/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a7795.yaml +++ /dev/null @@ -1,16 +0,0 @@ -title: "From bsp392, upport pinctrl: sh-pfc: r8a7795:" -team: Core -key: 3587de94-d534-493e-9b18-b43605775f1e -status: New - -relationships: - -bsp-commits: - - a263ca22013d3f6614cee0513db62ced3db444b8 # pinctrl: sh-pfc: r8a7795: Add VIN pins, groups and functions - -upstream: - - torvalds: b538dc5bbb40dbf214987cc2f30915275057c948 # pinctrl: sh-pfc: r8a7795: Correct VIN4 18-bit pins - - torvalds: 6b4de408105fc51e85e55937e049503f30f8c633 # pinctrl: sh-pfc: r8a7795: Add VIN4, VIN5 pins, groups and functions - -comments: - - "a263ca22013d3f6614cee0513db62ced3db444b8: data8_sft8 is missing" diff --git a/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a7796.yaml b/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a7796.yaml deleted file mode 100644 index 09bacd3..0000000 --- a/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a7796.yaml +++ /dev/null @@ -1,16 +0,0 @@ -title: "From bsp392, upport pinctrl: sh-pfc: r8a7796:" -team: Core -key: 8fee1682-d891-42cb-893e-9686c0c70e34 -status: New - -relationships: - -bsp-commits: - - 1c1231558b4853aaeb12fda59ed9cd9a79445995 # pinctrl: sh-pfc: r8a7796: Add VIN pins, groups and functions - -upstream: - - torvalds: a66b68ba7f288093ea17802442622ac7c0691c92 # pinctrl: sh-pfc: r8a7796: Correct VIN4 18-bit pins - - torvalds: 8db6cbabac4f2a02ccbce1dbf6845245f38d11f4 # pinctrl: sh-pfc: r8a7796: Add VIN4, VIN5 pins, groups and functions - -comments: - - "1c1231558b4853aaeb12fda59ed9cd9a79445995: data8_sft8 is missing" diff --git a/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a77965.yaml b/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a77965.yaml index 6b957d1..48e1751 100644 --- a/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a77965.yaml +++ b/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a77965.yaml @@ -8,7 +8,6 @@ relationships: bsp-commits: - 197e59350eaab4f86d6012b51a432097bfd0f1ed # pinctrl: sh-pfc: r8a77965: Add CAN FD pins, groups and functions - 7376d928d096bbfe6094459757fbc78d45a135f6 # pinctrl: sh-pfc: r8a77965: Add DRIF pins, groups and functions - - cd3bd44bbcc909b82ab4eacc09bf6ab2043f9f73 # pinctrl: sh-pfc: r8a77965: Add VIN pins, groups and functions - d3674aeba76653e48b9c65691449550a2f3d9e92 # pinctrl: sh-pfc: r8a77965: Add TMU pins, groups and functions - e254129a09683c2447205c6f658cca81eb5dda2a # pinctrl: sh-pfc: r8a77965: Add CAN pins, groups and functions - f65a44e53c524194380b61dfa6a50b87d02f0ea8 # pinctrl: sh-pfc: r8a77965: Add I2C{0,3,5} pins, groups and functions @@ -16,10 +15,8 @@ bsp-commits: upstream: - torvalds: 1b259dde9bd9001783d2deb1c4773a2e5ce45860 # pinctrl: sh-pfc: r8a77965: Add CAN FD pins, groups and functions - torvalds: 79dbbdbeccc6784d5e189710adcca750c03d3bd4 # pinctrl: sh-pfc: r8a77965: Add DRIF pins, groups and functions - - torvalds: 270b6eb715573c0d05b75351f804b7b445d88d4b # pinctrl: sh-pfc: r8a77965: Add VIN[4|5] groups/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 comments: - - "cd3bd44bbcc909b82ab4eacc09bf6ab2043f9f73: data8_sft8 is missing" - "f65a44e53c524194380b61dfa6a50b87d02f0ea8: https://patchwork.kernel.org/patch/10858051/" diff --git a/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a77990.yaml b/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a77990.yaml index 52dd165..571c4b3 100644 --- a/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a77990.yaml +++ b/projects/linux/core/bsp392_pinctrl_sh-pfc_r8a77990.yaml @@ -7,13 +7,11 @@ relationships: bsp-commits: - 1775d8d513f6b0c7fcfa4cc3c316f780dc886ddc # pinctrl: sh-pfc: r8a77990: Add DRIF pins, groups and functions - - 35cdd14889bc7aa421d3694ba50d5556ce7a517a # pinctrl: sh-pfc: r8a77990: Add VIN pins, groups and functions - 42b6458019bf13c2b5ad80c97c070c7b68e3c736 # pinctrl: sh-pfc: r8a77990: Add TMU pins, groups and functions - ddc07664f681be843655b8725acc406809679826 # pinctrl: sh-pfc: r8a77990: Add INTC-EX IRQ pin, group and function upstream: - torvalds: fdbbd6b74c9278f65302af113e73cf61d36d3037 # pinctrl: sh-pfc: r8a77990: Add DRIF pins, groups and functions - - torvalds: 60b7e5d98cdcb44db55333c5a145005fbb812928 # pinctrl: sh-pfc: r8a77990: Add VIN[4|5] groups/functions - torvalds: 16978e7d40f73bed462ca991ce3565d133b0c6cd # pinctrl: sh-pfc: r8a77990: Add TMU pins, groups and functions - torvalds: ef26d96023a4c34b1bcc4294f570df2b63a1b952 # pinctrl: sh-pfc: r8a77990: Add INTC-EX pins, groups and function diff --git a/projects/linux/core/bsp392_pinctrl_sh-pfc_vin.yaml b/projects/linux/core/bsp392_pinctrl_sh-pfc_vin.yaml new file mode 100644 index 0000000..9572853 --- /dev/null +++ b/projects/linux/core/bsp392_pinctrl_sh-pfc_vin.yaml @@ -0,0 +1,27 @@ +title: "From bsp392, upport pinctrl: sh-pfc: VIN" +team: Core +key: a20c3f98-62a3-4f75-827b-12f86f3ee79e +status: New + +relationships: + +bsp-commits: + - 1c1231558b4853aaeb12fda59ed9cd9a79445995 # pinctrl: sh-pfc: r8a7796: Add VIN pins, groups and functions + - 35cdd14889bc7aa421d3694ba50d5556ce7a517a # pinctrl: sh-pfc: r8a77990: Add VIN pins, groups and functions + - 8cc7bec59b22af32ee8e2e699e1643e95e4ecd5c # pinctrl: sh-pfc: r8a7795-es1: Add VIN pins, groups and functions + - a263ca22013d3f6614cee0513db62ced3db444b8 # pinctrl: sh-pfc: r8a7795: Add VIN pins, groups and functions + - cd3bd44bbcc909b82ab4eacc09bf6ab2043f9f73 # pinctrl: sh-pfc: r8a77965: Add VIN pins, groups and functions + +upstream: + - torvalds: 270b6eb715573c0d05b75351f804b7b445d88d4b # pinctrl: sh-pfc: r8a77965: Add VIN[4|5] groups/functions + - torvalds: 60b7e5d98cdcb44db55333c5a145005fbb812928 # pinctrl: sh-pfc: r8a77990: Add VIN[4|5] groups/functions + - torvalds: 6b4de408105fc51e85e55937e049503f30f8c633 # pinctrl: sh-pfc: r8a7795: Add VIN4, VIN5 pins, groups and functions + - torvalds: 8db6cbabac4f2a02ccbce1dbf6845245f38d11f4 # pinctrl: sh-pfc: r8a7796: Add VIN4, VIN5 pins, groups and functions + - torvalds: a66b68ba7f288093ea17802442622ac7c0691c92 # pinctrl: sh-pfc: r8a7796: Correct VIN4 18-bit pins + - torvalds: b538dc5bbb40dbf214987cc2f30915275057c948 # pinctrl: sh-pfc: r8a7795: Correct VIN4 18-bit pins + +comments: + - "1c1231558b4853aaeb12fda59ed9cd9a79445995: data8_sft8 is missing" + - "8cc7bec59b22af32ee8e2e699e1643e95e4ecd5c: requested upport with f7cac36f6d7862f93a12cfb8d4d0d9b47f132179 of BSPv3.6.0" + - "a263ca22013d3f6614cee0513db62ced3db444b8: data8_sft8 is missing" + - "cd3bd44bbcc909b82ab4eacc09bf6ab2043f9f73: data8_sft8 is missing" -- cgit v1.2.3