Skip to content

Commit

Permalink
Merge tag 'sunxi-dt-for-4.9-3' of https://git.kernel.org/pub/scm/linu…
Browse files Browse the repository at this point in the history 
…x/kernel/git/mripard/linux into next/late

Pull "Allwinner DT changes for 4.9, late edition" from Maxime Ripard:

Here is a bunch of late changes for the 4.9 merge window, mostly:
  - Added a bunch of touchscreens nodes to tablets
  - Added support for the AXP806 PMIC found in the A80 boards
  - Enabled a few pinmux options for the H3

* tag 'sunxi-dt-for-4.9-3' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: dts: sun8i: Add accelerometer to polaroid-mid2407pxe03
  ARM: dts: sun8i: enable UART1 for iNet D978 Rev2 board
  ARM: dts: sun8i: add pinmux for UART1 at PG
  dts: sun8i-h3: add I2C0-2 peripherals to H3 SOC
  dts: sun8i-h3: add pinmux definitions for I2C0-2
  dts: sun8i-h3: associate exposed UARTs on Orange Pi Boards
  dts: sun8i-h3: split off RTS/CTS for UART1 in seperate pinmux
  dts: sun8i-h3: add pinmux definitions for UART2-3
  ARM: dts: sun9i: a80-optimus: Disable EHCI1
  ARM: dts: sun9i: cubieboard4: Add AXP806 PMIC device node and regulators
  ARM: dts: sun9i: a80-optimus: Add AXP806 PMIC device node and regulators
  ARM: dts: sun9i: cubieboard4: Declare AXP809 SW regulator as unused
  ARM: dts: sun9i: a80-optimus: Declare AXP809 SW regulator as unused
  ARM: dts: sun8i: Add touchscreen node for sun8i-a33-ga10h
  ARM: dts: sun8i: Add touchscreen node for sun8i-a23-polaroid-mid2809pxe04
  ARM: dts: sun8i: Add touchscreen node for sun8i-a23-polaroid-mid2407pxe03
  ARM: dts: sun8i: Add touchscreen node for sun8i-a23-inet86dz
  ARM: dts: sun8i: Add touchscreen node for sun8i-a23-gt90h
  • Loading branch information
Arnd Bergmann committed Sep 21, 2016
2 parents c3a6627 + 90cb4b8 commit 1a66b85
Show file tree
Hide file tree
Showing 14 changed files with 468 additions and 5 deletions.
10 changes: 10 additions & 0 deletions arch/arm/boot/dts/sun8i-a23-a33.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,16 @@
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};

uart1_pins_a: uart1@0 {
allwinner,pins = "PG6", "PG7";
allwinner,function = "uart1";
};

uart1_pins_cts_rts_a: uart1-cts-rts@0 {
allwinner,pins = "PG8", "PG9";
allwinner,function = "uart1";
};

mmc0_pins_a: mmc0@0 {
allwinner,pins = "PF0", "PF1", "PF2",
"PF3", "PF4", "PF5";
Expand Down
9 changes: 9 additions & 0 deletions arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@
status = "okay";
};

&touchscreen {
reg = <0x40>;
compatible = "silead,gsl3675";
firmware-name = "gsl3675-gt90h.fw";
touchscreen-size-x = <1792>;
touchscreen-size-y = <1024>;
status = "okay";
};

&lradc {
button@600 {
label = "Back";
Expand Down
9 changes: 9 additions & 0 deletions arch/arm/boot/dts/sun8i-a23-inet86dz.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@
status = "okay";
};

&touchscreen {
reg = <0x40>;
compatible = "silead,gsl1680";
firmware-name = "gsl1680-inet86dz.fw";
touchscreen-size-x = <960>;
touchscreen-size-y = <640>;
status = "okay";
};

&usbphy {
usb1_vbus-supply = <&reg_dldo1>;
};
26 changes: 26 additions & 0 deletions arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@
};
};

&i2c1 {
mma7660: accelerometer@4c {
reg = <0x4c>;
compatible = "fsl,mma7660";
};
};

&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
Expand Down Expand Up @@ -90,3 +97,22 @@
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};
};

&reg_ldo_io1 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-name = "vcc-touchscreen";
status = "okay";
};

&touchscreen {
reg = <0x40>;
compatible = "silead,gsl1680";
firmware-name = "gsl1680-polaroid-mid2407pxe03.fw";
touchscreen-size-x = <960>;
touchscreen-size-y = <640>;
touchscreen-inverted-x;
touchscreen-inverted-y;
vddio-supply = <&reg_ldo_io1>;
status = "okay";
};
9 changes: 9 additions & 0 deletions arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,12 @@
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};
};

&touchscreen {
reg = <0x40>;
compatible = "silead,gsl3670";
firmware-name = "gsl3670-polaroid-mid2809pxe04.fw";
touchscreen-size-x = <1660>;
touchscreen-size-y = <890>;
status = "okay";
};
10 changes: 10 additions & 0 deletions arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,16 @@
status = "okay";
};

