kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

This:

Browse source 
- Corrects the debounce interval on some nodes
 - Drops the U8540/U9540 device trees
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJa7CUMAAoJEEEQszewGV1zar4QALZpu0kRn1lRcmBDl+imN8z/
 yx0zwY31NLRkAJe5l9/DCuRVn9M+f0phbU0DsnUjqxLJWuIN/EM/NOOJBPmOKNOp
 0u4qXvK18Aha4dfdOHU41P36xm5OgrLM3jhr2PLY1K4c8qrSYAwonsTSpE741wiC
 qYRaAcDLB3gJbABaAl43OIEzY7Mh041U9VPCVWG3Q+L2fgkdkr723TCjrXXqUCFO
 RJkP0Bxg0v6NRaWmWSUH4/fak26pHDfBiMLN2cgdMj3NGEF8hyiglEeDvKDDpZTt
 /HaBlqyrctqcKCpD7DjLKD/gesq+SqOK520nPCMTCI6zO8ecP8oYSKYBHPaNZy57
 QDMABgqOuo0u11aDgRFasWA9v+GD9Rdt2Xmy5Cd6wSACBRoU4V+lFun8Xhu/wTtc
 ssPbRLXVZ85Vl2hC5g3JDtL014dXuNUg+mYAkjm2zBCo/Avkj4G44F7m4MyT6bmL
 G0+9fpOyKAMJaA+D5FSpdDrcsSbcYankpF7kqF3FAQbPn0aQORpp/TLGky29263H
 9oBRCUmSQZHNNmWxk+tZXIjY+6LoppPNWpB2pKhNulJJUtgN06egsgAFR2AK87qs
 GHVsrtVnhk6OPxQHNdLO9/eQmD7DCvU63HBwCV9/0v4jwqFrBVet/XWq2OOdZnhV
 xGEEIF0tVmASRbmDGnBq
 =OYnk
 -----END PGP SIGNATURE-----

Merge tag 'ux500-dts-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt

This:
- Corrects the debounce interval on some nodes
- Drops the U8540/U9540 device trees

* tag 'ux500-dts-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: Drop the U8540 device trees
  ARM: dts: Ux500: Fix "debounce-interval" property misspelling

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-05-14 01:15:49 -07:00
commit edb5203339
5 changed files with 6 additions and 377 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/boot/dts/Makefile
View file

@ -1054,9 +1054,7 @@ dtb-$(CONFIG_ARCH_U8500) += \
ste-hrefprev60-stuib.dtb \
ste-hrefprev60-tvk.dtb \
ste-hrefv60plus-stuib.dtb \
ste-hrefv60plus-tvk.dtb \
ste-ccu8540.dtb \
ste-ccu9540.dtb
ste-hrefv60plus-tvk.dtb
dtb-$(CONFIG_ARCH_UNIPHIER) += \
uniphier-ld4-ref.dtb \
uniphier-ld6b-ref.dtb \

196
arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi
View file

