From f545e960a0d7fee96b68b00e4aed14f78283b1bc Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Sat, 3 Feb 2018 16:48:15 +0800 Subject: [PATCH] dts: g12a-skt: removed repetitive definition of i2c pinmux PD#156734: dts: g12a-skt: removed repetitive definition of i2c pinmux Replace i2c3 pinctrl with standard definition. Change-Id: I28f64dfde90ccb71f5b3fb12437b92f392de28ce Signed-off-by: Bo Yang --- arch/arm64/boot/dts/amlogic/g12a_skt.dts | 3 ++- arch/arm64/boot/dts/amlogic/mesong12a.dtsi | 8 -------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/g12a_skt.dts b/arch/arm64/boot/dts/amlogic/g12a_skt.dts index 65a5302..f29f6e1 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_skt.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_skt.dts @@ -1007,7 +1007,8 @@ &i2c3 { status = "okay"; pinctrl-names="default"; - pinctrl-0=<&c_i2c_master_pin1>; + pinctrl-0=<&i2c3_master_pins2>; + clock-frequency = <100000>; /* default 100k */ /* for ref board */ ad82584f_62: ad82584f_62@62 { diff --git a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi index 424a694..23a5a99 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi @@ -1092,14 +1092,6 @@ function = "pwm_e"; }; }; - - c_i2c_master_pin1:c_i2c_pin1 { - mux { - groups = "i2c3_sck_a", - "i2c3_sda_a"; - function = "i2c3"; - }; - }; }; &pinctrl_aobus { -- 2.7.4