Update for 4.20.3 dts changes

This commit is contained in:
jmcneill 2019-01-22 15:28:45 +00:00
parent 162ca8bc14
commit 41b86294f5
3 changed files with 9 additions and 136 deletions

View File

@ -1,6 +1,6 @@
#include "../../../external/gpl2/dts/dist/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts"
#include "../../../external/gpl2/dts/dist/arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts"
/ {
soc {

View File

@ -1,7 +1,7 @@
/* $NetBSD: sun50i-a64-pinebook.dts,v 1.13 2018/11/11 11:44:53 mrg Exp $ */
/* $NetBSD: sun50i-a64-pinebook.dts,v 1.14 2019/01/22 15:28:45 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcneill@invisible.ca>
* Copyright (c) 2017-2019 Jared McNeill <jmcneill@invisible.ca>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -26,9 +26,7 @@
* SUCH DAMAGE.
*/
/dts-v1/;
#include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi"
#include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts"
#include "sun50i-a64.dtsi"
#include <dt-bindings/gpio/gpio.h>
@ -37,48 +35,22 @@
#include <dt-bindings/pwm/pwm.h>
/ {
model = "Pine64 Pinebook";
compatible = "pine64,pinebook", "allwinner,sun50i-a64";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
framebuffer@0 {
allwinner,pipeline = "mixer0-lcd0";
};
};
gpio_keys {
compatible = "gpio-keys";
lid_switch {
label = "Lid Switch";
/*
* This is listed as PL12 in 4.20.3 sources, but
* we have used PH10 all along.
*/
gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
linux,input-type = <EV_SW>;
linux,code = <SW_LID>;
linux,can-disable;
};
};
backlight: backlight {
compatible = "pwm-backlight";
pwms = <&pwm 0 50000 0>;
brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
default-brightness-level = <3>;
enable-gpios = <&pio 3 23 GPIO_ACTIVE_HIGH>; /* PD23 */
};
reg_vcc3v3: vcc3v3 {
regulator-fixed;
regulator-name = "vcc3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
sound_spdif {
status = "disabled";
};
@ -101,22 +73,6 @@
status = "disabled";
};
&ehci0 {
status = "okay";
};
&ehci1 {
status = "okay";
};
&ohci0 {
status = "okay";
};
&ohci1 {
status = "okay";
};
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
@ -130,74 +86,6 @@
};
};
&usb_otg {
dr_mode = "host";
status = "okay";
};
&usbphy {
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
disable-wp;
bus-width = <4>;
status = "okay";
};
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <&reg_dldo4>;
vqmmc-supply = <&reg_eldo1>;
bus-width = <4>;
non-removable;
status = "okay";
rtl8723cs: wifi@1 {
reg = <1>;
};
};
&mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&reg_dcdc1>;
bus-width = <8>;
non-removable;
cap-mmc-hw-reset;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
status = "okay";
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins>;
status = "okay";
};
&r_rsb {
status = "okay";
axp803: pmic@3a3 {
compatible = "x-powers,axp803";
reg = <0x3a3>;
interrupt-parent = <&r_intc>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
};
};
#include "axp803.dtsi"
&codec {
allwinner,pa-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
status = "okay";

View File

@ -1,4 +1,4 @@
/* $NetBSD: sun50i-a64.dtsi,v 1.9 2018/05/11 00:00:04 jmcneill Exp $ */
/* $NetBSD: sun50i-a64.dtsi,v 1.10 2019/01/22 15:28:45 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcneill@invisible.ca>
@ -63,14 +63,6 @@
};
soc {
pwm: pwm@1c21400 {
compatible = "allwinner,sun50i-a64-pwm";
reg = <0x01c21400 0x8>;
clocks = <&osc24M>;
#pwm-cells = <3>;
status = "disabled";
};
dai: dai@1c22c00 {
#sound-dai-cells = <0>;
compatible = "allwinner,sun50i-a64-acodec-i2s";
@ -116,10 +108,3 @@
&cpu0 {
clocks = <&ccu 1>; /* 1=CLK_PLL_CPUX */
};
&pio {
pwm0_pins: pwm0 {
pins = "PD22";
function = "pwm";
};
};