On Wed, Nov 21, 2012 at 17:22:17, AnilKumar, Chimata wrote:
> Rename I2C and GPIO nodes according to AM33XX TRM. According to
> AM33XX TRM device instances are starting from "0" like i2c0, i2c1
> and i2c3.
>
> Signed-off-by: Pantelis Antoniou <panto@xxxxxxxxxxxxxxxxxxxxxxx>
> [panto@xxxxxxxxxxxxxxxxxxxxxxx: initial patch by pantelis's]
> Signed-off-by: AnilKumar Ch <anilkumar@xxxxxx>
> ---
> Changes from first version:
> - Updated pantelis's patch
> * Modified based on linux-omap/master
> * Added GPIO nodes renaming as well
Hi Tony/Benoit,
If there are no comments could you please pull this patch?
Thanks
AnilKumar
> arch/arm/boot/dts/am335x-bone.dts | 10 +++++-----
> arch/arm/boot/dts/am335x-evm.dts | 18 +++++++++---------
> arch/arm/boot/dts/am335x-evmsk.dts | 18 +++++++++---------
> arch/arm/boot/dts/am33xx.dtsi | 14 +++++++-------
> 4 files changed, 30 insertions(+), 30 deletions(-)
>
> diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
> index 2c33888..77b4352 100644
> --- a/arch/arm/boot/dts/am335x-bone.dts
> +++ b/arch/arm/boot/dts/am335x-bone.dts
> @@ -43,7 +43,7 @@
> status = "okay";
> };
>
> - i2c1: i2c@44e0b000 {
> + i2c0: i2c@44e0b000 {
> status = "okay";
> clock-frequency = <400000>;
>
> @@ -59,27 +59,27 @@
>
> led@2 {
> label = "beaglebone:green:heartbeat";
> - gpios = <&gpio2 21 0>;
> + gpios = <&gpio1 21 0>;
> linux,default-trigger = "heartbeat";
> default-state = "off";
> };
>
> led@3 {
> label = "beaglebone:green:mmc0";
> - gpios = <&gpio2 22 0>;
> + gpios = <&gpio1 22 0>;
> linux,default-trigger = "mmc0";
> default-state = "off";
> };
>
> led@4 {
> label = "beaglebone:green:usr2";
> - gpios = <&gpio2 23 0>;
> + gpios = <&gpio1 23 0>;
> default-state = "off";
> };
>
> led@5 {
> label = "beaglebone:green:usr3";
> - gpios = <&gpio2 24 0>;
> + gpios = <&gpio1 24 0>;
> default-state = "off";
> };
> };
> diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
> index 9f65f17..705a9c5 100644
> --- a/arch/arm/boot/dts/am335x-evm.dts
> +++ b/arch/arm/boot/dts/am335x-evm.dts
> @@ -51,7 +51,7 @@
> status = "okay";
> };
>
> - i2c1: i2c@44e0b000 {
> + i2c0: i2c@44e0b000 {
> status = "okay";
> clock-frequency = <400000>;
>
> @@ -60,7 +60,7 @@
> };
> };
>
> - i2c2: i2c@4802a000 {
> + i2c1: i2c@4802a000 {
> status = "okay";
> clock-frequency = <100000>;
>
> @@ -123,12 +123,12 @@
> debounce-delay-ms = <5>;
> col-scan-delay-us = <2>;
>
> - row-gpios = <&gpio2 25 0 /* Bank1, pin25 */
> - &gpio2 26 0 /* Bank1, pin26 */
> - &gpio2 27 0>; /* Bank1, pin27 */
> + row-gpios = <&gpio1 25 0 /* Bank1, pin25 */
> + &gpio1 26 0 /* Bank1, pin26 */
> + &gpio1 27 0>; /* Bank1, pin27 */
>
> - col-gpios = <&gpio2 21 0 /* Bank1, pin21 */
> - &gpio2 22 0>; /* Bank1, pin22 */
> + col-gpios = <&gpio1 21 0 /* Bank1, pin21 */
> + &gpio1 22 0>; /* Bank1, pin22 */
>
> linux,keymap = <0x0000008b /* MENU */
> 0x0100009e /* BACK */
> @@ -147,14 +147,14 @@
> switch@9 {
> label = "volume-up";
> linux,code = <115>;
> - gpios = <&gpio1 2 1>;
> + gpios = <&gpio0 2 1>;
> gpio-key,wakeup;
> };
>
> switch@10 {
> label = "volume-down";
> linux,code = <114>;
> - gpios = <&gpio1 3 1>;
> + gpios = <&gpio0 3 1>;
> gpio-key,wakeup;
> };
> };
> diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
> index f5a6162..f67c360 100644
> --- a/arch/arm/boot/dts/am335x-evmsk.dts
> +++ b/arch/arm/boot/dts/am335x-evmsk.dts
> @@ -58,7 +58,7 @@
> status = "okay";
> };
>
> - i2c1: i2c@44e0b000 {
> + i2c0: i2c@44e0b000 {
> status = "okay";
> clock-frequency = <400000>;
>
> @@ -115,26 +115,26 @@
>
> led@1 {
> label = "evmsk:green:usr0";
> - gpios = <&gpio2 4 0>;
> + gpios = <&gpio1 4 0>;
> default-state = "off";
> };
>
> led@2 {
> label = "evmsk:green:usr1";
> - gpios = <&gpio2 5 0>;
> + gpios = <&gpio1 5 0>;
> default-state = "off";
> };
>
> led@3 {
> label = "evmsk:green:mmc0";
> - gpios = <&gpio2 6 0>;
> + gpios = <&gpio1 6 0>;
> linux,default-trigger = "mmc0";
> default-state = "off";
> };
>
> led@4 {
> label = "evmsk:green:heartbeat";
> - gpios = <&gpio2 7 0>;
> + gpios = <&gpio1 7 0>;
> linux,default-trigger = "heartbeat";
> default-state = "off";
> };
> @@ -148,26 +148,26 @@
> switch@1 {
> label = "button0";
> linux,code = <0x100>;
> - gpios = <&gpio3 3 0>;
> + gpios = <&gpio2 3 0>;
> };
>
> switch@2 {
> label = "button1";
> linux,code = <0x101>;
> - gpios = <&gpio3 2 0>;
> + gpios = <&gpio2 2 0>;
> };
>
> switch@3 {
> label = "button2";
> linux,code = <0x102>;
> - gpios = <&gpio1 30 0>;
> + gpios = <&gpio0 30 0>;
> gpio-key,wakeup;
> };
>
> switch@4 {
> label = "button3";
> linux,code = <0x103>;
> - gpios = <&gpio3 5 0>;
> + gpios = <&gpio2 5 0>;
> };
> };
> };
> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
> index 5dfd682..2ad01c7 100644
> --- a/arch/arm/boot/dts/am33xx.dtsi
> +++ b/arch/arm/boot/dts/am33xx.dtsi
> @@ -87,7 +87,7 @@
> reg = <0x48200000 0x1000>;
> };
>
> - gpio1: gpio@44e07000 {
> + gpio0: gpio@44e07000 {
> compatible = "ti,omap4-gpio";
> ti,hwmods = "gpio1";
> gpio-controller;
> @@ -98,7 +98,7 @@
> interrupts = <96>;
> };
>
> - gpio2: gpio@4804c000 {
> + gpio1: gpio@4804c000 {
> compatible = "ti,omap4-gpio";
> ti,hwmods = "gpio2";
> gpio-controller;
> @@ -109,7 +109,7 @@
> interrupts = <98>;
> };
>
> - gpio3: gpio@481ac000 {
> + gpio2: gpio@481ac000 {
> compatible = "ti,omap4-gpio";
> ti,hwmods = "gpio3";
> gpio-controller;
> @@ -120,7 +120,7 @@
> interrupts = <32>;
> };
>
> - gpio4: gpio@481ae000 {
> + gpio3: gpio@481ae000 {
> compatible = "ti,omap4-gpio";
> ti,hwmods = "gpio4";
> gpio-controller;
> @@ -185,7 +185,7 @@
> status = "disabled";
> };
>
> - i2c1: i2c@44e0b000 {
> + i2c0: i2c@44e0b000 {
> compatible = "ti,omap4-i2c";
> #address-cells = <1>;
> #size-cells = <0>;
> @@ -195,7 +195,7 @@
> status = "disabled";
> };
>
> - i2c2: i2c@4802a000 {
> + i2c1: i2c@4802a000 {
> compatible = "ti,omap4-i2c";
> #address-cells = <1>;
> #size-cells = <0>;
> @@ -205,7 +205,7 @@
> status = "disabled";
> };
>
> - i2c3: i2c@4819c000 {
> + i2c2: i2c@4819c000 {
> compatible = "ti,omap4-i2c";
> #address-cells = <1>;
> #size-cells = <0>;
> --
> 1.7.9.5
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