@ -1,196 +0,0 @@
/*
* Copyright 2012 ST-Ericsson
*
* The code contained herein is licensed under the GNU General Public
* License. You may obtain a copy of the GNU General Public License
* Version 2 or later at the following locations:
*
* http://www.opensource.org/licenses/gpl-license.html
* http://www.gnu.org/copyleft/gpl.html
*/
#include "ste-nomadik-pinctrl.dtsi"
/ {
soc {
pinctrl {
uart0 {
uart0_default_mux: uart0_mux {
default_mux {
function = "u0";
groups = "u0_a_1";
};
};
uart0_default_mode: uart0_default {
default_cfg1 {
pins = "GPIO0", "GPIO2";
ste,config = <&in_pu>;
};
default_cfg2 {
pins = "GPIO1", "GPIO3";
ste,config = <&out_hi>;
};
};
uart0_sleep_mode: uart0_sleep {
sleep_cfg1 {
pins = "GPIO0", "GPIO2";
ste,config = <&slpm_in_pu>;
};
sleep_cfg2 {
pins = "GPIO1", "GPIO3";
ste,config = <&slpm_out_hi>;
};
};
};
uart2 {
uart2_default_mode: uart2_default {
default_mux {
function = "u2";
groups = "u2txrx_a_1";
};
default_cfg1 {
pins = "GPIO120";
ste,config = <&in_pu>;
};
default_cfg2 {
pins = "GPIO121";
ste,config = <&out_hi>;
};
};
uart2_sleep_mode: uart2_sleep {
sleep_cfg1 {
pins = "GPIO120";
ste,config = <&slpm_in_pu>;
};
sleep_cfg2 {
pins = "GPIO121";
ste,config = <&slpm_out_hi>;
};
};
};
i2c0 {
i2c0_default_mux: i2c_mux {
default_mux {
function = "i2c0";
groups = "i2c0_a_1";
};
};
i2c0_default_mode: i2c_default {
default_cfg1 {
pins = "GPIO147", "GPIO148";
ste,config = <&in_pu>;
};
};
i2c0_sleep_mode: i2c_sleep {
sleep_cfg1 {
pins = "GPIO147", "GPIO148";
ste,config = <&slpm_in_pu>;
};
};
};
i2c1 {
i2c1_default_mux: i2c_mux {
default_mux {
function = "i2c1";
groups = "i2c1_b_2";
};
};
i2c1_default_mode: i2c_default {
default_cfg1 {
pins = "GPIO16", "GPIO17";
ste,config = <&in_pu>;
};
};
i2c1_sleep_mode: i2c_sleep {
sleep_cfg1 {
pins = "GPIO16", "GPIO17";
ste,config = <&slpm_in_pu>;
};
};
};
i2c2 {
i2c2_default_mux: i2c_mux {
default_mux {
function = "i2c2";
groups = "i2c2_b_2";
};
};
i2c2_default_mode: i2c_default {
default_cfg1 {
pins = "GPIO10", "GPIO11";
ste,config = <&in_pu>;
};
};
i2c2_sleep_mode: i2c_sleep {
sleep_cfg1 {
pins = "GPIO11", "GPIO11";
ste,config = <&slpm_in_pu>;
};
};
};
i2c4 {
i2c4_default_mux: i2c_mux {
default_mux {
function = "i2c4";
groups = "i2c4_b_2";
};
};
i2c4_default_mode: i2c_default {
default_cfg1 {
pins = "GPIO122", "GPIO123";
ste,config = <&in_pu>;
};
};
i2c4_sleep_mode: i2c_sleep {
sleep_cfg1 {
pins = "GPIO122", "GPIO123";
ste,config = <&slpm_in_pu>;
};
};
};
i2c5 {
i2c5_default_mux: i2c_mux {
default_mux {
function = "i2c5";
groups = "i2c5_c_2";
};
};
i2c5_default_mode: i2c_default {
default_cfg1 {
pins = "GPIO118", "GPIO119";
ste,config = <&in_pu>;
};
};
i2c5_sleep_mode: i2c_sleep {
sleep_cfg1 {
pins = "GPIO118", "GPIO119";
ste,config = <&slpm_in_pu>;
};
};
};
};
};
};

94
arch/arm/boot/dts/ste-ccu8540.dts
View file

