Add standard non-removable and cd-gpios properties to the usdhc devices.

That generates references to gpio devices, so uncomment them even though
there isn't a gpio driver to do anything with them yet.
This commit is contained in:
Ian Lepore 2014-02-13 03:41:00 +00:00
parent 1744bacc7b
commit e4366cae40

View File

@ -112,58 +112,75 @@
// status = "disabled";
// };
// /*
// * GPIO modules moved up - to have it attached for
// * drivers which rely on GPIO
// */
// gpio1: gpio@0209C000 {
// compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";
// reg = <0x0209C000 0x4000>;
// interrupt-parent = <&gic>;
// interrupts = <50 51 42 43 44 45 46 47 48 49>;
// /* TODO: use <> also */
// gpio-controller;
// #gpio-cells = <2>;
// interrupt-controller;
// #interrupt-cells = <1>;
// status = "disabled";
// };
//
// gpio2: gpio@020A0000 {
// compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";
// reg = <0x020A0000 0x4000>;
// interrupt-parent = <&gic>;
// interrupts = <52 53>;
// gpio-controller;
// #gpio-cells = <2>;
// interrupt-controller;
// #interrupt-cells = <1>;
// status = "disabled";
// };
//
// gpio3: gpio@020A4000 {
// compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";
// reg = <0x020A4000 0x4000>;
// interrupt-parent = <&gic>;
// interrupts = <54 55>;
// gpio-controller;
// #gpio-cells = <2>;
// interrupt-controller;
// #interrupt-cells = <1>;
// status = "disabled";
// };
//
// gpio4: gpio@020A8000 {
// compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";
// reg = <0x020A8000 0x4000>;
// interrupt-parent = <&gic>;
// interrupts = <56 57>;
// gpio-controller;
// #gpio-cells = <2>;
// interrupt-controller;
// #interrupt-cells = <1>;
// status = "disabled";
// };
gpio1: gpio@0209c000 {
compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
reg = <0x0209c000 0x4000>;
interrupts = <0 66 0x04 0 67 0x04>;
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
};
gpio2: gpio@020a0000 {
compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
reg = <0x020a0000 0x4000>;
interrupts = <0 68 0x04 0 69 0x04>;
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
};
gpio3: gpio@020a4000 {
compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
reg = <0x020a4000 0x4000>;
interrupts = <0 70 0x04 0 71 0x04>;
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
};
gpio4: gpio@020a8000 {
compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
reg = <0x020a8000 0x4000>;
interrupts = <0 72 0x04 0 73 0x04>;
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
};
gpio5: gpio@020ac000 {
compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
reg = <0x020ac000 0x4000>;
interrupts = <0 74 0x04 0 75 0x04>;
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
};
gpio6: gpio@020b0000 {
compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
reg = <0x020b0000 0x4000>;
interrupts = <0 76 0x04 0 77 0x04>;
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
};
gpio7: gpio@020b4000 {
compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
reg = <0x020b4000 0x4000>;
interrupts = <0 78 0x04 0 79 0x04>;
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
};
uart1: serial@02020000 {
compatible = "fsl,imx6q-uart";
@ -287,6 +304,7 @@
reg = <0x02190000 0x4000>;
interrupt-parent = <&gic>;
interrupts = <54>;
cd-gpios = <&gpio1 2 0>;
bus-width = <0x4>;
status ="disabled";
};
@ -296,6 +314,7 @@
reg = <0x02194000 0x4000>;
interrupt-parent = <&gic>;
interrupts = <55>;
non-removable;
bus-width = <0x4>;
status ="disabled";
};
@ -305,6 +324,7 @@
reg = <0x02198000 0x4000>;
interrupt-parent = <&gic>;
interrupts = <56>;
cd-gpios = <&gpio3 9 0>;
bus-width = <0x4>;
status ="disabled";
};