aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-12-04 16:55:41 -0500
committerOlof Johansson <olof@lixom.net>2013-12-04 16:55:41 -0500
commit64bf54f7799a0ad603a30790dc550d53ce1e4352 (patch)
tree5b1620bbb54fec063e4020eb55471c66419b2bf8
parent25e9cd462baa8c5d8eda614a1cd205ae78c9a250 (diff)
parentc6fddbd47f04ba40122000bb3cc6f7eff71f2b6a (diff)
Merge tag 'DT-for-v3.14-part-1' of http://git.stlinux.com/devel/kernel/linux-sti into next/dt
From Srinivas Handagatla, DT updates for STi platforms. * tag 'DT-for-v3.14-part-1' of http://git.stlinux.com/devel/kernel/linux-sti: ARM: STi: Add I2C config to B2000 and B2020 boards ARM: STi: Supply I2C configuration to STiH415 SoC ARM: STi: Supply I2C configuration to STiH416 SoC ARM: STi: OF: Fix a typo in pincfg header Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat
-rw-r--r--arch/arm/boot/dts/st-pincfg.h2
-rw-r--r--arch/arm/boot/dts/stih415-pinctrl.dtsi36
-rw-r--r--arch/arm/boot/dts/stih415.dtsi53
-rw-r--r--arch/arm/boot/dts/stih416-pinctrl.dtsi35
-rw-r--r--arch/arm/boot/dts/stih416.dtsi53
-rw-r--r--arch/arm/boot/dts/stih41x-b2000.dtsi9
-rw-r--r--arch/arm/boot/dts/stih41x-b2020.dtsi22
7 files changed, 209 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/st-pincfg.h b/arch/arm/boot/dts/st-pincfg.h
index 8c45d85ac13e..4851c387d52d 100644
--- a/arch/arm/boot/dts/st-pincfg.h
+++ b/arch/arm/boot/dts/st-pincfg.h
@@ -15,7 +15,7 @@
15/* Pull Up */ 15/* Pull Up */
16#define PU (1 << 26) 16#define PU (1 << 26)
17/* Open Drain */ 17/* Open Drain */
18#define OD (1 << 26) 18#define OD (1 << 25)
19#define RT (1 << 23) 19#define RT (1 << 23)
20#define INVERTCLK (1 << 22) 20#define INVERTCLK (1 << 22)
21#define CLKNOTDATA (1 << 21) 21#define CLKNOTDATA (1 << 21)
diff --git a/arch/arm/boot/dts/stih415-pinctrl.dtsi b/arch/arm/boot/dts/stih415-pinctrl.dtsi
index 1d322b24d1e4..e56449d41481 100644
--- a/arch/arm/boot/dts/stih415-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stih415-pinctrl.dtsi
@@ -86,6 +86,24 @@
86 }; 86 };
87 }; 87 };
88 }; 88 };
89
90 sbc_i2c0 {
91 pinctrl_sbc_i2c0_default: sbc_i2c0-default {
92 st,pins {
93 sda = <&PIO4 6 ALT1 BIDIR>;
94 scl = <&PIO4 5 ALT1 BIDIR>;
95 };
96 };
97 };
98
99 sbc_i2c1 {
100 pinctrl_sbc_i2c1_default: sbc_i2c1-default {
101 st,pins {
102 sda = <&PIO3 2 ALT2 BIDIR>;
103 scl = <&PIO3 1 ALT2 BIDIR>;
104 };
105 };
106 };
89 }; 107 };
90 108
91 pin-controller-front { 109 pin-controller-front {
@@ -143,6 +161,24 @@
143 reg = <0x7000 0x100>; 161 reg = <0x7000 0x100>;
144 st,bank-name = "PIO12"; 162 st,bank-name = "PIO12";
145 }; 163 };
164
165 i2c0 {
166 pinctrl_i2c0_default: i2c0-default {
167 st,pins {
168 sda = <&PIO9 3 ALT1 BIDIR>;
169 scl = <&PIO9 2 ALT1 BIDIR>;
170 };
171 };
172 };
173
174 i2c1 {
175 pinctrl_i2c1_default: i2c1-default {
176 st,pins {
177 sda = <&PIO12 1 ALT1 BIDIR>;
178 scl = <&PIO12 0 ALT1 BIDIR>;
179 };
180 };
181 };
146 }; 182 };
147 183
148 pin-controller-rear { 184 pin-controller-rear {
diff --git a/arch/arm/boot/dts/stih415.dtsi b/arch/arm/boot/dts/stih415.dtsi
index 74ab8ded4b49..d9c7dd1d95a4 100644
--- a/arch/arm/boot/dts/stih415.dtsi
+++ b/arch/arm/boot/dts/stih415.dtsi
@@ -9,6 +9,7 @@
9#include "stih41x.dtsi" 9#include "stih41x.dtsi"
10#include "stih415-clock.dtsi" 10#include "stih415-clock.dtsi"
11#include "stih415-pinctrl.dtsi" 11#include "stih415-pinctrl.dtsi"
12#include <dt-bindings/interrupt-controller/arm-gic.h>
12/ { 13/ {
13 14
14 L2: cache-controller { 15 L2: cache-controller {
@@ -83,5 +84,57 @@
83 pinctrl-names = "default"; 84 pinctrl-names = "default";
84 pinctrl-0 = <&pinctrl_sbc_serial1>; 85 pinctrl-0 = <&pinctrl_sbc_serial1>;
85 }; 86 };
87
88 i2c@fed40000 {
89 compatible = "st,comms-ssc4-i2c";
90 reg = <0xfed40000 0x110>;
91 interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
92 clocks = <&CLKS_ICN_REG_0>;
93 clock-names = "ssc";
94 clock-frequency = <400000>;
95 pinctrl-names = "default";
96 pinctrl-0 = <&pinctrl_i2c0_default>;
97
98 status = "disabled";
99 };
100
101 i2c@fed41000 {
102 compatible = "st,comms-ssc4-i2c";
103 reg = <0xfed41000 0x110>;
104 interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
105 clocks = <&CLKS_ICN_REG_0>;
106 clock-names = "ssc";
107 clock-frequency = <400000>;
108 pinctrl-names = "default";
109 pinctrl-0 = <&pinctrl_i2c1_default>;
110
111 status = "disabled";
112 };
113
114 i2c@fe540000 {
115 compatible = "st,comms-ssc4-i2c";
116 reg = <0xfe540000 0x110>;
117 interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>;
118 clocks = <&CLK_SYSIN>;
119 clock-names = "ssc";
120 clock-frequency = <400000>;
121 pinctrl-names = "default";
122 pinctrl-0 = <&pinctrl_sbc_i2c0_default>;
123
124 status = "disabled";
125 };
126
127 i2c@fe541000 {
128 compatible = "st,comms-ssc4-i2c";
129 reg = <0xfe541000 0x110>;
130 interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
131 clocks = <&CLK_SYSIN>;
132 clock-names = "ssc";
133 clock-frequency = <400000>;
134 pinctrl-names = "default";
135 pinctrl-0 = <&pinctrl_sbc_i2c1_default>;
136
137 status = "disabled";
138 };
86 }; 139 };
87}; 140};
diff --git a/arch/arm/boot/dts/stih416-pinctrl.dtsi b/arch/arm/boot/dts/stih416-pinctrl.dtsi
index 0f246c979262..b29ff4ba542c 100644
--- a/arch/arm/boot/dts/stih416-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stih416-pinctrl.dtsi
@@ -97,6 +97,24 @@
97 }; 97 };
98 }; 98 };
99 }; 99 };
100
101 sbc_i2c0 {
102 pinctrl_sbc_i2c0_default: sbc_i2c0-default {
103 st,pins {
104 sda = <&PIO4 6 ALT1 BIDIR>;
105 scl = <&PIO4 5 ALT1 BIDIR>;
106 };
107 };
108 };
109
110 sbc_i2c1 {
111 pinctrl_sbc_i2c1_default: sbc_i2c1-default {
112 st,pins {
113 sda = <&PIO3 2 ALT2 BIDIR>;
114 scl = <&PIO3 1 ALT2 BIDIR>;
115 };
116 };
117 };
100 }; 118 };
101 119
102 pin-controller-front { 120 pin-controller-front {
@@ -175,6 +193,23 @@
175 }; 193 };
176 }; 194 };
177 195
196 i2c0 {
197 pinctrl_i2c0_default: i2c0-default {
198 st,pins {
199 sda = <&PIO9 3 ALT1 BIDIR>;
200 scl = <&PIO9 2 ALT1 BIDIR>;
201 };
202 };
203 };
204
205 i2c1 {
206 pinctrl_i2c1_default: i2c1-default {
207 st,pins {
208 sda = <&PIO12 1 ALT1 BIDIR>;
209 scl = <&PIO12 0 ALT1 BIDIR>;
210 };
211 };
212 };
178 }; 213 };
179 214
180 pin-controller-rear { 215 pin-controller-rear {
diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi
index 1a0326ea7d07..b7ab47b95816 100644
--- a/arch/arm/boot/dts/stih416.dtsi
+++ b/arch/arm/boot/dts/stih416.dtsi
@@ -9,6 +9,7 @@
9#include "stih41x.dtsi" 9#include "stih41x.dtsi"
10#include "stih416-clock.dtsi" 10#include "stih416-clock.dtsi"
11#include "stih416-pinctrl.dtsi" 11#include "stih416-pinctrl.dtsi"
12#include <dt-bindings/interrupt-controller/arm-gic.h>
12/ { 13/ {
13 L2: cache-controller { 14 L2: cache-controller {
14 compatible = "arm,pl310-cache"; 15 compatible = "arm,pl310-cache";
@@ -92,5 +93,57 @@
92 pinctrl-0 = <&pinctrl_sbc_serial1>; 93 pinctrl-0 = <&pinctrl_sbc_serial1>;
93 clocks = <&CLK_SYSIN>; 94 clocks = <&CLK_SYSIN>;
94 }; 95 };
96
97 i2c@fed40000 {
98 compatible = "st,comms-ssc4-i2c";
99 reg = <0xfed40000 0x110>;
100 interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
101 clocks = <&CLK_S_ICN_REG_0>;
102 clock-names = "ssc";
103 clock-frequency = <400000>;
104 pinctrl-names = "default";
105 pinctrl-0 = <&pinctrl_i2c0_default>;
106
107 status = "disabled";
108 };
109
110 i2c@fed41000 {
111 compatible = "st,comms-ssc4-i2c";
112 reg = <0xfed41000 0x110>;
113 interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
114 clocks = <&CLK_S_ICN_REG_0>;
115 clock-names = "ssc";
116 clock-frequency = <400000>;
117 pinctrl-names = "default";
118 pinctrl-0 = <&pinctrl_i2c1_default>;
119
120 status = "disabled";
121 };
122
123 i2c@fe540000 {
124 compatible = "st,comms-ssc4-i2c";
125 reg = <0xfe540000 0x110>;
126 interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>;
127 clocks = <&CLK_SYSIN>;
128 clock-names = "ssc";
129 clock-frequency = <400000>;
130 pinctrl-names = "default";
131 pinctrl-0 = <&pinctrl_sbc_i2c0_default>;
132
133 status = "disabled";
134 };
135
136 i2c@fe541000 {
137 compatible = "st,comms-ssc4-i2c";
138 reg = <0xfe541000 0x110>;
139 interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
140 clocks = <&CLK_SYSIN>;
141 clock-names = "ssc";
142 clock-frequency = <400000>;
143 pinctrl-names = "default";
144 pinctrl-0 = <&pinctrl_sbc_i2c1_default>;
145
146 status = "disabled";
147 };
95 }; 148 };
96}; 149};
diff --git a/arch/arm/boot/dts/stih41x-b2000.dtsi b/arch/arm/boot/dts/stih41x-b2000.dtsi
index 8e694d2b8f5b..1e6aa92772f5 100644
--- a/arch/arm/boot/dts/stih41x-b2000.dtsi
+++ b/arch/arm/boot/dts/stih41x-b2000.dtsi
@@ -37,5 +37,14 @@
37 }; 37 };
38 }; 38 };
39 39
40 /* HDMI Tx I2C */
41 i2c@fed41000 {
42 /* HDMI V1.3a supports Standard mode only */
43 clock-frequency = <100000>;
44 i2c-min-scl-pulse-width-us = <0>;
45 i2c-min-sda-pulse-width-us = <5>;
46
47 status = "okay";
48 };
40 }; 49 };
41}; 50};
diff --git a/arch/arm/boot/dts/stih41x-b2020.dtsi b/arch/arm/boot/dts/stih41x-b2020.dtsi
index 133e18143b1b..0ef0a69df8ea 100644
--- a/arch/arm/boot/dts/stih41x-b2020.dtsi
+++ b/arch/arm/boot/dts/stih41x-b2020.dtsi
@@ -38,5 +38,27 @@
38 default-state = "off"; 38 default-state = "off";
39 }; 39 };
40 }; 40 };
41
42 i2c@fed40000 {
43 status = "okay";
44 };
45
46 /* HDMI Tx I2C */
47 i2c@fed41000 {
48 /* HDMI V1.3a supports Standard mode only */
49 clock-frequency = <100000>;
50 i2c-min-scl-pulse-width-us = <0>;
51 i2c-min-sda-pulse-width-us = <5>;
52
53 status = "okay";
54 };
55
56 i2c@fe540000 {
57 status = "okay";
58 };
59
60 i2c@fe541000 {
61 status = "okay";
62 };
41 }; 63 };
42}; 64};
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-24 10:05:59 -0400