Commit fbb1f83c authored by Maxime Ripard's avatar Maxime Ripard

ARM: dts: sunxi: reference: Move the muxing back to the common DTSI

Now that all the SoCs using the tablet reference design DTSI are using the
same pinctrl naming scheme, we can move back the pinctrl phandles to the
main DTSI.
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
parent 9e41b5e9
...@@ -76,8 +76,6 @@ &ehci0 { ...@@ -76,8 +76,6 @@ &ehci0 {
}; };
&i2c0 { &i2c0 {
pinctrl-0 = <&i2c0_pins>;
axp209: pmic@34 { axp209: pmic@34 {
reg = <0x34>; reg = <0x34>;
interrupts = <0>; interrupts = <0>;
...@@ -85,8 +83,6 @@ axp209: pmic@34 { ...@@ -85,8 +83,6 @@ axp209: pmic@34 {
}; };
&i2c1 { &i2c1 {
pinctrl-0 = <&i2c1_pins>;
/* /*
* The gsl1680 is rated at 400KHz and it will not work reliable at * The gsl1680 is rated at 400KHz and it will not work reliable at
* 100KHz, this has been confirmed on multiple different q8 tablets. * 100KHz, this has been confirmed on multiple different q8 tablets.
...@@ -150,10 +146,6 @@ usb0_id_detect_pin: usb0-id-detect-pin { ...@@ -150,10 +146,6 @@ usb0_id_detect_pin: usb0-id-detect-pin {
}; };
}; };
&pwm {
pinctrl-0 = <&pwm0_pin>;
};
&reg_dcdc2 { &reg_dcdc2 {
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
......
...@@ -62,7 +62,6 @@ chosen { ...@@ -62,7 +62,6 @@ chosen {
}; };
&i2c0 { &i2c0 {
pinctrl-0 = <&i2c0_pins>;
/* /*
* The gsl1680 is rated at 400KHz and it will not work reliable at * The gsl1680 is rated at 400KHz and it will not work reliable at
* 100KHz, this has been confirmed on multiple different q8 tablets. * 100KHz, this has been confirmed on multiple different q8 tablets.
...@@ -80,10 +79,6 @@ touchscreen: touchscreen@40 { ...@@ -80,10 +79,6 @@ touchscreen: touchscreen@40 {
}; };
}; };
&i2c1 {
pinctrl-0 = <&i2c1_pins>;
};
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>; pinctrl-0 = <&mmc0_pins>;
...@@ -101,10 +96,6 @@ usb0_id_detect_pin: usb0-id-detect-pin { ...@@ -101,10 +96,6 @@ usb0_id_detect_pin: usb0-id-detect-pin {
}; };
}; };
&pwm {
pinctrl-0 = <&pwm0_pin>;
};
&r_rsb { &r_rsb {
status = "okay"; status = "okay";
......
...@@ -46,13 +46,13 @@ ...@@ -46,13 +46,13 @@
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>; pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
...@@ -77,6 +77,6 @@ button-400 { ...@@ -77,6 +77,6 @@ button-400 {
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins>; pinctrl-0 = <&pwm0_pin>;
status = "okay"; status = "okay";
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment