From 1d3f99f5da50fbad5294a740e2f87f3622128fa6 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Thu, 6 Jun 2013 12:21:15 +0100 Subject: [PATCH 01/22] ARM: ux500: Fix trivial whitespace/tabbing issue Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/dbx5x0.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index a1529455f081..aa2246988e72 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -245,7 +245,7 @@ <22 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH"; status = "disabled"; - }; + }; db8500-prcmu-regulators { compatible = "stericsson,db8500-prcmu-regulator"; From 62ebfe6b5e954e4911009edbd45560d5a60ed855 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 7 Jun 2013 17:11:19 +0100 Subject: [PATCH 02/22] ARM: ux500: Add Device Tree nodes for AB8500 External regulators The AB8500 has 3 external regulators which are used to control outside voltage sources. Some of the core AB8500 use these external regulators as a supply, so they must be obtainable via Device Tree. Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/dbx5x0.dtsi | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index aa2246988e72..77abea56c112 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -457,6 +457,33 @@ stericsson,earpeice-cmv = <950>; /* Units in mV. */ }; + ext_regulators: ab8500-ext-regulators { + compatible = "stericsson,ab8500-ext-regulator"; + + ab8500_ext1_reg: ab8500_ext1 { + regulator-compatible = "ab8500_ext1"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + regulator-always-on; + }; + + ab8500_ext2_reg: ab8500_ext2 { + regulator-compatible = "ab8500_ext2"; + regulator-min-microvolt = <1360000>; + regulator-max-microvolt = <1360000>; + regulator-boot-on; + regulator-always-on; + }; + + ab8500_ext3_reg: ab8500_ext3 { + regulator-compatible = "ab8500_ext3"; + regulator-min-microvolt = <3400000>; + regulator-max-microvolt = <3400000>; + regulator-boot-on; + }; + }; + ab8500-regulators { compatible = "stericsson,ab8500-regulator"; From 75f0999a8ba36d8a270f5f4305cb1a10f843e834 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 7 Jun 2013 17:11:20 +0100 Subject: [PATCH 03/22] ARM: ux500: Provide a supply name for the AB8500 AUX regulators to use AB8500 AUX regulators are supplied by EXT3 on some boards. This supply phandle lookup will enable the regulator core to search for and locate the EXT3 supply at registration time. Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/dbx5x0.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index 77abea56c112..1c1091eedade 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -486,6 +486,7 @@ ab8500-regulators { compatible = "stericsson,ab8500-regulator"; + vin-supply = <&ab8500_ext3_reg>; // supplies to the display/camera ab8500_ldo_aux1_reg: ab8500_ldo_aux1 { From b0c8fade98ea6a21a083ee861365837f91f287a2 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 7 Jun 2013 17:11:21 +0100 Subject: [PATCH 04/22] ARM: ux500: Supply external regulator names for Snowball's DT Regulator names are platform independent, so they need to be applied to the base level platform DTS files *.dts. Here we're supplying the names for the newly described AB8500 external regulators. Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/snowball.dts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index 49824be66845..928a192efa8a 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -310,6 +310,20 @@ compatible = "stericsson,ab8500-gpio"; }; + ext_regulators: ab8500-ext-regulators { + ab8500_ext1_reg: ab8500_ext1 { + regulator-name = "ab8500-ext-supply1"; + }; + + ab8500_ext2_reg_reg: ab8500_ext2 { + regulator-name = "ab8500-ext-supply2"; + }; + + ab8500_ext3_reg_reg: ab8500_ext3 { + regulator-name = "ab8500-ext-supply3"; + }; + }; + ab8500-regulators { ab8500_ldo_aux1_reg: ab8500_ldo_aux1 { regulator-name = "V-DISPLAY"; From 5dc26af111e9e71f02ae769d4f74b3d0b9fb6e4d Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 10 Jun 2013 11:23:33 +0100 Subject: [PATCH 05/22] Documentation: Update binding for Nomadik and DBx5x based platforms Change compatible string to something more standard. Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt index 9a2f3f420526..6b33b9f18e88 100644 --- a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt +++ b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt @@ -1,8 +1,8 @@ ST Ericsson Nomadik pinmux controller Required properties: -- compatible: "stericsson,nmk-pinctrl", "stericsson,nmk-pinctrl-db8540", - "stericsson,nmk-pinctrl-stn8815" +- compatible: "stericsson,db8500-pinctrl", "stericsson,db8540-pinctrl", + "stericsson,stn8815-pinctrl" - reg: Should contain the register physical address and length of the PRCMU. Please refer to pinctrl-bindings.txt in this directory for details of the @@ -68,7 +68,7 @@ Optional subnode-properties: Example board file extract: pinctrl@80157000 { - compatible = "stericsson,nmk-pinctrl"; + compatible = "stericsson,db8500-pinctrl"; reg = <0x80157000 0x2000>; pinctrl-names = "default"; From 49c129519a7a8840767321c38d2eaf84a263529b Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Wed, 15 May 2013 10:51:28 +0100 Subject: [PATCH 06/22] ARM: ux500: Stop passing MMC's platform data for Device Tree boots It was required to pass DMA channel configuration information to the MMC driver before the new DMA API was in place. Now that it is, and is fully compatible with Device Tree we can stop doing that. Reviewed-by: Linus Walleij Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/mach-ux500/cpu-db8500.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 12eee8167525..2061b6a2a766 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -223,10 +223,10 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", NULL), OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", NULL), OF_DEV_AUXDATA("arm,pl022", 0x80002000, "ssp0", &ssp0_plat), - OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0", &mop500_sdi0_data), - OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1", &mop500_sdi1_data), - OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2", &mop500_sdi2_data), - OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4", &mop500_sdi4_data), + OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0", NULL), + OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1", NULL), + OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2", NULL), + OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4", NULL), /* Requires clock name bindings. */ OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e000, "gpio.0", NULL), OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e080, "gpio.1", NULL), From 3d0899e8dab638dd00a7a36b8620ec80bb812fea Mon Sep 17 00:00:00 2001 From: Gabriel Fernandez Date: Wed, 12 Jun 2013 16:35:34 +0200 Subject: [PATCH 07/22] ARM: u8540: Add Pinctrl Device Tree settings for uart0, uart2 This patch adds pinctrl device tree settings for uart0 and uart2 for ccu8540 board. Signed-off-by: Gabriel Fernandez Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ccu8540-pinctrl.dtsi | 81 ++++++++++++++++++ arch/arm/boot/dts/ccu8540.dts | 11 +++ arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi | 95 ++++++++++++++++++++++ include/dt-bindings/pinctrl/nomadik.h | 36 ++++++++ 4 files changed, 223 insertions(+) create mode 100644 arch/arm/boot/dts/ccu8540-pinctrl.dtsi create mode 100644 arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi create mode 100644 include/dt-bindings/pinctrl/nomadik.h diff --git a/arch/arm/boot/dts/ccu8540-pinctrl.dtsi b/arch/arm/boot/dts/ccu8540-pinctrl.dtsi new file mode 100644 index 000000000000..644b189f8f72 --- /dev/null +++ b/arch/arm/boot/dts/ccu8540-pinctrl.dtsi @@ -0,0 +1,81 @@ +/* + * 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 { + ste,function = "u0"; + ste,pins = "u0_a_1"; + }; + }; + + uart0_default_mode: uart0_default { + default_cfg1 { + ste,pins = "GPIO0", "GPIO2"; + ste,config = <&in_pu>; + }; + + default_cfg2 { + ste,pins = "GPIO1", "GPIO3"; + ste,config = <&out_hi>; + }; + }; + + uart0_sleep_mode: uart0_sleep { + sleep_cfg1 { + ste,pins = "GPIO0", "GPIO2"; + ste,config = <&slpm_in_pu>; + }; + + sleep_cfg2 { + ste,pins = "GPIO1", "GPIO3"; + ste,config = <&slpm_out_hi>; + }; + }; + }; + + uart2 { + uart2_default_mode: uart2_default { + default_mux { + ste,function = "u2"; + ste,pins = "u2txrx_a_1"; + }; + + default_cfg1 { + ste,pins = "GPIO120"; + ste,config = <&in_pu>; + }; + + default_cfg2 { + ste,pins = "GPIO121"; + ste,config = <&out_hi>; + }; + }; + + uart2_sleep_mode: uart2_sleep { + sleep_cfg1 { + ste,pins = "GPIO120"; + ste,config = <&slpm_in_pu>; + }; + + sleep_cfg2 { + ste,pins = "GPIO121"; + ste,config = <&slpm_out_hi>; + }; + }; + }; + }; + }; +}; diff --git a/arch/arm/boot/dts/ccu8540.dts b/arch/arm/boot/dts/ccu8540.dts index 48ff03441f5a..3065fe4f60e5 100644 --- a/arch/arm/boot/dts/ccu8540.dts +++ b/arch/arm/boot/dts/ccu8540.dts @@ -11,6 +11,7 @@ /dts-v1/; #include "dbx5x0.dtsi" +#include "ccu8540-pinctrl.dtsi" / { model = "ST-Ericsson U8540 platform with Device Tree"; @@ -21,12 +22,19 @@ }; 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"; }; @@ -35,6 +43,9 @@ }; uart@80007000 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&uart2_default_mode>; + pinctrl-1 = <&uart2_sleep_mode>; status = "okay"; }; }; diff --git a/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi b/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi new file mode 100644 index 000000000000..efddee9403c4 --- /dev/null +++ b/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi @@ -0,0 +1,95 @@ +/* + * 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 + +/ { + in_nopull: in_nopull { + ste,input = ; + }; + + in_pu: input_pull_up { + ste,input = ; + }; + + in_pd: input_pull_down { + ste,input = ; + }; + + out_hi: output_high { + ste,output = ; + }; + + out_lo: output_low { + ste,output = ; + }; + + gpio_out_lo: gpio_output_low { + ste,gpio = ; + ste,output = ; + }; + + slpm_in_pu: slpm_in_pu { + ste,sleep = ; + ste,sleep-input = ; + ste,sleep-wakeup = ; + }; + + slpm_in_wkup_pdis: slpm_in_wkup_pdis { + ste,sleep = ; + ste,sleep-input = ; + ste,sleep-wakeup = ; + ste,sleep-pull-disable = ; + }; + + slpm_out_lo: slpm_out_lo { + ste,sleep = ; + ste,sleep-output = ; + ste,sleep-wakeup = ; + }; + + slpm_out_hi: slpm_out_hi { + ste,sleep = ; + ste,sleep-output = ; + ste,sleep-wakeup = ; + }; + + slpm_out_hi_wkup_pdis: slpm_out_hi_wkup_pdis { + ste,sleep = ; + ste,sleep-output = ; + ste,sleep-wakeup = ; + ste,sleep-pull-disable = ; + }; + + slpm_out_wkup_pdis: slpm_out_wkup_pdis { + ste,sleep = ; + ste,sleep-output = ; + ste,sleep-wakeup = ; + ste,sleep-pull-disable = ; + }; + + in_wkup_pdis: in_wkup_pdis { + ste,sleep-input = ; + ste,sleep-wakeup = ; + ste,sleep-pull-disable = ; + }; + + out_hi_wkup_pdis: out_hi_wkup_pdis { + ste,sleep-output = ; + ste,sleep-wakeup = ; + ste,sleep-pull-disable = ; + }; + + out_wkup_pdis: out_wkup_pdis { + ste,sleep-output = ; + ste,sleep-wakeup = ; + ste,sleep-pull-disable = ; + }; +}; diff --git a/include/dt-bindings/pinctrl/nomadik.h b/include/dt-bindings/pinctrl/nomadik.h new file mode 100644 index 000000000000..638fb321a1cb --- /dev/null +++ b/include/dt-bindings/pinctrl/nomadik.h @@ -0,0 +1,36 @@ +/* + * nomadik.h + * + * Copyright (C) ST-Ericsson SA 2013 + * Author: Gabriel Fernandez for ST-Ericsson. + * License terms: GNU General Public License (GPL), version 2 + */ + +#define INPUT_NOPULL 0 +#define INPUT_PULLUP 1 +#define INPUT_PULLDOWN 2 + +#define OUTPUT_LOW 0 +#define OUTPUT_HIGH 1 +#define DIR_OUTPUT 2 + +#define SLPM_DISABLED 0 +#define SLPM_ENABLED 1 + +#define SLPM_INPUT_NOPULL 0 +#define SLPM_INPUT_PULLUP 1 +#define SLPM_INPUT_PULLDOWN 2 +#define SLPM_DIR_INPUT 3 + +#define SLPM_OUTPUT_LOW 0 +#define SLPM_OUTPUT_HIGH 1 +#define SLPM_DIR_OUTPUT 2 + +#define SLPM_WAKEUP_DISABLE 0 +#define SLPM_WAKEUP_ENABLE 1 + +#define GPIOMODE_DISABLED 0 +#define GPIOMODE_ENABLED 1 + +#define SLPM_PDIS_DISABLED 0 +#define SLPM_PDIS_ENABLED 1 From e0dfe89d61be0953e558c56e076236d100d641f4 Mon Sep 17 00:00:00 2001 From: Gabriel Fernandez Date: Wed, 12 Jun 2013 16:35:35 +0200 Subject: [PATCH 08/22] ARM: u8540: DT: Set pinctrl mapping to i2c0,1,2,4 & 5 This patch configures pin map in device tree of i2c0, 1,2,4 & 5 for ccu8540 board. Signed-off-by: Gabriel Fernandez Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ccu8540-pinctrl.dtsi | 115 +++++++++++++++++++++++++ arch/arm/boot/dts/ccu8540.dts | 34 ++++++++ 2 files changed, 149 insertions(+) diff --git a/arch/arm/boot/dts/ccu8540-pinctrl.dtsi b/arch/arm/boot/dts/ccu8540-pinctrl.dtsi index 644b189f8f72..e0799966bc25 100644 --- a/arch/arm/boot/dts/ccu8540-pinctrl.dtsi +++ b/arch/arm/boot/dts/ccu8540-pinctrl.dtsi @@ -76,6 +76,121 @@ }; }; }; + + i2c0 { + i2c0_default_mux: i2c_mux { + default_mux { + ste,function = "i2c0"; + ste,pins = "i2c0_a_1"; + }; + }; + + i2c0_default_mode: i2c_default { + default_cfg1 { + ste,pins = "GPIO147", "GPIO148"; + ste,config = <&in_pu>; + }; + }; + + i2c0_sleep_mode: i2c_sleep { + sleep_cfg1 { + ste,pins = "GPIO147", "GPIO148"; + ste,config = <&slpm_in_pu>; + }; + }; + }; + + i2c1 { + i2c1_default_mux: i2c_mux { + default_mux { + ste,function = "i2c1"; + ste,pins = "i2c1_b_2"; + }; + }; + + i2c1_default_mode: i2c_default { + default_cfg1 { + ste,pins = "GPIO16", "GPIO17"; + ste,config = <&in_pu>; + }; + }; + + i2c1_sleep_mode: i2c_sleep { + sleep_cfg1 { + ste,pins = "GPIO16", "GPIO17"; + ste,config = <&slpm_in_pu>; + }; + }; + }; + + i2c2 { + i2c2_default_mux: i2c_mux { + default_mux { + ste,function = "i2c2"; + ste,pins = "i2c2_b_2"; + }; + }; + + i2c2_default_mode: i2c_default { + default_cfg1 { + ste,pins = "GPIO10", "GPIO11"; + ste,config = <&in_pu>; + }; + }; + + i2c2_sleep_mode: i2c_sleep { + sleep_cfg1 { + ste,pins = "GPIO11", "GPIO11"; + ste,config = <&slpm_in_pu>; + }; + }; + }; + + i2c4 { + i2c4_default_mux: i2c_mux { + default_mux { + ste,function = "i2c4"; + ste,pins = "i2c4_b_2"; + }; + }; + + i2c4_default_mode: i2c_default { + default_cfg1 { + ste,pins = "GPIO122", "GPIO123"; + ste,config = <&in_pu>; + }; + }; + + i2c4_sleep_mode: i2c_sleep { + sleep_cfg1 { + ste,pins = "GPIO122", "GPIO123"; + ste,config = <&slpm_in_pu>; + }; + }; + }; + + i2c5 { + i2c5_default_mux: i2c_mux { + default_mux { + ste,function = "i2c5"; + ste,pins = "i2c5_c_2"; + }; + }; + + i2c5_default_mode: i2c_default { + default_cfg1 { + ste,pins = "GPIO118", "GPIO119"; + ste,config = <&in_pu>; + }; + }; + + i2c5_sleep_mode: i2c_sleep { + sleep_cfg1 { + ste,pins = "GPIO118", "GPIO119"; + ste,config = <&slpm_in_pu>; + }; + }; + }; }; }; }; diff --git a/arch/arm/boot/dts/ccu8540.dts b/arch/arm/boot/dts/ccu8540.dts index 3065fe4f60e5..7df65f0a33a5 100644 --- a/arch/arm/boot/dts/ccu8540.dts +++ b/arch/arm/boot/dts/ccu8540.dts @@ -48,5 +48,39 @@ 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>; + }; }; }; From b4ff4d1d9fbca0d3ed9e5cc64b618d662293136b Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 19 Jul 2013 15:13:37 +0100 Subject: [PATCH 09/22] ARM: ux500: Remove Toshiba TC35892 I/O Expander's DT entry from Snowball's DTS It doesn't exist on this development board. Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/snowball.dts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index 928a192efa8a..6e38844e506c 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -166,12 +166,6 @@ }; i2c@80004000 { - tc3589x@42 { - //compatible = "tc3589x"; - reg = <0x42>; - gpios = <&gpio6 25 0x4>; - interrupt-parent = <&gpio6>; - }; tps61052@33 { //compatible = "tps61052"; reg = <0x33>; From bee3c79643d693c8b53cfda355925032ee1c569b Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 19 Jul 2013 15:13:38 +0100 Subject: [PATCH 10/22] ARM: ux500: Remove Snowball DTS entry for National Semiconductor LP5521 LED chip It doesn't exist on the Snowball development board. Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/snowball.dts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index 6e38844e506c..b63c4541dee0 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -173,14 +173,6 @@ }; i2c@80128000 { - lp5521@33 { - // compatible = "lp5521"; - reg = <0x33>; - }; - lp5521@34 { - // compatible = "lp5521"; - reg = <0x34>; - }; bh1780@29 { // compatible = "rohm,bh1780gli"; reg = <0x33>; From d6aacc49a4df2fe35bb3ebe0d1521be918291ce5 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 19 Jul 2013 15:13:39 +0100 Subject: [PATCH 11/22] ARM: ux500: Remove Snowball DTS entry for TPS61052 chip TPS61052 is a; boost converter, LED driver, LED flash driver and simple GPIO pin chip. It has no use here however, as it is not found on the Snowball development board. Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/snowball.dts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index b63c4541dee0..baca9950a004 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -165,13 +165,6 @@ status = "okay"; }; - i2c@80004000 { - tps61052@33 { - //compatible = "tps61052"; - reg = <0x33>; - }; - }; - i2c@80128000 { bh1780@29 { // compatible = "rohm,bh1780gli"; From 8be0e7119e5b2872e190043e249bafc629e59d61 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 19 Jul 2013 15:13:40 +0100 Subject: [PATCH 12/22] ARM: ux500: Remove Snowball DTS entry for ROHM BH1780GLI ambient light sensor It doesn't exist on the Snowball development board. Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/snowball.dts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index baca9950a004..f1567a075fe2 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -165,13 +165,6 @@ status = "okay"; }; - i2c@80128000 { - bh1780@29 { - // compatible = "rohm,bh1780gli"; - reg = <0x33>; - }; - }; - cpufreq-cooling { status = "okay"; }; From 32ceadd7bb28fecedfad6a31c6c7beca7d24915e Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 19 Jul 2013 15:13:41 +0100 Subject: [PATCH 13/22] ARM: ux500: Apply a ste-* prefix onto snowball.dts Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/{snowball.dts => ste-snowball.dts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename arch/arm/boot/dts/{snowball.dts => ste-snowball.dts} (100%) diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/ste-snowball.dts similarity index 100% rename from arch/arm/boot/dts/snowball.dts rename to arch/arm/boot/dts/ste-snowball.dts From ced237df435725eed3684d49927d7a04032a9ca3 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 19 Jul 2013 15:13:42 +0100 Subject: [PATCH 14/22] ARM: ux500: Apply a ste-* prefix onto ccu8540.dts Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/{ccu8540.dts => ste-ccu8540.dts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename arch/arm/boot/dts/{ccu8540.dts => ste-ccu8540.dts} (100%) diff --git a/arch/arm/boot/dts/ccu8540.dts b/arch/arm/boot/dts/ste-ccu8540.dts similarity index 100% rename from arch/arm/boot/dts/ccu8540.dts rename to arch/arm/boot/dts/ste-ccu8540.dts From 421c7399dd79aa1fd0c14430ee8e2ca42685f99e Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 19 Jul 2013 15:13:43 +0100 Subject: [PATCH 15/22] ARM: ux500: Apply a ste-* prefix onto ccu9540.dts Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/{ccu9540.dts => ste-ccu9540.dts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename arch/arm/boot/dts/{ccu9540.dts => ste-ccu9540.dts} (100%) diff --git a/arch/arm/boot/dts/ccu9540.dts b/arch/arm/boot/dts/ste-ccu9540.dts similarity index 100% rename from arch/arm/boot/dts/ccu9540.dts rename to arch/arm/boot/dts/ste-ccu9540.dts From 23a8ceb0765b717d92804feb3ee88a0b808e548d Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 19 Jul 2013 15:13:44 +0100 Subject: [PATCH 16/22] ARM: ux500: Apply a ste-* prefix onto href.dtsi Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/{href.dtsi => ste-href.dtsi} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename arch/arm/boot/dts/{href.dtsi => ste-href.dtsi} (100%) diff --git a/arch/arm/boot/dts/href.dtsi b/arch/arm/boot/dts/ste-href.dtsi similarity index 100% rename from arch/arm/boot/dts/href.dtsi rename to arch/arm/boot/dts/ste-href.dtsi From d1e686442f61845231d606bc08b8c922040fbcf9 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 19 Jul 2013 15:13:45 +0100 Subject: [PATCH 17/22] ARM: ux500: Apply a ste-* prefix onto hrefprev60.dts Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/{hrefprev60.dts => ste-hrefprev60.dts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename arch/arm/boot/dts/{hrefprev60.dts => ste-hrefprev60.dts} (100%) diff --git a/arch/arm/boot/dts/hrefprev60.dts b/arch/arm/boot/dts/ste-hrefprev60.dts similarity index 100% rename from arch/arm/boot/dts/hrefprev60.dts rename to arch/arm/boot/dts/ste-hrefprev60.dts From 7f733a4f529975c125bc0d96595e5008aa07c26e Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 19 Jul 2013 15:13:46 +0100 Subject: [PATCH 18/22] ARM: ux500: Apply a ste-* prefix onto hrefv60plus.dts Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/{hrefv60plus.dts => ste-hrefv60plus.dts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename arch/arm/boot/dts/{hrefv60plus.dts => ste-hrefv60plus.dts} (100%) diff --git a/arch/arm/boot/dts/hrefv60plus.dts b/arch/arm/boot/dts/ste-hrefv60plus.dts similarity index 100% rename from arch/arm/boot/dts/hrefv60plus.dts rename to arch/arm/boot/dts/ste-hrefv60plus.dts From 236fe09445029d817bf3ee07aeca25a291c0494c Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 19 Jul 2013 15:13:47 +0100 Subject: [PATCH 19/22] ARM: ux500: Apply a ste-* prefix onto stuib.dtsi Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/{stuib.dtsi => ste-stuib.dtsi} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename arch/arm/boot/dts/{stuib.dtsi => ste-stuib.dtsi} (100%) diff --git a/arch/arm/boot/dts/stuib.dtsi b/arch/arm/boot/dts/ste-stuib.dtsi similarity index 100% rename from arch/arm/boot/dts/stuib.dtsi rename to arch/arm/boot/dts/ste-stuib.dtsi From c105424a51767667029c1abafc54cb4d7bc13676 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 19 Jul 2013 15:13:48 +0100 Subject: [PATCH 20/22] ARM: ux500: Apply a ste-* prefix onto dbx5x0.dtsi Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/{dbx5x0.dtsi => ste-dbx5x0.dtsi} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename arch/arm/boot/dts/{dbx5x0.dtsi => ste-dbx5x0.dtsi} (100%) diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi similarity index 100% rename from arch/arm/boot/dts/dbx5x0.dtsi rename to arch/arm/boot/dts/ste-dbx5x0.dtsi From 2771211ad6d2489d87be2b8920115efe1439b34c Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 19 Jul 2013 15:13:49 +0100 Subject: [PATCH 21/22] ARM: ux500: Remove u9540.dts as it's been replaced This must have been a merge error. There was a patch which renamed the u9540.dts to ccu9540.dts, however the u9540.dts was reincarnate with the same patches which created it in the first place. Let's kill it once and for all. Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/u9540.dts | 72 ------------------------------------- 1 file changed, 72 deletions(-) delete mode 100644 arch/arm/boot/dts/u9540.dts diff --git a/arch/arm/boot/dts/u9540.dts b/arch/arm/boot/dts/u9540.dts deleted file mode 100644 index 95892ec6c342..000000000000 --- a/arch/arm/boot/dts/u9540.dts +++ /dev/null @@ -1,72 +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/ "dbx5x0.dtsi" - -/ { - model = "ST-Ericsson U9540 platform with Device Tree"; - compatible = "st-ericsson,u9540"; - - memory { - reg = <0x00000000 0x20000000>; - }; - - soc-u9500 { - 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>; - mmc-cap-sd-highspeed; - mmc-cap-mmc-highspeed; - vmmc-supply = <&ab8500_ldo_aux3_reg>; - - cd-gpios = <&gpio7 6 0x4>; // 230 - cd-inverted; - - status = "okay"; - }; - - - // WLAN SDIO channel - sdi1_per2@80118000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <50000000>; - bus-width = <4>; - - status = "okay"; - }; - - // On-board eMMC - sdi4_per2@80114000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <100000000>; - bus-width = <8>; - mmc-cap-mmc-highspeed; - vmmc-supply = <&ab8500_ldo_aux2_reg>; - - status = "okay"; - }; - }; -}; From 2ce05a14bb379bd81ba3ad12cc08b2c4bda83480 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 7 Aug 2013 15:37:52 +0200 Subject: [PATCH 22/22] ARM: ux500: fix devicetree builds The patch set beginning with commit: "ARM: ux500: Apply a ste-* prefix onto snowball.dts" thru commit: "ARM: ux500: Remove u9540.dts as it's been replaced" altered the names of the ux500 device tree files but forgot to: - Rename the ccu8540-pinctrl.dtsi file - Update #include statements from files using these files, so the build broke. - Update the Makefile for the device trees so the build broke. Fix it up so we can build them all again. Acked-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/Makefile | 10 +++++----- .../{ccu8540-pinctrl.dtsi => ste-ccu8540-pinctrl.dtsi} | 0 arch/arm/boot/dts/ste-ccu8540.dts | 4 ++-- arch/arm/boot/dts/ste-ccu9540.dts | 2 +- arch/arm/boot/dts/ste-href.dtsi | 2 +- arch/arm/boot/dts/ste-hrefprev60.dts | 6 +++--- arch/arm/boot/dts/ste-hrefv60plus.dts | 6 +++--- arch/arm/boot/dts/ste-snowball.dts | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) rename arch/arm/boot/dts/{ccu8540-pinctrl.dtsi => ste-ccu8540-pinctrl.dtsi} (100%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 641b3c9a7028..efee128a9d1f 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -176,11 +176,11 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ am43x-epos-evm.dtb dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb -dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \ - hrefprev60.dtb \ - hrefv60plus.dtb \ - ccu8540.dtb \ - ccu9540.dtb +dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ + ste-hrefprev60.dtb \ + ste-hrefv60plus.dtb \ + ste-ccu8540.dtb \ + ste-ccu9540.dtb dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ r8a7740-armadillo800eva.dtb \ diff --git a/arch/arm/boot/dts/ccu8540-pinctrl.dtsi b/arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi similarity index 100% rename from arch/arm/boot/dts/ccu8540-pinctrl.dtsi rename to arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi diff --git a/arch/arm/boot/dts/ste-ccu8540.dts b/arch/arm/boot/dts/ste-ccu8540.dts index 7df65f0a33a5..7f3baf51a3a9 100644 --- a/arch/arm/boot/dts/ste-ccu8540.dts +++ b/arch/arm/boot/dts/ste-ccu8540.dts @@ -10,8 +10,8 @@ */ /dts-v1/; -#include "dbx5x0.dtsi" -#include "ccu8540-pinctrl.dtsi" +#include "ste-dbx5x0.dtsi" +#include "ste-ccu8540-pinctrl.dtsi" / { model = "ST-Ericsson U8540 platform with Device Tree"; diff --git a/arch/arm/boot/dts/ste-ccu9540.dts b/arch/arm/boot/dts/ste-ccu9540.dts index ed29ec7288e4..229508750890 100644 --- a/arch/arm/boot/dts/ste-ccu9540.dts +++ b/arch/arm/boot/dts/ste-ccu9540.dts @@ -10,7 +10,7 @@ */ /dts-v1/; -#include "dbx5x0.dtsi" +#include "ste-dbx5x0.dtsi" / { model = "ST-Ericsson CCU9540 platform with Device Tree"; diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi index 9db41b9d8358..370e03f5e7b2 100644 --- a/arch/arm/boot/dts/ste-href.dtsi +++ b/arch/arm/boot/dts/ste-href.dtsi @@ -10,7 +10,7 @@ */ #include -#include "dbx5x0.dtsi" +#include "ste-dbx5x0.dtsi" / { memory { diff --git a/arch/arm/boot/dts/ste-hrefprev60.dts b/arch/arm/boot/dts/ste-hrefprev60.dts index c6bb07df2d1d..d8d3b99ab007 100644 --- a/arch/arm/boot/dts/ste-hrefprev60.dts +++ b/arch/arm/boot/dts/ste-hrefprev60.dts @@ -10,9 +10,9 @@ */ /dts-v1/; -#include "dbx5x0.dtsi" -#include "href.dtsi" -#include "stuib.dtsi" +#include "ste-dbx5x0.dtsi" +#include "ste-href.dtsi" +#include "ste-stuib.dtsi" / { model = "ST-Ericsson HREF (pre-v60) platform with Device Tree"; diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dts b/arch/arm/boot/dts/ste-hrefv60plus.dts index 3d580d6447f9..6e52ebbf113f 100644 --- a/arch/arm/boot/dts/ste-hrefv60plus.dts +++ b/arch/arm/boot/dts/ste-hrefv60plus.dts @@ -10,9 +10,9 @@ */ /dts-v1/; -#include "dbx5x0.dtsi" -#include "href.dtsi" -#include "stuib.dtsi" +#include "ste-dbx5x0.dtsi" +#include "ste-href.dtsi" +#include "ste-stuib.dtsi" / { model = "ST-Ericsson HREF (v60+) platform with Device Tree"; diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts index f1567a075fe2..f1fc128e249d 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts @@ -10,7 +10,7 @@ */ /dts-v1/; -#include "dbx5x0.dtsi" +#include "ste-dbx5x0.dtsi" / { model = "Calao Systems Snowball platform with device tree";