Skip to content

L
linux
Commit 2c94db38 authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'sunxi-dt-for-4.21' of... 

Merge tag 'sunxi-dt-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

Allwinner DT changes for 4.21

This is a quite big pull request this time, with a huge number of changes
(and patches) due to us fixing the vast majority of the DTC warnings our DT
had.

We also have a bunch of other good, more meaningful, changes:
  - Support for the new Allwinner T3 (rebranded R40) and f1c100s (armv5)
    SoCs
  - AXP803 PMIC AC Power supply support
  - Rework of the oscillators tree
  - Two new boards: the t3-cqa3t-bv3 and Lichee Pi Nano

Plus a few enhancements here and there.

* tag 'sunxi-dt-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (84 commits)
  ARM: dts: sunxi: Fix PMU compatible strings
  ARM: dts: sun8i: r40: Add RTC device node
  ARM: dts: sunxi: h3/h5: Fix up RTC device node and clock references
  ARM: dts: sun8i: a23/a33: Fix up RTC device node
  ARM: dts: sun8i: r40: Add clock accuracy for external oscillators
  ARM: dts: sunxi: h3/h5: Add clock accuracy for external oscillators
  ARM: dts: sun8i: a33: Drop audio codec oversampling rate to 128 fs
  ARM: dts: sun8i: h3: Remove unnecessary reserved memory node
  ARM: dts: sun8i: a33: Remove unnecessary reserved memory node
  ARM: dts: suniv: Add device tree for Lichee Pi Nano
  ARM: dts: suniv: add initial DTSI file for F1C100s
  ARM: dts: axp81x: add AC power supply subnode
  ARM: dts: sun8i: v3s: Remove skeleton and memory to avoid warnings
  ARM: dts: sun8i: v3s: Provide default muxing for relevant controllers
  ARM: dts: sun8i: v3s: Change pinctrl nodes to avoid warning
  ARM: dts: sun8i: v3s: Change LRADC node names to avoid warnings
  ARM: dts: sun8i: h3: Remove leading zeros from unit-addresses
  ARM: dts: sun8i: BPI-M2M: Remove i2c nodes
  ARM: dts: sun8i: a23/a33: Provide default muxing for relevant controllers
  ARM: dts: sunxi: reference: Move the muxing back to the common DTSI
  ...
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 91eac913 5719ac19
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1029 additions and 1919 deletions
Documentation/devicetree/bindings/arm/sunxi.txt
View file @ 2c94db38
...@@ -14,7 +14,8 @@ using one of the following compatible strings: ...@@ -14,7 +14,8 @@ using one of the following compatible strings:
allwinner,sun8i-a83t allwinner,sun8i-a83t
allwinner,sun8i-h2-plus allwinner,sun8i-h2-plus
allwinner,sun8i-h3 allwinner,sun8i-h3
allwinner-sun8i-r40 allwinner,sun8i-r40
allwinner,sun8i-t3
allwinner,sun8i-v3s allwinner,sun8i-v3s
allwinner,sun9i-a80 allwinner,sun9i-a80
allwinner,sun50i-a64 allwinner,sun50i-a64
......
Documentation/devicetree/bindings/media/cedrus.txt
View file @ 2c94db38
...@@ -31,7 +31,7 @@ reserved-memory { ...@@ -31,7 +31,7 @@ reserved-memory {
ranges; ranges;
/* Address must be kept in the lower 256 MiBs of DRAM for VE. */ /* Address must be kept in the lower 256 MiBs of DRAM for VE. */
cma_pool: cma@4a000000 { cma_pool: default-pool {
compatible = "shared-dma-pool"; compatible = "shared-dma-pool";
size = <0x6000000>; size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>; alloc-ranges = <0x4a000000 0x6000000>;
......
arch/arm/boot/dts/Makefile
View file @ 2c94db38
...@@ -1069,12 +1069,15 @@ dtb-$(CONFIG_MACH_SUN8I) += \ ...@@ -1069,12 +1069,15 @@ dtb-$(CONFIG_MACH_SUN8I) += \
sun8i-r16-nintendo-super-nes-classic.dtb \ sun8i-r16-nintendo-super-nes-classic.dtb \
sun8i-r16-parrot.dtb \ sun8i-r16-parrot.dtb \
sun8i-r40-bananapi-m2-ultra.dtb \ sun8i-r40-bananapi-m2-ultra.dtb \
sun8i-t3-cqa3t-bv3.dtb \
sun8i-v3s-licheepi-zero.dtb \ sun8i-v3s-licheepi-zero.dtb \
sun8i-v3s-licheepi-zero-dock.dtb \ sun8i-v3s-licheepi-zero-dock.dtb \
sun8i-v40-bananapi-m2-berry.dtb sun8i-v40-bananapi-m2-berry.dtb
dtb-$(CONFIG_MACH_SUN9I) += \ dtb-$(CONFIG_MACH_SUN9I) += \
sun9i-a80-optimus.dtb \ sun9i-a80-optimus.dtb \
sun9i-a80-cubieboard4.dtb sun9i-a80-cubieboard4.dtb
dtb-$(CONFIG_MACH_SUNIV) += \
suniv-f1c100s-licheepi-nano.dtb
dtb-$(CONFIG_ARCH_TANGO) += \ dtb-$(CONFIG_ARCH_TANGO) += \
tango4-vantage-1172.dtb tango4-vantage-1172.dtb
dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \
......
arch/arm/boot/dts/axp81x.dtsi
View file @ 2c94db38
...@@ -48,6 +48,11 @@ &axp81x { ...@@ -48,6 +48,11 @@ &axp81x {
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <1>;
ac_power_supply: ac-power-supply {
compatible = "x-powers,axp813-ac-power-supply";
status = "disabled";
};
axp_adc: adc { axp_adc: adc {
compatible = "x-powers,axp813-adc"; compatible = "x-powers,axp813-adc";
#io-channel-cells = <1>; #io-channel-cells = <1>;
......
arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
View file @ 2c94db38
...@@ -63,8 +63,6 @@ gpio-keys { ...@@ -63,8 +63,6 @@ gpio-keys {
compatible = "gpio-keys-polled"; compatible = "gpio-keys-polled";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&key_pins_inet9f>; pinctrl-0 = <&key_pins_inet9f>;
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <20>; poll-interval = <20>;
left-joystick-left { left-joystick-left {
......
arch/arm/boot/dts/sun4i-a10-pcduino.dts
View file @ 2c94db38
...@@ -76,8 +76,6 @@ rx { ...@@ -76,8 +76,6 @@ rx {
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
back { back {
label = "Key Back"; label = "Key Back";
......
arch/arm/boot/dts/sun4i-a10.dtsi
View file @ 2c94db38
...@@ -530,8 +530,6 @@ hdmi_in_tcon1: endpoint@1 { ...@@ -530,8 +530,6 @@ hdmi_in_tcon1: endpoint@1 {
}; };
hdmi_out: port@1 { hdmi_out: port@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>; reg = <1>;
}; };
}; };
......
arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
View file @ 2c94db38
...@@ -75,8 +75,6 @@ &ehci0 { ...@@ -75,8 +75,6 @@ &ehci0 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp152: pmic@30 { axp152: pmic@30 {
...@@ -89,8 +87,6 @@ axp152: pmic@30 { ...@@ -89,8 +87,6 @@ axp152: pmic@30 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_t003>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */ cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
...@@ -106,13 +102,7 @@ &otg_sram { ...@@ -106,13 +102,7 @@ &otg_sram {
}; };
&pio { &pio {
mmc0_cd_pin_t003: mmc0_cd_pin@0 { led_pins_t003: led-pin {
pins = "PG1";
function = "gpio_in";
bias-pull-up;
};
led_pins_t003: led_pins@0 {
pins = "PB2"; pins = "PB2";
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
...@@ -131,7 +121,7 @@ &reg_usb1_vbus { ...@@ -131,7 +121,7 @@ &reg_usb1_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
View file @ 2c94db38
...@@ -71,8 +71,6 @@ red { ...@@ -71,8 +71,6 @@ red {
reg_vmmc1: vmmc1 { reg_vmmc1: vmmc1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&mmc1_vcc_en_pin_t004>;
regulator-name = "vmmc1"; regulator-name = "vmmc1";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -86,8 +84,6 @@ &ehci0 { ...@@ -86,8 +84,6 @@ &ehci0 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp152: pmic@30 { axp152: pmic@30 {
...@@ -100,8 +96,6 @@ axp152: pmic@30 { ...@@ -100,8 +96,6 @@ axp152: pmic@30 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_t004>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */ cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
...@@ -109,8 +103,6 @@ &mmc0 { ...@@ -109,8 +103,6 @@ &mmc0 {
}; };
&mmc1 { &mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
vmmc-supply = <&reg_vmmc1>; vmmc-supply = <&reg_vmmc1>;
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;
...@@ -127,24 +119,13 @@ &otg_sram { ...@@ -127,24 +119,13 @@ &otg_sram {
}; };
&pio { &pio {
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG12"; pins = "PG12";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
mmc0_cd_pin_t004: mmc0_cd_pin@0 { led_pins_t004: led-pin {
pins = "PG1";
function = "gpio_in";
bias-pull-up;
};
mmc1_vcc_en_pin_t004: mmc1_vcc_en_pin@0 {
pins = "PB18";
function = "gpio_out";
};
led_pins_t004: led_pins@0 {
pins = "PB2"; pins = "PB2";
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
...@@ -158,7 +139,7 @@ &reg_usb1_vbus { ...@@ -158,7 +139,7 @@ &reg_usb1_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun5i-a10s-mk802.dts
View file @ 2c94db38
...@@ -59,8 +59,6 @@ chosen { ...@@ -59,8 +59,6 @@ chosen {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_mk802>;
red { red {
label = "mk802:red:usr"; label = "mk802:red:usr";
...@@ -74,8 +72,6 @@ &ehci0 { ...@@ -74,8 +72,6 @@ &ehci0 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp152: pmic@30 { axp152: pmic@30 {
...@@ -88,8 +84,6 @@ axp152: pmic@30 { ...@@ -88,8 +84,6 @@ axp152: pmic@30 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_mk802>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */ cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
...@@ -97,8 +91,6 @@ &mmc0 { ...@@ -97,8 +91,6 @@ &mmc0 {
}; };
&mmc1 { &mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;
...@@ -113,33 +105,14 @@ &otg_sram { ...@@ -113,33 +105,14 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
led_pins_mk802: led_pins@0 {
pins = "PB2";
function = "gpio_out";
};
mmc0_cd_pin_mk802: mmc0_cd_pin@0 {
pins = "PG1";
function = "gpio_in";
bias-pull-up;
};
usb1_vbus_pin_mk802: usb1_vbus_pin@0 {
pins = "PB10";
function = "gpio_out";
};
};
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_mk802>;
gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */ gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
View file @ 2c94db38
...@@ -97,7 +97,7 @@ &ehci0 { ...@@ -97,7 +97,7 @@ &ehci0 {
&emac { &emac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&emac_pins_b>; pinctrl-0 = <&emac_pa_pins>;
phy = <&phy1>; phy = <&phy1>;
status = "okay"; status = "okay";
}; };
...@@ -117,8 +117,6 @@ hdmi_out_con: endpoint { ...@@ -117,8 +117,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp152: pmic@30 { axp152: pmic@30 {
...@@ -130,8 +128,6 @@ axp152: pmic@30 { ...@@ -130,8 +128,6 @@ axp152: pmic@30 {
#include "axp152.dtsi" #include "axp152.dtsi"
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
at24@50 { at24@50 {
...@@ -143,8 +139,6 @@ at24@50 { ...@@ -143,8 +139,6 @@ at24@50 {
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
}; };
...@@ -152,35 +146,35 @@ &lradc { ...@@ -152,35 +146,35 @@ &lradc {
vref-supply = <&reg_vcc3v0>; vref-supply = <&reg_vcc3v0>;
status = "okay"; status = "okay";
button@191 { button-191 {
label = "Volume Up"; label = "Volume Up";
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
channel = <0>; channel = <0>;
voltage = <191274>; voltage = <191274>;
}; };
button@392 { button-392 {
label = "Volume Down"; label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
channel = <0>; channel = <0>;
voltage = <392644>; voltage = <392644>;
}; };
button@601 { button-601 {
label = "Menu"; label = "Menu";
linux,code = <KEY_MENU>; linux,code = <KEY_MENU>;
channel = <0>; channel = <0>;
voltage = <601151>; voltage = <601151>;
}; };
button@795 { button-795 {
label = "Enter"; label = "Enter";
linux,code = <KEY_ENTER>; linux,code = <KEY_ENTER>;
channel = <0>; channel = <0>;
voltage = <795090>; voltage = <795090>;
}; };
button@987 { button-987 {
label = "Home"; label = "Home";
linux,code = <KEY_HOMEPAGE>; linux,code = <KEY_HOMEPAGE>;
channel = <0>; channel = <0>;
...@@ -197,8 +191,6 @@ phy1: ethernet-phy@1 { ...@@ -197,8 +191,6 @@ phy1: ethernet-phy@1 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino_micro>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */ cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
...@@ -206,8 +198,6 @@ &mmc0 { ...@@ -206,8 +198,6 @@ &mmc0 {
}; };
&mmc1 { &mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>, <&mmc1_cd_pin_olinuxino_micro>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>; /* PG13 */ cd-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>; /* PG13 */
...@@ -223,30 +213,13 @@ &otg_sram { ...@@ -223,30 +213,13 @@ &otg_sram {
}; };
&pio { &pio {
mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin@0 { led_pins_olinuxino: led-pin {
pins = "PG1";
function = "gpio_in";
bias-pull-up;
};
mmc1_cd_pin_olinuxino_micro: mmc1_cd_pin@0 {
pins = "PG13";
function = "gpio_in";
bias-pull-up;
};
led_pins_olinuxino: led_pins@0 {
pins = "PE3"; pins = "PE3";
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb1_vbus_pin_olinuxino_m: usb1_vbus_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PB10";
function = "gpio_out";
};
usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PG12"; pins = "PG12";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
...@@ -259,15 +232,14 @@ &reg_usb0_vbus { ...@@ -259,15 +232,14 @@ &reg_usb0_vbus {
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_olinuxino_m>;
gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
&spi2 { &spi2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi2_pins_b>, pinctrl-0 = <&spi2_pb_pins>,
<&spi2_cs0_pins_b>; <&spi2_cs0_pb_pin>;
status = "okay"; status = "okay";
}; };
...@@ -277,19 +249,19 @@ &tcon0 { ...@@ -277,19 +249,19 @@ &tcon0 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
&uart2 { &uart2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart2_pins_b>; pinctrl-0 = <&uart2_pc_pins>;
status = "okay"; status = "okay";
}; };
&uart3 { &uart3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart3_pins_a>; pinctrl-0 = <&uart3_pg_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
View file @ 2c94db38
...@@ -76,8 +76,6 @@ &ehci0 { ...@@ -76,8 +76,6 @@ &ehci0 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_r7>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */ cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
...@@ -85,8 +83,6 @@ &mmc0 { ...@@ -85,8 +83,6 @@ &mmc0 {
}; };
&mmc1 { &mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;
...@@ -98,33 +94,21 @@ &ohci0 { ...@@ -98,33 +94,21 @@ &ohci0 {
}; };
&pio { &pio {
mmc0_cd_pin_r7: mmc0_cd_pin@0 { led_pins_r7: led-pin {
pins = "PG1";
function = "gpio_in";
bias-pull-up;
};
led_pins_r7: led_pins@0 {
pins = "PB2"; pins = "PB2";
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb1_vbus_pin_r7: usb1_vbus_pin@0 {
pins = "PG13";
function = "gpio_out";
};
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_r7>;
gpio = <&pio 6 13 GPIO_ACTIVE_HIGH>; gpio = <&pio 6 13 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
View file @ 2c94db38
...@@ -61,8 +61,6 @@ chosen { ...@@ -61,8 +61,6 @@ chosen {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_wobo_i5>;
blue { blue {
label = "a10s-wobo-i5:blue:usr"; label = "a10s-wobo-i5:blue:usr";
...@@ -73,8 +71,6 @@ blue { ...@@ -73,8 +71,6 @@ blue {
reg_emac_3v3: emac-3v3 { reg_emac_3v3: emac-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&emac_power_pin_wobo>;
regulator-name = "emac-3v3"; regulator-name = "emac-3v3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -94,7 +90,7 @@ &ehci0 { ...@@ -94,7 +90,7 @@ &ehci0 {
&emac { &emac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&emac_pins_a>; pinctrl-0 = <&emac_pd_pins>;
phy = <&phy1>; phy = <&phy1>;
status = "okay"; status = "okay";
}; };
...@@ -104,8 +100,6 @@ &emac_sram { ...@@ -104,8 +100,6 @@ &emac_sram {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -126,8 +120,6 @@ phy1: ethernet-phy@1 { ...@@ -126,8 +120,6 @@ phy1: ethernet-phy@1 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_wobo_i5>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 1 3 GPIO_ACTIVE_LOW>; /* PB3 */ cd-gpios = <&pio 1 3 GPIO_ACTIVE_LOW>; /* PB3 */
...@@ -142,24 +134,6 @@ &otg_sram { ...@@ -142,24 +134,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
led_pins_wobo_i5: led_pins@0 {
pins = "PB2";
function = "gpio_out";
};
mmc0_cd_pin_wobo_i5: mmc0_cd_pin@0 {
pins = "PB3";
function = "gpio_in";
bias-pull-up;
};
emac_power_pin_wobo: emac_power_pin@0 {
pins = "PA02";
function = "gpio_out";
};
};
&reg_dcdc2 { &reg_dcdc2 {
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
...@@ -206,7 +180,7 @@ &reg_usb1_vbus { ...@@ -206,7 +180,7 @@ &reg_usb1_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun5i-a10s.dtsi
View file @ 2c94db38
...@@ -42,15 +42,11 @@ ...@@ -42,15 +42,11 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include "skeleton.dtsi"
#include "sun5i.dtsi" #include "sun5i.dtsi"
#include <dt-bindings/dma/sun4i-a10.h> #include <dt-bindings/dma/sun4i-a10.h>
/ { / {
interrupt-parent = <&intc>;
aliases { aliases {
ethernet0 = &emac; ethernet0 = &emac;
}; };
...@@ -60,7 +56,7 @@ chosen { ...@@ -60,7 +56,7 @@ chosen {
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
framebuffer@2 { framebuffer-lcd0-hdmi {
compatible = "allwinner,simple-framebuffer", compatible = "allwinner,simple-framebuffer",
"simple-framebuffer"; "simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0-hdmi"; allwinner,pipeline = "de_be0-lcd0-hdmi";
...@@ -76,7 +72,7 @@ display-engine { ...@@ -76,7 +72,7 @@ display-engine {
allwinner,pipelines = <&fe0>; allwinner,pipelines = <&fe0>;
}; };
soc@1c00000 { soc {
hdmi: hdmi@1c16000 { hdmi: hdmi@1c16000 {
compatible = "allwinner,sun5i-a10s-hdmi"; compatible = "allwinner,sun5i-a10s-hdmi";
reg = <0x01c16000 0x1000>; reg = <0x01c16000 0x1000>;
...@@ -104,8 +100,6 @@ hdmi_in_tcon0: endpoint { ...@@ -104,8 +100,6 @@ hdmi_in_tcon0: endpoint {
}; };
hdmi_out: port@1 { hdmi_out: port@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>; reg = <1>;
}; };
}; };
...@@ -125,20 +119,25 @@ &ccu { ...@@ -125,20 +119,25 @@ &ccu {
compatible = "allwinner,sun5i-a10s-ccu"; compatible = "allwinner,sun5i-a10s-ccu";
}; };
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>;
};
&pio { &pio {
compatible = "allwinner,sun5i-a10s-pinctrl"; compatible = "allwinner,sun5i-a10s-pinctrl";
uart0_pins_a: uart0@0 { uart0_pb_pins: uart0-pb-pins {
pins = "PB19", "PB20"; pins = "PB19", "PB20";
function = "uart0"; function = "uart0";
}; };
uart2_pins_b: uart2@1 { uart2_pc_pins: uart2-pc-pins {
pins = "PC18", "PC19"; pins = "PC18", "PC19";
function = "uart2"; function = "uart2";
}; };
emac_pins_b: emac0@1 { emac_pa_pins: emac-pa-pins {
pins = "PA0", "PA1", "PA2", pins = "PA0", "PA1", "PA2",
"PA3", "PA4", "PA5", "PA6", "PA3", "PA4", "PA5", "PA6",
"PA7", "PA8", "PA9", "PA10", "PA7", "PA8", "PA9", "PA10",
...@@ -147,27 +146,24 @@ emac_pins_b: emac0@1 { ...@@ -147,27 +146,24 @@ emac_pins_b: emac0@1 {
function = "emac"; function = "emac";
}; };
mmc1_pins_a: mmc1@0 { mmc1_pins: mmc1-pins {
pins = "PG3", "PG4", "PG5", pins = "PG3", "PG4", "PG5",
"PG6", "PG7", "PG8"; "PG6", "PG7", "PG8";
function = "mmc1"; function = "mmc1";
drive-strength = <30>; drive-strength = <30>;
}; };
spi2_pins_b: spi2@1 { spi2_pb_pins: spi2-pb-pins {
pins = "PB12", "PB13", "PB14"; pins = "PB12", "PB13", "PB14";
function = "spi2"; function = "spi2";
}; };
spi2_cs0_pins_b: spi2_cs0@1 { spi2_cs0_pb_pin: spi2-cs0-pb-pin {
pins = "PB11"; pins = "PB11";
function = "spi2"; function = "spi2";
}; };
}; };
&sram_a {
};
&tcon0_out { &tcon0_out {
tcon0_out_hdmi: endpoint@2 { tcon0_out_hdmi: endpoint@2 {
reg = <2>; reg = <2>;
......
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
View file @ 2c94db38
...@@ -78,8 +78,6 @@ &ehci0 { ...@@ -78,8 +78,6 @@ &ehci0 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -91,8 +89,6 @@ axp209: pmic@34 { ...@@ -91,8 +89,6 @@ axp209: pmic@34 {
#include "axp209.dtsi" #include "axp209.dtsi"
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
pcf8563: rtc@51 { pcf8563: rtc@51 {
...@@ -105,14 +101,14 @@ &lradc { ...@@ -105,14 +101,14 @@ &lradc {
vref-supply = <&reg_ldo2>; vref-supply = <&reg_ldo2>;
status = "okay"; status = "okay";
button@200 { button-200 {
label = "Volume Up"; label = "Volume Up";
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
channel = <0>; channel = <0>;
voltage = <200000>; voltage = <200000>;
}; };
button@400 { button-400 {
label = "Volume Down"; label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
channel = <0>; channel = <0>;
...@@ -121,8 +117,6 @@ button@400 { ...@@ -121,8 +117,6 @@ button@400 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_d709>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */ cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
...@@ -134,19 +128,13 @@ &otg_sram { ...@@ -134,19 +128,13 @@ &otg_sram {
}; };
&pio { &pio {
mmc0_cd_pin_d709: mmc0_cd_pin@0 { usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PG0";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
pins = "PG1"; pins = "PG1";
function = "gpio_in"; function = "gpio_in";
bias-pull-down; bias-pull-down;
}; };
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG2"; pins = "PG2";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
...@@ -155,7 +143,7 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 { ...@@ -155,7 +143,7 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 {
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins>; pinctrl-0 = <&pwm0_pin>;
status = "okay"; status = "okay";
}; };
...@@ -197,7 +185,7 @@ &reg_usb0_vbus { ...@@ -197,7 +185,7 @@ &reg_usb0_vbus {
&uart1 { &uart1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>; pinctrl-0 = <&uart1_pg_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
View file @ 2c94db38
...@@ -69,8 +69,6 @@ &ehci0 { ...@@ -69,8 +69,6 @@ &ehci0 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -80,8 +78,6 @@ axp209: pmic@34 { ...@@ -80,8 +78,6 @@ axp209: pmic@34 {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
pcf8563: rtc@51 { pcf8563: rtc@51 {
...@@ -91,8 +87,6 @@ pcf8563: rtc@51 { ...@@ -91,8 +87,6 @@ pcf8563: rtc@51 {
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
}; };
...@@ -100,14 +94,14 @@ &lradc { ...@@ -100,14 +94,14 @@ &lradc {
vref-supply = <&reg_ldo2>; vref-supply = <&reg_ldo2>;
status = "okay"; status = "okay";
button@200 { button-200 {
label = "Volume Up"; label = "Volume Up";
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
channel = <0>; channel = <0>;
voltage = <200000>; voltage = <200000>;
}; };
button@400 { button-400 {
label = "Volume Down"; label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
channel = <0>; channel = <0>;
...@@ -116,8 +110,6 @@ button@400 { ...@@ -116,8 +110,6 @@ button@400 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_h702>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */ cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
...@@ -133,22 +125,11 @@ &otg_sram { ...@@ -133,22 +125,11 @@ &otg_sram {
}; };
&pio { &pio {
mmc0_cd_pin_h702: mmc0_cd_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG0";
function = "gpio_in";
bias-pull-up;
};
usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PG2"; pins = "PG2";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
pins = "PG1";
function = "gpio_in";
};
}; };
#include "axp209.dtsi" #include "axp209.dtsi"
...@@ -191,7 +172,7 @@ &reg_usb0_vbus { ...@@ -191,7 +172,7 @@ &reg_usb0_vbus {
&uart1 { &uart1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>; pinctrl-0 = <&uart1_pg_pins>;
status = "okay"; status = "okay";
}; };
...@@ -202,7 +183,7 @@ &usb_otg { ...@@ -202,7 +183,7 @@ &usb_otg {
&usbphy { &usbphy {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
......
arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
View file @ 2c94db38
...@@ -94,8 +94,6 @@ &ehci0 { ...@@ -94,8 +94,6 @@ &ehci0 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -109,14 +107,10 @@ axp209: pmic@34 { ...@@ -109,14 +107,10 @@ axp209: pmic@34 {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "disabled"; status = "disabled";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "disabled"; status = "disabled";
}; };
...@@ -124,7 +118,7 @@ &lradc { ...@@ -124,7 +118,7 @@ &lradc {
vref-supply = <&reg_ldo2>; vref-supply = <&reg_ldo2>;
status = "okay"; status = "okay";
button@984 { button-984 {
label = "Home"; label = "Home";
linux,code = <KEY_HOMEPAGE>; linux,code = <KEY_HOMEPAGE>;
channel = <0>; channel = <0>;
...@@ -133,8 +127,6 @@ button@984 { ...@@ -133,8 +127,6 @@ button@984 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
broken-cd; broken-cd;
...@@ -143,7 +135,7 @@ &mmc0 { ...@@ -143,7 +135,7 @@ &mmc0 {
&mmc2 { &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_4bit_pins_a>; pinctrl-0 = <&mmc2_4bit_pc_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
broken-cd; broken-cd;
...@@ -204,7 +196,7 @@ &reg_usb0_vbus { ...@@ -204,7 +196,7 @@ &reg_usb0_vbus {
&uart1 { &uart1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>; pinctrl-0 = <&uart1_pg_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
View file @ 2c94db38
...@@ -77,26 +77,18 @@ &ehci0 { ...@@ -77,26 +77,18 @@ &ehci0 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxinom>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */ cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
...@@ -112,56 +104,38 @@ &otg_sram { ...@@ -112,56 +104,38 @@ &otg_sram {
}; };
&pio { &pio {
mmc0_cd_pin_olinuxinom: mmc0_cd_pin@0 { led_pins_olinuxinom: led-pin {
pins = "PG0";
function = "gpio_in";
bias-pull-up;
};
led_pins_olinuxinom: led_pins@0 {
pins = "PG9"; pins = "PG9";
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG2"; pins = "PG2";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PG1"; pins = "PG1";
function = "gpio_in"; function = "gpio_in";
bias-pull-down; bias-pull-down;
}; };
usb0_vbus_pin_olinuxinom: usb0_vbus_pin@0 {
pins = "PG12";
function = "gpio_out";
};
usb1_vbus_pin_olinuxinom: usb1_vbus_pin@0 {
pins = "PG11";
function = "gpio_out";
};
}; };
&reg_usb0_vbus { &reg_usb0_vbus {
pinctrl-0 = <&usb0_vbus_pin_olinuxinom>;
gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_olinuxinom>;
gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>; gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
&uart1 { &uart1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>; pinctrl-0 = <&uart1_pg_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun5i-a13-olinuxino.dts
View file @ 2c94db38
...@@ -123,8 +123,6 @@ &ehci0 { ...@@ -123,8 +123,6 @@ &ehci0 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -138,14 +136,10 @@ axp209: pmic@34 { ...@@ -138,14 +136,10 @@ axp209: pmic@34 {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
}; };
...@@ -153,35 +147,35 @@ &lradc { ...@@ -153,35 +147,35 @@ &lradc {
vref-supply = <&reg_vcc3v0>; vref-supply = <&reg_vcc3v0>;
status = "okay"; status = "okay";
button@191 { button-191 {
label = "Volume Up"; label = "Volume Up";
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
channel = <0>; channel = <0>;
voltage = <191274>; voltage = <191274>;
}; };
button@392 { button-392 {
label = "Volume Down"; label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
channel = <0>; channel = <0>;
voltage = <392644>; voltage = <392644>;
}; };
button@601 { button-601 {
label = "Menu"; label = "Menu";
linux,code = <KEY_MENU>; linux,code = <KEY_MENU>;
channel = <0>; channel = <0>;
voltage = <601151>; voltage = <601151>;
}; };
button@795 { button-795 {
label = "Enter"; label = "Enter";
linux,code = <KEY_ENTER>; linux,code = <KEY_ENTER>;
channel = <0>; channel = <0>;
voltage = <795090>; voltage = <795090>;
}; };
button@987 { button-987 {
label = "Home"; label = "Home";
linux,code = <KEY_HOMEPAGE>; linux,code = <KEY_HOMEPAGE>;
channel = <0>; channel = <0>;
...@@ -190,8 +184,6 @@ button@987 { ...@@ -190,8 +184,6 @@ button@987 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */ cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
...@@ -207,34 +199,23 @@ &otg_sram { ...@@ -207,34 +199,23 @@ &otg_sram {
}; };
&pio { &pio {
mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 { led_pins_olinuxino: led-pin {
pins = "PG0";
function = "gpio_in";
bias-pull-up;
};
led_pins_olinuxino: led_pins@0 {
pins = "PG9"; pins = "PG9";
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG2"; pins = "PG2";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PG1"; pins = "PG1";
function = "gpio_in"; function = "gpio_in";
bias-pull-down; bias-pull-down;
}; };
usb1_vbus_pin_olinuxino: usb1_vbus_pin@0 {
pins = "PG11";
function = "gpio_out";
};
}; };
&reg_usb0_vbus { &reg_usb0_vbus {
...@@ -243,7 +224,6 @@ &reg_usb0_vbus { ...@@ -243,7 +224,6 @@ &reg_usb0_vbus {
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_olinuxino>;
gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>; gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -263,7 +243,7 @@ tcon0_out_vga: endpoint@0 { ...@@ -263,7 +243,7 @@ tcon0_out_vga: endpoint@0 {
&uart1 { &uart1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>; pinctrl-0 = <&uart1_pg_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
View file @ 2c94db38
...@@ -58,7 +58,7 @@ chosen { ...@@ -58,7 +58,7 @@ chosen {
/delete-property/stdout-path; /delete-property/stdout-path;
}; };
i2c_lcd: i2c@0 { i2c_lcd: i2c-gpio {
/* The lcd panel i2c interface is hooked up via gpios */ /* The lcd panel i2c interface is hooked up via gpios */
compatible = "i2c-gpio"; compatible = "i2c-gpio";
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -79,13 +79,9 @@ &codec { ...@@ -79,13 +79,9 @@ &codec {
allwinner,pa-gpios = <&pio 6 3 GPIO_ACTIVE_HIGH>; /* PG3 */ allwinner,pa-gpios = <&pio 6 3 GPIO_ACTIVE_HIGH>; /* PG3 */
}; };
&codec_pa_pin {
pins = "PG3";
};
&mmc2 { &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>; pinctrl-0 = <&mmc2_8bit_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
...@@ -99,7 +95,7 @@ mmccard: mmccard@0 { ...@@ -99,7 +95,7 @@ mmccard: mmccard@0 {
}; };
&pio { &pio {
i2c_lcd_pins: i2c_lcd_pin@0 { i2c_lcd_pins: i2c-lcd-pin {
pins = "PG10", "PG12"; pins = "PG10", "PG12";
function = "gpio_out"; function = "gpio_out";
bias-pull-up; bias-pull-up;
...@@ -128,7 +124,3 @@ &uart1 { ...@@ -128,7 +124,3 @@ &uart1 {
/* The P66 uses the uart pins as gpios */ /* The P66 uses the uart pins as gpios */
status = "disabled"; status = "disabled";
}; };
&usb0_vbus_pin_a {
pins = "PB4";
};
arch/arm/boot/dts/sun5i-a13.dtsi
View file @ 2c94db38
...@@ -42,15 +42,11 @@ ...@@ -42,15 +42,11 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include "skeleton.dtsi"
#include "sun5i.dtsi" #include "sun5i.dtsi"
#include <dt-bindings/thermal/thermal.h> #include <dt-bindings/thermal/thermal.h>
/ { / {
interrupt-parent = <&intc>;
thermal-zones { thermal-zones {
cpu_thermal { cpu_thermal {
/* milliseconds */ /* milliseconds */
...@@ -88,7 +84,7 @@ display-engine { ...@@ -88,7 +84,7 @@ display-engine {
allwinner,pipelines = <&fe0>; allwinner,pipelines = <&fe0>;
}; };
soc@1c00000 { soc {
pwm: pwm@1c20e00 { pwm: pwm@1c20e00 {
compatible = "allwinner,sun5i-a13-pwm"; compatible = "allwinner,sun5i-a13-pwm";
reg = <0x01c20e00 0xc>; reg = <0x01c20e00 0xc>;
......
arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
View file @ 2c94db38
...@@ -79,8 +79,6 @@ status { ...@@ -79,8 +79,6 @@ status {
mmc0_pwrseq: mmc0_pwrseq { mmc0_pwrseq: mmc0_pwrseq {
compatible = "mmc-pwrseq-simple"; compatible = "mmc-pwrseq-simple";
pinctrl-names = "default";
pinctrl-0 = <&wifi_reg_on_pin_chip_pro>;
reset-gpios = <&pio 1 10 GPIO_ACTIVE_LOW>; /* PB10 */ reset-gpios = <&pio 1 10 GPIO_ACTIVE_LOW>; /* PB10 */
}; };
}; };
...@@ -94,8 +92,6 @@ &ehci0 { ...@@ -94,8 +92,6 @@ &ehci0 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -114,20 +110,16 @@ axp209: pmic@34 { ...@@ -114,20 +110,16 @@ axp209: pmic@34 {
#include "axp209.dtsi" #include "axp209.dtsi"
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "disabled"; status = "disabled";
}; };
&i2s0 { &i2s0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2s0_mclk_pins_a>, <&i2s0_data_pins_a>; pinctrl-0 = <&i2s0_mclk_pin>, <&i2s0_data_pins>;
status = "disabled"; status = "disabled";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc0_pwrseq>; mmc-pwrseq = <&mmc0_pwrseq>;
bus-width = <4>; bus-width = <4>;
...@@ -137,7 +129,7 @@ &mmc0 { ...@@ -137,7 +129,7 @@ &mmc0 {
&nfc { &nfc {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&nand_pins_a &nand_cs0_pins_a &nand_rb0_pins_a>; pinctrl-0 = <&nand_pins &nand_cs0_pin &nand_rb0_pin>;
status = "okay"; status = "okay";
nand@0 { nand@0 {
...@@ -157,21 +149,9 @@ &otg_sram { ...@@ -157,21 +149,9 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_pin_chip_pro: usb0-id-pin@0 {
pins = "PG2";
function = "gpio_in";
};
wifi_reg_on_pin_chip_pro: wifi-reg-on-pin@0 {
pins = "PB10";
function = "gpio_out";
};
};
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins>, <&pwm1_pins>; pinctrl-0 = <&pwm0_pin>, <&pwm1_pins>;
status = "disabled"; status = "disabled";
}; };
...@@ -220,19 +200,19 @@ &reg_ldo4 { ...@@ -220,19 +200,19 @@ &reg_ldo4 {
&uart1 { &uart1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>, <&uart1_cts_rts_pins_a>; pinctrl-0 = <&uart1_pg_pins>, <&uart1_cts_rts_pins>;
status = "okay"; status = "okay";
}; };
&uart2 { &uart2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart2_pins_a>, <&uart2_cts_rts_pins_a>; pinctrl-0 = <&uart2_pd_pins>, <&uart2_cts_rts_pd_pins>;
status = "disabled"; status = "disabled";
}; };
&uart3 { &uart3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart3_pins_a>, <&uart3_cts_rts_pins_a>; pinctrl-0 = <&uart3_pg_pins>, <&uart3_cts_rts_pg_pins>;
status = "okay"; status = "okay";
}; };
...@@ -253,8 +233,6 @@ &usb_power_supply { ...@@ -253,8 +233,6 @@ &usb_power_supply {
}; };
&usbphy { &usbphy {
pinctrl-names = "default";
pinctrl-0 = <&usb0_id_pin_chip_pro>;
usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus_power-supply = <&usb_power_supply>;
usb1_vbus-supply = <&reg_vcc5v0>; usb1_vbus-supply = <&reg_vcc5v0>;
......
arch/arm/boot/dts/sun5i-gr8-evb.dts
View file @ 2c94db38
...@@ -123,8 +123,6 @@ &ehci0 { ...@@ -123,8 +123,6 @@ &ehci0 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -143,8 +141,6 @@ axp209: pmic@34 { ...@@ -143,8 +141,6 @@ axp209: pmic@34 {
#include "axp209.dtsi" #include "axp209.dtsi"
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
wm8978: codec@1a { wm8978: codec@1a {
...@@ -160,20 +156,18 @@ pcf8563: rtc@51 { ...@@ -160,20 +156,18 @@ pcf8563: rtc@51 {
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
}; };
&i2s0 { &i2s0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2s0_mclk_pins_a>, <&i2s0_data_pins_a>; pinctrl-0 = <&i2s0_mclk_pin>, <&i2s0_data_pins>;
status = "okay"; status = "okay";
}; };
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
...@@ -181,49 +175,49 @@ &lradc { ...@@ -181,49 +175,49 @@ &lradc {
vref-supply = <&reg_ldo2>; vref-supply = <&reg_ldo2>;
status = "okay"; status = "okay";
button@190 { button-190 {
label = "Volume Up"; label = "Volume Up";
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
channel = <0>; channel = <0>;
voltage = <190000>; voltage = <190000>;
}; };
button@390 { button-390 {
label = "Volume Down"; label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
channel = <0>; channel = <0>;
voltage = <390000>; voltage = <390000>;
}; };
button@600 { button-600 {
label = "Menu"; label = "Menu";
linux,code = <KEY_MENU>; linux,code = <KEY_MENU>;
channel = <0>; channel = <0>;
voltage = <600000>; voltage = <600000>;
}; };
button@800 { button-800 {
label = "Search"; label = "Search";
linux,code = <KEY_SEARCH>; linux,code = <KEY_SEARCH>;
channel = <0>; channel = <0>;
voltage = <800000>; voltage = <800000>;
}; };
button@980 { button-980 {
label = "Home"; label = "Home";
linux,code = <KEY_HOMEPAGE>; linux,code = <KEY_HOMEPAGE>;
channel = <0>; channel = <0>;
voltage = <980000>; voltage = <980000>;
}; };
button@1180 { button-1180 {
label = "Esc"; label = "Esc";
linux,code = <KEY_ESC>; linux,code = <KEY_ESC>;
channel = <0>; channel = <0>;
voltage = <1180000>; voltage = <1180000>;
}; };
button@1400 { button-1400 {
label = "Enter"; label = "Enter";
linux,code = <KEY_ENTER>; linux,code = <KEY_ENTER>;
channel = <0>; channel = <0>;
...@@ -232,8 +226,6 @@ button@1400 { ...@@ -232,8 +226,6 @@ button@1400 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_gr8_evb>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */ cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
...@@ -242,7 +234,7 @@ &mmc0 { ...@@ -242,7 +234,7 @@ &mmc0 {
&nfc { &nfc {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&nand_pins_a &nand_cs0_pins_a &nand_rb0_pins_a>; pinctrl-0 = <&nand_pins &nand_cs0_pin &nand_rb0_pin>;
/* MLC Support sucks for now */ /* MLC Support sucks for now */
status = "disabled"; status = "disabled";
...@@ -256,31 +248,9 @@ &otg_sram { ...@@ -256,31 +248,9 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
mmc0_cd_pin_gr8_evb: mmc0-cd-pin@0 {
pins = "PG0";
function = "gpio_in";
};
usb0_id_pin_gr8_evb: usb0-id-pin@0 {
pins = "PG2";
function = "gpio_in";
};
usb0_vbus_det_pin_gr8_evb: usb0-vbus-det-pin@0 {
pins = "PG1";
function = "gpio_in";
};
usb1_vbus_pin_gr8_evb: usb1-vbus-pin@0 {
pins = "PG13";
function = "gpio_out";
};
};
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins>; pinctrl-0 = <&pwm0_pin>;
status = "okay"; status = "okay";
}; };
...@@ -310,7 +280,6 @@ &reg_ldo2 { ...@@ -310,7 +280,6 @@ &reg_ldo2 {
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_gr8_evb>;
gpio = <&pio 6 13 GPIO_ACTIVE_HIGH>; gpio = <&pio 6 13 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -321,7 +290,7 @@ &rtp { ...@@ -321,7 +290,7 @@ &rtp {
&spdif { &spdif {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spdif_tx_pins_a>; pinctrl-0 = <&spdif_tx_pin>;
status = "okay"; status = "okay";
}; };
...@@ -331,7 +300,7 @@ &tve0 { ...@@ -331,7 +300,7 @@ &tve0 {
&uart1 { &uart1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>, <&uart1_cts_rts_pins_a>; pinctrl-0 = <&uart1_pg_pins>, <&uart1_cts_rts_pins>;
status = "okay"; status = "okay";
}; };
...@@ -356,8 +325,6 @@ &usb_power_supply { ...@@ -356,8 +325,6 @@ &usb_power_supply {
}; };
&usbphy { &usbphy {
pinctrl-names = "default";
pinctrl-0 = <&usb0_id_pin_gr8_evb>, <&usb0_vbus_det_pin_gr8_evb>;
usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus_power-supply = <&usb_power_supply>;
......
arch/arm/boot/dts/sun5i-gr8.dtsi
View file @ 2c94db38
...@@ -54,7 +54,7 @@ display-engine { ...@@ -54,7 +54,7 @@ display-engine {
allwinner,pipelines = <&fe0>; allwinner,pipelines = <&fe0>;
}; };
soc@1c00000 { soc {
pwm: pwm@1c20e00 { pwm: pwm@1c20e00 {
compatible = "allwinner,sun5i-a10s-pwm"; compatible = "allwinner,sun5i-a10s-pwm";
reg = <0x01c20e00 0xc>; reg = <0x01c20e00 0xc>;
...@@ -98,28 +98,28 @@ &ccu { ...@@ -98,28 +98,28 @@ &ccu {
&pio { &pio {
compatible = "nextthing,gr8-pinctrl"; compatible = "nextthing,gr8-pinctrl";
i2s0_data_pins_a: i2s0-data@0 { i2s0_data_pins: i2s0-data-pins {
pins = "PB6", "PB7", "PB8", "PB9"; pins = "PB6", "PB7", "PB8", "PB9";
function = "i2s0"; function = "i2s0";
}; };
i2s0_mclk_pins_a: i2s0-mclk@0 { i2s0_mclk_pin: i2s0-mclk-pin {
pins = "PB5"; pins = "PB5";
function = "i2s0"; function = "i2s0";
}; };
pwm1_pins: pwm1 { pwm1_pins: pwm1-pin {
pins = "PG13"; pins = "PG13";
function = "pwm1"; function = "pwm1";
}; };
spdif_tx_pins_a: spdif@0 { spdif_tx_pin: spdif-tx-pin {
pins = "PB10"; pins = "PB10";
function = "spdif"; function = "spdif";
bias-pull-up; bias-pull-up;
}; };
uart1_cts_rts_pins_a: uart1-cts-rts@0 { uart1_cts_rts_pins: uart1-cts-rts-pins {
pins = "PG5", "PG6"; pins = "PG5", "PG6";
function = "uart1"; function = "uart1";
}; };
......
arch/arm/boot/dts/sun5i-r8-chip.dts
View file @ 2c94db38
...@@ -79,8 +79,6 @@ status { ...@@ -79,8 +79,6 @@ status {
mmc0_pwrseq: mmc0_pwrseq { mmc0_pwrseq: mmc0_pwrseq {
compatible = "mmc-pwrseq-simple"; compatible = "mmc-pwrseq-simple";
pinctrl-names = "default";
pinctrl-0 = <&chip_wifi_reg_on_pin>;
reset-gpios = <&pio 2 19 GPIO_ACTIVE_LOW>; /* PC19 */ reset-gpios = <&pio 2 19 GPIO_ACTIVE_LOW>; /* PC19 */
}; };
...@@ -109,8 +107,6 @@ &ehci0 { ...@@ -109,8 +107,6 @@ &ehci0 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -137,14 +133,10 @@ &battery_power_supply { ...@@ -137,14 +133,10 @@ &battery_power_supply {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "disabled"; status = "disabled";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
xio: gpio@38 { xio: gpio@38 {
...@@ -161,13 +153,11 @@ xio: gpio@38 { ...@@ -161,13 +153,11 @@ xio: gpio@38 {
}; };
}; };
&mmc0_pins_a { &mmc0_pins {
bias-pull-up; bias-pull-up;
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc0_pwrseq>; mmc-pwrseq = <&mmc0_pwrseq>;
bus-width = <4>; bus-width = <4>;
...@@ -184,22 +174,7 @@ &otg_sram { ...@@ -184,22 +174,7 @@ &otg_sram {
}; };
&pio { &pio {
chip_vbus_pin: chip_vbus_pin@0 { chip_w1_pin: chip-w1-pin {
pins = "PB10";
function = "gpio_out";
};
chip_wifi_reg_on_pin: chip_wifi_reg_on_pin@0 {
pins = "PC19";
function = "gpio_out";
};
chip_id_det_pin: chip_id_det_pin@0 {
pins = "PG2";
function = "gpio_in";
};
chip_w1_pin: chip_w1_pin@0 {
pins = "PD2"; pins = "PD2";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
...@@ -260,7 +235,6 @@ &reg_ldo5 { ...@@ -260,7 +235,6 @@ &reg_ldo5 {
}; };
&reg_usb0_vbus { &reg_usb0_vbus {
pinctrl-0 = <&chip_vbus_pin>;
vin-supply = <&reg_vcc5v0>; vin-supply = <&reg_vcc5v0>;
gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */ gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */
status = "okay"; status = "okay";
...@@ -268,7 +242,7 @@ &reg_usb0_vbus { ...@@ -268,7 +242,7 @@ &reg_usb0_vbus {
&spi2 { &spi2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi2_pins_a>; pinctrl-0 = <&spi2_pe_pins>;
status = "disabled"; status = "disabled";
}; };
...@@ -282,14 +256,14 @@ &tve0 { ...@@ -282,14 +256,14 @@ &tve0 {
&uart1 { &uart1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>; pinctrl-0 = <&uart1_pg_pins>;
status = "okay"; status = "okay";
}; };
&uart3 { &uart3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart3_pins_a>, pinctrl-0 = <&uart3_pg_pins>,
<&uart3_cts_rts_pins_a>; <&uart3_cts_rts_pg_pins>;
status = "okay"; status = "okay";
}; };
...@@ -303,8 +277,6 @@ &usb_power_supply { ...@@ -303,8 +277,6 @@ &usb_power_supply {
}; };
&usbphy { &usbphy {
pinctrl-names = "default";
pinctrl-0 = <&chip_id_det_pin>;
status = "okay"; status = "okay";
usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
......
arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
View file @ 2c94db38
...@@ -63,8 +63,6 @@ chosen { ...@@ -63,8 +63,6 @@ chosen {
}; };
&codec { &codec {
pinctrl-names = "default";
pinctrl-0 = <&codec_pa_pin>;
allwinner,pa-gpios = <&pio 6 10 GPIO_ACTIVE_HIGH>; /* PG10 */ allwinner,pa-gpios = <&pio 6 10 GPIO_ACTIVE_HIGH>; /* PG10 */
status = "okay"; status = "okay";
}; };
...@@ -96,8 +94,6 @@ touchscreen: touchscreen@40 { ...@@ -96,8 +94,6 @@ touchscreen: touchscreen@40 {
reg = <0x40>; reg = <0x40>;
interrupt-parent = <&pio>; interrupt-parent = <&pio>;
interrupts = <6 11 IRQ_TYPE_EDGE_FALLING>; /* EINT11 (PG11) */ interrupts = <6 11 IRQ_TYPE_EDGE_FALLING>; /* EINT11 (PG11) */
pinctrl-names = "default";
pinctrl-0 = <&ts_power_pin>;
power-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */ power-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
/* Tablet dts must provide reg and compatible */ /* Tablet dts must provide reg and compatible */
status = "disabled"; status = "disabled";
...@@ -125,7 +121,7 @@ &lradc { ...@@ -125,7 +121,7 @@ &lradc {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v0>; vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */ cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
...@@ -137,40 +133,17 @@ &otg_sram { ...@@ -137,40 +133,17 @@ &otg_sram {
}; };
&pio { &pio {
codec_pa_pin: codec_pa_pin@0 { usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PG10";
function = "gpio_out";
};
mmc0_cd_pin: mmc0_cd_pin@0 {
pins = "PG0";
function = "gpio_in";
bias-pull-up;
};
ts_power_pin: ts_power_pin {
pins = "PB3";
function = "gpio_out";
drive-strength = <10>;
bias-disable;
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
pins = "PG1"; pins = "PG1";
function = "gpio_in"; function = "gpio_in";
bias-pull-down; bias-pull-down;
}; };
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG2"; pins = "PG2";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb0_vbus_pin_a: usb0_vbus_pin@0 {
pins = "PG12";
function = "gpio_out";
};
}; };
&reg_dcdc2 { &reg_dcdc2 {
...@@ -211,7 +184,7 @@ &reg_usb0_vbus { ...@@ -211,7 +184,7 @@ &reg_usb0_vbus {
&uart1 { &uart1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>; pinctrl-0 = <&uart1_pg_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun5i.dtsi
View file @ 2c94db38
...@@ -42,14 +42,14 @@ ...@@ -42,14 +42,14 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/clock/sun5i-ccu.h> #include <dt-bindings/clock/sun5i-ccu.h>
#include <dt-bindings/dma/sun4i-a10.h> #include <dt-bindings/dma/sun4i-a10.h>
#include <dt-bindings/reset/sun5i-ccu.h> #include <dt-bindings/reset/sun5i-ccu.h>
/ { / {
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
#address-cells = <1>;
#size-cells = <1>;
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
...@@ -68,7 +68,7 @@ chosen { ...@@ -68,7 +68,7 @@ chosen {
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
framebuffer@0 { framebuffer-lcd0 {
compatible = "allwinner,simple-framebuffer", compatible = "allwinner,simple-framebuffer",
"simple-framebuffer"; "simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0"; allwinner,pipeline = "de_be0-lcd0";
...@@ -77,7 +77,7 @@ framebuffer@0 { ...@@ -77,7 +77,7 @@ framebuffer@0 {
status = "disabled"; status = "disabled";
}; };
framebuffer@1 { framebuffer-lcd0-tve0 {
compatible = "allwinner,simple-framebuffer", compatible = "allwinner,simple-framebuffer",
"simple-framebuffer"; "simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0-tve0"; allwinner,pipeline = "de_be0-lcd0-tve0";
...@@ -93,14 +93,14 @@ clocks { ...@@ -93,14 +93,14 @@ clocks {
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
osc24M: clk@1c20050 { osc24M: clk-24M {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "fixed-clock"; compatible = "fixed-clock";
clock-frequency = <24000000>; clock-frequency = <24000000>;
clock-output-names = "osc24M"; clock-output-names = "osc24M";
}; };
osc32k: clk@0 { osc32k: clk-32k {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "fixed-clock"; compatible = "fixed-clock";
clock-frequency = <32768>; clock-frequency = <32768>;
...@@ -114,7 +114,7 @@ reserved-memory { ...@@ -114,7 +114,7 @@ reserved-memory {
ranges; ranges;
/* Address must be kept in the lower 256 MiBs of DRAM for VE. */ /* Address must be kept in the lower 256 MiBs of DRAM for VE. */
cma_pool: cma@4a000000 { default-pool {
compatible = "shared-dma-pool"; compatible = "shared-dma-pool";
size = <0x6000000>; size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>; alloc-ranges = <0x4a000000 0x6000000>;
...@@ -123,7 +123,7 @@ cma_pool: cma@4a000000 { ...@@ -123,7 +123,7 @@ cma_pool: cma@4a000000 {
}; };
}; };
soc@1c00000 { soc {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -326,6 +326,8 @@ mmc0: mmc@1c0f000 { ...@@ -326,6 +326,8 @@ mmc0: mmc@1c0f000 {
clocks = <&ccu CLK_AHB_MMC0>, <&ccu CLK_MMC0>; clocks = <&ccu CLK_AHB_MMC0>, <&ccu CLK_MMC0>;
clock-names = "ahb", "mmc"; clock-names = "ahb", "mmc";
interrupts = <32>; interrupts = <32>;
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -446,7 +448,7 @@ pio: pinctrl@1c20800 { ...@@ -446,7 +448,7 @@ pio: pinctrl@1c20800 {
#interrupt-cells = <3>; #interrupt-cells = <3>;
#gpio-cells = <3>; #gpio-cells = <3>;
emac_pins_a: emac0@0 { emac_pd_pins: emac-pd-pins {
pins = "PD6", "PD7", "PD10", pins = "PD6", "PD7", "PD10",
"PD11", "PD12", "PD13", "PD14", "PD11", "PD12", "PD13", "PD14",
"PD15", "PD18", "PD19", "PD20", "PD15", "PD18", "PD19", "PD20",
...@@ -455,27 +457,27 @@ emac_pins_a: emac0@0 { ...@@ -455,27 +457,27 @@ emac_pins_a: emac0@0 {
function = "emac"; function = "emac";
}; };
i2c0_pins_a: i2c0@0 { i2c0_pins: i2c0-pins {
pins = "PB0", "PB1"; pins = "PB0", "PB1";
function = "i2c0"; function = "i2c0";
}; };
i2c1_pins_a: i2c1@0 { i2c1_pins: i2c1-pins {
pins = "PB15", "PB16"; pins = "PB15", "PB16";
function = "i2c1"; function = "i2c1";
}; };
i2c2_pins_a: i2c2@0 { i2c2_pins: i2c2-pins {
pins = "PB17", "PB18"; pins = "PB17", "PB18";
function = "i2c2"; function = "i2c2";
}; };
ir0_rx_pins_a: ir0@0 { ir0_rx_pin: ir0-rx-pin {
pins = "PB4"; pins = "PB4";
function = "ir0"; function = "ir0";
}; };
lcd_rgb565_pins: lcd_rgb565@0 { lcd_rgb565_pins: lcd-rgb565-pins {
pins = "PD3", "PD4", "PD5", "PD6", "PD7", pins = "PD3", "PD4", "PD5", "PD6", "PD7",
"PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15",
"PD19", "PD20", "PD21", "PD22", "PD23", "PD19", "PD20", "PD21", "PD22", "PD23",
...@@ -483,7 +485,7 @@ lcd_rgb565_pins: lcd_rgb565@0 { ...@@ -483,7 +485,7 @@ lcd_rgb565_pins: lcd_rgb565@0 {
function = "lcd0"; function = "lcd0";
}; };
lcd_rgb666_pins: lcd_rgb666@0 { lcd_rgb666_pins: lcd-rgb666-pins {
pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7",
"PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15",
"PD18", "PD19", "PD20", "PD21", "PD22", "PD23", "PD18", "PD19", "PD20", "PD21", "PD22", "PD23",
...@@ -491,7 +493,7 @@ lcd_rgb666_pins: lcd_rgb666@0 { ...@@ -491,7 +493,7 @@ lcd_rgb666_pins: lcd_rgb666@0 {
function = "lcd0"; function = "lcd0";
}; };
mmc0_pins_a: mmc0@0 { mmc0_pins: mmc0-pins {
pins = "PF0", "PF1", "PF2", "PF3", pins = "PF0", "PF1", "PF2", "PF3",
"PF4", "PF5"; "PF4", "PF5";
function = "mmc0"; function = "mmc0";
...@@ -499,7 +501,7 @@ mmc0_pins_a: mmc0@0 { ...@@ -499,7 +501,7 @@ mmc0_pins_a: mmc0@0 {
bias-pull-up; bias-pull-up;
}; };
mmc2_pins_a: mmc2@0 { mmc2_8bit_pins: mmc2-8bit-pins {
pins = "PC6", "PC7", "PC8", "PC9", pins = "PC6", "PC7", "PC8", "PC9",
"PC10", "PC11", "PC12", "PC13", "PC10", "PC11", "PC12", "PC13",
"PC14", "PC15"; "PC14", "PC15";
...@@ -508,7 +510,7 @@ mmc2_pins_a: mmc2@0 { ...@@ -508,7 +510,7 @@ mmc2_pins_a: mmc2@0 {
bias-pull-up; bias-pull-up;
}; };
mmc2_4bit_pins_a: mmc2-4bit@0 { mmc2_4bit_pc_pins: mmc2-4bit-pc-pins {
pins = "PC6", "PC7", "PC8", "PC9", pins = "PC6", "PC7", "PC8", "PC9",
"PC10", "PC11"; "PC10", "PC11";
function = "mmc2"; function = "mmc2";
...@@ -516,7 +518,7 @@ mmc2_4bit_pins_a: mmc2-4bit@0 { ...@@ -516,7 +518,7 @@ mmc2_4bit_pins_a: mmc2-4bit@0 {
bias-pull-up; bias-pull-up;
}; };
nand_pins_a: nand-base0@0 { nand_pins: nand-pins {
pins = "PC0", "PC1", "PC2", pins = "PC0", "PC1", "PC2",
"PC5", "PC8", "PC9", "PC10", "PC5", "PC8", "PC9", "PC10",
"PC11", "PC12", "PC13", "PC14", "PC11", "PC12", "PC13", "PC14",
...@@ -524,57 +526,57 @@ nand_pins_a: nand-base0@0 { ...@@ -524,57 +526,57 @@ nand_pins_a: nand-base0@0 {
function = "nand0"; function = "nand0";
}; };
nand_cs0_pins_a: nand-cs@0 { nand_cs0_pin: nand-cs0-pin {
pins = "PC4"; pins = "PC4";
function = "nand0"; function = "nand0";
}; };
nand_rb0_pins_a: nand-rb@0 { nand_rb0_pin: nand-rb0-pin {
pins = "PC6"; pins = "PC6";
function = "nand0"; function = "nand0";
}; };
spi2_pins_a: spi2@0 { spi2_pe_pins: spi2-pe-pins {
pins = "PE1", "PE2", "PE3"; pins = "PE1", "PE2", "PE3";
function = "spi2"; function = "spi2";
}; };
spi2_cs0_pins_a: spi2-cs0@0 { spi2_cs0_pe_pin: spi2-cs0-pe-pin {
pins = "PE0"; pins = "PE0";
function = "spi2"; function = "spi2";
}; };
uart1_pins_a: uart1@0 { uart1_pe_pins: uart1-pe-pins {
pins = "PE10", "PE11"; pins = "PE10", "PE11";
function = "uart1"; function = "uart1";
}; };
uart1_pins_b: uart1@1 { uart1_pg_pins: uart1-pg-pins {
pins = "PG3", "PG4"; pins = "PG3", "PG4";
function = "uart1"; function = "uart1";
}; };
uart2_pins_a: uart2@0 { uart2_pd_pins: uart2-pd-pins {
pins = "PD2", "PD3"; pins = "PD2", "PD3";
function = "uart2"; function = "uart2";
}; };
uart2_cts_rts_pins_a: uart2-cts-rts@0 { uart2_cts_rts_pd_pins: uart2-cts-rts-pd-pins {
pins = "PD4", "PD5"; pins = "PD4", "PD5";
function = "uart2"; function = "uart2";
}; };
uart3_pins_a: uart3@0 { uart3_pg_pins: uart3-pg-pins {
pins = "PG9", "PG10"; pins = "PG9", "PG10";
function = "uart3"; function = "uart3";
}; };
uart3_cts_rts_pins_a: uart3-cts-rts@0 { uart3_cts_rts_pg_pins: uart3-cts-rts-pg-pins {
pins = "PG11", "PG12"; pins = "PG11", "PG12";
function = "uart3"; function = "uart3";
}; };
pwm0_pins: pwm0 { pwm0_pin: pwm0-pin {
pins = "PB2"; pins = "PB2";
function = "pwm"; function = "pwm";
}; };
...@@ -678,6 +680,8 @@ i2c0: i2c@1c2ac00 { ...@@ -678,6 +680,8 @@ i2c0: i2c@1c2ac00 {
reg = <0x01c2ac00 0x400>; reg = <0x01c2ac00 0x400>;
interrupts = <7>; interrupts = <7>;
clocks = <&ccu CLK_APB1_I2C0>; clocks = <&ccu CLK_APB1_I2C0>;
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -688,6 +692,8 @@ i2c1: i2c@1c2b000 { ...@@ -688,6 +692,8 @@ i2c1: i2c@1c2b000 {
reg = <0x01c2b000 0x400>; reg = <0x01c2b000 0x400>;
interrupts = <8>; interrupts = <8>;
clocks = <&ccu CLK_APB1_I2C1>; clocks = <&ccu CLK_APB1_I2C1>;
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -698,6 +704,8 @@ i2c2: i2c@1c2b400 { ...@@ -698,6 +704,8 @@ i2c2: i2c@1c2b400 {
reg = <0x01c2b400 0x400>; reg = <0x01c2b400 0x400>;
interrupts = <9>; interrupts = <9>;
clocks = <&ccu CLK_APB1_I2C2>; clocks = <&ccu CLK_APB1_I2C2>;
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
View file @ 2c94db38
...@@ -65,22 +65,14 @@ &ehci0 { ...@@ -65,22 +65,14 @@ &ehci0 {
status = "okay"; status = "okay";
}; };
&pio {
usb1_vbus_pin_a: usb1_vbus_pin@0 {
pins = "PH27";
function = "gpio_out";
};
};
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_a>;
gpio = <&pio 7 27 GPIO_ACTIVE_HIGH>; gpio = <&pio 7 27 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_ph_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun6i-a31-colombus.dts
View file @ 2c94db38
...@@ -60,7 +60,7 @@ chosen { ...@@ -60,7 +60,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
i2c_lcd: i2c@0 { i2c_lcd: i2c {
/* The lcd panel i2c interface is hooked up via gpios */ /* The lcd panel i2c interface is hooked up via gpios */
compatible = "i2c-gpio"; compatible = "i2c-gpio";
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -77,7 +77,7 @@ &ehci1 { ...@@ -77,7 +77,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
status = "okay"; status = "okay";
...@@ -88,20 +88,14 @@ phy1: ethernet-phy@1 { ...@@ -88,20 +88,14 @@ phy1: ethernet-phy@1 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "fail"; status = "fail";
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
mma8452: mma8452@1d { mma8452: mma8452@1d {
...@@ -113,31 +107,14 @@ mma8452: mma8452@1d { ...@@ -113,31 +107,14 @@ mma8452: mma8452@1d {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_colombus>;
vmmc-supply = <&reg_vcc3v0>; vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */ cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
status = "okay"; status = "okay";
}; };
&mmc0_pins_a {
bias-pull-up;
};
&pio { &pio {
mmc0_cd_pin_colombus: mmc0_cd_pin@0 { i2c_lcd_pins: i2c-lcd-pins {
pins = "PA8";
function = "gpio_in";
bias-pull-up;
};
usb2_vbus_pin_colombus: usb2_vbus_pin@0 {
pins = "PH24";
function = "gpio_out";
};
i2c_lcd_pins: i2c_lcd_pin@0 {
pins = "PA23", "PA24"; pins = "PA23", "PA24";
function = "gpio_out"; function = "gpio_out";
bias-pull-up; bias-pull-up;
...@@ -145,15 +122,13 @@ i2c_lcd_pins: i2c_lcd_pin@0 { ...@@ -145,15 +122,13 @@ i2c_lcd_pins: i2c_lcd_pin@0 {
}; };
&reg_usb2_vbus { &reg_usb2_vbus {
pinctrl-names = "default";
pinctrl-0 = <&usb2_vbus_pin_colombus>;
gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>; gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_ph_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun6i-a31-hummingbird.dts
View file @ 2c94db38
...@@ -160,7 +160,7 @@ &ehci0 { ...@@ -160,7 +160,7 @@ &ehci0 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>, <&gmac_phy_reset_pin_hummingbird>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>; snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>;
...@@ -184,21 +184,15 @@ hdmi_out_con: endpoint { ...@@ -184,21 +184,15 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
/* pull-ups and devices require AXP221 DLDO3 */ /* pull-ups and devices require AXP221 DLDO3 */
status = "failed"; status = "failed";
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
pcf8563: rtc@51 { pcf8563: rtc@51 {
...@@ -209,27 +203,18 @@ pcf8563: rtc@51 { ...@@ -209,27 +203,18 @@ pcf8563: rtc@51 {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&s_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_hummingbird>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */ cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
status = "okay"; status = "okay";
}; };
&mmc0_pins_a {
/* external pull-ups missing for some pins */
bias-pull-up;
};
&mmc1 { &mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>, <&wifi_reset_pin_hummingbird>;
vmmc-supply = <&reg_aldo1>; vmmc-supply = <&reg_aldo1>;
mmc-pwrseq = <&wifi_pwrseq>; mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>; bus-width = <4>;
...@@ -241,24 +226,6 @@ &ohci0 { ...@@ -241,24 +226,6 @@ &ohci0 {
status = "okay"; status = "okay";
}; };
&pio {
gmac_phy_reset_pin_hummingbird: gmac_phy_reset_pin@0 {
pins = "PA21";
function = "gpio_out";
};
mmc0_cd_pin_hummingbird: mmc0_cd_pin@0 {
pins = "PA8";
function = "gpio_in";
bias-pull-up;
};
wifi_reset_pin_hummingbird: wifi_reset_pin@0 {
pins = "PG10";
function = "gpio_out";
};
};
&p2wi { &p2wi {
status = "okay"; status = "okay";
...@@ -354,7 +321,7 @@ tcon0_out_vga: endpoint@0 { ...@@ -354,7 +321,7 @@ tcon0_out_vga: endpoint@0 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_ph_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun6i-a31-i7.dts
View file @ 2c94db38
...@@ -71,8 +71,6 @@ hdmi_con_in: endpoint { ...@@ -71,8 +71,6 @@ hdmi_con_in: endpoint {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_i7>;
blue { blue {
label = "i7:blue:usr"; label = "i7:blue:usr";
...@@ -118,7 +116,7 @@ &ehci1 { ...@@ -118,7 +116,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
status = "okay"; status = "okay";
...@@ -140,47 +138,25 @@ hdmi_out_con: endpoint { ...@@ -140,47 +138,25 @@ hdmi_out_con: endpoint {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&s_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_i7>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */ cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
status = "okay"; status = "okay";
}; };
&pio {
led_pins_i7: led_pins@0 {
pins = "PH13";
function = "gpio_out";
};
mmc0_cd_pin_i7: mmc0_cd_pin@0 {
pins = "PH22";
function = "gpio_in";
bias-pull-up;
};
usb1_vbus_pin_i7: usb1_vbus_pin@0 {
pins = "PC27";
function = "gpio_out";
};
};
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-names = "default";
pinctrl-0 = <&usb1_vbus_pin_i7>;
gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>; gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
&spdif { &spdif {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spdif_pins_a>; pinctrl-0 = <&spdif_tx_pin>;
spdif-out = "okay"; spdif-out = "okay";
status = "okay"; status = "okay";
}; };
...@@ -191,7 +167,7 @@ &tcon0 { ...@@ -191,7 +167,7 @@ &tcon0 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_ph_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun6i-a31-m9.dts
View file @ 2c94db38
...@@ -60,8 +60,6 @@ chosen { ...@@ -60,8 +60,6 @@ chosen {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_m9>;
blue { blue {
label = "m9:blue:pwr"; label = "m9:blue:pwr";
...@@ -85,7 +83,7 @@ &ehci1 { ...@@ -85,7 +83,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
phy-supply = <&reg_dldo1>; phy-supply = <&reg_dldo1>;
...@@ -98,13 +96,11 @@ phy1: ethernet-phy@1 { ...@@ -98,13 +96,11 @@ phy1: ethernet-phy@1 {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&s_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */ cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
...@@ -124,24 +120,6 @@ axp22x: pmic@68 { ...@@ -124,24 +120,6 @@ axp22x: pmic@68 {
#include "axp22x.dtsi" #include "axp22x.dtsi"
&pio {
led_pins_m9: led_pins@0 {
pins = "PH13";
function = "gpio_out";
};
mmc0_cd_pin_m9: mmc0_cd_pin@0 {
pins = "PH22";
function = "gpio_in";
bias-pull-up;
};
usb1_vbus_pin_m9: usb1_vbus_pin@0 {
pins = "PC27";
function = "gpio_out";
};
};
&reg_aldo1 { &reg_aldo1 {
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -215,15 +193,13 @@ &reg_dldo4 { ...@@ -215,15 +193,13 @@ &reg_dldo4 {
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-names = "default";
pinctrl-0 = <&usb1_vbus_pin_m9>;
gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>; gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_ph_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
View file @ 2c94db38
...@@ -60,8 +60,6 @@ chosen { ...@@ -60,8 +60,6 @@ chosen {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_m9>;
blue { blue {
label = "a1000g:blue:pwr"; label = "a1000g:blue:pwr";
...@@ -85,7 +83,7 @@ &ehci1 { ...@@ -85,7 +83,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
phy-supply = <&reg_dldo1>; phy-supply = <&reg_dldo1>;
...@@ -98,13 +96,11 @@ phy1: ethernet-phy@1 { ...@@ -98,13 +96,11 @@ phy1: ethernet-phy@1 {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&s_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */ cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
...@@ -124,24 +120,6 @@ axp22x: pmic@68 { ...@@ -124,24 +120,6 @@ axp22x: pmic@68 {
#include "axp22x.dtsi" #include "axp22x.dtsi"
&pio {
led_pins_m9: led_pins@0 {
pins = "PH13";
function = "gpio_out";
};
mmc0_cd_pin_m9: mmc0_cd_pin@0 {
pins = "PH22";
function = "gpio_in";
bias-pull-up;
};
usb1_vbus_pin_m9: usb1_vbus_pin@0 {
pins = "PC27";
function = "gpio_out";
};
};
&reg_aldo1 { &reg_aldo1 {
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -215,15 +193,13 @@ &reg_dldo4 { ...@@ -215,15 +193,13 @@ &reg_dldo4 {
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-names = "default";
pinctrl-0 = <&usb1_vbus_pin_m9>;
gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>; gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_ph_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun6i-a31.dtsi
View file @ 2c94db38
...@@ -42,8 +42,6 @@ ...@@ -42,8 +42,6 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/thermal/thermal.h> #include <dt-bindings/thermal/thermal.h>
...@@ -52,6 +50,8 @@ ...@@ -52,6 +50,8 @@
/ { / {
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
ethernet0 = &gmac; ethernet0 = &gmac;
...@@ -62,7 +62,7 @@ chosen { ...@@ -62,7 +62,7 @@ chosen {
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
simplefb_hdmi: framebuffer@0 { simplefb_hdmi: framebuffer-lcd0-hdmi {
compatible = "allwinner,simple-framebuffer", compatible = "allwinner,simple-framebuffer",
"simple-framebuffer"; "simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0-hdmi"; allwinner,pipeline = "de_be0-lcd0-hdmi";
...@@ -73,7 +73,7 @@ simplefb_hdmi: framebuffer@0 { ...@@ -73,7 +73,7 @@ simplefb_hdmi: framebuffer@0 {
status = "disabled"; status = "disabled";
}; };
simplefb_lcd: framebuffer@1 { simplefb_lcd: framebuffer-lcd0 {
compatible = "allwinner,simple-framebuffer", compatible = "allwinner,simple-framebuffer",
"simple-framebuffer"; "simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0"; allwinner,pipeline = "de_be0-lcd0";
...@@ -115,7 +115,7 @@ cpu0: cpu@0 { ...@@ -115,7 +115,7 @@ cpu0: cpu@0 {
#cooling-cells = <2>; #cooling-cells = <2>;
}; };
cpu@1 { cpu1: cpu@1 {
compatible = "arm,cortex-a7"; compatible = "arm,cortex-a7";
device_type = "cpu"; device_type = "cpu";
reg = <1>; reg = <1>;
...@@ -131,7 +131,7 @@ cpu@1 { ...@@ -131,7 +131,7 @@ cpu@1 {
#cooling-cells = <2>; #cooling-cells = <2>;
}; };
cpu@2 { cpu2: cpu@2 {
compatible = "arm,cortex-a7"; compatible = "arm,cortex-a7";
device_type = "cpu"; device_type = "cpu";
reg = <2>; reg = <2>;
...@@ -147,7 +147,7 @@ cpu@2 { ...@@ -147,7 +147,7 @@ cpu@2 {
#cooling-cells = <2>; #cooling-cells = <2>;
}; };
cpu@3 { cpu3: cpu@3 {
compatible = "arm,cortex-a7"; compatible = "arm,cortex-a7";
device_type = "cpu"; device_type = "cpu";
reg = <3>; reg = <3>;
...@@ -174,7 +174,10 @@ cpu_thermal { ...@@ -174,7 +174,10 @@ cpu_thermal {
cooling-maps { cooling-maps {
map0 { map0 {
trip = <&cpu_alert0>; trip = <&cpu_alert0>;
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
}; };
}; };
...@@ -196,12 +199,8 @@ cpu_crit: cpu_crit { ...@@ -196,12 +199,8 @@ cpu_crit: cpu_crit {
}; };
}; };
memory {
reg = <0x40000000 0x80000000>;
};
pmu { pmu {
compatible = "arm,cortex-a7-pmu", "arm,cortex-a15-pmu"; compatible = "arm,cortex-a7-pmu";
interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
...@@ -213,13 +212,13 @@ clocks { ...@@ -213,13 +212,13 @@ clocks {
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
osc24M: osc24M { osc24M: clk-24M {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "fixed-clock"; compatible = "fixed-clock";
clock-frequency = <24000000>; clock-frequency = <24000000>;
}; };
osc32k: clk@0 { osc32k: clk-32k {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "fixed-clock"; compatible = "fixed-clock";
clock-frequency = <32768>; clock-frequency = <32768>;
...@@ -235,14 +234,14 @@ osc32k: clk@0 { ...@@ -235,14 +234,14 @@ osc32k: clk@0 {
* The actual TX clock rate is not controlled by the * The actual TX clock rate is not controlled by the
* gmac_tx clock. * gmac_tx clock.
*/ */
mii_phy_tx_clk: clk@1 { mii_phy_tx_clk: clk-mii-phy-tx {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "fixed-clock"; compatible = "fixed-clock";
clock-frequency = <25000000>; clock-frequency = <25000000>;
clock-output-names = "mii_phy_tx"; clock-output-names = "mii_phy_tx";
}; };
gmac_int_tx_clk: clk@2 { gmac_int_tx_clk: clk-gmac-int-tx {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "fixed-clock"; compatible = "fixed-clock";
clock-frequency = <125000000>; clock-frequency = <125000000>;
...@@ -264,7 +263,7 @@ de: display-engine { ...@@ -264,7 +263,7 @@ de: display-engine {
status = "disabled"; status = "disabled";
}; };
soc@1c00000 { soc {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -389,6 +388,8 @@ mmc0: mmc@1c0f000 { ...@@ -389,6 +388,8 @@ mmc0: mmc@1c0f000 {
resets = <&ccu RST_AHB1_MMC0>; resets = <&ccu RST_AHB1_MMC0>;
reset-names = "ahb"; reset-names = "ahb";
interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -408,6 +409,8 @@ mmc1: mmc@1c10000 { ...@@ -408,6 +409,8 @@ mmc1: mmc@1c10000 {
resets = <&ccu RST_AHB1_MMC1>; resets = <&ccu RST_AHB1_MMC1>;
reset-names = "ahb"; reset-names = "ahb";
interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -607,7 +610,7 @@ pio: pinctrl@1c20800 { ...@@ -607,7 +610,7 @@ pio: pinctrl@1c20800 {
#interrupt-cells = <3>; #interrupt-cells = <3>;
#gpio-cells = <3>; #gpio-cells = <3>;
gmac_pins_gmii_a: gmac_gmii@0 { gmac_gmii_pins: gmac-gmii-pins {
pins = "PA0", "PA1", "PA2", "PA3", pins = "PA0", "PA1", "PA2", "PA3",
"PA4", "PA5", "PA6", "PA7", "PA4", "PA5", "PA6", "PA7",
"PA8", "PA9", "PA10", "PA11", "PA8", "PA9", "PA10", "PA11",
...@@ -623,7 +626,7 @@ gmac_pins_gmii_a: gmac_gmii@0 { ...@@ -623,7 +626,7 @@ gmac_pins_gmii_a: gmac_gmii@0 {
drive-strength = <30>; drive-strength = <30>;
}; };
gmac_pins_mii_a: gmac_mii@0 { gmac_mii_pins: gmac-mii-pins {
pins = "PA0", "PA1", "PA2", "PA3", pins = "PA0", "PA1", "PA2", "PA3",
"PA8", "PA9", "PA11", "PA8", "PA9", "PA11",
"PA12", "PA13", "PA14", "PA19", "PA12", "PA13", "PA14", "PA19",
...@@ -632,7 +635,7 @@ gmac_pins_mii_a: gmac_mii@0 { ...@@ -632,7 +635,7 @@ gmac_pins_mii_a: gmac_mii@0 {
function = "gmac"; function = "gmac";
}; };
gmac_pins_rgmii_a: gmac_rgmii@0 { gmac_rgmii_pins: gmac-rgmii-pins {
pins = "PA0", "PA1", "PA2", "PA3", pins = "PA0", "PA1", "PA2", "PA3",
"PA9", "PA10", "PA11", "PA9", "PA10", "PA11",
"PA12", "PA13", "PA14", "PA19", "PA12", "PA13", "PA14", "PA19",
...@@ -645,22 +648,22 @@ gmac_pins_rgmii_a: gmac_rgmii@0 { ...@@ -645,22 +648,22 @@ gmac_pins_rgmii_a: gmac_rgmii@0 {
drive-strength = <40>; drive-strength = <40>;
}; };
i2c0_pins_a: i2c0@0 { i2c0_pins: i2c0-pins {
pins = "PH14", "PH15"; pins = "PH14", "PH15";
function = "i2c0"; function = "i2c0";
}; };
i2c1_pins_a: i2c1@0 { i2c1_pins: i2c1-pins {
pins = "PH16", "PH17"; pins = "PH16", "PH17";
function = "i2c1"; function = "i2c1";
}; };
i2c2_pins_a: i2c2@0 { i2c2_pins: i2c2-pins {
pins = "PH18", "PH19"; pins = "PH18", "PH19";
function = "i2c2"; function = "i2c2";
}; };
lcd0_rgb888_pins: lcd0_rgb888 { lcd0_rgb888_pins: lcd0-rgb888-pins {
pins = "PD0", "PD1", "PD2", "PD3", pins = "PD0", "PD1", "PD2", "PD3",
"PD4", "PD5", "PD6", "PD7", "PD4", "PD5", "PD6", "PD7",
"PD8", "PD9", "PD10", "PD11", "PD8", "PD9", "PD10", "PD11",
...@@ -671,7 +674,7 @@ lcd0_rgb888_pins: lcd0_rgb888 { ...@@ -671,7 +674,7 @@ lcd0_rgb888_pins: lcd0_rgb888 {
function = "lcd0"; function = "lcd0";
}; };
mmc0_pins_a: mmc0@0 { mmc0_pins: mmc0-pins {
pins = "PF0", "PF1", "PF2", pins = "PF0", "PF1", "PF2",
"PF3", "PF4", "PF5"; "PF3", "PF4", "PF5";
function = "mmc0"; function = "mmc0";
...@@ -679,7 +682,7 @@ mmc0_pins_a: mmc0@0 { ...@@ -679,7 +682,7 @@ mmc0_pins_a: mmc0@0 {
bias-pull-up; bias-pull-up;
}; };
mmc1_pins_a: mmc1@0 { mmc1_pins: mmc1-pins {
pins = "PG0", "PG1", "PG2", "PG3", pins = "PG0", "PG1", "PG2", "PG3",
"PG4", "PG5"; "PG4", "PG5";
function = "mmc1"; function = "mmc1";
...@@ -687,7 +690,7 @@ mmc1_pins_a: mmc1@0 { ...@@ -687,7 +690,7 @@ mmc1_pins_a: mmc1@0 {
bias-pull-up; bias-pull-up;
}; };
mmc2_pins_a: mmc2@0 { mmc2_4bit_pins: mmc2-4bit-pins {
pins = "PC6", "PC7", "PC8", "PC9", pins = "PC6", "PC7", "PC8", "PC9",
"PC10", "PC11"; "PC10", "PC11";
function = "mmc2"; function = "mmc2";
...@@ -695,7 +698,7 @@ mmc2_pins_a: mmc2@0 { ...@@ -695,7 +698,7 @@ mmc2_pins_a: mmc2@0 {
bias-pull-up; bias-pull-up;
}; };
mmc2_8bit_emmc_pins: mmc2@1 { mmc2_8bit_emmc_pins: mmc2-8bit-emmc-pins {
pins = "PC6", "PC7", "PC8", "PC9", pins = "PC6", "PC7", "PC8", "PC9",
"PC10", "PC11", "PC12", "PC10", "PC11", "PC12",
"PC13", "PC14", "PC15", "PC13", "PC14", "PC15",
...@@ -705,7 +708,7 @@ mmc2_8bit_emmc_pins: mmc2@1 { ...@@ -705,7 +708,7 @@ mmc2_8bit_emmc_pins: mmc2@1 {
bias-pull-up; bias-pull-up;
}; };
mmc3_8bit_emmc_pins: mmc3@1 { mmc3_8bit_emmc_pins: mmc3-8bit-emmc-pins {
pins = "PC6", "PC7", "PC8", "PC9", pins = "PC6", "PC7", "PC8", "PC9",
"PC10", "PC11", "PC12", "PC10", "PC11", "PC12",
"PC13", "PC14", "PC15", "PC13", "PC14", "PC15",
...@@ -715,12 +718,12 @@ mmc3_8bit_emmc_pins: mmc3@1 { ...@@ -715,12 +718,12 @@ mmc3_8bit_emmc_pins: mmc3@1 {
bias-pull-up; bias-pull-up;
}; };
spdif_pins_a: spdif@0 { spdif_tx_pin: spdif-tx-pin {
pins = "PH28"; pins = "PH28";
function = "spdif"; function = "spdif";
}; };
uart0_pins_a: uart0@0 { uart0_ph_pins: uart0-ph-pins {
pins = "PH20", "PH21"; pins = "PH20", "PH21";
function = "uart0"; function = "uart0";
}; };
...@@ -879,6 +882,8 @@ i2c0: i2c@1c2ac00 { ...@@ -879,6 +882,8 @@ i2c0: i2c@1c2ac00 {
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_APB2_I2C0>; clocks = <&ccu CLK_APB2_I2C0>;
resets = <&ccu RST_APB2_I2C0>; resets = <&ccu RST_APB2_I2C0>;
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -890,6 +895,8 @@ i2c1: i2c@1c2b000 { ...@@ -890,6 +895,8 @@ i2c1: i2c@1c2b000 {
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_APB2_I2C1>; clocks = <&ccu CLK_APB2_I2C1>;
resets = <&ccu RST_APB2_I2C1>; resets = <&ccu RST_APB2_I2C1>;
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -901,6 +908,8 @@ i2c2: i2c@1c2b400 { ...@@ -901,6 +908,8 @@ i2c2: i2c@1c2b400 {
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_APB2_I2C2>; clocks = <&ccu CLK_APB2_I2C2>;
resets = <&ccu RST_APB2_I2C2>; resets = <&ccu RST_APB2_I2C2>;
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -1373,12 +1382,12 @@ r_pio: pinctrl@1f02c00 { ...@@ -1373,12 +1382,12 @@ r_pio: pinctrl@1f02c00 {
#size-cells = <0>; #size-cells = <0>;
#gpio-cells = <3>; #gpio-cells = <3>;
ir_pins_a: ir@0 { s_ir_rx_pin: s-ir-rx-pin {
pins = "PL4"; pins = "PL4";
function = "s_ir"; function = "s_ir";
}; };
p2wi_pins: p2wi { s_p2wi_pins: s-p2wi-pins {
pins = "PL0", "PL1"; pins = "PL0", "PL1";
function = "s_p2wi"; function = "s_p2wi";
}; };
...@@ -1392,7 +1401,7 @@ p2wi: i2c@1f03400 { ...@@ -1392,7 +1401,7 @@ p2wi: i2c@1f03400 {
clock-frequency = <100000>; clock-frequency = <100000>;
resets = <&apb0_rst 3>; resets = <&apb0_rst 3>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&p2wi_pins>; pinctrl-0 = <&s_p2wi_pins>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts
View file @ 2c94db38
...@@ -53,7 +53,7 @@ &lradc { ...@@ -53,7 +53,7 @@ &lradc {
vref-supply = <&reg_aldo3>; vref-supply = <&reg_aldo3>;
status = "okay"; status = "okay";
button@1000 { button-1000 {
label = "Home"; label = "Home";
linux,code = <KEY_HOMEPAGE>; linux,code = <KEY_HOMEPAGE>;
channel = <0>; channel = <0>;
......
arch/arm/boot/dts/sun6i-a31s-cs908.dts
View file @ 2c94db38
...@@ -66,7 +66,7 @@ &ehci1 { ...@@ -66,7 +66,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
status = "okay"; status = "okay";
...@@ -77,7 +77,7 @@ phy1: ethernet-phy@1 { ...@@ -77,7 +77,7 @@ phy1: ethernet-phy@1 {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&s_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
...@@ -87,7 +87,7 @@ &ohci1 { ...@@ -87,7 +87,7 @@ &ohci1 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_ph_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun6i-a31s-inet-q972.dts
View file @ 2c94db38
...@@ -54,8 +54,6 @@ &ehci1 { ...@@ -54,8 +54,6 @@ &ehci1 {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
ft5406ee8: touchscreen@38 { ft5406ee8: touchscreen@38 {
...@@ -73,21 +71,21 @@ &lradc { ...@@ -73,21 +71,21 @@ &lradc {
vref-supply = <&reg_aldo3>; vref-supply = <&reg_aldo3>;
status = "okay"; status = "okay";
button@200 { button-200 {
label = "Volume Down"; label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
channel = <0>; channel = <0>;
voltage = <200000>; voltage = <200000>;
}; };
button@900 { button-900 {
label = "Volume Up"; label = "Volume Up";
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
channel = <0>; channel = <0>;
voltage = <900000>; voltage = <900000>;
}; };
button@1200 { button-1200 {
label = "Back"; label = "Back";
linux,code = <KEY_BACK>; linux,code = <KEY_BACK>;
channel = <0>; channel = <0>;
......
arch/arm/boot/dts/sun6i-a31s-primo81.dts
View file @ 2c94db38
...@@ -90,19 +90,13 @@ hdmi_out_con: endpoint { ...@@ -90,19 +90,13 @@ hdmi_out_con: endpoint {
&i2c0 { &i2c0 {
/* pull-ups and device VDDIO use AXP221 DLDO3 */ /* pull-ups and device VDDIO use AXP221 DLDO3 */
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "failed"; status = "failed";
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
ctp@5d { ctp@5d {
pinctrl-names = "default";
pinctrl-0 = <&gt911_int_primo81>;
compatible = "goodix,gt911"; compatible = "goodix,gt911";
reg = <0x5d>; reg = <0x5d>;
interrupt-parent = <&pio>; interrupt-parent = <&pio>;
...@@ -112,8 +106,6 @@ ctp@5d { ...@@ -112,8 +106,6 @@ ctp@5d {
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
accelerometer@1c { accelerometer@1c {
...@@ -131,14 +123,14 @@ &lradc { ...@@ -131,14 +123,14 @@ &lradc {
vref-supply = <&reg_aldo3>; vref-supply = <&reg_aldo3>;
status = "okay"; status = "okay";
button@158 { button-158 {
label = "Volume Up"; label = "Volume Up";
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
channel = <0>; channel = <0>;
voltage = <158730>; voltage = <158730>;
}; };
button@349 { button-349 {
label = "Volume Down"; label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
channel = <0>; channel = <0>;
...@@ -147,8 +139,6 @@ button@349 { ...@@ -147,8 +139,6 @@ button@349 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_primo81>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */ cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
...@@ -156,22 +146,11 @@ &mmc0 { ...@@ -156,22 +146,11 @@ &mmc0 {
}; };
&pio { &pio {
gt911_int_primo81: gt911_int_pin@0 { mma8452_int_primo81: mma8452-int-pin {
pins = "PA3";
function = "gpio_in";
};
mma8452_int_primo81: mma8452_int_pin@0 {
pins = "PA9"; pins = "PA9";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
mmc0_cd_pin_primo81: mmc0_cd_pin@0 {
pins = "PA8";
function = "gpio_in";
bias-pull-up;
};
}; };
&p2wi { &p2wi {
......
arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi
View file @ 2c94db38
...@@ -135,7 +135,7 @@ &reg_dcdc5 { ...@@ -135,7 +135,7 @@ &reg_dcdc5 {
/* UART0 pads available on core board */ /* UART0 pads available on core board */
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_ph_pins>;
status = "okay"; status = "okay";
}; };
arch/arm/boot/dts/sun6i-a31s-sina31s.dts
View file @ 2c94db38
...@@ -66,8 +66,6 @@ hdmi_con_in: endpoint { ...@@ -66,8 +66,6 @@ hdmi_con_in: endpoint {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pin_sina31s>;
status { status {
label = "sina31s:status:usr"; label = "sina31s:status:usr";
...@@ -116,7 +114,7 @@ &ehci1 { ...@@ -116,7 +114,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
phy-supply = <&reg_dldo1>; phy-supply = <&reg_dldo1>;
...@@ -139,7 +137,7 @@ hdmi_out_con: endpoint { ...@@ -139,7 +137,7 @@ hdmi_out_con: endpoint {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&s_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
...@@ -147,14 +145,14 @@ &lradc { ...@@ -147,14 +145,14 @@ &lradc {
vref-supply = <&reg_aldo3>; vref-supply = <&reg_aldo3>;
status = "okay"; status = "okay";
button@158 { button-158 {
label = "Volume Up"; label = "Volume Up";
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
channel = <0>; channel = <0>;
voltage = <158730>; voltage = <158730>;
}; };
button@349 { button-349 {
label = "Volume Down"; label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
channel = <0>; channel = <0>;
...@@ -163,8 +161,6 @@ button@349 { ...@@ -163,8 +161,6 @@ button@349 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina31s>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */ cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
...@@ -175,19 +171,6 @@ &ohci1 { ...@@ -175,19 +171,6 @@ &ohci1 {
status = "okay"; status = "okay";
}; };
&pio {
led_pin_sina31s: led_pin@0 {
pins = "PH13";
function = "gpio_out";
};
mmc0_cd_pin_sina31s: mmc0_cd_pin@0 {
pins = "PA4";
function = "gpio_in";
bias-pull-up;
};
};
&reg_dldo1 { &reg_dldo1 {
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -196,7 +179,7 @@ &reg_dldo1 { ...@@ -196,7 +179,7 @@ &reg_dldo1 {
&spdif { &spdif {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spdif_pins_a>; pinctrl-0 = <&spdif_tx_pin>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
View file @ 2c94db38
...@@ -58,8 +58,6 @@ chosen { ...@@ -58,8 +58,6 @@ chosen {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_bpi_m2>;
blue { blue {
label = "bpi-m2:blue:usr"; label = "bpi-m2:blue:usr";
...@@ -79,8 +77,6 @@ red { ...@@ -79,8 +77,6 @@ red {
mmc2_pwrseq: mmc2_pwrseq { mmc2_pwrseq: mmc2_pwrseq {
compatible = "mmc-pwrseq-simple"; compatible = "mmc-pwrseq-simple";
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pwrseq_pin_bpi_m2>;
reset-gpios = <&r_pio 0 8 GPIO_ACTIVE_LOW>; /* PL8 WIFI_EN */ reset-gpios = <&r_pio 0 8 GPIO_ACTIVE_LOW>; /* PL8 WIFI_EN */
}; };
}; };
...@@ -95,7 +91,7 @@ &ehci0 { ...@@ -95,7 +91,7 @@ &ehci0 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>, <&gmac_phy_reset_pin_bpi_m2>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-supply = <&reg_dldo1>; phy-supply = <&reg_dldo1>;
...@@ -111,26 +107,20 @@ phy1: ethernet-phy@1 { ...@@ -111,26 +107,20 @@ phy1: ethernet-phy@1 {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&s_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */ cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
status = "okay"; status = "okay";
}; };
&mmc0_pins_a {
bias-pull-up;
};
&mmc2 { &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>; pinctrl-0 = <&mmc2_4bit_pins>;
vmmc-supply = <&reg_aldo1>; vmmc-supply = <&reg_aldo1>;
mmc-pwrseq = <&mmc2_pwrseq>; mmc-pwrseq = <&mmc2_pwrseq>;
bus-width = <4>; bus-width = <4>;
...@@ -146,10 +136,6 @@ brcmf: wifi@1 { ...@@ -146,10 +136,6 @@ brcmf: wifi@1 {
}; };
}; };
&mmc2_pins_a {
bias-pull-up;
};
&ohci0 { &ohci0 {
status = "okay"; status = "okay";
}; };
...@@ -167,31 +153,6 @@ axp22x: pmic@68 { ...@@ -167,31 +153,6 @@ axp22x: pmic@68 {
}; };
}; };
&pio {
gmac_phy_reset_pin_bpi_m2: gmac_phy_reset_pin@0 {
pins = "PA21";
function = "gpio_out";
};
led_pins_bpi_m2: led_pins@0 {
pins = "PG5", "PG10", "PG11";
function = "gpio_out";
};
mmc0_cd_pin_bpi_m2: mmc0_cd_pin@0 {
pins = "PA4";
function = "gpio_in";
bias-pull-up;
};
};
&r_pio {
mmc2_pwrseq_pin_bpi_m2: mmc2_pwrseq_pin@0 {
pins = "PL8";
function = "gpio_out";
};
};
#include "axp22x.dtsi" #include "axp22x.dtsi"
&reg_aldo1 { &reg_aldo1 {
...@@ -291,7 +252,7 @@ &reg_ldo_io1 { ...@@ -291,7 +252,7 @@ &reg_ldo_io1 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_ph_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
View file @ 2c94db38
...@@ -62,14 +62,10 @@ chosen { ...@@ -62,14 +62,10 @@ chosen {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
}; };
...@@ -89,27 +85,13 @@ &ohci1 { ...@@ -89,27 +85,13 @@ &ohci1 {
status = "okay"; status = "okay";
}; };
&pio {
mmc0_cd_pin_bs1078v2: mmc0_cd_pin@0 {
pins = "PA8";
function = "gpio_in";
bias-pull-up;
};
};
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bs1078v2>;
vmmc-supply = <&reg_vcc3v0>; vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */ cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
status = "okay"; status = "okay";
}; };
&mmc0_pins_a {
bias-pull-up;
};
&p2wi { &p2wi {
status = "okay"; status = "okay";
...@@ -189,7 +171,7 @@ &reg_dldo3 { ...@@ -189,7 +171,7 @@ &reg_dldo3 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_ph_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
View file @ 2c94db38
...@@ -66,7 +66,7 @@ &ehci0 { ...@@ -66,7 +66,7 @@ &ehci0 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_e708_q1>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */ cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
...@@ -74,13 +74,7 @@ &mmc0 { ...@@ -74,13 +74,7 @@ &mmc0 {
}; };
&pio { &pio {
mmc0_cd_pin_e708_q1: mmc0_cd_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PA8";
function = "gpio_in";
bias-pull-up;
};
usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PA15"; pins = "PA15";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
......
arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
View file @ 2c94db38
...@@ -73,8 +73,6 @@ hdmi_con_in: endpoint { ...@@ -73,8 +73,6 @@ hdmi_con_in: endpoint {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_bpi_m1p>;
green { green {
label = "bananapi-m1-plus:green:usr"; label = "bananapi-m1-plus:green:usr";
...@@ -90,15 +88,11 @@ pwr { ...@@ -90,15 +88,11 @@ pwr {
mmc3_pwrseq: mmc3_pwrseq { mmc3_pwrseq: mmc3_pwrseq {
compatible = "mmc-pwrseq-simple"; compatible = "mmc-pwrseq-simple";
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pwrseq_pin_bpi_m1p>;
reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 WL-PMU-EN */ reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 WL-PMU-EN */
}; };
reg_gmac_3v3: gmac-3v3 { reg_gmac_3v3: gmac-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&gmac_power_pin_bpi_m1p>;
regulator-name = "gmac-3v3"; regulator-name = "gmac-3v3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -134,7 +128,7 @@ &ehci1 { ...@@ -134,7 +128,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-supply = <&reg_gmac_3v3>; phy-supply = <&reg_gmac_3v3>;
...@@ -156,8 +150,6 @@ hdmi_out_con: endpoint { ...@@ -156,8 +150,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -175,13 +167,11 @@ &ac_power_supply { ...@@ -175,13 +167,11 @@ &ac_power_supply {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m1p>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
...@@ -191,8 +181,6 @@ &mmc0 { ...@@ -191,8 +181,6 @@ &mmc0 {
&mmc3 { &mmc3 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc3_pwrseq>; mmc-pwrseq = <&mmc3_pwrseq>;
bus-width = <4>; bus-width = <4>;
...@@ -209,11 +197,6 @@ brcmf: wifi@1 { ...@@ -209,11 +197,6 @@ brcmf: wifi@1 {
}; };
}; };
&mmc3_pins_a {
/* AP6210 requires pull-up */
bias-pull-up;
};
&ohci0 { &ohci0 {
status = "okay"; status = "okay";
}; };
...@@ -226,29 +209,6 @@ &otg_sram { ...@@ -226,29 +209,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
gmac_power_pin_bpi_m1p: gmac_power_pin@0 {
pins = "PH23";
function = "gpio_out";
};
led_pins_bpi_m1p: led_pins@0 {
pins = "PH24", "PH25";
function = "gpio_out";
};
mmc0_cd_pin_bpi_m1p: mmc0_cd_pin@0 {
pins = "PH10";
function = "gpio_in";
bias-pull-up;
};
mmc3_pwrseq_pin_bpi_m1p: mmc3_pwrseq_pin@0 {
pins = "PH22";
function = "gpio_out";
};
};
&reg_dcdc2 { &reg_dcdc2 {
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
...@@ -280,7 +240,7 @@ &reg_usb0_vbus { ...@@ -280,7 +240,7 @@ &reg_usb0_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-bananapi.dts
View file @ 2c94db38
...@@ -76,8 +76,6 @@ hdmi_con_in: endpoint { ...@@ -76,8 +76,6 @@ hdmi_con_in: endpoint {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_bananapi>;
green { green {
label = "bananapi:green:usr"; label = "bananapi:green:usr";
...@@ -87,8 +85,6 @@ green { ...@@ -87,8 +85,6 @@ green {
reg_gmac_3v3: gmac-3v3 { reg_gmac_3v3: gmac-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&gmac_power_pin_bananapi>;
regulator-name = "gmac-3v3"; regulator-name = "gmac-3v3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -134,7 +130,7 @@ &ehci1 { ...@@ -134,7 +130,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-supply = <&reg_gmac_3v3>; phy-supply = <&reg_gmac_3v3>;
...@@ -156,8 +152,6 @@ hdmi_out_con: endpoint { ...@@ -156,8 +152,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -168,20 +162,16 @@ axp209: pmic@34 { ...@@ -168,20 +162,16 @@ axp209: pmic@34 {
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
}; };
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
...@@ -252,27 +242,11 @@ &pio { ...@@ -252,27 +242,11 @@ &pio {
"IO-6", "IO-3", "IO-2", "IO-0", "", "", "", "", "IO-6", "IO-3", "IO-2", "IO-0", "", "", "", "",
"", "", "", "", "", "", "", ""; "", "", "", "", "", "", "", "";
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
pins = "PH10";
function = "gpio_in";
bias-pull-up;
};
gmac_power_pin_bananapi: gmac_power_pin@0 {
pins = "PH23";
function = "gpio_out";
};
led_pins_bananapi: led_pins@0 {
pins = "PH24";
function = "gpio_out";
};
}; };
#include "axp209.dtsi" #include "axp209.dtsi"
...@@ -316,27 +290,27 @@ &reg_usb2_vbus { ...@@ -316,27 +290,27 @@ &reg_usb2_vbus {
&spi0 { &spi0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi0_pins_a>, pinctrl-0 = <&spi0_pi_pins>,
<&spi0_cs0_pins_a>, <&spi0_cs0_pi_pin>,
<&spi0_cs1_pins_a>; <&spi0_cs1_pi_pin>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
&uart3 { &uart3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart3_pins_b>; pinctrl-0 = <&uart3_ph_pins>;
status = "okay"; status = "okay";
}; };
&uart7 { &uart7 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart7_pins_a>; pinctrl-0 = <&uart7_pi_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-bananapro.dts
View file @ 2c94db38
...@@ -62,8 +62,6 @@ chosen { ...@@ -62,8 +62,6 @@ chosen {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_bananapro>;
blue { blue {
label = "bananapro:blue:usr"; label = "bananapro:blue:usr";
...@@ -78,15 +76,11 @@ green { ...@@ -78,15 +76,11 @@ green {
wifi_pwrseq: wifi-pwrseq { wifi_pwrseq: wifi-pwrseq {
compatible = "mmc-pwrseq-simple"; compatible = "mmc-pwrseq-simple";
pinctrl-names = "default";
pinctrl-0 = <&vmmc3_pin_bananapro>;
reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>;
}; };
reg_gmac_3v3: gmac-3v3 { reg_gmac_3v3: gmac-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&gmac_power_pin_bananapro>;
regulator-name = "gmac-3v3"; regulator-name = "gmac-3v3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -114,7 +108,7 @@ &ehci1 { ...@@ -114,7 +108,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-supply = <&reg_gmac_3v3>; phy-supply = <&reg_gmac_3v3>;
...@@ -126,8 +120,6 @@ phy1: ethernet-phy@1 { ...@@ -126,8 +120,6 @@ phy1: ethernet-phy@1 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -142,20 +134,16 @@ axp209: pmic@34 { ...@@ -142,20 +134,16 @@ axp209: pmic@34 {
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
}; };
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapro>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
...@@ -163,8 +151,6 @@ &mmc0 { ...@@ -163,8 +151,6 @@ &mmc0 {
}; };
&mmc3 { &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&wifi_pwrseq>; mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>; bus-width = <4>;
...@@ -188,74 +174,39 @@ &ohci1 { ...@@ -188,74 +174,39 @@ &ohci1 {
status = "okay"; status = "okay";
}; };
&pio {
gmac_power_pin_bananapro: gmac_power_pin@0 {
pins = "PH23";
function = "gpio_out";
};
led_pins_bananapro: led_pins@0 {
pins = "PH24", "PG2";
function = "gpio_out";
};
mmc0_cd_pin_bananapro: mmc0_cd_pin@0 {
pins = "PH10";
function = "gpio_in";
bias-pull-up;
};
usb1_vbus_pin_bananapro: usb1_vbus_pin@0 {
pins = "PH0";
function = "gpio_out";
};
usb2_vbus_pin_bananapro: usb2_vbus_pin@0 {
pins = "PH1";
function = "gpio_out";
};
vmmc3_pin_bananapro: vmmc3_pin@0 {
pins = "PH22";
function = "gpio_out";
};
};
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_bananapro>;
gpio = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */ gpio = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */
status = "okay"; status = "okay";
}; };
&reg_usb2_vbus { &reg_usb2_vbus {
pinctrl-0 = <&usb2_vbus_pin_bananapro>;
gpio = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ gpio = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
status = "okay"; status = "okay";
}; };
&spi0 { &spi0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi0_pins_a>, pinctrl-0 = <&spi0_pi_pins>,
<&spi0_cs0_pins_a>, <&spi0_cs0_pi_pin>,
<&spi0_cs1_pins_a>; <&spi0_cs1_pi_pin>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
&uart4 { &uart4 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart4_pins_b>; pinctrl-0 = <&uart4_ph_pins>;
status = "okay"; status = "okay";
}; };
&uart7 { &uart7 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart7_pins_a>; pinctrl-0 = <&uart7_pi_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
View file @ 2c94db38
...@@ -74,8 +74,6 @@ hdmi_con_in: endpoint { ...@@ -74,8 +74,6 @@ hdmi_con_in: endpoint {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_cubieboard2>;
blue { blue {
label = "cubieboard2:blue:usr"; label = "cubieboard2:blue:usr";
...@@ -116,7 +114,7 @@ &ehci1 { ...@@ -116,7 +114,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
status = "okay"; status = "okay";
...@@ -137,8 +135,6 @@ hdmi_out_con: endpoint { ...@@ -137,8 +135,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -149,20 +145,16 @@ axp209: pmic@34 { ...@@ -149,20 +145,16 @@ axp209: pmic@34 {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
}; };
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -182,12 +174,7 @@ &otg_sram { ...@@ -182,12 +174,7 @@ &otg_sram {
}; };
&pio { &pio {
led_pins_cubieboard2: led_pins@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH20", "PH21";
function = "gpio_out";
};
usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
...@@ -239,7 +226,7 @@ &reg_usb2_vbus { ...@@ -239,7 +226,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-cubietruck.dts
View file @ 2c94db38
...@@ -74,8 +74,6 @@ hdmi_con_in: endpoint { ...@@ -74,8 +74,6 @@ hdmi_con_in: endpoint {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_cubietruck>;
blue { blue {
label = "cubietruck:blue:usr"; label = "cubietruck:blue:usr";
...@@ -100,8 +98,6 @@ green { ...@@ -100,8 +98,6 @@ green {
mmc3_pwrseq: mmc3_pwrseq { mmc3_pwrseq: mmc3_pwrseq {
compatible = "mmc-pwrseq-simple"; compatible = "mmc-pwrseq-simple";
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pwrseq_pin_cubietruck>;
reset-gpios = <&pio 7 9 GPIO_ACTIVE_LOW>; /* PH9 WIFI_EN */ reset-gpios = <&pio 7 9 GPIO_ACTIVE_LOW>; /* PH9 WIFI_EN */
}; };
...@@ -151,7 +147,7 @@ &ehci1 { ...@@ -151,7 +147,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
status = "okay"; status = "okay";
...@@ -172,8 +168,6 @@ hdmi_out_con: endpoint { ...@@ -172,8 +168,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -185,25 +179,20 @@ axp209: pmic@34 { ...@@ -185,25 +179,20 @@ axp209: pmic@34 {
&i2c1 { &i2c1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
}; };
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -211,8 +200,6 @@ &mmc0 { ...@@ -211,8 +200,6 @@ &mmc0 {
}; };
&mmc3 { &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc3_pwrseq>; mmc-pwrseq = <&mmc3_pwrseq>;
bus-width = <4>; bus-width = <4>;
...@@ -228,11 +215,6 @@ brcmf: wifi@1 { ...@@ -228,11 +215,6 @@ brcmf: wifi@1 {
}; };
}; };
&mmc3_pins_a {
/* AP6210 requires pull-up */
bias-pull-up;
};
&ohci0 { &ohci0 {
status = "okay"; status = "okay";
}; };
...@@ -245,46 +227,13 @@ &otg_sram { ...@@ -245,46 +227,13 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
ahci_pwr_pin_cubietruck: ahci_pwr_pin@1 {
pins = "PH12";
function = "gpio_out";
};
led_pins_cubietruck: led_pins@0 {
pins = "PH7", "PH11", "PH20", "PH21";
function = "gpio_out";
};
mmc3_pwrseq_pin_cubietruck: mmc3_pwrseq_pin@0 {
pins = "PH9";
function = "gpio_out";
};
usb0_vbus_pin_a: usb0_vbus_pin@0 {
pins = "PH17";
function = "gpio_out";
};
usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PH19";
function = "gpio_in";
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
pins = "PH22";
function = "gpio_in";
};
};
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins_a>, <&pwm1_pins_a>; pinctrl-0 = <&pwm0_pin>, <&pwm1_pin>;
status = "okay"; status = "okay";
}; };
&reg_ahci_5v { &reg_ahci_5v {
pinctrl-0 = <&ahci_pwr_pin_cubietruck>;
gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>; gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -325,7 +274,6 @@ &reg_ldo2 { ...@@ -325,7 +274,6 @@ &reg_ldo2 {
}; };
&reg_usb0_vbus { &reg_usb0_vbus {
pinctrl-0 = <&usb0_vbus_pin_a>;
gpio = <&pio 7 17 GPIO_ACTIVE_HIGH>; gpio = <&pio 7 17 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -340,13 +288,13 @@ &reg_usb2_vbus { ...@@ -340,13 +288,13 @@ &reg_usb2_vbus {
&spdif { &spdif {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spdif_tx_pins_a>; pinctrl-0 = <&spdif_tx_pin>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
...@@ -360,8 +308,6 @@ &usb_power_supply { ...@@ -360,8 +308,6 @@ &usb_power_supply {
}; };
&usbphy { &usbphy {
pinctrl-names = "default";
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
usb0_id_det-gpios = <&pio 7 19 GPIO_ACTIVE_HIGH>; /* PH19 */ usb0_id_det-gpios = <&pio 7 19 GPIO_ACTIVE_HIGH>; /* PH19 */
usb0_vbus_det-gpios = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */ usb0_vbus_det-gpios = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */
usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus_power-supply = <&usb_power_supply>;
......
arch/arm/boot/dts/sun7i-a20-hummingbird.dts
View file @ 2c94db38
...@@ -67,8 +67,6 @@ chosen { ...@@ -67,8 +67,6 @@ chosen {
reg_mmc3_vdd: mmc3_vdd { reg_mmc3_vdd: mmc3_vdd {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&mmc3_vdd_pin_a20_hummingbird>;
regulator-name = "mmc3_vdd"; regulator-name = "mmc3_vdd";
regulator-min-microvolt = <3000000>; regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>; regulator-max-microvolt = <3000000>;
...@@ -78,8 +76,6 @@ reg_mmc3_vdd: mmc3_vdd { ...@@ -78,8 +76,6 @@ reg_mmc3_vdd: mmc3_vdd {
reg_gmac_vdd: gmac_vdd { reg_gmac_vdd: gmac_vdd {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&gmac_vdd_pin_a20_hummingbird>;
regulator-name = "gmac_vdd"; regulator-name = "gmac_vdd";
regulator-min-microvolt = <3000000>; regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>; regulator-max-microvolt = <3000000>;
...@@ -103,7 +99,7 @@ &ehci1 { ...@@ -103,7 +99,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-supply = <&reg_gmac_vdd>; phy-supply = <&reg_gmac_vdd>;
...@@ -120,8 +116,6 @@ phy1: ethernet-phy@1 { ...@@ -120,8 +116,6 @@ phy1: ethernet-phy@1 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -135,32 +129,24 @@ axp209: pmic@34 { ...@@ -135,32 +129,24 @@ axp209: pmic@34 {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
}; };
&i2c3 { &i2c3 {
pinctrl-names = "default";
pinctrl-0 = <&i2c3_pins_a>;
status = "okay"; status = "okay";
}; };
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v0>; vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -168,8 +154,6 @@ &mmc0 { ...@@ -168,8 +154,6 @@ &mmc0 {
}; };
&mmc3 { &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>;
vmmc-supply = <&reg_mmc3_vdd>; vmmc-supply = <&reg_mmc3_vdd>;
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;
...@@ -184,42 +168,18 @@ &ohci1 { ...@@ -184,42 +168,18 @@ &ohci1 {
status = "okay"; status = "okay";
}; };
&pio {
ahci_pwr_pin_a20_hummingbird: ahci_pwr_pin@0 {
pins = "PH15";
function = "gpio_out";
};
usb1_vbus_pin_a20_hummingbird: usb1_vbus_pin@0 {
pins = "PH2";
function = "gpio_out";
};
mmc3_vdd_pin_a20_hummingbird: mmc3_vdd_pin@0 {
pins = "PH9";
function = "gpio_out";
};
gmac_vdd_pin_a20_hummingbird: gmac_vdd_pin@0 {
pins = "PH16";
function = "gpio_out";
};
};
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins_a>; pinctrl-0 = <&pwm0_pin>;
status = "okay"; status = "okay";
}; };
&reg_ahci_5v { &reg_ahci_5v {
pinctrl-0 = <&ahci_pwr_pin_a20_hummingbird>;
gpio = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */ gpio = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */
status = "okay"; status = "okay";
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_a20_hummingbird>;
gpio = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */ gpio = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */
status = "okay"; status = "okay";
}; };
...@@ -230,38 +190,38 @@ &reg_usb2_vbus { ...@@ -230,38 +190,38 @@ &reg_usb2_vbus {
&spi2 { &spi2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi2_pins_b>, pinctrl-0 = <&spi2_pb_pins>,
<&spi2_cs0_pins_b>; <&spi2_cs0_pb_pin>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
&uart2 { &uart2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart2_pins_a>; pinctrl-0 = <&uart2_pi_pins>, <&uart2_cts_rts_pi_pins>;
status = "okay"; status = "okay";
}; };
&uart3 { &uart3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart3_pins_a>; pinctrl-0 = <&uart3_pg_pins>, <&uart3_cts_rts_pg_pins>;
status = "okay"; status = "okay";
}; };
&uart4 { &uart4 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart4_pins_a>; pinctrl-0 = <&uart4_pg_pins>;
status = "okay"; status = "okay";
}; };
&uart5 { &uart5 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart5_pins_a>; pinctrl-0 = <&uart5_pi_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
View file @ 2c94db38
...@@ -61,8 +61,6 @@ chosen { ...@@ -61,8 +61,6 @@ chosen {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_i12_tvbox>;
red { red {
label = "i12_tvbox:red:usr"; label = "i12_tvbox:red:usr";
...@@ -77,8 +75,6 @@ blue { ...@@ -77,8 +75,6 @@ blue {
reg_vmmc3: vmmc3 { reg_vmmc3: vmmc3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&vmmc3_pin_i12_tvbox>;
regulator-name = "vmmc3"; regulator-name = "vmmc3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -88,8 +84,6 @@ reg_vmmc3: vmmc3 { ...@@ -88,8 +84,6 @@ reg_vmmc3: vmmc3 {
reg_vmmc3_io: vmmc3-io { reg_vmmc3_io: vmmc3-io {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&vmmc3_io_pin_i12_tvbox>;
regulator-name = "vmmc3-io"; regulator-name = "vmmc3-io";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -101,8 +95,6 @@ reg_vmmc3_io: vmmc3-io { ...@@ -101,8 +95,6 @@ reg_vmmc3_io: vmmc3-io {
reg_gmac_3v3: gmac-3v3 { reg_gmac_3v3: gmac-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&gmac_power_pin_i12_tvbox>;
regulator-name = "gmac-3v3"; regulator-name = "gmac-3v3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -122,7 +114,7 @@ &ehci1 { ...@@ -122,7 +114,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
phy-supply = <&reg_gmac_3v3>; phy-supply = <&reg_gmac_3v3>;
...@@ -134,8 +126,6 @@ phy1: ethernet-phy@1 { ...@@ -134,8 +126,6 @@ phy1: ethernet-phy@1 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -151,13 +141,11 @@ axp209: pmic@34 { ...@@ -151,13 +141,11 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -165,8 +153,6 @@ &mmc0 { ...@@ -165,8 +153,6 @@ &mmc0 {
}; };
&mmc3 { &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>;
vmmc-supply = <&reg_vmmc3>; vmmc-supply = <&reg_vmmc3>;
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;
...@@ -181,11 +167,6 @@ brcmf: wifi@1 { ...@@ -181,11 +167,6 @@ brcmf: wifi@1 {
}; };
}; };
&mmc3_pins_a {
/* AP6210 / AP6330 requires pull-up */
bias-pull-up;
};
&ohci0 { &ohci0 {
status = "okay"; status = "okay";
}; };
...@@ -194,28 +175,6 @@ &ohci1 { ...@@ -194,28 +175,6 @@ &ohci1 {
status = "okay"; status = "okay";
}; };
&pio {
vmmc3_pin_i12_tvbox: vmmc3_pin@0 {
pins = "PH2";
function = "gpio_out";
};
vmmc3_io_pin_i12_tvbox: vmmc3_io_pin@0 {
pins = "PH12";
function = "gpio_out";
};
gmac_power_pin_i12_tvbox: gmac_power_pin@0 {
pins = "PH21";
function = "gpio_out";
};
led_pins_i12_tvbox: led_pins@0 {
pins = "PH9", "PH20";
function = "gpio_out";
};
};
&reg_usb1_vbus { &reg_usb1_vbus {
status = "okay"; status = "okay";
}; };
...@@ -226,7 +185,7 @@ &reg_usb2_vbus { ...@@ -226,7 +185,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
View file @ 2c94db38
...@@ -74,7 +74,7 @@ &ehci1 { ...@@ -74,7 +74,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
status = "okay"; status = "okay";
...@@ -85,8 +85,6 @@ phy1: ethernet-phy@1 { ...@@ -85,8 +85,6 @@ phy1: ethernet-phy@1 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -97,14 +95,10 @@ axp209: pmic@34 { ...@@ -97,14 +95,10 @@ axp209: pmic@34 {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 8 5 GPIO_ACTIVE_LOW>; /* PI5 */ cd-gpios = <&pio 8 5 GPIO_ACTIVE_LOW>; /* PI5 */
...@@ -156,7 +150,7 @@ &reg_usb2_vbus { ...@@ -156,7 +150,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
View file @ 2c94db38
...@@ -96,7 +96,7 @@ &codec { ...@@ -96,7 +96,7 @@ &codec {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
status = "okay"; status = "okay";
...@@ -115,13 +115,11 @@ axp209: pmic@34 { ...@@ -115,13 +115,11 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -129,7 +127,7 @@ &mmc0 { ...@@ -129,7 +127,7 @@ &mmc0 {
}; };
&pio { &pio {
led_pins_itead_core: led_pins@0 { led_pins_itead_core: led-pins {
pins = "PH20","PH21"; pins = "PH20","PH21";
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
...@@ -142,6 +140,6 @@ &reg_ahci_5v { ...@@ -142,6 +140,6 @@ &reg_ahci_5v {
&spdif { &spdif {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spdif_tx_pins_a>; pinctrl-0 = <&spdif_tx_pin>;
status = "okay"; status = "okay";
}; };
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
View file @ 2c94db38
...@@ -74,8 +74,6 @@ hdmi_con_in: endpoint { ...@@ -74,8 +74,6 @@ hdmi_con_in: endpoint {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_lamobo_r1>;
green { green {
label = "lamobo_r1:green:usr"; label = "lamobo_r1:green:usr";
...@@ -85,8 +83,6 @@ green { ...@@ -85,8 +83,6 @@ green {
reg_gmac_3v3: gmac-3v3 { reg_gmac_3v3: gmac-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&gmac_power_pin_lamobo_r1>;
regulator-name = "gmac-3v3"; regulator-name = "gmac-3v3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -123,10 +119,12 @@ &ehci1 { ...@@ -123,10 +119,12 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-supply = <&reg_gmac_3v3>; phy-supply = <&reg_gmac_3v3>;
status = "okay"; status = "okay";
/delete-property/#address-cells;
/delete-property/#size-cells;
fixed-link { fixed-link {
speed = <1000>; speed = <1000>;
...@@ -141,8 +139,6 @@ mdio { ...@@ -141,8 +139,6 @@ mdio {
switch: ethernet-switch@1e { switch: ethernet-switch@1e {
compatible = "brcm,bcm53125"; compatible = "brcm,bcm53125";
reg = <30>; reg = <30>;
#address-cells = <1>;
#size-cells = <0>;
ports { ports {
#address-cells = <1>; #address-cells = <1>;
...@@ -199,8 +195,6 @@ hdmi_out_con: endpoint { ...@@ -199,8 +195,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -211,20 +205,16 @@ axp209: pmic@34 { ...@@ -211,20 +205,16 @@ axp209: pmic@34 {
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
}; };
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_lamobo_r1>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
...@@ -240,27 +230,11 @@ &otg_sram { ...@@ -240,27 +230,11 @@ &otg_sram {
}; };
&pio { &pio {
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
mmc0_cd_pin_lamobo_r1: mmc0_cd_pin@0 {
pins = "PH10";
function = "gpio_in";
bias-pull-up;
};
gmac_power_pin_lamobo_r1: gmac_power_pin@0 {
pins = "PH23";
function = "gpio_out";
};
led_pins_lamobo_r1: led_pins@0 {
pins = "PH24";
function = "gpio_out";
};
}; };
#include "axp209.dtsi" #include "axp209.dtsi"
...@@ -314,27 +288,27 @@ &reg_usb2_vbus { ...@@ -314,27 +288,27 @@ &reg_usb2_vbus {
&spi0 { &spi0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi0_pins_a>, pinctrl-0 = <&spi0_pi_pins>,
<&spi0_cs0_pins_a>, <&spi0_cs0_pi_pin>,
<&spi0_cs1_pins_a>; <&spi0_cs1_pi_pin>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
&uart3 { &uart3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart3_pins_b>; pinctrl-0 = <&uart3_ph_pins>;
status = "okay"; status = "okay";
}; };
&uart7 { &uart7 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart7_pins_a>; pinctrl-0 = <&uart7_pi_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-m3.dts
View file @ 2c94db38
...@@ -63,8 +63,6 @@ chosen { ...@@ -63,8 +63,6 @@ chosen {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_m3>;
blue { blue {
label = "m3:blue:usr"; label = "m3:blue:usr";
...@@ -83,7 +81,7 @@ &ehci1 { ...@@ -83,7 +81,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
status = "okay"; status = "okay";
...@@ -94,8 +92,6 @@ phy1: ethernet-phy@1 { ...@@ -94,8 +92,6 @@ phy1: ethernet-phy@1 {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -111,13 +107,11 @@ axp209: pmic@34 { ...@@ -111,13 +107,11 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -125,8 +119,6 @@ &mmc0 { ...@@ -125,8 +119,6 @@ &mmc0 {
}; };
&mmc2 { &mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;
...@@ -141,13 +133,6 @@ &ohci1 { ...@@ -141,13 +133,6 @@ &ohci1 {
status = "okay"; status = "okay";
}; };
&pio {
led_pins_m3: led_pins@0 {
pins = "PH20";
function = "gpio_out";
};
};
&reg_usb1_vbus { &reg_usb1_vbus {
status = "okay"; status = "okay";
}; };
...@@ -158,7 +143,7 @@ &reg_usb2_vbus { ...@@ -158,7 +143,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-mk808c.dts
View file @ 2c94db38
...@@ -106,8 +106,6 @@ hdmi_out_con: endpoint { ...@@ -106,8 +106,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -121,20 +119,14 @@ axp209: pmic@34 { ...@@ -121,20 +119,14 @@ axp209: pmic@34 {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v0>; vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -153,18 +145,6 @@ &otg_sram { ...@@ -153,18 +145,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PH4";
function = "gpio_in";
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
pins = "PH5";
function = "gpio_in";
};
};
&reg_usb0_vbus { &reg_usb0_vbus {
status = "okay"; status = "okay";
}; };
...@@ -179,13 +159,13 @@ &reg_usb2_vbus { ...@@ -179,13 +159,13 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
&uart2 { &uart2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart2_pins_a>; pinctrl-0 = <&uart2_pi_pins>, <&uart2_cts_rts_pi_pins>;
status = "okay"; status = "okay";
}; };
...@@ -195,8 +175,6 @@ &usb_otg { ...@@ -195,8 +175,6 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default";
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
......
arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts
View file @ 2c94db38
...@@ -21,8 +21,6 @@ mmc2_pwrseq: mmc2_pwrseq { ...@@ -21,8 +21,6 @@ mmc2_pwrseq: mmc2_pwrseq {
}; };
&mmc2 { &mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc2_pwrseq>; mmc-pwrseq = <&mmc2_pwrseq>;
bus-width = <4>; bus-width = <4>;
......
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
View file @ 2c94db38
...@@ -74,8 +74,6 @@ hdmi_con_in: endpoint { ...@@ -74,8 +74,6 @@ hdmi_con_in: endpoint {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_olimex_som_evb>;
green { green {
label = "a20-olimex-som-evb:green:usr"; label = "a20-olimex-som-evb:green:usr";
...@@ -112,7 +110,7 @@ &codec { ...@@ -112,7 +110,7 @@ &codec {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
status = "okay"; status = "okay";
...@@ -133,8 +131,6 @@ hdmi_out_con: endpoint { ...@@ -133,8 +131,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -145,14 +141,10 @@ axp209: pmic@34 { ...@@ -145,14 +141,10 @@ axp209: pmic@34 {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
}; };
...@@ -160,49 +152,49 @@ &lradc { ...@@ -160,49 +152,49 @@ &lradc {
vref-supply = <&reg_vcc3v0>; vref-supply = <&reg_vcc3v0>;
status = "okay"; status = "okay";
button@190 { button-190 {
label = "Volume Up"; label = "Volume Up";
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
channel = <0>; channel = <0>;
voltage = <190000>; voltage = <190000>;
}; };
button@390 { button-390 {
label = "Volume Down"; label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
channel = <0>; channel = <0>;
voltage = <390000>; voltage = <390000>;
}; };
button@600 { button-600 {
label = "Menu"; label = "Menu";
linux,code = <KEY_MENU>; linux,code = <KEY_MENU>;
channel = <0>; channel = <0>;
voltage = <600000>; voltage = <600000>;
}; };
button@800 { button-800 {
label = "Search"; label = "Search";
linux,code = <KEY_SEARCH>; linux,code = <KEY_SEARCH>;
channel = <0>; channel = <0>;
voltage = <800000>; voltage = <800000>;
}; };
button@980 { button-980 {
label = "Home"; label = "Home";
linux,code = <KEY_HOMEPAGE>; linux,code = <KEY_HOMEPAGE>;
channel = <0>; channel = <0>;
voltage = <980000>; voltage = <980000>;
}; };
button@1180 { button-1180 {
label = "Esc"; label = "Esc";
linux,code = <KEY_ESC>; linux,code = <KEY_ESC>;
channel = <0>; channel = <0>;
voltage = <1180000>; voltage = <1180000>;
}; };
button@1400 { button-1400 {
label = "Enter"; label = "Enter";
linux,code = <KEY_ENTER>; linux,code = <KEY_ENTER>;
channel = <0>; channel = <0>;
...@@ -211,8 +203,6 @@ button@1400 { ...@@ -211,8 +203,6 @@ button@1400 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -220,8 +210,6 @@ &mmc0 { ...@@ -220,8 +210,6 @@ &mmc0 {
}; };
&mmc3 { &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olimex_som_evb>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 0 GPIO_ACTIVE_LOW>; /* PH0 */ cd-gpios = <&pio 7 0 GPIO_ACTIVE_LOW>; /* PH0 */
...@@ -241,36 +229,14 @@ &otg_sram { ...@@ -241,36 +229,14 @@ &otg_sram {
}; };
&pio { &pio {
ahci_pwr_pin_olimex_som_evb: ahci_pwr_pin@1 { led_pins_olimex_som_evb: led-pins {
pins = "PC3";
function = "gpio_out";
};
led_pins_olimex_som_evb: led_pins@0 {
pins = "PH2"; pins = "PH2";
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
mmc3_cd_pin_olimex_som_evb: mmc3_cd_pin@0 {
pins = "PH0";
function = "gpio_in";
bias-pull-up;
};
usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PH4";
function = "gpio_in";
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
pins = "PH5";
function = "gpio_in";
};
}; };
&reg_ahci_5v { &reg_ahci_5v {
pinctrl-0 = <&ahci_pwr_pin_olimex_som_evb>;
gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>; gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -316,33 +282,33 @@ &reg_usb2_vbus { ...@@ -316,33 +282,33 @@ &reg_usb2_vbus {
&spi1 { &spi1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi1_pins_a>, pinctrl-0 = <&spi1_pi_pins>,
<&spi1_cs0_pins_a>; <&spi1_cs0_pi_pin>;
status = "okay"; status = "okay";
}; };
&spi2 { &spi2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi2_pins_a>, pinctrl-0 = <&spi2_pc_pins>,
<&spi2_cs0_pins_a>; <&spi2_cs0_pc_pin>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
&uart6 { &uart6 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart6_pins_a>; pinctrl-0 = <&uart6_pi_pins>;
status = "okay"; status = "okay";
}; };
&uart7 { &uart7 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart7_pins_a>; pinctrl-0 = <&uart7_pi_pins>;
status = "okay"; status = "okay";
}; };
...@@ -352,8 +318,6 @@ &usb_otg { ...@@ -352,8 +318,6 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default";
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH04 */ usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH04 */
usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH05 */ usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH05 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
......
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts
View file @ 2c94db38
...@@ -20,8 +20,6 @@ mmc2_pwrseq: mmc2_pwrseq { ...@@ -20,8 +20,6 @@ mmc2_pwrseq: mmc2_pwrseq {
}; };
&mmc2 { &mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc2_pwrseq>; mmc-pwrseq = <&mmc2_pwrseq>;
bus-width = <4>; bus-width = <4>;
......
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
View file @ 2c94db38
...@@ -78,7 +78,7 @@ &ahci { ...@@ -78,7 +78,7 @@ &ahci {
&can0 { &can0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&can0_pins_a>; pinctrl-0 = <&can_ph_pins>;
status = "okay"; status = "okay";
}; };
...@@ -104,7 +104,7 @@ &ehci1 { ...@@ -104,7 +104,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy3>; phy = <&phy3>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-supply = <&reg_vcc3v3>; phy-supply = <&reg_vcc3v3>;
...@@ -130,8 +130,6 @@ hdmi_out_con: endpoint { ...@@ -130,8 +130,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -143,8 +141,6 @@ axp209: pmic@34 { ...@@ -143,8 +141,6 @@ axp209: pmic@34 {
/* Exposed to UEXT1 */ /* Exposed to UEXT1 */
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
eeprom: eeprom@50 { eeprom: eeprom@50 {
...@@ -156,20 +152,16 @@ eeprom: eeprom@50 { ...@@ -156,20 +152,16 @@ eeprom: eeprom@50 {
/* Exposed to UEXT2 */ /* Exposed to UEXT2 */
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
}; };
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>;
...@@ -177,8 +169,6 @@ &mmc0 { ...@@ -177,8 +169,6 @@ &mmc0 {
}; };
&mmc3 { &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&rtl_pwrseq>; mmc-pwrseq = <&rtl_pwrseq>;
bus-width = <4>; bus-width = <4>;
...@@ -203,8 +193,8 @@ &otg_sram { ...@@ -203,8 +193,8 @@ &otg_sram {
}; };
&pio { &pio {
bt_uart_pins: bt_uart_pins@0 { uart3_rts_pin: uart3-rts-pin {
pins = "PG6", "PG7", "PG8"; pins = "PG8";
function = "uart3"; function = "uart3";
}; };
}; };
...@@ -274,43 +264,43 @@ &reg_usb2_vbus { ...@@ -274,43 +264,43 @@ &reg_usb2_vbus {
/* Exposed to UEXT1 */ /* Exposed to UEXT1 */
&spi1 { &spi1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi1_pins_a>, pinctrl-0 = <&spi1_pi_pins>,
<&spi1_cs0_pins_a>; <&spi1_cs0_pi_pin>;
status = "okay"; status = "okay";
}; };
/* Exposed to UEXT2 */ /* Exposed to UEXT2 */
&spi2 { &spi2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi2_pins_a>, pinctrl-0 = <&spi2_pc_pins>,
<&spi2_cs0_pins_a>; <&spi2_cs0_pc_pin>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
/* Used for RTL8723BS bluetooth */ /* Used for RTL8723BS bluetooth */
&uart3 { &uart3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&bt_uart_pins>; pinctrl-0 = <&uart3_pg_pins>, <&uart3_rts_pin>;
status = "okay"; status = "okay";
}; };
/* Exposed to UEXT1 */ /* Exposed to UEXT1 */
&uart4 { &uart4 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart4_pins_a>; pinctrl-0 = <&uart4_pg_pins>;
status = "okay"; status = "okay";
}; };
/* Exposed to UEXT2 */ /* Exposed to UEXT2 */
&uart7 { &uart7 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart7_pins_a>; pinctrl-0 = <&uart7_pi_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
View file @ 2c94db38
...@@ -105,7 +105,7 @@ &ehci1 { ...@@ -105,7 +105,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
status = "okay"; status = "okay";
...@@ -126,8 +126,6 @@ hdmi_out_con: endpoint { ...@@ -126,8 +126,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -142,8 +140,6 @@ axp209: pmic@34 { ...@@ -142,8 +140,6 @@ axp209: pmic@34 {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
eeprom: eeprom@50 { eeprom: eeprom@50 {
...@@ -154,8 +150,6 @@ eeprom: eeprom@50 { ...@@ -154,8 +150,6 @@ eeprom: eeprom@50 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -175,24 +169,19 @@ &otg_sram { ...@@ -175,24 +169,19 @@ &otg_sram {
}; };
&pio { &pio {
ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 { led_pins_olinuxinolime: led-pins {
pins = "PC3";
function = "gpio_out";
};
led_pins_olinuxinolime: led_pins@0 {
pins = "PH2"; pins = "PH2";
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5"; pins = "PH5";
function = "gpio_in"; function = "gpio_in";
bias-pull-down; bias-pull-down;
...@@ -200,7 +189,6 @@ usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { ...@@ -200,7 +189,6 @@ usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
}; };
&reg_ahci_5v { &reg_ahci_5v {
pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>;
gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>; gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -219,7 +207,7 @@ &reg_usb2_vbus { ...@@ -219,7 +207,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
View file @ 2c94db38
...@@ -48,23 +48,12 @@ / { ...@@ -48,23 +48,12 @@ / {
compatible = "olimex,a20-olinuxino-lime2-emmc", "allwinner,sun7i-a20"; compatible = "olimex,a20-olinuxino-lime2-emmc", "allwinner,sun7i-a20";
mmc2_pwrseq: pwrseq { mmc2_pwrseq: pwrseq {
pinctrl-0 = <&mmc2_pins_nrst>;
pinctrl-names = "default";
compatible = "mmc-pwrseq-emmc"; compatible = "mmc-pwrseq-emmc";
reset-gpios = <&pio 2 16 GPIO_ACTIVE_LOW>; reset-gpios = <&pio 2 16 GPIO_ACTIVE_LOW>;
}; };
}; };
&pio {
mmc2_pins_nrst: mmc2-rst-pin {
pins = "PC16";
function = "gpio_out";
};
};
&mmc2 { &mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
vqmmc-supply = <&reg_vcc3v3>; vqmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
......
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
View file @ 2c94db38
...@@ -110,7 +110,7 @@ &ehci1 { ...@@ -110,7 +110,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
status = "okay"; status = "okay";
...@@ -131,8 +131,6 @@ hdmi_out_con: endpoint { ...@@ -131,8 +131,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -143,8 +141,6 @@ axp209: pmic@34 { ...@@ -143,8 +141,6 @@ axp209: pmic@34 {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
eeprom: eeprom@50 { eeprom: eeprom@50 {
...@@ -154,9 +150,11 @@ eeprom: eeprom@50 { ...@@ -154,9 +150,11 @@ eeprom: eeprom@50 {
}; };
}; };
&lradc {
vref-supply = <&reg_vcc3v0>;
};
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -176,37 +174,26 @@ &otg_sram { ...@@ -176,37 +174,26 @@ &otg_sram {
}; };
&pio { &pio {
ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 { led_pins_olinuxinolime: led-pins {
pins = "PC3";
function = "gpio_out";
};
led_pins_olinuxinolime: led_pins@0 {
pins = "PH2"; pins = "PH2";
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5"; pins = "PH5";
function = "gpio_in"; function = "gpio_in";
bias-pull-down; bias-pull-down;
}; };
usb0_vbus_pin_lime2: usb0_vbus_pin@0 {
pins = "PC17";
function = "gpio_out";
};
}; };
&reg_ahci_5v { &reg_ahci_5v {
pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>;
gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>; gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -254,7 +241,6 @@ &reg_ldo4 { ...@@ -254,7 +241,6 @@ &reg_ldo4 {
}; };
&reg_usb0_vbus { &reg_usb0_vbus {
pinctrl-0 = <&usb0_vbus_pin_lime2>;
gpio = <&pio 2 17 GPIO_ACTIVE_HIGH>; gpio = <&pio 2 17 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -269,7 +255,7 @@ &reg_usb2_vbus { ...@@ -269,7 +255,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts
View file @ 2c94db38
...@@ -54,8 +54,6 @@ mmc2_pwrseq: pwrseq { ...@@ -54,8 +54,6 @@ mmc2_pwrseq: pwrseq {
}; };
&mmc2 { &mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;
......
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
View file @ 2c94db38
...@@ -117,7 +117,7 @@ &ehci1 { ...@@ -117,7 +117,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>, <&gmac_txerr>; pinctrl-0 = <&gmac_mii_pins>, <&gmac_txerr>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
status = "okay"; status = "okay";
...@@ -138,8 +138,6 @@ hdmi_out_con: endpoint { ...@@ -138,8 +138,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -150,8 +148,6 @@ axp209: pmic@34 { ...@@ -150,8 +148,6 @@ axp209: pmic@34 {
}; };
&i2c1 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
eeprom: eeprom@50 { eeprom: eeprom@50 {
...@@ -162,8 +158,6 @@ eeprom: eeprom@50 { ...@@ -162,8 +158,6 @@ eeprom: eeprom@50 {
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
status = "okay"; status = "okay";
}; };
...@@ -171,49 +165,49 @@ &lradc { ...@@ -171,49 +165,49 @@ &lradc {
vref-supply = <&reg_vcc3v0>; vref-supply = <&reg_vcc3v0>;
status = "okay"; status = "okay";
button@191 { button-191 {
label = "Volume Up"; label = "Volume Up";
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
channel = <0>; channel = <0>;
voltage = <191274>; voltage = <191274>;
}; };
button@392 { button-392 {
label = "Volume Down"; label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
channel = <0>; channel = <0>;
voltage = <392644>; voltage = <392644>;
}; };
button@601 { button-601 {
label = "Menu"; label = "Menu";
linux,code = <KEY_MENU>; linux,code = <KEY_MENU>;
channel = <0>; channel = <0>;
voltage = <601151>; voltage = <601151>;
}; };
button@795 { button-795 {
label = "Search"; label = "Search";
linux,code = <KEY_SEARCH>; linux,code = <KEY_SEARCH>;
channel = <0>; channel = <0>;
voltage = <795090>; voltage = <795090>;
}; };
button@987 { button-987 {
label = "Home"; label = "Home";
linux,code = <KEY_HOMEPAGE>; linux,code = <KEY_HOMEPAGE>;
channel = <0>; channel = <0>;
voltage = <987387>; voltage = <987387>;
}; };
button@1184 { button-1184 {
label = "Esc"; label = "Esc";
linux,code = <KEY_ESC>; linux,code = <KEY_ESC>;
channel = <0>; channel = <0>;
voltage = <1184678>; voltage = <1184678>;
}; };
button@1398 { button-1398 {
label = "Enter"; label = "Enter";
linux,code = <KEY_ENTER>; linux,code = <KEY_ENTER>;
channel = <0>; channel = <0>;
...@@ -222,8 +216,6 @@ button@1398 { ...@@ -222,8 +216,6 @@ button@1398 {
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -231,8 +223,6 @@ &mmc0 { ...@@ -231,8 +223,6 @@ &mmc0 {
}; };
&mmc3 { &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olinuxinom>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */ cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */
...@@ -252,30 +242,24 @@ &otg_sram { ...@@ -252,30 +242,24 @@ &otg_sram {
}; };
&pio { &pio {
gmac_txerr: gmac_txerr@0 { gmac_txerr: gmac-txerr-pin {
pins = "PA17"; pins = "PA17";
function = "gmac"; function = "gmac";
}; };
mmc3_cd_pin_olinuxinom: mmc3_cd_pin@0 { led_pins_olinuxino: led-pins {
pins = "PH11";
function = "gpio_in";
bias-pull-up;
};
led_pins_olinuxino: led_pins@0 {
pins = "PH2"; pins = "PH2";
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5"; pins = "PH5";
function = "gpio_in"; function = "gpio_in";
bias-pull-down; bias-pull-down;
...@@ -331,33 +315,33 @@ &reg_usb2_vbus { ...@@ -331,33 +315,33 @@ &reg_usb2_vbus {
&spi1 { &spi1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi1_pins_a>, pinctrl-0 = <&spi1_pi_pins>,
<&spi1_cs0_pins_a>; <&spi1_cs0_pi_pin>;
status = "okay"; status = "okay";
}; };
&spi2 { &spi2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi2_pins_a>, pinctrl-0 = <&spi2_pc_pins>,
<&spi2_cs0_pins_a>; <&spi2_cs0_pc_pin>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
&uart6 { &uart6 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart6_pins_a>; pinctrl-0 = <&uart6_pi_pins>;
status = "okay"; status = "okay";
}; };
&uart7 { &uart7 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart7_pins_a>; pinctrl-0 = <&uart7_pi_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
View file @ 2c94db38
...@@ -74,8 +74,6 @@ hdmi_con_in: endpoint { ...@@ -74,8 +74,6 @@ hdmi_con_in: endpoint {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_orangepi>;
green { green {
label = "orangepi:green:usr"; label = "orangepi:green:usr";
...@@ -90,8 +88,6 @@ blue { ...@@ -90,8 +88,6 @@ blue {
reg_gmac_3v3: gmac-3v3 { reg_gmac_3v3: gmac-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&gmac_power_pin_orangepi>;
regulator-name = "gmac-3v3"; regulator-name = "gmac-3v3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -123,7 +119,7 @@ &ehci1 { ...@@ -123,7 +119,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-supply = <&reg_gmac_3v3>; phy-supply = <&reg_gmac_3v3>;
...@@ -145,8 +141,6 @@ hdmi_out_con: endpoint { ...@@ -145,8 +141,6 @@ hdmi_out_con: endpoint {
}; };
&i2c0 { &i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -160,13 +154,11 @@ axp209: pmic@34 { ...@@ -160,13 +154,11 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_orangepi>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
...@@ -174,8 +166,6 @@ &mmc0 { ...@@ -174,8 +166,6 @@ &mmc0 {
}; };
&mmc3 { &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_orangepi>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */ cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */
...@@ -187,43 +177,11 @@ &otg_sram { ...@@ -187,43 +177,11 @@ &otg_sram {
}; };
&pio { &pio {
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
mmc0_cd_pin_orangepi: mmc0_cd_pin@0 {
pins = "PH10";
function = "gpio_in";
bias-pull-up;
};
mmc3_cd_pin_orangepi: mmc3_cd_pin@0 {
pins = "PH11";
function = "gpio_in";
bias-pull-up;
};
usb2_vbus_pin_bananapro: usb2_vbus_pin@0 {
pins = "PH22";
function = "gpio_out";
};
gmac_power_pin_orangepi: gmac_power_pin@0 {
pins = "PH23";
function = "gpio_out";
};
led_pins_orangepi: led_pins@0 {
pins = "PH24", "PH25";
function = "gpio_out";
};
usb1_vbus_pin_bananapro: usb1_vbus_pin@0 {
pins = "PH26";
function = "gpio_out";
};
}; };
&reg_dcdc2 { &reg_dcdc2 {
...@@ -256,20 +214,18 @@ &reg_usb0_vbus { ...@@ -256,20 +214,18 @@ &reg_usb0_vbus {
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_bananapro>;
gpio = <&pio 7 26 GPIO_ACTIVE_HIGH>; /* PH26 */ gpio = <&pio 7 26 GPIO_ACTIVE_HIGH>; /* PH26 */
status = "okay"; status = "okay";
}; };
&reg_usb2_vbus { &reg_usb2_vbus {
pinctrl-0 = <&usb2_vbus_pin_bananapro>;
gpio = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */ gpio = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-orangepi.dts
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/sun7i-a20-pcduino3.dts
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/sun7i-a20.dtsi
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/sun8i-a23-a33.dtsi
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/sun8i-a23-evb.dts
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts
View file @ 2c94db38
...@@ -63,7 +63,7 @@ &touchscreen { ...@@ -63,7 +63,7 @@ &touchscreen {
}; };
&lradc { &lradc {
button@600 { button-600 {
label = "Back"; label = "Back";
linux,code = <KEY_BACK>; linux,code = <KEY_BACK>;
channel = <0>; channel = <0>;
......
arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
View file @ 2c94db38
...@@ -54,8 +54,6 @@ aliases { ...@@ -54,8 +54,6 @@ aliases {
wifi_pwrseq: wifi_pwrseq { wifi_pwrseq: wifi_pwrseq {
compatible = "mmc-pwrseq-simple"; compatible = "mmc-pwrseq-simple";
pinctrl-names = "default";
pinctrl-0 = <&wifi_pwrseq_pin_mid2407>;
reset-gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */ reset-gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
/* The esp8089 needs 200 ms after driving wifi-en high */ /* The esp8089 needs 200 ms after driving wifi-en high */
post-power-on-delay-ms = <200>; post-power-on-delay-ms = <200>;
...@@ -71,7 +69,7 @@ mma7660: accelerometer@4c { ...@@ -71,7 +69,7 @@ mma7660: accelerometer@4c {
&mmc1 { &mmc1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>; pinctrl-0 = <&mmc1_pg_pins>;
vmmc-supply = <&reg_dldo1>; vmmc-supply = <&reg_dldo1>;
mmc-pwrseq = <&wifi_pwrseq>; mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>; bus-width = <4>;
...@@ -85,17 +83,6 @@ esp8089: sdio_wifi@1 { ...@@ -85,17 +83,6 @@ esp8089: sdio_wifi@1 {
}; };
}; };
&mmc1_pins_a {
bias-pull-up;
};
&r_pio {
wifi_pwrseq_pin_mid2407: wifi_pwrseq_pin@0 {
pins = "PL6";
function = "gpio_out";
};
};
&touchscreen { &touchscreen {
reg = <0x40>; reg = <0x40>;
compatible = "silead,gsl1680"; compatible = "silead,gsl1680";
......
arch/arm/boot/dts/sun8i-a23.dtsi
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/sun8i-a33-olinuxino.dts
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/sun8i-a33.dtsi
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/sun8i-a83t.dtsi
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/sun8i-h3.dtsi
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/sun8i-q8-common.dtsi
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/sun8i-r16-parrot.dts
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/sun8i-r40.dtsi
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/sun8i-t3-cqa3t-bv3.dts 0 → 100644
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/sun8i-v3s.dtsi
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/suniv-f1c100s-licheepi-nano.dts 0 → 100644
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/suniv-f1c100s.dtsi 0 → 100644
View file @ 2c94db38
This diff is collapsed.
arch/arm/boot/dts/sunxi-h3-h5.dtsi
View file @ 2c94db38
This diff is collapsed.
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7