&touchscreen {
reg = <0x40>;
compatible = "silead,gsl3675";
firmware-name = "gsl3675-ga10h.fw";
touchscreen-size-x = <1630>;
touchscreen-size-y = <990>;
touchscreen-inverted-y;
status = "okay";
};

&lradc {
button@600 {
label = "Back";
Expand Down
20 changes: 20 additions & 0 deletions arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,15 @@
model = "INet-D978 Rev 02";
compatible = "primux,inet-d978-rev2", "allwinner,sun8i-a33";

aliases {
serial0 = &uart1;
};

chosen {
/* Delete debug UART as serial0 is the UART for bluetooth */
/delete-property/stdout-path;
};

leds {
compatible = "gpio-leds";
pinctrl-names = "default";
Expand Down Expand Up @@ -86,3 +95,14 @@
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};
};

&r_uart {
status = "disabled";
};

&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_a>,
<&uart1_pins_cts_rts_a>;
status = "okay";
};
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@

&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_a>;
pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
status = "okay";
};

Expand Down
18 changes: 18 additions & 0 deletions arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,24 @@
status = "okay";
};

&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins>;
status = "disabled";
};

&uart2 {
pinctrl-names = "default";
pinctrl-0 = <&uart2_pins>;
status = "disabled";
};

&uart3 {
pinctrl-names = "default";
pinctrl-0 = <&uart3_pins>;
status = "disabled";
};

&usb1_vbus_pin_a {
allwinner,pins = "PG13";
};
Expand Down
18 changes: 18 additions & 0 deletions arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,24 @@
status = "okay";
};

&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins>;
status = "disabled";
};

&uart2 {
pinctrl-names = "default";
pinctrl-0 = <&uart2_pins>;
status = "disabled";
};

&uart3 {
pinctrl-names = "default";
pinctrl-0 = <&uart3_pins>;
status = "disabled";
};

&usbphy {
/* USB VBUS is always on */
status = "okay";
Expand Down
18 changes: 18 additions & 0 deletions arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,24 @@
status = "okay";
};

&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins>;
status = "disabled";
};

&uart2 {
pinctrl-names = "default";
pinctrl-0 = <&uart2_pins>;
status = "disabled";
};

&uart3 {
pinctrl-names = "default";
pinctrl-0 = <&uart3_pins>;
status = "disabled";
};

&usbphy {
/* USB VBUS is always on */
status = "okay";
Expand Down
85 changes: 83 additions & 2 deletions arch/arm/boot/dts/sun8i-h3.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,27 @@
interrupt-controller;
#interrupt-cells = <3>;

i2c0_pins: i2c0 {
allwinner,pins = "PA11", "PA12";
allwinner,function = "i2c0";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};

i2c1_pins: i2c1 {
allwinner,pins = "PA18", "PA19";
allwinner,function = "i2c1";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};

i2c2_pins: i2c2 {
allwinner,pins = "PE12", "PE13";
allwinner,function = "i2c2";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};

mmc0_pins_a: mmc0@0 {
allwinner,pins = "PF0", "PF1", "PF2", "PF3",
"PF4", "PF5";
Expand Down Expand Up @@ -367,12 +388,33 @@
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};

uart1_pins_a: uart1@0 {
allwinner,pins = "PG6", "PG7", "PG8", "PG9";
uart1_pins: uart1 {
allwinner,pins = "PG6", "PG7";
allwinner,function = "uart1";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};

uart1_rts_cts_pins: uart1_rts_cts {
allwinner,pins = "PG8", "PG9";
allwinner,function = "uart1";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};

uart2_pins: uart2 {
allwinner,pins = "PA0", "PA1";
allwinner,function = "uart2";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};

uart3_pins: uart3 {
allwinner,pins = "PG13", "PG14";
allwinner,function = "uart3";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};
};

timer@01c20c00 {
Expand Down Expand Up @@ -449,6 +491,45 @@
status = "disabled";
};

i2c0: i2c@01c2ac00 {
compatible = "allwinner,sun6i-a31-i2c";
reg = <0x01c2ac00 0x400>;
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_BUS_I2C0>;
resets = <&ccu RST_BUS_I2C0>;
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
};

i2c1: i2c@01c2b000 {
compatible = "allwinner,sun6i-a31-i2c";
reg = <0x01c2b000 0x400>;
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_BUS_I2C1>;
resets = <&ccu RST_BUS_I2C1>;
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
};

i2c2: i2c@01c2b400 {
compatible = "allwinner,sun6i-a31-i2c";
reg = <0x01c2b000 0x400>;
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_BUS_I2C2>;
resets = <&ccu RST_BUS_I2C2>;
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
};

gic: interrupt-controller@01c81000 {
compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";
reg = <0x01c81000 0x1000>,
Expand Down
Loading

0 comments on commit 1a66b85

Please sign in to comment.