forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/arch/arm/boot/dts/pxa3xx.dtsi
....@@ -71,6 +71,14 @@
7171 #define MFP_DS13X < (0x7 << 10) MFP_DSMSK >
7272
7373 /*
74
+ * MFP bias pull mode for pins.
75
+ * Example of use: pinctrl-single,bias-pullup = MPF_PULL_UP;
76
+ */
77
+#define MPF_PULL_MSK (0x7 << 13)
78
+#define MPF_PULL_DOWN < (0x5 << 13) (0x5 << 13) 0 MPF_PULL_MSK >
79
+#define MPF_PULL_UP < (0x6 << 13) (0x6 << 13) 0 MPF_PULL_MSK >
80
+
81
+/*
7482 * MFP low power mode for pins.
7583 * Example of use:
7684 * pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_LOW|MFP_LPM_EDGE_FALL);
....@@ -151,8 +159,6 @@
151159 pinctrl: pinctrl@40e10000 {
152160 compatible = "pinconf-single";
153161 reg = <0x40e10000 0xffff>;
154
- #address-cells = <1>;
155
- #size-cells = <0>;
156162 #pinctrl-cells = <1>;
157163 pinctrl-single,register-width = <32>;
158164 pinctrl-single,function-mask = <0x7>;
....@@ -164,7 +170,7 @@
164170 clocks = <&clks CLK_GPIO>;
165171 gpio-ranges = <&pinctrl 0 0 128>;
166172 interrupt-names = "gpio0", "gpio1", "gpio_mux";
167
- interrupts = <8 9 10>;
173
+ interrupts = <8>, <9>, <10>;
168174 gpio-controller;
169175 #gpio-cells = <0x2>;
170176 interrupt-controller;
....@@ -275,6 +281,22 @@
275281 clocks = <&clks CLK_SSP4>;
276282 status = "disabled";
277283 };
284
+
285
+ timer@40a00000 {
286
+ compatible = "marvell,pxa-timer";
287
+ reg = <0x40a00000 0x20>;
288
+ interrupts = <26>;
289
+ clocks = <&clks CLK_OSTIMER>;
290
+ status = "okay";
291
+ };
292
+
293
+ gcu: display-controller@54000000 {
294
+ compatible = "marvell,pxa300-gcu";
295
+ reg = <0x54000000 0x1000>;
296
+ interrupts = <39>;
297
+ clocks = <&clks CLK_PXA300_GCU>;
298
+ status = "disabled";
299
+ };
278300 };
279301
280302 clocks {
....@@ -286,18 +308,10 @@
286308 #size-cells = <1>;
287309 ranges;
288310
289
- clks: pxa3xx_clks@41300004 {
311
+ clks: clocks {
290312 compatible = "marvell,pxa300-clocks";
291313 #clock-cells = <1>;
292314 status = "okay";
293315 };
294
- };
295
-
296
- timer@40a00000 {
297
- compatible = "marvell,pxa-timer";
298
- reg = <0x40a00000 0x20>;
299
- interrupts = <26>;
300
- clocks = <&clks CLK_OSTIMER>;
301
- status = "okay";
302316 };
303317 };