Unverified Commit ec16a8e7 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

ARM: dts: sun8i: a23/a33: Provide default muxing for relevant controllers 



The I2C's and MMC0 controllers have only one muxing option in the SoC. In
such a case, we can just move the muxing into the DTSI, and remove it from
the DTS.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
parent fbb1f83c

arch/arm/boot/dts/sun8i-a23-a33.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -169,6 +169,8 @@ 
			resets = <&ccu RST_BUS_MMC0>;

			reset-names = "ahb";

			interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;

			pinctrl-names = "default";

			pinctrl-0 = <&mmc0_pins>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -499,6 +501,8 @@ 
			interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_I2C0>;

			resets = <&ccu RST_BUS_I2C0>;

			pinctrl-names = "default";

			pinctrl-0 = <&i2c0_pins>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -510,6 +514,8 @@ 
			interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_I2C1>;

			resets = <&ccu RST_BUS_I2C1>;

			pinctrl-names = "default";

			pinctrl-0 = <&i2c1_pins>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -521,6 +527,8 @@ 
			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_I2C2>;

			resets = <&ccu RST_BUS_I2C2>;

			pinctrl-names = "default";

			pinctrl-0 = <&i2c2_pins>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

arch/arm/boot/dts/sun8i-a23-evb.dts

+0 −6
Original line number Diff line number Diff line
@@ -65,14 +65,10 @@ 
};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";

};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;

	status = "okay";

};
@@ -103,8 +99,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v0>;

	bus-width = <4>;

	cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */

arch/arm/boot/dts/sun8i-a33-olinuxino.dts

+0 −2
Original line number Diff line number Diff line
@@ -82,8 +82,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_dcdc1>;

	bus-width = <4>;

	cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */

arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts

+0 −2
Original line number Diff line number Diff line
@@ -140,8 +140,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_dcdc1>;

	bus-width = <4>;

	cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */

arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts

+0 −8
Original line number Diff line number Diff line
@@ -126,28 +126,20 @@ 


/* This is the i2c bus exposed on the DSI connector for the touch panel */

&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "disabled";

};



/* This is the i2c bus exposed on the GPIO header */

&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;

	status = "disabled";

};



/* This is the i2c bus exposed on the CSI connector to control the sensor */

&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins>;

	status = "disabled";

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_dcdc1>;

	bus-width = <4>;

	cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE