aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Shyti <andi.shyti@samsung.com>2016-12-29 23:14:21 -0500
committerKrzysztof Kozlowski <krzk@kernel.org>2017-01-06 01:52:21 -0500
commitd74b9db5e8e0f877468b9047a0927bd92dc54dea (patch)
tree8f8ecb0ffb168728d22239d567085ea2176f81ad
parent4c50383e87472f8abb607ede597e6e6625120854 (diff)
arm64: dts: exynos: Comply to the samsung pinctrl naming convention in TM2
Change the PIN() macro definition so that it can use the macros from pinctrl/samsung.h header file. Signed-off-by: Andi Shyti <andi.shyti@samsung.com> Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Diffstat
-rw-r--r--arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi25
-rw-r--r--arch/arm64/boot/dts/exynos/exynos5433-tm2.dts254
2 files changed, 133 insertions, 146 deletions
diff --git a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi
index 2af854b11644..d49879bd34bb 100644
--- a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi
@@ -14,25 +14,12 @@
14 14
15#include <dt-bindings/pinctrl/samsung.h> 15#include <dt-bindings/pinctrl/samsung.h>
16 16
17#define PIN_PULL_NONE 0 17#define PIN(_func, _pin, _pull, _drv) \
18#define PIN_PULL_DOWN 1 18 _pin { \
19#define PIN_PULL_UP 3 19 samsung,pins = #_pin; \
20 20 samsung,pin-function = <EXYNOS_PIN_FUNC_ ##_func>; \
21#define PIN_DRV_LV1 0 21 samsung,pin-pud = <EXYNOS_PIN_PULL_ ##_pull>; \
22#define PIN_DRV_LV2 2 22 samsung,pin-drv = <EXYNOS5433_PIN_DRV_ ##_drv>; \
23#define PIN_DRV_LV3 1
24#define PIN_DRV_LV4 3
25
26#define PIN_IN 0
27#define PIN_OUT 1
28#define PIN_FUNC1 2
29
30#define PIN(_func, _pin, _pull, _drv) \
31 _pin { \
32 samsung,pins = #_pin; \
33 samsung,pin-function = <PIN_ ##_func>; \
34 samsung,pin-pud = <PIN_PULL_ ##_pull>; \
35 samsung,pin-drv = <PIN_DRV_ ##_drv>; \
36 } 23 }
37 24
38&pinctrl_alive { 25&pinctrl_alive {
diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
index 4e6619c55480..3b5215c40fcd 100644
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
@@ -812,77 +812,77 @@
812 pinctrl-0 = <&initial_alive>; 812 pinctrl-0 = <&initial_alive>;
813 813
814 initial_alive: initial-state { 814 initial_alive: initial-state {
815 PIN(IN, gpa0-0, DOWN, LV1); 815 PIN(INPUT, gpa0-0, DOWN, FAST_SR1);
816 PIN(IN, gpa0-1, NONE, LV1); 816 PIN(INPUT, gpa0-1, NONE, FAST_SR1);
817 PIN(IN, gpa0-2, DOWN, LV1); 817 PIN(INPUT, gpa0-2, DOWN, FAST_SR1);
818 PIN(IN, gpa0-3, NONE, LV1); 818 PIN(INPUT, gpa0-3, NONE, FAST_SR1);
819 PIN(IN, gpa0-4, NONE, LV1); 819 PIN(INPUT, gpa0-4, NONE, FAST_SR1);
820 PIN(IN, gpa0-5, DOWN, LV1); 820 PIN(INPUT, gpa0-5, DOWN, FAST_SR1);
821 PIN(IN, gpa0-6, NONE, LV1); 821 PIN(INPUT, gpa0-6, NONE, FAST_SR1);
822 PIN(IN, gpa0-7, NONE, LV1); 822 PIN(INPUT, gpa0-7, NONE, FAST_SR1);
823 823
824 PIN(IN, gpa1-0, UP, LV1); 824 PIN(INPUT, gpa1-0, UP, FAST_SR1);
825 PIN(IN, gpa1-1, NONE, LV1); 825 PIN(INPUT, gpa1-1, NONE, FAST_SR1);
826 PIN(IN, gpa1-2, NONE, LV1); 826 PIN(INPUT, gpa1-2, NONE, FAST_SR1);
827 PIN(IN, gpa1-3, DOWN, LV1); 827 PIN(INPUT, gpa1-3, DOWN, FAST_SR1);
828 PIN(IN, gpa1-4, DOWN, LV1); 828 PIN(INPUT, gpa1-4, DOWN, FAST_SR1);
829 PIN(IN, gpa1-5, NONE, LV1); 829 PIN(INPUT, gpa1-5, NONE, FAST_SR1);
830 PIN(IN, gpa1-6, NONE, LV1); 830 PIN(INPUT, gpa1-6, NONE, FAST_SR1);
831 PIN(IN, gpa1-7, NONE, LV1); 831 PIN(INPUT, gpa1-7, NONE, FAST_SR1);
832 832
833 PIN(IN, gpa2-0, NONE, LV1); 833 PIN(INPUT, gpa2-0, NONE, FAST_SR1);
834 PIN(IN, gpa2-1, NONE, LV1); 834 PIN(INPUT, gpa2-1, NONE, FAST_SR1);
835 PIN(IN, gpa2-2, NONE, LV1); 835 PIN(INPUT, gpa2-2, NONE, FAST_SR1);
836 PIN(IN, gpa2-3, DOWN, LV1); 836 PIN(INPUT, gpa2-3, DOWN, FAST_SR1);
837 PIN(IN, gpa2-4, NONE, LV1); 837 PIN(INPUT, gpa2-4, NONE, FAST_SR1);
838 PIN(IN, gpa2-5, DOWN, LV1); 838 PIN(INPUT, gpa2-5, DOWN, FAST_SR1);
839 PIN(IN, gpa2-6, DOWN, LV1); 839 PIN(INPUT, gpa2-6, DOWN, FAST_SR1);
840 PIN(IN, gpa2-7, NONE, LV1); 840 PIN(INPUT, gpa2-7, NONE, FAST_SR1);
841 841
842 PIN(IN, gpa3-0, DOWN, LV1); 842 PIN(INPUT, gpa3-0, DOWN, FAST_SR1);
843 PIN(IN, gpa3-1, DOWN, LV1); 843 PIN(INPUT, gpa3-1, DOWN, FAST_SR1);
844 PIN(IN, gpa3-2, NONE, LV1); 844 PIN(INPUT, gpa3-2, NONE, FAST_SR1);
845 PIN(IN, gpa3-3, DOWN, LV1); 845 PIN(INPUT, gpa3-3, DOWN, FAST_SR1);
846 PIN(IN, gpa3-4, NONE, LV1); 846 PIN(INPUT, gpa3-4, NONE, FAST_SR1);
847 PIN(IN, gpa3-5, DOWN, LV1); 847 PIN(INPUT, gpa3-5, DOWN, FAST_SR1);
848 PIN(IN, gpa3-6, DOWN, LV1); 848 PIN(INPUT, gpa3-6, DOWN, FAST_SR1);
849 PIN(IN, gpa3-7, DOWN, LV1); 849 PIN(INPUT, gpa3-7, DOWN, FAST_SR1);
850 850
851 PIN(IN, gpf1-0, NONE, LV1); 851 PIN(INPUT, gpf1-0, NONE, FAST_SR1);
852 PIN(IN, gpf1-1, NONE, LV1); 852 PIN(INPUT, gpf1-1, NONE, FAST_SR1);
853 PIN(IN, gpf1-2, DOWN, LV1); 853 PIN(INPUT, gpf1-2, DOWN, FAST_SR1);
854 PIN(IN, gpf1-4, UP, LV1); 854 PIN(INPUT, gpf1-4, UP, FAST_SR1);
855 PIN(OUT, gpf1-5, NONE, LV1); 855 PIN(OUTPUT, gpf1-5, NONE, FAST_SR1);
856 PIN(IN, gpf1-6, DOWN, LV1); 856 PIN(INPUT, gpf1-6, DOWN, FAST_SR1);
857 PIN(IN, gpf1-7, DOWN, LV1); 857 PIN(INPUT, gpf1-7, DOWN, FAST_SR1);
858 858
859 PIN(IN, gpf2-0, DOWN, LV1); 859 PIN(INPUT, gpf2-0, DOWN, FAST_SR1);
860 PIN(IN, gpf2-1, DOWN, LV1); 860 PIN(INPUT, gpf2-1, DOWN, FAST_SR1);
861 PIN(IN, gpf2-2, DOWN, LV1); 861 PIN(INPUT, gpf2-2, DOWN, FAST_SR1);
862 PIN(IN, gpf2-3, DOWN, LV1); 862 PIN(INPUT, gpf2-3, DOWN, FAST_SR1);
863 863
864 PIN(IN, gpf3-0, DOWN, LV1); 864 PIN(INPUT, gpf3-0, DOWN, FAST_SR1);
865 PIN(IN, gpf3-1, DOWN, LV1); 865 PIN(INPUT, gpf3-1, DOWN, FAST_SR1);
866 PIN(IN, gpf3-2, NONE, LV1); 866 PIN(INPUT, gpf3-2, NONE, FAST_SR1);
867 PIN(IN, gpf3-3, DOWN, LV1); 867 PIN(INPUT, gpf3-3, DOWN, FAST_SR1);
868 868
869 PIN(IN, gpf4-0, DOWN, LV1); 869 PIN(INPUT, gpf4-0, DOWN, FAST_SR1);
870 PIN(IN, gpf4-1, DOWN, LV1); 870 PIN(INPUT, gpf4-1, DOWN, FAST_SR1);
871 PIN(IN, gpf4-2, DOWN, LV1); 871 PIN(INPUT, gpf4-2, DOWN, FAST_SR1);
872 PIN(IN, gpf4-3, DOWN, LV1); 872 PIN(INPUT, gpf4-3, DOWN, FAST_SR1);
873 PIN(IN, gpf4-4, DOWN, LV1); 873 PIN(INPUT, gpf4-4, DOWN, FAST_SR1);
874 PIN(IN, gpf4-5, DOWN, LV1); 874 PIN(INPUT, gpf4-5, DOWN, FAST_SR1);
875 PIN(IN, gpf4-6, DOWN, LV1); 875 PIN(INPUT, gpf4-6, DOWN, FAST_SR1);
876 PIN(IN, gpf4-7, DOWN, LV1); 876 PIN(INPUT, gpf4-7, DOWN, FAST_SR1);
877 877
878 PIN(IN, gpf5-0, DOWN, LV1); 878 PIN(INPUT, gpf5-0, DOWN, FAST_SR1);
879 PIN(IN, gpf5-1, DOWN, LV1); 879 PIN(INPUT, gpf5-1, DOWN, FAST_SR1);
880 PIN(IN, gpf5-2, DOWN, LV1); 880 PIN(INPUT, gpf5-2, DOWN, FAST_SR1);
881 PIN(IN, gpf5-3, DOWN, LV1); 881 PIN(INPUT, gpf5-3, DOWN, FAST_SR1);
882 PIN(OUT, gpf5-4, NONE, LV1); 882 PIN(OUTPUT, gpf5-4, NONE, FAST_SR1);
883 PIN(IN, gpf5-5, DOWN, LV1); 883 PIN(INPUT, gpf5-5, DOWN, FAST_SR1);
884 PIN(IN, gpf5-6, DOWN, LV1); 884 PIN(INPUT, gpf5-6, DOWN, FAST_SR1);
885 PIN(IN, gpf5-7, DOWN, LV1); 885 PIN(INPUT, gpf5-7, DOWN, FAST_SR1);
886 }; 886 };
887 887
888 te_irq: te_irq { 888 te_irq: te_irq {
@@ -896,8 +896,8 @@
896 pinctrl-0 = <&initial_cpif>; 896 pinctrl-0 = <&initial_cpif>;
897 897
898 initial_cpif: initial-state { 898 initial_cpif: initial-state {
899 PIN(IN, gpv6-0, DOWN, LV1); 899 PIN(INPUT, gpv6-0, DOWN, FAST_SR1);
900 PIN(IN, gpv6-1, DOWN, LV1); 900 PIN(INPUT, gpv6-1, DOWN, FAST_SR1);
901 }; 901 };
902}; 902};
903 903
@@ -906,9 +906,9 @@
906 pinctrl-0 = <&initial_ese>; 906 pinctrl-0 = <&initial_ese>;
907 907
908 initial_ese: initial-state { 908 initial_ese: initial-state {
909 PIN(IN, gpj2-0, DOWN, LV1); 909 PIN(INPUT, gpj2-0, DOWN, FAST_SR1);
910 PIN(IN, gpj2-1, DOWN, LV1); 910 PIN(INPUT, gpj2-1, DOWN, FAST_SR1);
911 PIN(IN, gpj2-2, DOWN, LV1); 911 PIN(INPUT, gpj2-2, DOWN, FAST_SR1);
912 }; 912 };
913}; 913};
914 914
@@ -917,11 +917,11 @@
917 pinctrl-0 = <&initial_fsys>; 917 pinctrl-0 = <&initial_fsys>;
918 918
919 initial_fsys: initial-state { 919 initial_fsys: initial-state {
920 PIN(IN, gpr3-0, NONE, LV1); 920 PIN(INPUT, gpr3-0, NONE, FAST_SR1);
921 PIN(IN, gpr3-1, DOWN, LV1); 921 PIN(INPUT, gpr3-1, DOWN, FAST_SR1);
922 PIN(IN, gpr3-2, DOWN, LV1); 922 PIN(INPUT, gpr3-2, DOWN, FAST_SR1);
923 PIN(IN, gpr3-3, DOWN, LV1); 923 PIN(INPUT, gpr3-3, DOWN, FAST_SR1);
924 PIN(IN, gpr3-7, NONE, LV1); 924 PIN(INPUT, gpr3-7, NONE, FAST_SR1);
925 }; 925 };
926}; 926};
927 927
@@ -930,14 +930,14 @@
930 pinctrl-0 = <&initial_imem>; 930 pinctrl-0 = <&initial_imem>;
931 931
932 initial_imem: initial-state { 932 initial_imem: initial-state {
933 PIN(IN, gpf0-0, UP, LV1); 933 PIN(INPUT, gpf0-0, UP, FAST_SR1);
934 PIN(IN, gpf0-1, UP, LV1); 934 PIN(INPUT, gpf0-1, UP, FAST_SR1);
935 PIN(IN, gpf0-2, DOWN, LV1); 935 PIN(INPUT, gpf0-2, DOWN, FAST_SR1);
936 PIN(IN, gpf0-3, UP, LV1); 936 PIN(INPUT, gpf0-3, UP, FAST_SR1);
937 PIN(IN, gpf0-4, DOWN, LV1); 937 PIN(INPUT, gpf0-4, DOWN, FAST_SR1);
938 PIN(IN, gpf0-5, NONE, LV1); 938 PIN(INPUT, gpf0-5, NONE, FAST_SR1);
939 PIN(IN, gpf0-6, DOWN, LV1); 939 PIN(INPUT, gpf0-6, DOWN, FAST_SR1);
940 PIN(IN, gpf0-7, UP, LV1); 940 PIN(INPUT, gpf0-7, UP, FAST_SR1);
941 }; 941 };
942}; 942};
943 943
@@ -946,7 +946,7 @@
946 pinctrl-0 = <&initial_nfc>; 946 pinctrl-0 = <&initial_nfc>;
947 947
948 initial_nfc: initial-state { 948 initial_nfc: initial-state {
949 PIN(IN, gpj0-2, DOWN, LV1); 949 PIN(INPUT, gpj0-2, DOWN, FAST_SR1);
950 }; 950 };
951}; 951};
952 952
@@ -955,54 +955,54 @@
955 pinctrl-0 = <&initial_peric>; 955 pinctrl-0 = <&initial_peric>;
956 956
957 initial_peric: initial-state { 957 initial_peric: initial-state {
958 PIN(IN, gpv7-0, DOWN, LV1); 958 PIN(INPUT, gpv7-0, DOWN, FAST_SR1);
959 PIN(IN, gpv7-1, DOWN, LV1); 959 PIN(INPUT, gpv7-1, DOWN, FAST_SR1);
960 PIN(IN, gpv7-2, NONE, LV1); 960 PIN(INPUT, gpv7-2, NONE, FAST_SR1);
961 PIN(IN, gpv7-3, DOWN, LV1); 961 PIN(INPUT, gpv7-3, DOWN, FAST_SR1);
962 PIN(IN, gpv7-4, DOWN, LV1); 962 PIN(INPUT, gpv7-4, DOWN, FAST_SR1);
963 PIN(IN, gpv7-5, DOWN, LV1); 963 PIN(INPUT, gpv7-5, DOWN, FAST_SR1);
964 964
965 PIN(IN, gpb0-4, DOWN, LV1); 965 PIN(INPUT, gpb0-4, DOWN, FAST_SR1);
966 966
967 PIN(IN, gpc0-2, DOWN, LV1); 967 PIN(INPUT, gpc0-2, DOWN, FAST_SR1);
968 PIN(IN, gpc0-5, DOWN, LV1); 968 PIN(INPUT, gpc0-5, DOWN, FAST_SR1);
969 PIN(IN, gpc0-7, DOWN, LV1); 969 PIN(INPUT, gpc0-7, DOWN, FAST_SR1);
970 970
971 PIN(IN, gpc1-1, DOWN, LV1); 971 PIN(INPUT, gpc1-1, DOWN, FAST_SR1);
972 972
973 PIN(IN, gpc3-4, NONE, LV1); 973 PIN(INPUT, gpc3-4, NONE, FAST_SR1);
974 PIN(IN, gpc3-5, NONE, LV1); 974 PIN(INPUT, gpc3-5, NONE, FAST_SR1);
975 PIN(IN, gpc3-6, NONE, LV1); 975 PIN(INPUT, gpc3-6, NONE, FAST_SR1);
976 PIN(IN, gpc3-7, NONE, LV1); 976 PIN(INPUT, gpc3-7, NONE, FAST_SR1);
977 977
978 PIN(OUT, gpg0-0, NONE, LV1); 978 PIN(OUTPUT, gpg0-0, NONE, FAST_SR1);
979 PIN(FUNC1, gpg0-1, DOWN, LV1); 979 PIN(2, gpg0-1, DOWN, FAST_SR1);
980 980
981 PIN(IN, gpd2-5, DOWN, LV1); 981 PIN(INPUT, gpd2-5, DOWN, FAST_SR1);
982 982
983 PIN(IN, gpd4-0, NONE, LV1); 983 PIN(INPUT, gpd4-0, NONE, FAST_SR1);
984 PIN(IN, gpd4-1, DOWN, LV1); 984 PIN(INPUT, gpd4-1, DOWN, FAST_SR1);
985 PIN(IN, gpd4-2, DOWN, LV1); 985 PIN(INPUT, gpd4-2, DOWN, FAST_SR1);
986 PIN(IN, gpd4-3, DOWN, LV1); 986 PIN(INPUT, gpd4-3, DOWN, FAST_SR1);
987 PIN(IN, gpd4-4, DOWN, LV1); 987 PIN(INPUT, gpd4-4, DOWN, FAST_SR1);
988 988
989 PIN(IN, gpd6-3, DOWN, LV1); 989 PIN(INPUT, gpd6-3, DOWN, FAST_SR1);
990 990
991 PIN(IN, gpd8-1, UP, LV1); 991 PIN(INPUT, gpd8-1, UP, FAST_SR1);
992 992
993 PIN(IN, gpg1-0, DOWN, LV1); 993 PIN(INPUT, gpg1-0, DOWN, FAST_SR1);
994 PIN(IN, gpg1-1, DOWN, LV1); 994 PIN(INPUT, gpg1-1, DOWN, FAST_SR1);
995 PIN(IN, gpg1-2, DOWN, LV1); 995 PIN(INPUT, gpg1-2, DOWN, FAST_SR1);
996 PIN(IN, gpg1-3, DOWN, LV1); 996 PIN(INPUT, gpg1-3, DOWN, FAST_SR1);
997 PIN(IN, gpg1-4, DOWN, LV1); 997 PIN(INPUT, gpg1-4, DOWN, FAST_SR1);
998 998
999 PIN(IN, gpg2-0, DOWN, LV1); 999 PIN(INPUT, gpg2-0, DOWN, FAST_SR1);
1000 PIN(IN, gpg2-1, DOWN, LV1); 1000 PIN(INPUT, gpg2-1, DOWN, FAST_SR1);
1001 1001
1002 PIN(IN, gpg3-0, DOWN, LV1); 1002 PIN(INPUT, gpg3-0, DOWN, FAST_SR1);
1003 PIN(IN, gpg3-1, DOWN, LV1); 1003 PIN(INPUT, gpg3-1, DOWN, FAST_SR1);
1004 PIN(IN, gpg3-5, DOWN, LV1); 1004 PIN(INPUT, gpg3-5, DOWN, FAST_SR1);
1005 PIN(IN, gpg3-7, DOWN, LV1); 1005 PIN(INPUT, gpg3-7, DOWN, FAST_SR1);
1006 }; 1006 };
1007}; 1007};
1008 1008
@@ -1011,7 +1011,7 @@
1011 pinctrl-0 = <&initial_touch>; 1011 pinctrl-0 = <&initial_touch>;
1012 1012
1013 initial_touch: initial-state { 1013 initial_touch: initial-state {
1014 PIN(IN, gpj1-2, DOWN, LV1); 1014 PIN(INPUT, gpj1-2, DOWN, FAST_SR1);
1015 }; 1015 };
1016}; 1016};
1017 1017
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-24 00:06:24 -0400