Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4108e98e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'amlogic-dt64-2' of... 

Merge tag 'amlogic-dt64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt

Amlogic 64-bit DT updates for v4.18, round 2
- AXG I2C fixups/cleanups

* tag 'amlogic-dt64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic

:
  ARM64: dts: meson-axg: enable i2c AO on the S400 board
  ARM64: dts: meson-axg: add i2c AO pins
  ARM64: dts: meson-axg: correct i2c AO clock
  ARM64: dts: meson-axg: clean-up i2c nodes

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a17f6a89 ffe2f2a4

arch/arm64/boot/dts/amlogic/meson-axg-s400.dts

+6 −0
Original line number Diff line number Diff line
@@ -95,6 +95,12 @@ 
	pinctrl-names = "default";

};



&i2c_AO {

	status = "okay";

	pinctrl-0 = <&i2c_ao_sck_10_pins>, <&i2c_ao_sda_11_pins>;

	pinctrl-names = "default";

};



&pwm_ab {

	status = "okay";

	pinctrl-0 = <&pwm_a_x20_pins>;

arch/arm64/boot/dts/amlogic/meson-axg.dtsi

+56 −23
Original line number Diff line number Diff line
@@ -214,50 +214,42 @@ 


			i2c0: i2c@1f000 {

				compatible = "amlogic,meson-axg-i2c";

				status = "disabled";

				reg = <0x0 0x1f000 0x0 0x20>;

				interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,

					<GIC_SPI 47 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>;

				clocks = <&clkc CLKID_I2C>;

				#address-cells = <1>;

				#size-cells = <0>;

				clocks = <&clkc CLKID_I2C>;

				clock-names = "clk_i2c";

				status = "disabled";

			};



			i2c1: i2c@1e000 {

				compatible = "amlogic,meson-axg-i2c";

				reg = <0x0 0x1e000 0x0 0x20>;

				interrupts = <GIC_SPI 214 IRQ_TYPE_EDGE_RISING>;

				clocks = <&clkc CLKID_I2C>;

				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0x0 0x1e000 0x0 0x20>;

				status = "disabled";

				interrupts = <GIC_SPI 214 IRQ_TYPE_EDGE_RISING>,

					<GIC_SPI 48 IRQ_TYPE_EDGE_RISING>;

				clocks = <&clkc CLKID_I2C>;

				clock-names = "clk_i2c";

			};



			i2c2: i2c@1d000 {

				compatible = "amlogic,meson-axg-i2c";

				status = "disabled";

				reg = <0x0 0x1d000 0x0 0x20>;

				interrupts = <GIC_SPI 215 IRQ_TYPE_EDGE_RISING>,

					<GIC_SPI 49 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 215 IRQ_TYPE_EDGE_RISING>;

				clocks = <&clkc CLKID_I2C>;

				#address-cells = <1>;

				#size-cells = <0>;

				clocks = <&clkc CLKID_I2C>;

				clock-names = "clk_i2c";

				status = "disabled";

			};



			i2c3: i2c@1c000 {

				compatible = "amlogic,meson-axg-i2c";

				status = "disabled";

				reg = <0x0 0x1c000 0x0 0x20>;

				interrupts = <GIC_SPI 39 IRQ_TYPE_EDGE_RISING>,

					<GIC_SPI 50 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 39 IRQ_TYPE_EDGE_RISING>;

				clocks = <&clkc CLKID_I2C>;

				#address-cells = <1>;

				#size-cells = <0>;

				clocks = <&clkc CLKID_I2C>;

				clock-names = "clk_i2c";

				status = "disabled";

			};



			uart_A: serial@24000 {
@@ -1054,6 +1046,48 @@ 
					gpio-ranges = <&pinctrl_aobus 0 0 15>;

				};



				i2c_ao_sck_4_pins: i2c_ao_sck_4 {

					mux {

						groups = "i2c_ao_sck_4";

						function = "i2c_ao";

					};

				};



				i2c_ao_sck_8_pins: i2c_ao_sck_8 {

					mux {

						groups = "i2c_ao_sck_8";

						function = "i2c_ao";

					};

				};



				i2c_ao_sck_10_pins: i2c_ao_sck_10 {

					mux {

						groups = "i2c_ao_sck_10";

						function = "i2c_ao";

					};

				};



				i2c_ao_sda_5_pins: i2c_ao_sda_5 {

					mux {

						groups = "i2c_ao_sda_5";

						function = "i2c_ao";

					};

				};



				i2c_ao_sda_9_pins: i2c_ao_sda_9 {

					mux {

						groups = "i2c_ao_sda_9";

						function = "i2c_ao";

					};

				};



				i2c_ao_sda_11_pins: i2c_ao_sda_11 {

					mux {

						groups = "i2c_ao_sda_11";

						function = "i2c_ao";

					};

				};



				remote_input_ao_pins: remote_input_ao {

					mux {

						groups = "remote_input_ao";
@@ -1116,13 +1150,12 @@ 


			i2c_AO: i2c@5000 {

				compatible = "amlogic,meson-axg-i2c";

				status = "disabled";

				reg = <0x0 0x05000 0x0 0x20>;

				interrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>;

				clocks = <&clkc CLKID_AO_I2C>;

				#address-cells = <1>;

				#size-cells = <0>;

				clocks = <&clkc CLKID_I2C>;

				clock-names = "clk_i2c";

				status = "disabled";

			};



			uart_AO: serial@3000 {