From 6aaff51d03a2de77e471a03e12cc7938f7cec8bd Mon Sep 17 00:00:00 2001 From: Jian Hu Date: Thu, 1 Mar 2018 14:33:42 +0800 Subject: [PATCH] arm64: dts: add i2c alias aliases node PD#158433: arm64: dts: add i2c alias in aliases node add alias for i2c controller to fasten i2c dev id Change-Id: I87c1999766c69e9df63f551f0559b8028844d660 Signed-off-by: Jian Hu --- MAINTAINERS | 1 - arch/arm64/boot/dts/amlogic/g12a_pxp.dts | 5 +++ arch/arm64/boot/dts/amlogic/g12a_skt.dts | 5 +++ .../boot/dts/amlogic/g12a_skt_buildroot.dts | 5 +++ arch/arm64/boot/dts/amlogic/mesong12a.dtsi | 6 ---- include/dt-bindings/i2c/i2c-meson.h | 34 ------------------- 6 files changed, 15 insertions(+), 41 deletions(-) delete mode 100644 include/dt-bindings/i2c/i2c-meson.h diff --git a/MAINTAINERS b/MAINTAINERS index 6b5733b060c6..ed1fb796aaa4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13562,7 +13562,6 @@ F: drivers/amlogic/cec/* AMLOGIC I2C DRIVER M: Jian Hu F: driver/amlogic/i2c/* -F: include/dt-bindings/i2c/i2c-meson.h F: Documentation/devicetree/bindings/amlogic/i2c-meson.txt AMLOGIC internal phy driver for ethernet diff --git a/arch/arm64/boot/dts/amlogic/g12a_pxp.dts b/arch/arm64/boot/dts/amlogic/g12a_pxp.dts index 0d6216c1d710..daf1700cdf9c 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_pxp.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_pxp.dts @@ -28,6 +28,11 @@ aliases { serial0 = &uart_AO; + i2c0 = &i2c0; + i2c1 = &i2c1; + i2c2 = &i2c2; + i2c3 = &i2c3; + i2c4 = &i2c_AO; }; memory@00000000 { diff --git a/arch/arm64/boot/dts/amlogic/g12a_skt.dts b/arch/arm64/boot/dts/amlogic/g12a_skt.dts index 55929d3de5fe..a72adec3f052 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_skt.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_skt.dts @@ -36,6 +36,11 @@ serial4 = &uart_AO_B; tsensor0 = &p_tsensor; tsensor1 = &d_tsensor; + i2c0 = &i2c0; + i2c1 = &i2c1; + i2c2 = &i2c2; + i2c3 = &i2c3; + i2c4 = &i2c_AO; }; memory@00000000 { diff --git a/arch/arm64/boot/dts/amlogic/g12a_skt_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_skt_buildroot.dts index 66ac978151a6..3e0f463d2664 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_skt_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_skt_buildroot.dts @@ -38,6 +38,11 @@ serial4 = &uart_AO_B; tsensor0 = &p_tsensor; tsensor1 = &d_tsensor; + i2c0 = &i2c0; + i2c1 = &i2c1; + i2c2 = &i2c2; + i2c3 = &i2c3; + i2c4 = &i2c_AO; }; memory@00000000 { diff --git a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi index 8b93ec607c33..6826597d1ee8 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -546,7 +545,6 @@ #size-cells = <0>; clocks = <&clkc CLKID_I2C>; clock-names = "clk_i2c"; - dev-id = ; }; i2c1: i2c@1e000 { @@ -559,7 +557,6 @@ #size-cells = <0>; clocks = <&clkc CLKID_I2C>; clock-names = "clk_i2c"; - dev-id = ; }; i2c2: i2c@1d000 { @@ -572,7 +569,6 @@ #size-cells = <0>; clocks = <&clkc CLKID_I2C>; clock-names = "clk_i2c"; - dev-id = ; }; i2c3: i2c@1c000 { @@ -585,7 +581,6 @@ #size-cells = <0>; clocks = <&clkc CLKID_I2C>; clock-names = "clk_i2c"; - dev-id = ; }; }; /* end of cbus */ @@ -646,7 +641,6 @@ #size-cells = <0>; clocks = <&clkc CLKID_I2C>; clock-names = "clk_i2c"; - dev-id = ; }; i2c_AO_slave:i2c_slave@6000 { diff --git a/include/dt-bindings/i2c/i2c-meson.h b/include/dt-bindings/i2c/i2c-meson.h deleted file mode 100644 index d9b9ac84427d..000000000000 --- a/include/dt-bindings/i2c/i2c-meson.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * include/dt-bindings/i2c/i2c-meson.h - * - * Copyright (C) 2017 Amlogic, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - */ - -#ifndef _DT_BINDINGS_I2C_MESON_H -#define _DT_BINDINGS_I2C_MESON_H - -/*MESON_I2C_MASTER0 - MESON_I2C_MASTERA - *MESON_I2C_MASTER0 - MESON_I2C_MASTERB - *MESON_I2C_MASTER0 - MESON_I2C_MASTERC - *MESON_I2C_MASTER0 - MESON_I2C_MASTERD - *we can see i2c-A/B/C/D rename to i2c0/1/2/3 - */ - -#define MESON_I2C_MASTER0 0 -#define MESON_I2C_MASTER1 1 -#define MESON_I2C_MASTER2 2 -#define MESON_I2C_MASTER3 3 -#define MESON_I2C_MASTERAO 4 - -#endif