pinctrl:sirf:re-arch and add support for new SiRFatlas6 SoC
PATCH 1/1 pinctrl:sirf:re-arch and add support for new SiRFatlas6 SoC
atlas6 is a SoC very similar with primaII, the register layput of pinctrl is same, but the pads, groups and functions of atlas6 have different layout with prima2, this patch
1. pull the definition of pads, groups and functions out of the pinctrl-sirf driver,and put them into soc-specific files
2. add pads, groups and functions tables for atlas6
3. let pads, groups and functions tables become the config data of the related dt compatible node, so the pinctrl-sirf can support all SiRF SoCs with the config data as private data.
In this patch,we create a sirf dir, and let
the old drivers/pinctrl/pinctrl-sirf.c =
drivers/pinctrl/sirf/pinctrl-prima2.c +
drivers/pinctrl/sirf/pinctrl-sirf.c
drivers/pinctrl/sirf/pinctrl-atlas6.c is a newly created file for the pin layout of atlas6.
---
drivers/pinctrl/Makefile | 2 +-
drivers/pinctrl/sirf/Makefile | 5 +
drivers/pinctrl/sirf/pinctrl-atlas6.c | 947 +++++++++++++++++++
.../{pinctrl-sirf.c => sirf/pinctrl-prima2.c} | 955 +-------------------
drivers/pinctrl/sirf/pinctrl-sirf.c | 885 ++++++++++++++++++
drivers/pinctrl/sirf/pinctrl-sirf.h | 111 +++
6 files changed, 1960 insertions(+), 945 deletions(-)
create mode 100644 drivers/pinctrl/sirf/Makefile
create mode 100644 drivers/pinctrl/sirf/pinctrl-atlas6.c
rename drivers/pinctrl/{pinctrl-sirf.c => sirf/pinctrl-prima2.c} (50%)
create mode 100644 drivers/pinctrl/sirf/pinctrl-sirf.c
create mode 100644 drivers/pinctrl/sirf/pinctrl-sirf.hdrivers/pinctrl/Makefile +1 -1
@@ -34,7 +34,7 @@ obj-$(CONFIG_PINCTRL_DB8540) += pinctrl-nomadik-db8540.o obj-$(CONFIG_PINCTRL_PXA168) += pinctrl-pxa168.o obj-$(CONFIG_PINCTRL_PXA910) += pinctrl-pxa910.o obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o -obj-$(CONFIG_PINCTRL_SIRF) += pinctrl-sirf.o +obj-$(CONFIG_PINCTRL_SIRF) += sirf/ obj-$(CONFIG_PINCTRL_SUNXI) += pinctrl-sunxi.o obj-$(CONFIG_PINCTRL_TEGRA) += pinctrl-tegra.o obj-$(CONFIG_PINCTRL_TEGRA20) += pinctrl-tegra20.o
drivers/pinctrl/sirf/Makefile new file +5 -0
@@ -0,0 +1,5 @@ +# CSR SiRFsoc pinmux support + +obj-y += pinctrl-sirf.o +obj-y += pinctrl-prima2.o +obj-y += pinctrl-atlas6.o
drivers/pinctrl/sirf/pinctrl-atlas6.c new file +947 -0
947 lines not on this page · raw message
drivers/pinctrl/sirf/pinctrl-prima2.c renamed from drivers/pinctrl/pinctrl-sirf.c +11 -944
1,002 lines not on this page · raw message
drivers/pinctrl/sirf/pinctrl-sirf.c new file +885 -0
885 lines not on this page · raw message
drivers/pinctrl/sirf/pinctrl-sirf.h new file +111 -0
111 lines not on this page · raw message
Signature · 6 lines
1.7.5.4 Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
PATCH 1/1 pinctrl:sirf:re-arch and add support for new SiRFatlas6 SoC
Quoted 15 lines · Barry Song
atlas6 is a SoC very similar with primaII, the register layput of pinctrl is same, but the pads, groups and functions of atlas6 have different layout with prima2, this patch
1. pull the definition of pads, groups and functions out of the pinctrl-sirf driver,and put them into soc-specific files
2. add pads, groups and functions tables for atlas6
3. let pads, groups and functions tables become the config data of the related dt compatible node, so the pinctrl-sirf can support all SiRF SoCs with the config data as private data.In this patch,we create a sirf dir, and let
the olddrivers/pinctrl/pinctrl-sirf.c=
drivers/pinctrl/sirf/pinctrl-prima2.c+
drivers/pinctrl/sirf/pinctrl-sirf.c
Quoted 4 lines
drivers/pinctrl/sirf/pinctrl-atlas6.cis a newly created file for the pin layout of atlas6.Signed-off-by Barry Song <[email protected]>
This is OK but can you please:
- Base the patch on the "devel" branch in my pinctrl tree?
- Try to use the -M flag when formatting the patch so it gets more readable?
Yours,
Linus Walleij
PATCH 1/1 pinctrl:sirf:re-arch and add support for new SiRFatlas6 SoC
2013/3/28, Linus Walleij <[email protected]>:
Quoted 17 lines · Barry Song
Quoted 16 lines
atlas6 is a SoC very similar with primaII, the register layput of pinctrl is same, but the pads, groups and functions of atlas6 have different layout with prima2, this patch
1. pull the definition of pads, groups and functions out of the pinctrl-sirf driver,and put them into soc-specific files
2. add pads, groups and functions tables for atlas6
3. let pads, groups and functions tables become the config data of the related dt compatible node, so the pinctrl-sirf can support all SiRF SoCs with the config data as private data.In this patch,we create a sirf dir, and let
the olddrivers/pinctrl/pinctrl-sirf.c=
drivers/pinctrl/sirf/pinctrl-prima2.c+
drivers/pinctrl/sirf/pinctrl-sirf.c
Quoted 6 lines
Quoted 4 lines
drivers/pinctrl/sirf/pinctrl-atlas6.cis a newly created file for the pin layout of atlas6.Signed-off-by Barry Song <[email protected]>This is OK but can you please:
ok. one issue is recently Arnd has given another changes in pinctrl-sirf in arm-soc multiple platform branch:
https://git.kernel.org/cgit/linux/kernel/git/arm/arm-soc.git/commit/?h=prima2/multiplatform&id=67d71344fd09223820eb9de39b597ec29f035e89
it makes us easily to get merging conflict. what is your suggestion about taking all these changes in 3.10?
Quoted 5 lines
- Base the patch on the "devel" branch in my pinctrl tree?
- Try to use the -M flag when formatting the patch so it gets more readable?
yes. i did have already done that in this patch as you see:
"
rename drivers/pinctrl/{pinctrl-sirf.c => sirf/pinctrl-prima2.c} (50%)"
but git -M has failed to know this:drivers/pinctrl/{pinctrl-sirf.c => sirf/pinctrl-sirf}
it seems git -M can't support the case a file are forked to 2 files and let the 2 files follow the old file. it only lets one follow the old file.
Quoted 3 lines
Yours,
Linus Walleij
-barry
PATCH 1/1 pinctrl:sirf:re-arch and add support for new SiRFatlas6 SoC
Quoted 4 lines · Barry Song
2013/3/28, Linus Walleij <[email protected]>:
Quoted 2 lines
Quoted 1 line
Signed-off-by Barry Song <[email protected]>
Quoted 8 lines
Quoted 1 line
This is OK but can you please:
ok. one issue is recently Arnd has given another changes in pinctrl-sirf in arm-soc multiple platform branch:
https://git.kernel.org/cgit/linux/kernel/git/arm/arm-soc.git/commit/?h=prima2/multiplatform&id=67d71344fd09223820eb9de39b597ec29f035e89it makes us easily to get merging conflict. what is your suggestion about taking all these changes in 3.10?
Please send this to where the rest of the patches are with my ACK (I guess the ARM SoC tree?)
Yours,
Linus Walleij
PATCH 1/1 pinctrl:sirf:re-arch and add support for new SiRFatlas6 SoC
2013/4/3 Linus Walleij <[email protected]>:
Quoted 11 lines · Barry Song
Quoted 10 lines
2013/3/28, Linus Walleij <[email protected]>:
Quoted 3 lines
Quoted 1 line
Signed-off-by Barry Song <[email protected]>This is OK but can you please:
ok. one issue is recently Arnd has given another changes in pinctrl-sirf in arm-soc multiple platform branch:
https://git.kernel.org/cgit/linux/kernel/git/arm/arm-soc.git/commit/?h=prima2/multiplatform&id=67d71344fd09223820eb9de39b597ec29f035e89
Quoted 5 lines
Quoted 2 lines
it makes us easily to get merging conflict. what is your suggestion about taking all these changes in 3.10?
Please send this to where the rest of the patches are with my ACK (I guess the ARM SoC tree?)
unfortunately, this is not in arm soc:
Wei Yongjun <[email protected]>
pinctrl: sirf: using for_each_set_bit to simplify the code
i think there will still be some merge conflict. so to make people easy, i might wait for 3.11 and resend the patch with your ack, then you apply it on pinctrl tree.
Quoted 5 lines
Acked-by Linus Walleij <[email protected]>Yours,
Linus Walleij
-barry
PATCH 1/1 pinctrl:sirf:re-arch and add support for new SiRFatlas6 SoC
Quoted 22 lines · Barry Song
2013/4/3 Linus Walleij <[email protected]>:
Quoted 11 lines · Barry Song
Quoted 10 lines
2013/3/28, Linus Walleij <[email protected]>:
Quoted 3 lines
Quoted 1 line
Signed-off-by Barry Song <[email protected]>This is OK but can you please:
ok. one issue is recently Arnd has given another changes in pinctrl-sirf in arm-soc multiple platform branch:
https://git.kernel.org/cgit/linux/kernel/git/arm/arm-soc.git/commit/?h=prima2/multiplatform&id=67d71344fd09223820eb9de39b597ec29f035e89Quoted 5 lines
Quoted 2 lines
it makes us easily to get merging conflict. what is your suggestion about taking all these changes in 3.10?
Please send this to where the rest of the patches are with my ACK (I guess the ARM SoC tree?)
unfortunately, this is not in arm soc:
Wei Yongjun <[email protected]>
pinctrl: sirf: usingfor_each_set_bitto simplify the code
Quoted 5 lines
i think there will still be some merge conflict. so to make people easy, i might wait for 3.11 and resend the patch with your ack, then you apply it on pinctrl tree.
OK let's do it like that.
Yours,
Linus Walleij
PATCH 1/1 pinctrl:sirf:re-arch and add support for new SiRFatlas6 SoC
2013/4/9 Linus Walleij <[email protected]>:
Quoted 23 lines · Barry Song
Quoted 22 lines
2013/4/3 Linus Walleij <[email protected]>:
Quoted 11 lines · Barry Song
Quoted 10 lines
2013/3/28, Linus Walleij <[email protected]>:
Quoted 3 lines
Quoted 1 line
Signed-off-by Barry Song <[email protected]>This is OK but can you please:
ok. one issue is recently Arnd has given another changes in pinctrl-sirf in arm-soc multiple platform branch:
https://git.kernel.org/cgit/linux/kernel/git/arm/arm-soc.git/commit/?h=prima2/multiplatform&id=67d71344fd09223820eb9de39b597ec29f035e89Quoted 5 lines
Quoted 2 lines
it makes us easily to get merging conflict. what is your suggestion about taking all these changes in 3.10?
Please send this to where the rest of the patches are with my ACK (I guess the ARM SoC tree?)
unfortunately, this is not in arm soc:
Wei Yongjun <[email protected]>
pinctrl: sirf: usingfor_each_set_bitto simplify the code
Quoted 7 lines
Quoted 5 lines
i think there will still be some merge conflict. so to make people easy, i might wait for 3.11 and resend the patch with your ack, then you apply it on pinctrl tree.
OK let's do it like that.
done by "[PATCH RESEND] pinctrl:sirf:re-arch and add support for new SiRFatlas6 SoC"
Quoted 1 line
Linus Walleij
-barry