@ -1,94 +0,0 @@
/*
* Copyright 2013 ST-Ericsson AB
*
* The code contained herein is licensed under the GNU General Public
* License. You may obtain a copy of the GNU General Public License
* Version 2 or later at the following locations:
*
* http://www.opensource.org/licenses/gpl-license.html
* http://www.gnu.org/copyleft/gpl.html
*/
/dts-v1/;
#include "ste-dbx5x0.dtsi"
#include "ste-ccu8540-pinctrl.dtsi"
/ {
model = "ST-Ericsson U8540 platform with Device Tree";
compatible = "st-ericsson,ccu8540", "st-ericsson,u8540";
/* This stablilizes the serial port enumeration */
aliases {
serial0 = &ux500_serial0;
serial1 = &ux500_serial1;
serial2 = &ux500_serial2;
};
memory@0 {
device_type = "memory";
reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>;
};
soc {
pinctrl {
compatible = "stericsson,db8540-pinctrl";
};
prcmu@80157000 {
reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x3000>;
reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";
};
uart@80120000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&uart0_default_mux>, <&uart0_default_mode>;
pinctrl-1 = <&uart0_sleep_mode>;
status = "okay";
};
uart@80121000 {
status = "okay";
};
uart@80007000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&uart2_default_mode>;
pinctrl-1 = <&uart2_sleep_mode>;
status = "okay";
};
i2c0: i2c@80004000 {
pinctrl-names = "default","sleep";
pinctrl-0 = <&i2c0_default_mux>, <&i2c0_default_mode>;
pinctrl-1 = <&i2c0_sleep_mode>;
};
i2c1: i2c@80122000 {
pinctrl-names = "default","sleep";
pinctrl-0 = <&i2c1_default_mux>, <&i2c1_default_mode>;
pinctrl-1 = <&i2c1_sleep_mode>;
};
i2c2: i2c@80128000 {
pinctrl-names = "default","sleep";
pinctrl-0 = <&i2c2_default_mux>, <&i2c2_default_mode>;
pinctrl-1 = <&i2c2_sleep_mode>;
};
i2c3: i2c@80110000 {
status = "disabled";
};
i2c4: i2c@8012a000 {
pinctrl-names = "default","sleep";
pinctrl-0 = <&i2c4_default_mux>, <&i2c4_default_mode>;
pinctrl-1 = <&i2c4_sleep_mode>;
};
i2c5: i2c@80001000 {
pinctrl-names = "default","sleep";
pinctrl-0 = <&i2c5_default_mux>, <&i2c5_default_mode>;
pinctrl-1 = <&i2c5_sleep_mode>;
};
};
};

79
arch/arm/boot/dts/ste-ccu9540.dts
View file

@ -1,79 +0,0 @@
/*
* Copyright 2012 ST-Ericsson AB
*
* The code contained herein is licensed under the GNU General Public
* License. You may obtain a copy of the GNU General Public License
* Version 2 or later at the following locations:
*
* http://www.opensource.org/licenses/gpl-license.html
* http://www.gnu.org/copyleft/gpl.html
*/
/dts-v1/;
#include "ste-dbx5x0.dtsi"
/ {
model = "ST-Ericsson CCU9540 platform with Device Tree";
compatible = "st-ericsson,ccu9540", "st-ericsson,u9540";
/* This stablilizes the serial port enumeration */
aliases {
serial0 = &ux500_serial0;
serial1 = &ux500_serial1;
serial2 = &ux500_serial2;
};
memory {
reg = <0x00000000 0x20000000>;
};
soc {
uart@80120000 {
status = "okay";
};
uart@80121000 {
status = "okay";
};
uart@80007000 {
status = "okay";
};
// External Micro SD slot
sdi0_per1@80126000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <4>;
cap-sd-highspeed;
cap-mmc-highspeed;
vmmc-supply = <&ab8500_ldo_aux3_reg>;
cd-gpios = <&gpio7 6 GPIO_ACTIVE_HIGH>; // 230
cd-inverted;
status = "okay";
};
// WLAN SDIO channel
sdi1_per2@80118000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <4>;
status = "okay";
};
// On-board eMMC
sdi4_per2@80114000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <8>;
cap-mmc-highspeed;
vmmc-supply = <&ab8500_ldo_aux2_reg>;
status = "okay";
};
};
};

10
arch/arm/boot/dts/ste-snowball.dts
View file

@ -46,35 +46,35 @@
#size-cells = <0>;
button@1 {
debounce_interval = <50>;
debounce-interval = <50>;
wakeup-source;
linux,code = <2>;
label = "userpb";
gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
};
button@2 {
debounce_interval = <50>;
debounce-interval = <50>;
wakeup-source;
linux,code = <3>;
label = "extkb1";
gpios = <&gpio4 23 GPIO_ACTIVE_HIGH>;
};
button@3 {
debounce_interval = <50>;
debounce-interval = <50>;
wakeup-source;
linux,code = <4>;
label = "extkb2";
gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>;
};
button@4 {
debounce_interval = <50>;
debounce-interval = <50>;
wakeup-source;
linux,code = <5>;
label = "extkb3";
gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
};
button@5 {
debounce_interval = <50>;
debounce-interval = <50>;
wakeup-source;
linux,code = <6>;
label = "extkb4";