mirror of https://gitee.com/openkylin/linux.git
Allwinner DT changes for 4.21 - round 2
This is a small pull request for some lingering things that didn't make the first round of patches. First, the new suniv device tree included device tree headers for the clock and reset indices. These header filers are going in through the clock tree. Thus with the dt and core branches in arm-soc alone, it doesn't build. One fix is included to remove the #include statements. The defined macros aren't used yet as they were properly removed during the review phase. Second, Bluetooth using Broadcom (now Cypress) chips connected to UARTs on various boards is enabled using serdev and the updated bindings for Broadcom Bluetooth. The patch series had been sitting on the mailing lists for a month, and the driver bits were just merged on 2018/12/19. -----BEGIN PGP SIGNATURE----- iQJCBAABCgAsFiEE2nN1m/hhnkhOWjtHOJpUIZwPJDAFAlwaELsOHHdlbnNAY3Np ZS5vcmcACgkQOJpUIZwPJDDIihAAmC72IrJ/hVJIToGoZfl/fUdqVcr82K04SsH0 6jeIKVR3l8okb1xwA22bkq/VXppVz71cadvAPQzq9V+HrUS+tUyTkxWjW17pCFjb Bbbfbt7gV2Ki9wvPqZv0QCUA7jnWvUHYcuwWJC079D6FYFYbTs/LKvJfdKMAQ30d ptjWXFqiEwQ/AQ5/F1sCVxQdCLdW4tFAW+GMT+MjFGy1HTRdYbur3RMGYVcHIaNr 3SFxffNkfDFeKlGOC1mV8S2bqr85ChXnVbzyw6kg4EmrpP3TSgEAgJjz/7H6kVB8 LE6t1C1+slN+MzdcBr1YihIOA1gCOuf6BRDBN2+dPcmi9+XkrctgPmh2cdOs7x44 YbD4kc4pETa8XNB+BXZD4jspBK4sLFymczsHu2wySS8m0tI13Cdcy/p5Khr3iwJY 5N3U82H5jQjub1RE91xjXVWesMAzmX6dOI1mOzz252dSds5MZNUoGZywzX/pZ16/ jKDR1kCO8JmZJxFf8ip+rRAT+QzKbZ73uCisca5lHuE73NyRQgWXBtfKAM5RArQu 9CWRhiXxM0SuJ6cFb3lDS/v1FU0sZZhNLH3f8BeSw/pbzeHoR3+YQMbCKPq0vPu5 1x7Y0xbSAeU4UljmJjYyvhNAOSYYaZiCDj7fkDrcPeplVg/7QckV+kTynrQ5VrdN 9+jS6Ss= =FiER -----END PGP SIGNATURE----- Merge tag 'sunxi-dt-for-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt Allwinner DT changes for 4.21 - round 2 This is a small pull request for some lingering things that didn't make the first round of patches. First, the new suniv device tree included device tree headers for the clock and reset indices. These header filers are going in through the clock tree. Thus with the dt and core branches in arm-soc alone, it doesn't build. One fix is included to remove the #include statements. The defined macros aren't used yet as they were properly removed during the review phase. Second, Bluetooth using Broadcom (now Cypress) chips connected to UARTs on various boards is enabled using serdev and the updated bindings for Broadcom Bluetooth. The patch series had been sitting on the mailing lists for a month, and the driver bits were just merged on 2018/12/19. * tag 'sunxi-dt-for-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: ARM: dts: sunxi: Enable Broadcom-based Bluetooth for multiple boards ARM: dts: suniv: Fix improper bindings include patch Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
984199efb0
|
@ -99,6 +99,8 @@ green {
|
|||
mmc3_pwrseq: mmc3_pwrseq {
|
||||
compatible = "mmc-pwrseq-simple";
|
||||
reset-gpios = <&pio 7 9 GPIO_ACTIVE_LOW>; /* PH9 WIFI_EN */
|
||||
clocks = <&ccu CLK_OUT_A>;
|
||||
clock-names = "ext_clock";
|
||||
};
|
||||
|
||||
sound {
|
||||
|
@ -227,6 +229,12 @@ &otg_sram {
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&pio {
|
||||
/* Pin outputs low power clock for WiFi and BT */
|
||||
pinctrl-0 = <&clk_out_a_pin>;
|
||||
pinctrl-names = "default";
|
||||
};
|
||||
|
||||
&pwm {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pwm0_pin>, <&pwm1_pin>;
|
||||
|
@ -298,6 +306,23 @@ &uart0 {
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&uart2 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&uart2_pi_pins>, <&uart2_cts_rts_pi_pins>;
|
||||
uart-has-rtscts;
|
||||
status = "okay";
|
||||
|
||||
bluetooth {
|
||||
compatible = "brcm,bcm20702a1";
|
||||
clocks = <&ccu CLK_OUT_A>;
|
||||
clock-names = "lpo";
|
||||
device-wakeup-gpios = <&pio 7 24 GPIO_ACTIVE_LOW>; /* PH24 */
|
||||
host-wakeup-gpios = <&pio 7 25 GPIO_ACTIVE_LOW>; /* PH25 */
|
||||
shutdown-gpios = <&pio 7 18 GPIO_ACTIVE_HIGH>; /* PH18 */
|
||||
max-speed = <1500000>;
|
||||
};
|
||||
};
|
||||
|
||||
&usb_otg {
|
||||
dr_mode = "otg";
|
||||
status = "okay";
|
||||
|
|
|
@ -363,6 +363,24 @@ &uart0 {
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&uart1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
|
||||
uart-has-rtscts;
|
||||
status = "okay";
|
||||
|
||||
bluetooth {
|
||||
compatible = "brcm,bcm43438-bt";
|
||||
clocks = <&ac100_rtc 1>;
|
||||
clock-names = "lpo";
|
||||
vbat-supply = <®_dldo1>;
|
||||
vddio-supply = <®_dldo1>;
|
||||
device-wakeup-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */
|
||||
host-wakeup-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */
|
||||
shutdown-gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
|
||||
};
|
||||
};
|
||||
|
||||
&usbphy {
|
||||
usb1_vbus-supply = <®_usb1_vbus>;
|
||||
status = "okay";
|
||||
|
|
|
@ -394,6 +394,24 @@ &uart0 {
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&uart1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
|
||||
uart-has-rtscts;
|
||||
status = "okay";
|
||||
|
||||
bluetooth {
|
||||
compatible = "brcm,bcm4330-bt";
|
||||
clocks = <&ac100_rtc 1>;
|
||||
clock-names = "lpo";
|
||||
vbat-supply = <®_dcdc1>;
|
||||
vddio-supply = <®_sw>;
|
||||
device-wakeup-gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
|
||||
host-wakeup-gpios = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */
|
||||
shutdown-gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
|
||||
};
|
||||
};
|
||||
|
||||
&usbphy {
|
||||
usb1_vbus-supply = <®_usb1_vbus>;
|
||||
usb2_vbus-supply = <®_usb2_vbus>;
|
||||
|
|
|
@ -91,6 +91,8 @@ reg_vcc5v0: vcc5v0 {
|
|||
wifi_pwrseq: wifi_pwrseq {
|
||||
compatible = "mmc-pwrseq-simple";
|
||||
reset-gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL06 */
|
||||
clocks = <&rtc 1>;
|
||||
clock-names = "ext_clock";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -276,7 +278,19 @@ &uart0 {
|
|||
&uart1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&uart1_pg_pins>, <&uart1_cts_rts_pg_pins>;
|
||||
uart-has-rtscts;
|
||||
status = "okay";
|
||||
|
||||
bluetooth {
|
||||
compatible = "brcm,bcm43438-bt";
|
||||
clocks = <&rtc 1>;
|
||||
clock-names = "lpo";
|
||||
vbat-supply = <®_dldo1>;
|
||||
vddio-supply = <®_aldo3>;
|
||||
device-wakeup-gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
|
||||
host-wakeup-gpios = <&r_pio 0 9 GPIO_ACTIVE_HIGH>; /* PL9 */
|
||||
shutdown-gpios = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */
|
||||
};
|
||||
};
|
||||
|
||||
&usb_otg {
|
||||
|
|
Loading…
Reference in New Issue