kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: shmobile: kzm9g-reference: Move SDHI regulators to DT

Browse source 
Create two GPIO-controlled fixed-voltage regulators in the
kzm9g-reference DT and remove manual configuration of the corresponding
GPIOs from board code.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Laurent Pinchart 2013-05-09 17:41:59 +02:00 committed by Simon Horman
parent ec028600f4
commit f8f77ce940
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
View file

@ -13,6 +13,7 @@
/dts-v1/; /dts-v1/;
/include/ "sh73a0.dtsi" /include/ "sh73a0.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ { / {
model = "KZM-A9-GT"; model = "KZM-A9-GT";
@ -58,6 +59,24 @@
regulator-boot-on; regulator-boot-on;
}; };
vmmc_sdhi0: regulator@2 {
compatible = "regulator-fixed";
regulator-name = "SDHI0 Vcc";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&pfc 15 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
vmmc_sdhi2: regulator@3 {
compatible = "regulator-fixed";
regulator-name = "SDHI2 Vcc";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&pfc 14 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
lan9220@10000000 { lan9220@10000000 {
compatible = "smsc,lan9220", "smsc,lan9115"; compatible = "smsc,lan9220", "smsc,lan9115";
reg = <0x10000000 0x100>; reg = <0x10000000 0x100>;
@ -200,7 +219,7 @@
pinctrl-0 = <&sdhi0_pins>; pinctrl-0 = <&sdhi0_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
vmmc-supply = <&reg_3p3v>; vmmc-supply = <&vmmc_sdhi0>;
bus-width = <4>; bus-width = <4>;
status = "okay"; status = "okay";
}; };
@ -209,7 +228,7 @@
pinctrl-0 = <&sdhi2_pins>; pinctrl-0 = <&sdhi2_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
vmmc-supply = <&reg_3p3v>; vmmc-supply = <&vmmc_sdhi2>;
bus-width = <4>; bus-width = <4>;
broken-cd; broken-cd;
status = "okay"; status = "okay";

6
arch/arm/mach-shmobile/board-kzm9g-reference.c
View file

@ -21,7 +21,6 @@
*/ */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/gpio.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/irqchip.h> #include <linux/irqchip.h>
@ -37,11 +36,6 @@ static void __init kzm_init(void)
{ {
sh73a0_add_standard_devices_dt(); sh73a0_add_standard_devices_dt();
/* enable SD */
gpio_request_one(15, GPIOF_OUT_INIT_HIGH, NULL); /* power */
gpio_request_one(14, GPIOF_OUT_INIT_HIGH, NULL); /* power */
#ifdef CONFIG_CACHE_L2X0 #ifdef CONFIG_CACHE_L2X0
/* Early BRESP enable, Shared attribute override enable, 64K*8way */ /* Early BRESP enable, Shared attribute override enable, 64K*8way */
l2x0_init(IOMEM(0xf0100000), 0x40460000, 0x82000fff); l2x0_init(IOMEM(0xf0100000), 0x40460000, 0x82000fff);